summaryrefslogtreecommitdiff
path: root/include/uapi (follow)
Commit message (Collapse)AuthorAge
...
* | | | | | | Merge "msm: vidc: Addition of VIDIOC_QUERY_EXT_CTRL ioctl"Linux Build Service Account2017-06-20
|\ \ \ \ \ \ \
| * | | | | | | msm: vidc: Addition of VIDIOC_QUERY_EXT_CTRL ioctlAkshay Chandrashekhar Kalghatgi2017-06-19
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding vidc support for VIDIOC_QUERY_EXT_CTRL ioctl. This ioctl will return the details for the V4L2 control identified by the ID provided by the user or the next supported control based upon the flags provided by the user. Change-Id: I68161ceb000a46a8e54333ab39c0229f8fbdbf72 Signed-off-by: Akshay Chandrashekhar Kalghatgi <akalghat@codeaurora.org>
* | | | | | | drm/msm: Add a submit queue flag to disable the QoS timerJordan Crouse2017-06-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow priviliged (CAP_SYS_ADMIN) processes to disable the hangcheck / quality of service timer to allow individual submits to run for as long as they need. Change-Id: Ic0dedbad1399ebe7c6db74ba374bfa3a6f72917a Signed-off-by: Jordan Crouse <jcrouse@codeaurora.org>
* | | | | | | drm/msm: Add submit queue queriesJordan Crouse2017-06-19
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add the capability to query information from a submit queue. The first available parameter is to query the number of GPU faults that have been caused by the queue. The driver can periodically query this value to see if it has caused a fault and take action accordingly. Change-Id: Ic0dedbadc68d5782c0b8b71d89722742aa6aaf1a Signed-off-by: Jordan Crouse <jcrouse@codeaurora.org>
* | | | | | Merge "drm/msm: Add per-instance submit queues"Linux Build Service Account2017-06-15
|\ \ \ \ \ \
| * | | | | | drm/msm: Add per-instance submit queuesJordan Crouse2017-06-12
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently the priority and other behavior of a command stream is provided by the user application during submission and the application is expected to internally maintain the settings for each 'context' or 'rendering queue' and specify the correct ones. This works okay for simple cases but as applications become more complex we will want to set context specific flags and do various permisson checks to allow certain contexts to enable additional privileges. Add kernel-side submit queues to be analogous to 'contexts' or 'rendering queues' on the application side. Each file descriptor instance will maintain its own list of queues. Queues cannot be shared between file descriptors. For backwards compatibility context id '0' is defined as a default context specifying middle priority and no special flags. This is intended to be the usual configuration for 99% of applications so that a garden variety application can function correctly without creating a queue. Only those applications requiring the specific benefit of different queues need create one. In addition to the basic infrastructure, allow the user to specify the queue priority - this will be used in lieu of the legacy flags to set priority during the submission. Only the master DRM instance can set the highest priority, but all the others are open to all processes. Change-Id: Ic0dedbad02fa27c0ba20c1157a05ddb143e46357 Signed-off-by: Jordan Crouse <jcrouse@codeaurora.org>
* | | | | | Merge "msm: ba: Update ba driver to latest v4l2 framework"Linux Build Service Account2017-06-14
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | msm: ba: Merge relevant changes from A familyShiju Mathew2017-06-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge relevant bridge abstraction changes from 8064 to MSM8996. CRs-Fixed: 998927 Change-Id: I4baaa5a8b93cade64b0064acdc63b3b4ab7765e7 Signed-off-by: Shiju Mathew <shijum@codeaurora.org>
| * | | | | msm: BA: Create Bridge Abstraction (BA)Domi Papoi2017-06-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create bridge abstraction driver to provide a framework that can be used to abstract different types of bridge chips under a common API. The framework also allows multiple drivers to control different functional aspects of a bridge chip. The bridge abstraction driver is limited to bridge chips that deal with converting audio/video data from one protocol to a different one. Change-Id: Ib42365fb41afda8029f4f6e9b1ec27549d885659 Signed-off-by: Domi Papoi <dpapoi@codeaurora.org>
* | | | | | Merge "drm/msm/sde: add secure use case properties"Linux Build Service Account2017-06-08
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | drm/msm/sde: add secure use case propertiesAbhijit Kulkarni2017-06-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change adds custom PLANE(fb_translation_mode) and CRTC(security_level) properties for supporting secure use case. Plane property identifies the translation requirement for the planes. CRTC property speicifies what planes could be attached to this CRTC. CRs-Fixed: 2053654 Change-Id: Iea59027d4bee536c8554e3955723982a6fc361dd Signed-off-by: Abhijit Kulkarni <kabhijit@codeaurora.org>
* | | | | | Merge "drm/msm: Use mmu notifiers to track SVM range invalidations"Linux Build Service Account2017-06-08
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | drm/msm: Implement shared virtual memory ioctlSushmita Susheelendra2017-06-02
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Shared virtual memory allows the CPU and GPU to use the same virtual address for a buffer. This change implements an ioctl to allow creation of SVM buffer objects. Change-Id: I0d929a2e37a9eeef948dc2a37250c1eb9adf6fc7 Signed-off-by: Sushmita Susheelendra <ssusheel@codeaurora.org>
* / / / / spcom: move SPCOM_MAX_CHANNELS define to uapi/linux/spcom.hAmir Samuelov2017-06-06
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move SPCOM_MAX_CHANNELS to common H file to make sure that kernel spcom driver and user space spcomlib library are synced. Change-Id: I5e19f8def7de755fa89b6a5c67e9d3372f8433f1 Signed-off-by: Amir Samuelov <amirs@codeaurora.org>
* | | | Merge "ASoC: msm: Add IEC_61937_FMT_UPDATE event"Linux Build Service Account2017-05-28
|\ \ \ \
| * | | | ASoC: msm: Add IEC_61937_FMT_UPDATE eventSiddartha Shaik2017-05-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DSP sends IEC_61937_FMT_UPDATE_EVENT event to notify audio format change during HDMI in loopback usecase. CRs-Fixed: 2049714 Change-Id: Ifb8565cbe7e7755b891588cd206293daa9300ce4 Signed-off-by: Siddartha Shaik <sshaik@codeaurora.org>
* | | | | Merge "drm/msm: profile submit_time in nanosecond resolution"Linux Build Service Account2017-05-26
|\ \ \ \ \
| * | | | | drm/msm: profile submit_time in nanosecond resolutionSharat Masetty2017-05-15
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The initial version of the patch save the command submit_time and queue_time in seconds, but its desired by the users of this profiling API to return the time in nanoseconds resolution. Change-Id: I3a56e3ffd3ebe86f51a00a12b7c3e7c4b4c9a956 Signed-off-by: Sharat Masetty <smasetty@codeaurora.org>
* | | | | Merge "drm/msm: add irq mapping for cec in hdmi driver"Linux Build Service Account2017-05-26
|\ \ \ \ \
| * | | | | [media] cec: fix report_current_latencyHans Verkuil2017-05-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the (very) small print of the REPORT_CURRENT_LATENCY message there is a line that says that the last byte of the message (audio out delay) is only present if the 'audio out compensated' value is 3. I missed this, and so if this message was sent with a total length of 6 (i.e. without the audio out delay byte), then it was rejected by the framework since a minimum length of 7 was expected. Fix this minimum length check and update the wrappers in cec-funcs.h to do the right thing based on the message length. Change-Id: I123cc5fc2b6baca8cb2910bc687489329e81ca73 Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com> Git-commit: f3854973f196baad5be6b62d8f5ea24b0346b63f Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git Signed-off-by: Ray Zhang <rayz@codeaurora.org>
| * | | | | [media] cec: move the CEC framework out of staging and to mediaHans Verkuil2017-05-25
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The last open issues have been addressed, so it is time to move this out of staging and into the mainline and to move the public cec headers to include/uapi/linux. Conflicts: Documentation/media/Makefile drivers/media/i2c/Kconfig drivers/media/platform/vivid/Kconfig drivers/staging/media/Makefile drivers/staging/media/pulse8-cec/Kconfig drivers/staging/media/s5p-cec/Kconfig drivers/staging/media/st-cec/Kconfig Change-Id: Ie46e780a7d29d773dbb9bd642059695eb580e8ad Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com> Git-commit: 0dbacebede1e4e44bf500f94d692fad05eb2c293 Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git [rayz@codeaurora.org: make some modifications to the original patch to fix the cherry-pick conflicts. (1) discard the changes in Documentation. (2) discard the CEC adapter driver changes for other vendors because they are not needed.] Signed-off-by: Ray Zhang <rayz@codeaurora.org>
* | | | | Merge "msm: ais: Security fixes for ispif and cpp"Linux Build Service Account2017-05-25
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | msm: Initial ais driver for automotive cameraTerence Ho2017-05-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Initial driver directory setup for automotive imaging subsystem - ais. The camera kernel drivers for mobile and automotive platforms have been decoupled and placed in separate directories as automotive usecases will require significant divergence from mobile drivers. The changes to the imaging pipeline drivers enable automotive imaging subsystem interface from userspace. This snapshot is taken as of msm-3.18 'commit c3d5931bbc51 ("msm: Initial ais driver for automotive camera")' Change-Id: I49b8e827818994d0a8b320ffe92f8031ffbb69ca Signed-off-by: Terence Ho <terenceh@codeaurora.org> Signed-off-by: Andy Sun <bins@codeaurora.org>
* | | | | Merge "drm/msm: make msm_drm.h uapi header safe for C++"Linux Build Service Account2017-05-13
|\ \ \ \ \
| * | | | | drm/msm: make msm_drm.h uapi header safe for C++Manoj Kumar AVM2017-05-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixes the C++ related compilation issues. CRs-Fixed: 2038080 Change-Id: If6b4f379eb27f3de6153b8666f733c0b8245851f Signed-off-by: Manoj Kumar AVM <manojavm@codeaurora.org>
* | | | | | Merge "drm/msm: add extern C guard for the UAPI header"Linux Build Service Account2017-05-11
|\| | | | |
| * | | | | drm/msm: add extern C guard for the UAPI headerEmil Velikov2017-05-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CRs-Fixed: 2038080 Change-Id: Idf66084b7d07c828d96538dfb7430da2fed796f2 Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com> Acked-by: Rob Clark <robdclark@gmail.com> (over irc) Git-commit: a62424e29dc33fdf1cf9efadfbf54deefbcfe7bf Git-repo: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=a62424e Signed-off-by: Manoj Kumar AVM <manojavm@codeaurora.org>
* | | | | | Merge "drm/msm: Allocate secure buffer objects"Linux Build Service Account2017-05-11
|\ \ \ \ \ \
| * | | | | | drm/msm: Support secure rendering for A5XX targetsJordan Crouse2017-05-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A5XX targets support GPU rendering on secured surfaces by going into a special secure mode to execute the commands. In secure mode GPU rendering can only write to secure buffers that have been mapped in an appropriately secured pagetable. In secure mode the GPU can read both secure and unsecure buffers and the CP engine can only access unsecured buffers (so commands do not need to be secure). Secure buffers virtual addresses must fall into a specific range; this is the clue to the GPU that it should use the secure pagetable instead of the regular one. For A5XX targets that range will start at 0xC0000000 and be 256MB in size. All secure buffers in all processes share the same pagetable. Add a secure address space for A5XX targets and automatically trigger into secure mode if any buffer in the submission is marked as secure. Change-Id: Ic0dedbad8f7168711d10928cd1894b98f908425f Signed-off-by: Jordan Crouse <jcrouse@codeaurora.org>
* | | | | | | Merge "drm: add extern C guard for the UAPI headers"Linux Build Service Account2017-05-10
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | drm: add extern C guard for the UAPI headersEmil Velikov2017-05-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CRs-Fixed: 2038080 Change-Id: Id6f4ac3d41fec4804b1449f303d4872bf7a1fd51 Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com> Git-commit: ebbb0e5cfd2ceb1150b1af7f9fcf7aeebfb1b69f Git-repo: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=ebbb0e5cf Signed-off-by: Manoj Kumar AVM <manojavm@codeaurora.org>
| * | | | | | drm: Make drm.h uapi header safe for C++Daniel Vetter2017-05-10
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | virtual is a protected keyword in C++ and can't be used at all. Ugh. This aligns the kernel versions of the drm headers with the ones in libdrm. v2: Also annote with __user, as request by Emil&Ilia. CRs-Fixed: 2038080 Change-Id: I184b99e51fc5c6efd4eb6f5ed9da2858b7972a6e Cc: Ilia Mirkin <imirkin@alum.mit.edu> Cc: Emil Velikov <emil.l.velikov@gmail.com> Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1459350753-18320-1-git-send-email-daniel.vetter@ffwll.ch Git-commit: 4c4925fa0c2b5943655ef28b2d6a379961db551f Git-repo: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=4c4925f Signed-off-by: Manoj Kumar AVM <manojavm@codeaurora.org>
* | | | | | Merge "msm: ipa: support aggregated ipa stats query"Linux Build Service Account2017-05-10
|\ \ \ \ \ \
| * | | | | | msm: ipa: support aggregated ipa stats querySkylar Chang2017-05-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add support on wan-driver to query modem or wlan-fw to get the total data usage for all tethered clients. Change-Id: I56f40f1c0f6b2ec4279e78b3aeb81c687d08bf2e Signed-off-by: Skylar Chang <chiaweic@codeaurora.org>
* | | | | | | Merge "ASoC: msm: enhance ADSP Stream Callback"Linux Build Service Account2017-05-10
|\ \ \ \ \ \ \
| * | | | | | | ASoC: msm: add the support for ADSP event dataKuirong Wang2017-04-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add the ADSP event data definition used to pass the event registration information to ADSP or get event payload from ADSP. Change-Id: I05259ee1fe1faf72f90a1a56f8485cf8b1281e01 Signed-off-by: Kuirong Wang <kuirongw@codeaurora.org>
* | | | | | | | Merge "ASoC: msm: qdspv2: Add mixer controls for drift query"Linux Build Service Account2017-05-10
|\ \ \ \ \ \ \ \
| * | | | | | | | ASoc: msm: qdspv2: Clock recovery support in compress driverManish Dewangan2017-05-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support for clock recovery in compress driver. Userspace app can issue clock recovery command with a positive value to advance the clock or a negative value to delay the clock. CRs-Fixed: 2036899 Change-Id: Iacfc18afe6723edea84ed3382ac62810fcadb31a Signed-off-by: Manish Dewangan <manish@codeaurora.org>
* | | | | | | | | Merge "Merge branch 'android-4.4@24ac44d' into branch 'msm-4.4'"Linux Build Service Account2017-05-10
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | |
| * | | | | | | | Merge branch 'android-4.4@24ac44d' into branch 'msm-4.4'Blagovest Kolenichev2017-05-04
| |\ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | / / / | | | |_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * refs/heads/tmp-24ac44d Linux 4.4.66 ftrace/x86: Fix triple fault with graph tracing and suspend-to-ram ARCv2: save r30 on kernel entry as gcc uses it for code-gen nfsd: check for oversized NFSv2/v3 arguments Input: i8042 - add Clevo P650RS to the i8042 reset list p9_client_readdir() fix MIPS: Avoid BUG warning in arch_check_elf MIPS: KGDB: Use kernel context for sleeping threads ALSA: seq: Don't break snd_use_lock_sync() loop by timeout ALSA: firewire-lib: fix inappropriate assignment between signed/unsigned type ipv6: check raw payload size correctly in ioctl ipv6: check skb->protocol before lookup for nexthop macvlan: Fix device ref leak when purging bc_queue ip6mr: fix notification device destruction netpoll: Check for skb->queue_mapping net: ipv6: RTF_PCPU should not be settable from userspace dp83640: don't recieve time stamps twice tcp: clear saved_syn in tcp_disconnect() sctp: listen on the sock only when it's state is listening or closed net: ipv4: fix multipath RTM_GETROUTE behavior when iif is given l2tp: fix PPP pseudo-wire auto-loading l2tp: take reference on sessions being dumped net/packet: fix overflow in check for tp_reserve net/packet: fix overflow in check for tp_frame_nr l2tp: purge socket queues in the .destruct() callback net: phy: handle state correctly in phy_stop_machine net: neigh: guard against NULL solicit() method sparc64: Fix kernel panic due to erroneous #ifdef surrounding pmd_write() sparc64: kern_addr_valid regression xen/x86: don't lose event interrupts usb: gadget: f_midi: Fixed a bug when buflen was smaller than wMaxPacketSize regulator: core: Clear the supply pointer if enabling fails RDS: Fix the atomicity for congestion map update net_sched: close another race condition in tcf_mirred_release() net: cavium: liquidio: Avoid dma_unmap_single on uninitialized ndata MIPS: Fix crash registers on non-crashing CPUs md:raid1: fix a dead loop when read from a WriteMostly disk ext4: check if in-inode xattr is corrupted in ext4_expand_extra_isize_ea() drm/amdgpu: fix array out of bounds crypto: testmgr - fix out of bound read in __test_aead() clk: sunxi: Add apb0 gates for H3 ARM: OMAP2+: timer: add probe for clocksources xc2028: unlock on error in xc2028_set_config() f2fs: do more integrity verification for superblock net: pppolac/pppopns: Add back the msg_flags Conflicts: drivers/regulator/core.c Change-Id: I8e7b279efa442a0338ee735d27ff3ebe866a8dee Signed-off-by: Blagovest Kolenichev <bkolenichev@codeaurora.org>
| | * | | | | | Merge 4.4.66 into android-4.4Greg Kroah-Hartman2017-05-03
| | |\ \ \ \ \ \ | | | | |_|_|/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes in 4.4.66: f2fs: do more integrity verification for superblock xc2028: unlock on error in xc2028_set_config() ARM: OMAP2+: timer: add probe for clocksources clk: sunxi: Add apb0 gates for H3 crypto: testmgr - fix out of bound read in __test_aead() drm/amdgpu: fix array out of bounds ext4: check if in-inode xattr is corrupted in ext4_expand_extra_isize_ea() md:raid1: fix a dead loop when read from a WriteMostly disk MIPS: Fix crash registers on non-crashing CPUs net: cavium: liquidio: Avoid dma_unmap_single on uninitialized ndata net_sched: close another race condition in tcf_mirred_release() RDS: Fix the atomicity for congestion map update regulator: core: Clear the supply pointer if enabling fails usb: gadget: f_midi: Fixed a bug when buflen was smaller than wMaxPacketSize xen/x86: don't lose event interrupts sparc64: kern_addr_valid regression sparc64: Fix kernel panic due to erroneous #ifdef surrounding pmd_write() net: neigh: guard against NULL solicit() method net: phy: handle state correctly in phy_stop_machine l2tp: purge socket queues in the .destruct() callback net/packet: fix overflow in check for tp_frame_nr net/packet: fix overflow in check for tp_reserve l2tp: take reference on sessions being dumped l2tp: fix PPP pseudo-wire auto-loading net: ipv4: fix multipath RTM_GETROUTE behavior when iif is given sctp: listen on the sock only when it's state is listening or closed tcp: clear saved_syn in tcp_disconnect() dp83640: don't recieve time stamps twice net: ipv6: RTF_PCPU should not be settable from userspace netpoll: Check for skb->queue_mapping ip6mr: fix notification device destruction macvlan: Fix device ref leak when purging bc_queue ipv6: check skb->protocol before lookup for nexthop ipv6: check raw payload size correctly in ioctl ALSA: firewire-lib: fix inappropriate assignment between signed/unsigned type ALSA: seq: Don't break snd_use_lock_sync() loop by timeout MIPS: KGDB: Use kernel context for sleeping threads MIPS: Avoid BUG warning in arch_check_elf p9_client_readdir() fix Input: i8042 - add Clevo P650RS to the i8042 reset list nfsd: check for oversized NFSv2/v3 arguments ARCv2: save r30 on kernel entry as gcc uses it for code-gen ftrace/x86: Fix triple fault with graph tracing and suspend-to-ram Linux 4.4.66 Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
| | | * | | | | net: ipv6: RTF_PCPU should not be settable from userspaceDavid Ahern2017-05-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ Upstream commit 557c44be917c322860665be3d28376afa84aa936 ] Andrey reported a fault in the IPv6 route code: kasan: GPF could be caused by NULL-ptr deref or user memory access general protection fault: 0000 [#1] SMP KASAN Modules linked in: CPU: 1 PID: 4035 Comm: a.out Not tainted 4.11.0-rc7+ #250 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS Bochs 01/01/2011 task: ffff880069809600 task.stack: ffff880062dc8000 RIP: 0010:ip6_rt_cache_alloc+0xa6/0x560 net/ipv6/route.c:975 RSP: 0018:ffff880062dced30 EFLAGS: 00010206 RAX: dffffc0000000000 RBX: ffff8800670561c0 RCX: 0000000000000006 RDX: 0000000000000003 RSI: ffff880062dcfb28 RDI: 0000000000000018 RBP: ffff880062dced68 R08: 0000000000000001 R09: 0000000000000000 R10: 0000000000000000 R11: 0000000000000000 R12: 0000000000000000 R13: ffff880062dcfb28 R14: dffffc0000000000 R15: 0000000000000000 FS: 00007feebe37e7c0(0000) GS:ffff88006cb00000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 00000000205a0fe4 CR3: 000000006b5c9000 CR4: 00000000000006e0 Call Trace: ip6_pol_route+0x1512/0x1f20 net/ipv6/route.c:1128 ip6_pol_route_output+0x4c/0x60 net/ipv6/route.c:1212 ... Andrey's syzkaller program passes rtmsg.rtmsg_flags with the RTF_PCPU bit set. Flags passed to the kernel are blindly copied to the allocated rt6_info by ip6_route_info_create making a newly inserted route appear as though it is a per-cpu route. ip6_rt_cache_alloc sees the flag set and expects rt->dst.from to be set - which it is not since it is not really a per-cpu copy. The subsequent call to __ip6_dst_alloc then generates the fault. Fix by checking for the flag and failing with EINVAL. Fixes: d52d3997f843f ("ipv6: Create percpu rt6_info") Reported-by: Andrey Konovalov <andreyknvl@google.com> Signed-off-by: David Ahern <dsa@cumulusnetworks.com> Acked-by: Martin KaFai Lau <kafai@fb.com> Tested-by: Andrey Konovalov <andreyknvl@google.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* | | | | | | | Merge "msm: mdss: Add multi-rectangle validation support"Linux Build Service Account2017-05-05
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | msm: mdss: Add multi-rectangle validation supportAnimesh Kishore2017-04-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rectangle number is being passed to kernel from userspace. Added required validation checks. CRs-Fixed: 2000464 Change-Id: I179caa1a86beb9a8f5f3f9b9ef489bf1fd12c73e Signed-off-by: Animesh Kishore <animeshk@codeaurora.org>
* | | | | | | | Merge "msm: camera: ispif: extend interface with line width"Linux Build Service Account2017-05-03
|\ \ \ \ \ \ \ \
| * | | | | | | | msm: camera: ispif: extend interface with line widthPetar Sivenov2017-04-27
| | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | During ISPIF 3D merge configuration, line width is needed in order to properly determine stereo merge 3D threshold register value. This change adds line width to ISPIF extended configuration struct. Change-Id: Iaa8ca00b4a69559d42b58a42cb61a0aa8f7a355b Signed-off-by: Petar Sivenov <psiven@codeaurora.org>
* | | | | | | | Merge "esoc: Add provision to handle shutdown request in userspace"Linux Build Service Account2017-05-02
|\ \ \ \ \ \ \ \
| * | | | | | | | esoc: Add provision to handle shutdown request in userspaceArun KS2017-05-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In certain scenarios, modem shutdown requests are handled in userspace. Enhance request engine of esoc driver to send shutdown requests to userspace. Also, during a shutdown, avoid setting status to 0, if line is not a power source. There can be multiple mdms monitoring status line. This can otherwise be misinterpreted as an unexpected reset by other mdms. Change-Id: I9c20a86e76f892cc61dbfb814202b26e5cce3e96 Signed-off-by: Arun KS <arunks@codeaurora.org> Signed-off-by: Srivatsa Vaddagiri <vatsa@codeaurora.org>
* | | | | | | | | Merge "esoc: mdm-4x: Add support for mdm9x45 and apq8096"Linux Build Service Account2017-05-01
|\| | | | | | | |
| * | | | | | | | esoc: Add err_fatal signal status to clink_opsArun KS2017-04-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto_boot esoc devices can boot and crash before esoc driver comes up. But there is no way for the user space code to know that it has crashed by looking at status line alone. Hence, create a new ioctl entry to export status of err_fatal line to user space. Change-Id: Ie7d6115c749d4c63f06aefca29ba457d38eccc7f Signed-off-by: Arun KS <arunks@codeaurora.org>