aboutsummaryrefslogtreecommitdiff
path: root/include/uapi
Commit message (Collapse)AuthorAgeFilesLines
* net: ipv6: autoconf routes into per-device tablesLorenzo Colitti2014-10-181-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, IPv6 router discovery always puts routes into RT6_TABLE_MAIN. This causes problems for connection managers that want to support multiple simultaneous network connections and want control over which one is used by default (e.g., wifi and wired). To work around this connection managers typically take the routes they prefer and copy them to static routes with low metrics in the main table. This puts the burden on the connection manager to watch netlink to see if the routes have changed, delete the routes when their lifetime expires, etc. Instead, this patch adds a per-interface sysctl to have the kernel put autoconf routes into different tables. This allows each interface to have its own autoconf table, and choosing the default interface (or using different interfaces at the same time for different types of traffic) can be done using appropriate ip rules. The sysctl behaves as follows: - = 0: default. Put routes into RT6_TABLE_MAIN as before. - > 0: manual. Put routes into the specified table. - < 0: automatic. Add the absolute value of the sysctl to the device's ifindex, and use that table. The automatic mode is most useful in conjunction with net.ipv6.conf.default.accept_ra_rt_table. A connection manager or distribution could set it to, say, -100 on boot, and thereafter just use IP rules. Change-Id: I82d16e3737d9cdfa6489e649e247894d0d60cbb1 Signed-off-by: Lorenzo Colitti <lorenzo@google.com> (cherry picked from commit a03f539b1636dd97e7f4f78da08b5e2e02e6cb6d) Reviewed-on: http://git-master/r/558593 GVS: Gerrit_Virtual_Submit Reviewed-by: Harshavardhan Nalajala <hnalajala@nvidia.com> Tested-by: Harshavardhan Nalajala <hnalajala@nvidia.com> Reviewed-by: Dhiren Parmar <dparmar@nvidia.com>
* usb: gadget: f_fs: support superspeed gadgetsJC Kuo2014-09-161-0/+10
| | | | | | | | | | | | | | This commit add superspeed gadgets support to f_fs gadget. Change-Id: I16a540098cfcd157e25b0e81d7cf2533ced2ae39 Signed-off-by: JC Kuo <jckuo@nvidia.com> Reviewed-on: http://git-master/r/436303 (cherry picked from commit 7b3de28db5d3a14838c8a31eb189bcb8e3fcc513) Reviewed-on: http://git-master/r/499235 GVS: Gerrit_Virtual_Submit Reviewed-by: Robert Shih <rshih@nvidia.com> Tested-by: Robert Shih <rshih@nvidia.com> Reviewed-by: Todd Poynter <tpoynter@nvidia.com>
* usb: gadget: mtp: add new ioctl for compatRohith Seelaboyina2014-03-251-1/+11
| | | | | | | | | | | | | | | | | Define a new ioctl for MTP_SEND_EVENT, as its ioctl numbers depends on the size of struct mtp_event, which varies in ARCH32 and ARCH64. Bug 1466403 Change-Id: I1d172aae422ca483b00c6dd59e739166f40c53ce Signed-off-by: Rohith Seelaboyina <rseelaboyina@nvidia.com> Reviewed-on: http://git-master/r/377800 (cherry picked from commit c4367afe1d2bc3eca18ba8b83001869351fd30f1) Reviewed-on: http://git-master/r/385956 Reviewed-by: Automatic_Commit_Validation_User GVS: Gerrit_Virtual_Submit Reviewed-by: Venkat Moganty <vmoganty@nvidia.com>
* Merge branch 'linux-3.10.33' into dev-kernel-3.10Deepak Nibade2014-03-131-3/+3
|\ | | | | | | | | | | | | Bug 1456092 Change-Id: I3021247ec68a3c2dddd9e98cde13d70a45191d53 Signed-off-by: Deepak Nibade <dnibade@nvidia.com>
| * ALSA: compress: Fix 64bit ABI incompatibilityTakashi Iwai2013-12-201-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 6733cf572a9e20db2b7580a5dd39d5782d571eec upstream. snd_pcm_uframes_t is defined as unsigned long so it would take different sizes depending on 32 or 64bit architectures. As we don't want this ABI incompatibility, and there is no real 64bit user yet, let's make it the fixed size with __u32. Also bump the protocol version number to 0.1.2. Acked-by: Vinod Koul <vinod.koul@intel.com> Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* | Merge branch 'android-3.10' into dev-kernel-3.10Deepak Nibade2014-03-101-11/+21
|\ \ | | | | | | | | | | | | | | | | | | Bug 1456092 Change-Id: I87b6b883c382000fc0dfee7c8d8f36269f504e46 Signed-off-by: Deepak Nibade <dnibade@nvidia.com>
| * | video: adf: define constants for device-custom ioctlsGreg Hackmann2014-01-171-11/+21
| | | | | | | | | | | | | | | | | | | | | | | | Device-custom ADF ioctls can use type ADF_IOCTL_TYPE and nr >= ADF_IOCTL_NR_CUSTOM Change-Id: Ia8270973df5100e996ca0e021ede60e54b9af72a Signed-off-by: Greg Hackmann <ghackmann@google.com>
* | | audit: change decimal constant to macro for invalid uidRichard Guy Briggs2014-01-291-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SFR reported this 2013-05-15: > After merging the final tree, today's linux-next build (i386 defconfig) > produced this warning: > > kernel/auditfilter.c: In function 'audit_data_to_entry': > kernel/auditfilter.c:426:3: warning: this decimal constant is unsigned only > in ISO C90 [enabled by default] > > Introduced by commit 780a7654cee8 ("audit: Make testing for a valid > loginuid explicit") from Linus' tree. Replace this decimal constant in the code with a macro to make it more readable (add to the unsigned cast to quiet the warning). Cc: Stephen Rothwell <sfr@canb.auug.org.au> Cc: "Eric W. Biederman" <ebiederm@xmission.com> Signed-off-by: Richard Guy Briggs <rgb@redhat.com> Signed-off-by: Eric Paris <eparis@redhat.com> (cherry picked from commit 42f74461a5b60cf6b42887e6d2ff5b7be4abf1ca) Change-Id: Ic6bf1f225cb8d8d9678b209a963bacfa8d9b0216 Signed-off-by: Philip Rakity <prakity@nvidia.com> Reviewed-on: http://git-master/r/361012 Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
* | | driver: mmc: Add new ioctl to send combo commandsSeshagiri Holi2014-01-061-1/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add ioctl for sending a sequence of commands to the device, atomically. This combo command (MMC_COMBO_IOC_CMD) is a array of mmc_ioc_cmd. The user space application can send an array (mmc_ioc_cmd) of MMC commands. To ensure atomic operations of all commands in array, a single lock is acquired. This is required for user-space tools to issue refresh and check device's health and status. bug 1304972 Change-Id: I340b9a95e6471ee578e404a7b01eec3db02662d0 Reviewed-on: http://git-master/r/281699 (cherry picked from commit 8945e061c4c5b26bb17c6e2d7ab610a056e7011f) Reviewed-on: http://git-master/r/302096 Signed-off-by: Seshagiri Holi <sholi@nvidia.com> Reviewed-on: http://git-master/r/337181 Reviewed-by: Pavan Kunapuli <pkunapuli@nvidia.com> Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
* | | Merge branch 'remotes/android/android-3.10' into dev-kernel-3.10Bharat Nihalani2013-12-307-0/+638
|\| | | | | | | | | | | Change-Id: I0c919e55654e0c224a5f8a5df80d9f49e92dbb37
| * | video: adf: fix ADF_MAX_ATTACHMENTS declarationGreg Hackmann2013-11-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Userspace-facing ADF_MAX_ATTACHMENTS must be in terms of userspace-facing struct adf_attachment_config Change-Id: Iaaddcd6366f13b3e52eb3911efcfff8a61e0b225 Signed-off-by: Greg Hackmann <ghackmann@google.com>
| * | video: adf: remove PAGE_SIZE from userspace-facing headerGreg Hackmann2013-11-201-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | Systems may define PAGE_SIZE in userspace limits.h but don't have to. PAGE_SIZE was picked as an arbitrary "reasonable" limit so just use 4096 instead. Change-Id: I9555e39aba64a3a70f61eb6ded2a4129ab236ce0 Signed-off-by: Greg Hackmann <ghackmann@google.com>
| * | net: move PPPoLAC and PPPoPNS headers to uapiColin Cross2013-11-072-0/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | Move the entire contents of the linux/if_pppolac.h and linux/if_pppopns.h headers to uapi, they only contain userspace interfaces. Change-Id: I3cfed7f2ae400b53269a1f59144aa3dbc30ae0b5 Signed-off-by: Colin Cross <ccross@android.com>
| * | usb: gadget: f_accessory: move userspace interface to uapiColin Cross2013-11-071-0/+146
| | | | | | | | | | | | | | | | | | | | | | | | Move the entire contents of linux/usb/f_accessory.h header to uapi, it only contains a userspace interface. Change-Id: Ieb5547da449588ae554988a201c0e6b4e3afc531 Signed-off-by: Colin Cross <ccross@android.com>
| * | usb: gadget: f_mtp: move userspace interface to uapiColin Cross2013-11-071-0/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | Move the most of linux/usb/f_mtp.h header to uapi. Move the only remaining structure definition into f_mtp.c, the only place that uses it. Change-Id: I952c1a9dc15c36bf295a0eb4d74b6b1ad912ed03 Signed-off-by: Colin Cross <ccross@android.com>
| * | input: misc: keychord: move header to uapiColin Cross2013-11-071-0/+52
| | | | | | | | | | | | | | | | | | | | | | | | Move the entire contents of linux/keychord.h header to uapi, it only contains a userspace interface. Change-Id: If94f83328b19efb58c66391dce3bd8e927788d8d Signed-off-by: Colin Cross <ccross@android.com>
| * | video: adf: add informational flags to interfacesGreg Hackmann2013-10-111-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | Informational flags don't affect ADF directly but may be useful to clients. Currently used to indicate primary and external displays. Change-Id: I343c7f0148da0869244c8e818350e9855525df85 Signed-off-by: Greg Hackmann <ghackmann@google.com>
| * | video: adf: add supported formats to adf_overlay_engine_dataGreg Hackmann2013-10-111-0/+6
| | | | | | | | | | | | | | | Change-Id: If2aa783b9ece60160f465bf697508fc58682e1bc Signed-off-by: Greg Hackmann <ghackmann@google.com>
| * | video: adf: support "simple" buffersGreg Hackmann2013-10-111-0/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Simple buffers are linear RGB buffers analogous to KMS's dumb buffers. Simple buffers can be allocated and posted to a display interface without any driver-private data. Internally, ADF drivers provide the driver-private data needed (if any) to post a simple buffer to the display. Change-Id: Ib0b737622eaf343111310f6623f99d69cf3807d2 Signed-off-by: Greg Hackmann <ghackmann@google.com>
| * | video: add atomic display frameworkGreg Hackmann2013-10-111-0/+254
| | | | | | | | | | | | | | | Change-Id: I693257e269a99012cd0dbb57576ac222869cf4c7 Signed-off-by: Greg Hackmann <ghackmann@google.com>
| * | mm: add a field to store names for private anonymous memoryColin Cross2013-09-191-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Userspace processes often have multiple allocators that each do anonymous mmaps to get memory. When examining memory usage of individual processes or systems as a whole, it is useful to be able to break down the various heaps that were allocated by each layer and examine their size, RSS, and physical memory usage. This patch adds a user pointer to the shared union in vm_area_struct that points to a null terminated string inside the user process containing a name for the vma. vmas that point to the same address will be merged, but vmas that point to equivalent strings at different addresses will not be merged. Userspace can set the name for a region of memory by calling prctl(PR_SET_VMA, PR_SET_VMA_ANON_NAME, start, len, (unsigned long)name); Setting the name to NULL clears it. The names of named anonymous vmas are shown in /proc/pid/maps as [anon:<name>] and in /proc/pid/smaps in a new "Name" field that is only present for named vmas. If the userspace pointer is no longer valid all or part of the name will be replaced with "<fault>". The idea to store a userspace pointer to reduce the complexity within mm (at the expense of the complexity of reading /proc/pid/mem) came from Dave Hansen. This results in no runtime overhead in the mm subsystem other than comparing the anon_name pointers when considering vma merging. The pointer is stored in a union with fieds that are only used on file-backed mappings, so it does not increase memory usage. Change-Id: Ie2ffc0967d4ffe7ee4c70781313c7b00cf7e3092 Signed-off-by: Colin Cross <ccross@android.com>
* | | Merge tag 'v3.10.24' into HEADAjay Nandakumar2013-12-162-5/+9
|\ \ \ | | |/ | |/| | | | | | | | | | This is the 3.10.24 stable release Change-Id: Ibd2734f93d44385ab86867272a1359158635133b
| * | perf: Fix perf ring buffer memory orderingPeter Zijlstra2013-11-201-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit bf378d341e4873ed928dc3c636252e6895a21f50 upstream. The PPC64 people noticed a missing memory barrier and crufty old comments in the perf ring buffer code. So update all the comments and add the missing barrier. When the architecture implements local_t using atomic_long_t there will be double barriers issued; but short of introducing more conditional barrier primitives this is the best we can do. Reported-by: Victor Kaplansky <victork@il.ibm.com> Tested-by: Victor Kaplansky <victork@il.ibm.com> Signed-off-by: Peter Zijlstra <peterz@infradead.org> Cc: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca> Cc: michael@ellerman.id.au Cc: Paul McKenney <paulmck@linux.vnet.ibm.com> Cc: Michael Neuling <mikey@neuling.org> Cc: Frederic Weisbecker <fweisbec@gmail.com> Cc: anton@samba.org Cc: benh@kernel.crashing.org Link: http://lkml.kernel.org/r/20131025173749.GG19466@laptop.lan Signed-off-by: Ingo Molnar <mingo@kernel.org> Cc: Michael Neuling <mikey@neuling.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| * | drm: Pad drm_mode_get_connector to 64-bit boundaryChris Wilson2013-11-131-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit bc5bd37ce48c66e9192ad2e7231e9678880f6f8e upstream. Pavel Roskin reported that DRM_IOCTL_MODE_GETCONNECTOR was overwritting the 4 bytes beyond the end of its structure with a 32-bit userspace running on a 64-bit kernel. This is due to the padding gcc inserts as the drm_mode_get_connector struct includes a u64 and its size is not a natural multiple of u64s. 64-bit kernel: sizeof(drm_mode_get_connector)=80, alignof=8 sizeof(drm_mode_get_encoder)=20, alignof=4 sizeof(drm_mode_modeinfo)=68, alignof=4 32-bit userspace: sizeof(drm_mode_get_connector)=76, alignof=4 sizeof(drm_mode_get_encoder)=20, alignof=4 sizeof(drm_mode_modeinfo)=68, alignof=4 Fortuituously we can insert explicit padding to the tail of our structures without breaking ABI. Reported-by: Pavel Roskin <proski@gnu.org> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Cc: Dave Airlie <airlied@redhat.com> Cc: dri-devel@lists.freedesktop.org Signed-off-by: Dave Airlie <airlied@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* | | media: tegra v4l2 camera: refactor driver codeBryan Wu2013-11-011-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reconstruct the driver for Tegra V4L2 camera driver: - remove old driver file tegra_v4l2_camera.c - create driver file vi.c for VI/CSI (T20/T30/T114/T148) - create driver file vi2.c for VI2/CSI2 (T124) Bug 1377330 Change-Id: If030cf98e700b9201caa60328be822bc10610e74 Signed-off-by: Bryan Wu <pengw@nvidia.com> Reviewed-on: http://git-master/r/289329 GVS: Gerrit_Virtual_Submit Reviewed-by: Allen Martin <amartin@nvidia.com>
* | | Merge tag 'v3.10.17' into dev-kernel-3.10Ajay Nandakumar2013-10-311-0/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | This is the 3.10.17 stable release Conflicts: drivers/usb/host/xhci.c Change-Id: I6bd3b15ff92a0b94568b9d02e9bb1036becfca20
| * | drm/radeon/si: Add support for CP DMA to CS checker for compute v2Tom Stellard2013-10-011-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit e5b9e7503eb1f4884efa3b321d3cc47806779202 upstream. Also add a new RADEON_INFO query to check that CP DMA packets are supported on the compute ring. CP DMA has been supported since the 3.8 kernel, but due to an oversight we forgot to teach the CS checker that the CP DMA packet was legal for the compute ring on Southern Islands GPUs. This patch fixes a bug where the radeon driver will incorrectly reject a legal CP DMA packet from user space. I would like to have the patch backported to stable so that we don't have to require Mesa users to use a bleeding edge kernel in order to take advantage of this feature which is already present in the stable kernels (3.8 and newer). v2: - Don't bump kms version, so this patch can be backported to stable kernels. Signed-off-by: Tom Stellard <thomas.stellard@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* | | Merge tag 'v3.10.12' into android-tegra-nv-3.10-rebaseDan Willemsen2013-09-142-1/+11
|\| | | | | | | | | | | | | | | | | This is the 3.10.12 stable release Signed-off-by: Dan Willemsen <dwillemsen@nvidia.com>
| * | ICMPv6: treat dest unreachable codes 5 and 6 as EACCES, not EPROTOJiri Bohac2013-09-141-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ Upstream commit 61e76b178dbe7145e8d6afa84bb4ccea71918994 ] RFC 4443 has defined two additional codes for ICMPv6 type 1 (destination unreachable) messages: 5 - Source address failed ingress/egress policy 6 - Reject route to destination Now they are treated as protocol error and icmpv6_err_convert() converts them to EPROTO. RFC 4443 says: "Codes 5 and 6 are more informative subsets of code 1." Treat codes 5 and 6 as code 1 (EACCES) Btw, connect() returning -EPROTO confuses firefox, so that fallback to other/IPv4 addresses does not work: https://bugzilla.mozilla.org/show_bug.cgi?id=910773 Signed-off-by: Jiri Bohac <jbohac@suse.cz> Acked-by: Hannes Frederic Sowa <hannes@stressinduktion.org> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| * | net_sched: restore "linklayer atm" handlingJesper Dangaard Brouer2013-09-141-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ Upstream commit 8a8e3d84b1719a56f9151909e80ea6ebc5b8e318 ] commit 56b765b79 ("htb: improved accuracy at high rates") broke the "linklayer atm" handling. tc class add ... htb rate X ceil Y linklayer atm The linklayer setting is implemented by modifying the rate table which is send to the kernel. No direct parameter were transferred to the kernel indicating the linklayer setting. The commit 56b765b79 ("htb: improved accuracy at high rates") removed the use of the rate table system. To keep compatible with older iproute2 utils, this patch detects the linklayer by parsing the rate table. It also supports future versions of iproute2 to send this linklayer parameter to the kernel directly. This is done by using the __reserved field in struct tc_ratespec, to convey the choosen linklayer option, but only using the lower 4 bits of this field. Linklayer detection is limited to speeds below 100Mbit/s, because at high rates the rtab is gets too inaccurate, so bad that several fields contain the same values, this resembling the ATM detect. Fields even start to contain "0" time to send, e.g. at 1000Mbit/s sending a 96 bytes packet cost "0", thus the rtab have been more broken than we first realized. Signed-off-by: Jesper Dangaard Brouer <brouer@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* | | input: Add MSC_TIMESEC/_TIMEUSEC for androidXiaohui Tao2013-09-141-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Eventhub defines two entries: MSC_ANDROID_TIME_SEC 0x6 MSC_ANDROID_TIME_USEC 0x7 to pass the timestamp from the linux kernel to android if the input devices have a better concetp of the time. These two entries conflict with MSC_ACTIVITY which is used for CPU_BOOST, which causes the first touc does not work after lp0. Add the two entries in input.h to match with android layer. Bug 1354400 Change-Id: I5cc9b2605db609cebad96ad1b95433fa333e77f7 Signed-off-by: Xiaohui Tao <xtao@nvidia.com> Reviewed-on: http://git-master/r/266219 Reviewed-by: Mitch Luban <mluban@nvidia.com> Tested-by: Mitch Luban <mluban@nvidia.com>
* | | Input: touch: synaptics: Direct Touch kernel files.Xiaohui Tao2013-09-141-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code drop from synaptics Below is the detailed description of the change: * Support for multiple RMI4 devices has been added. * The Kconfig options have been further simplified. CONFIG_RMI4_BUS and CONFIG_RMI4_GENERIC are replaced by a single control, CONFIG_RMI4_CORE. You'll need to update your defconfig file appropriately. * some debugfs and sysfs files have moved around. If you have tools or scripts that depend on these files, you'll need to update the paths. * The driver_name field of rmi_device_platform_data has been removed, as it was no longer necessary. * Polling support has been added. Polling works on I2C and SPIv1. It does not work for SPIv2, since that requires a working ATTN line. * A sensor_type field has been added to the F11 per-sensor platform data. This allows you to specify whether the device is touchscreen or touchpad type sensor in cases where the register map does not allow this to be determined programmatically. * F11 platform data has been updated to a per-sensor basis (remember that a single F11 module might have more than one 2D sensor attached to it). * F11 virtual button maps have been switched to a per-sensor basis. * F11 Type B support is always on, and removed from Kconfig. Per-sensor platformdata is provided if you need to force Multifinger Type A input. * IMPORTANT: the RMI4 driver has been converted over to the Linux kernel bus and driver model. This means that the sysfs file structure has changed. Some files have moved to debugfs, and for remaining files, the sysfs tree structure has changed. Refer to Documentation/ABI/testing/debugfs-rmi4 and sysfs-rmi4 for full details. * ALSO IMPORTANT: The Kconfig options have been simplified. Several have been eliminated, and others have been consolidated. Please consult Kconfig and make any necessary related changes to your kernel configuration. * ATTN interrupts are not enabled until the F01 function driver is bound to the sensor. This should eliminate spurious interrupts that were seen during the system bootup process. Bug 960856 Bug 1253719 Change-Id: I773ec9210e0d6c7e8f03d551ca61bbda156080f7 Signed-off-by: Xiaohui Tao <xtao@nvidia.com> Reviewed-on: http://git-master/r/130310 Reviewed-by: Seema Khowala <seemaj@nvidia.com> Tested-by: Seema Khowala <seemaj@nvidia.com> Reviewed-by: Thomas Cherry <tcherry@nvidia.com>
* | | Input: add MSC_ACTIVITY event for reporting early input activityYogish Kulkarni2013-09-141-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Input devices which depends on host processor for converting raw samples to input event needs to report early event so that CPU frequency governor can act to boost process of converting raw samples to input event data. Direct touch technology based device is an example where computation happens on CPU instead of dedicated controller. Bug 1229219 Change-Id: I404fb30e2a05f8092d194825488db017e7e935af Signed-off-by: Yogish Kulkarni <yogishk@nvidia.com> Reviewed-on: http://git-master/r/196737 (cherry picked from commit 39614533cbc98531d5ecaca08cbb0145161d2eb3) Reviewed-on: http://git-master/r/200761 GVS: Gerrit_Virtual_Submit Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
* | | mac80211&nl80211: support to abort a scan request on txWei Ni2013-09-141-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mac80211 & nl80211: add support to abort a scan request on tx The original issue is the chromium issue: http://code.google.com/p/chromium-os/issues/detail?id=11485 This fix comes from: https://gerrit.chromium.org/gerrit/#change,5744 https://gerrit.chromium.org/gerrit/#change,5745 Since this change is for ChromeOs and will affect Android P2P function, so we add config option MAC80211_SCAN_ABORT for it. Bug 1051830 Change-Id: I77504f4d279f3f3d99b5e5f9d734480888d62193 Signed-off-by: Wei Ni <wni@nvidia.com> Reviewed-on: http://git-master/r/160777 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Rhyland Klein <rklein@nvidia.com> Reviewed-by: Bibhay Ranjan <bibhayr@nvidia.com> Tested-by: Bibhay Ranjan <bibhayr@nvidia.com> Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
* | | usb: gadget: phonet: Add Phonet over ACM for RMCBH Hsieh2013-09-141-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * As submitted by RMC for modem support * Add Phonet over ACM support for RMC PegaPCI Bug 1066582 Bug 1167013 Change-Id: Id7883e30767d47200a1ed8ccb4e79f01a30c7a06 Signed-off-by: BH Hsieh <bhsieh@nvidia.com> Reviewed-on: http://git-master/r/160149 (cherry picked from commit 17ad36b016454666bf3c81036fe3d4e6987be591) Reviewed-on: http://git-master/r/162772 GVS: Gerrit_Virtual_Submit Reviewed-by: Steve Lin <stlin@nvidia.com>
* | | drivers: net: Modifications for RMC PegaPCI.Raj Jayaraman2013-09-141-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * As submitted by RMC for modem support * Bug 1054808 Change-Id: Ia25f0d6aaea899cb327cb2141d6896a508238c0c Signed-off-by: Raj Jayaraman <rjayaraman@nvidia.com> Reviewed-on: http://git-master/r/160032 (cherry picked from commit a81627cafe577dc5f640feb11596d485200c4c0d) Reviewed-on: http://git-master/r/162292 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: WK Tsai <wtsai@nvidia.com> Reviewed-by: Steve Lin <stlin@nvidia.com>
* | | net: phonet: Modifications for RMC PegaPCI.Raj Jayaraman2013-09-142-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * As submitted by RMC for modem support * Bug 1054808 Change-Id: I6674df1870dea09e3a1b6035d2d8218e2f56de3b Signed-off-by: Raj Jayaraman <rjayaraman@nvidia.com> Reviewed-on: http://git-master/r/160031 (cherry picked from commit 60564998c44336e29d653e7d10a20555f0a5703b) Reviewed-on: http://git-master/r/162291 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: WK Tsai <wtsai@nvidia.com> Reviewed-by: Steve Lin <stlin@nvidia.com>
* | | Merge commit 'a88f9e27498afaea615ad3e93af4f26df1f84987' into ↵Dan Willemsen2013-09-146-1/+35
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | after-upstream-android Conflicts: arch/arm/common/Kconfig arch/arm/mm/Makefile arch/arm/mm/cache-l2x0.c arch/arm/mm/mmu.c drivers/input/Kconfig drivers/input/Makefile drivers/power/Kconfig kernel/futex.c
| * | netfilter: xt_IDLETIMER: Add new netlink msg typeJP Abgrall2013-07-011-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Send notifications when the label becomes active after an idle period. Send netlink message notifications in addition to sysfs notifications. Using a uevent with subsystem=xt_idletimer INTERFACE=... STATE={active,inactive} This is backport from common android-3.0 commit: beb914e987cbbd368988d2b94a6661cb907c4d5a with uevent support instead of a new netlink message type. Change-Id: I31677ef00c94b5f82c8457e5bf9e5e584c23c523 Signed-off-by: Ashish Sharma <ashishsharma@google.com> Signed-off-by: JP Abgrall <jpa@google.com>
| * | nf: xt_socket: export the fancy sock finder codeJP Abgrall2013-07-011-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The socket matching function has some nifty logic to get the struct sock from the skb or from the connection tracker. We export this so other xt_* can use it, similarly to ho how xt_socket uses nf_tproxy_get_sock. Change-Id: I11c58f59087e7f7ae09e4abd4b937cd3370fa2fd Signed-off-by: JP Abgrall <jpa@google.com>
| * | net: add PPP on PPTP Network Server (PPPoPNS) driver.Chia-chi Yeh2013-07-011-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Chia-chi Yeh <chiachi@android.com> ppopns: dont include px_proto define in if_pppopns.h Change-Id: I27e687667db5b45182562f4a517a2e6cec6b1350 Signed-off-by: Dima Zavin <dima@android.com>
| * | net: add PPP on L2TP Access Concentrator (PPPoLAC) driver.Chia-chi Yeh2013-07-011-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3ae3ee7520951ae24269db0ef2898c6455cf6bcc Signed-off-by: Chia-chi Yeh <chiachi@android.com> ppolac: dont include px_proto define in if_pppolac.h Change-Id: I55bc9cf91ea0e9e8f7bf5d6e241d188e1269343a Signed-off-by: Dima Zavin <dima@android.com>
| * | FAT: Add new ioctl VFAT_IOCTL_GET_VOLUME_ID for reading the volume ID.Mike Lockwood2013-07-011-0/+12
| | | | | | | | | | | | Signed-off-by: Brian Swetland <swetland@google.com>
| * | net: socket ioctl to reset connections matching local addressRobert Love2013-07-011-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduce a new socket ioctl, SIOCKILLADDR, that nukes all sockets bound to the same local address. This is useful in situations with dynamic IPs, to kill stuck connections. Signed-off-by: Brian Swetland <swetland@google.com> net: fix tcp_v4_nuke_addr Signed-off-by: Dima Zavin <dima@android.com> net: ipv4: Fix a spinlock recursion bug in tcp_v4_nuke. We can't hold the lock while calling to tcp_done(), so we drop it before calling. We then have to start at the top of the chain again. Signed-off-by: Dima Zavin <dima@android.com> net: ipv4: Fix race in tcp_v4_nuke_addr(). To fix a recursive deadlock in 2.6.29, we stopped holding the hash table lock across tcp_done() calls. This fixed the deadlock, but introduced a race where the socket could die or change state. Fix: Before unlocking the hash table, we grab a reference to the socket. We can then unlock the hash table without risk of the socket going away. We then lock the socket, which is safe because it is pinned. We can then call tcp_done() without recursive deadlock and without race. Upon return, we unlock the socket and then unpin it, killing it. Change-Id: Idcdae072b48238b01bdbc8823b60310f1976e045 Signed-off-by: Robert Love <rlove@google.com> Acked-by: Dima Zavin <dima@android.com> ipv4: disable bottom halves around call to tcp_done(). Signed-off-by: Robert Love <rlove@google.com> Signed-off-by: Colin Cross <ccross@android.com> ipv4: Move sk_error_report inside bh_lock_sock in tcp_v4_nuke_addr When sk_error_report is called, it wakes up the user-space thread, which then calls tcp_close. When the tcp_close is interrupted by the tcp_v4_nuke_addr ioctl thread running tcp_done, it leaks 392 bytes and triggers a WARN_ON. This patch moves the call to sk_error_report inside the bh_lock_sock, which matches the locking used in tcp_v4_err. Signed-off-by: Colin Cross <ccross@android.com>
| * | Input: evdev - Add ioctl to block suspend while event queue is not empty.Arve Hjønnevåg2013-07-011-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add an ioctl, EVIOCSSUSPENDBLOCK, to enable a wakelock that will block suspend while the event queue is not empty. This allows userspace code to process input events while the device appears to be asleep. The current code holds the wakelock for up 5 seconds for every input device and client. This can prevent suspend if sensor with a high data rate is active, even when that sensor is not capable of waking the device once it is suspended. Change-Id: I624d66ef30a0b3abb543685c343382b8419b42b9 Signed-off-by: Arve Hjønnevåg <arve@android.com>
* | | Merge branch 'buckets/video' into after-bucketsDan Willemsen2013-09-141-0/+13
|\ \ \
| * | | HDMI stereo support - kernel code changeschzhang2013-09-141-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Chong Zhang <chzhang@nvidia.com> Original-Change-Id: I53eea3b14852aecd589dfbd0461258e064835cc9 Reviewed-on: http://git-master/r/11405 Reviewed-by: Daniel Willemsen <dwillemsen@nvidia.com> Rebase-Id: R4c2c1bba6eeeee16cf3d99061717c236c695eaf7
| * | | video: fbmon: Add support for CEA pixel ratios.Lajos Molnar2013-09-141-0/+4
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CEA defines multiple timings with dual timing ratios that cannot be distinguished from timings parameters. Added 2 new fb flags to specify 4:3 or 16:9 display ratios. Also added a flag that denotes CEA formats that require repeating pixels. Change-Id: I75d413babdcb4048a0ccce6548ed386ad0e52318 Signed-off-by: Lajos Molnar <molnar@ti.com> Rebase-Id: Re8a9c83e4707ae0ffabf4f2a539758faeacd6211
* | | Merge branch 'buckets/serial' into after-bucketsDan Willemsen2013-09-141-4/+6
|\ \ \
| * | | serial: 8250: support auto control of RTSCTS on tegra typePradeep Goudagunta2013-09-141-4/+6
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add UART_CAP_HW_CTSRTS flag to tegra type for supporting auto control of RTSCTS. Bug 803910 Original-Change-Id: I7b69e4b203e66903ba5755338fcb55f4a87b9a43 Reviewed-on: http://git-master/r/24463 Tested-by: Pradeep Goudagunta <pgoudagunta@nvidia.com> Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com> Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com> Rebase-Id: R3d534669876a75c3d72ed9eb6b878915a2d96e71
generated by cgit v1.2.3 (git 2.25.1) at 2026-01-13 16:52:16 +0000