summaryrefslogtreecommitdiff
path: root/include
AgeCommit message (Collapse)Author
2017-05-26Merge "power_supply: introduce PR_SWAP property"Linux Build Service Account
2017-05-26Merge "time: Remove CONFIG_TIMER_STATS"Linux Build Service Account
2017-05-26power_supply: introduce PR_SWAP propertyAbhijeet Dharmapurikar
Introduce POWER_SUPPLY_PROP_PR_SWAP to notify if the device is in power role swap. Change-Id: I8d0cb3a71ec1a646b7ec37405e66cb00ddc40e0d Signed-off-by: Abhijeet Dharmapurikar <adharmap@codeaurora.org>
2017-05-26Merge "ASoC: msm: Convert ALSA to ADSP format"Linux Build Service Account
2017-05-26Merge "drm/msm: profile submit_time in nanosecond resolution"Linux Build Service Account
2017-05-26Merge "mmc: core: extend SDR104 workaround for other paths"Linux Build Service Account
2017-05-26Merge "cnss: save the cc source to platform driver"Linux Build Service Account
2017-05-26Merge "soc: qcom: glink: Add new APIs to toggle RX thread priority"Linux Build Service Account
2017-05-26Merge "drm/msm: add irq mapping for cec in hdmi driver"Linux Build Service Account
2017-05-26Merge "soc: qcom: pil: Use subsys_set_error to indicate firmware errors"Linux Build Service Account
2017-05-25Merge "ASoC: msm: qdsp6v2: Add IEC61937 compressed HDMI pass-though"Linux Build Service Account
2017-05-25Merge "msm: ais: Security fixes for ispif and cpp"Linux Build Service Account
2017-05-25Merge "Merge remote-tracking branch 'origin/tmp-285c137' into msm-4.4"Linux Build Service Account
2017-05-25[media] cec: fix report_current_latencyHans Verkuil
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>
2017-05-25[media] cec: pass parent device in register(), not allocate()Hans Verkuil
The cec_allocate_adapter function doesn't need the parent device, only the cec_register_adapter function needs it. Drop the cec_devnode parent field, since devnode.dev.parent can be used instead. This change makes the framework consistent with other frameworks where the parent device is not used until the device is registered. Conflicts: Documentation/media/kapi/cec-core.rst drivers/media/i2c/adv7511.c drivers/media/i2c/adv7604.c drivers/media/i2c/adv7842.c drivers/media/platform/vivid/vivid-cec.c drivers/media/platform/vivid/vivid-cec.h drivers/media/platform/vivid/vivid-core.c drivers/media/usb/pulse8-cec/pulse8-cec.c drivers/staging/media/s5p-cec/s5p_cec.c drivers/staging/media/st-cec/stih-cec.c Change-Id: Id7a687308c4d3f2bc63ed2e8a55229b4e71fd8ed Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com> Git-commit: f51e80804f084de269954d875c0892b081b7df3c Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git [rayz@codeaurora.org: make some changes to fix the cherry-pick conflicts: (1) discard the CEC documentation change. (2) discard the CEC adapter driver changes for other vendors.] Signed-off-by: Ray Zhang <rayz@codeaurora.org>
2017-05-25[media] cec: move the CEC framework out of staging and to mediaHans Verkuil
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>
2017-05-25[media] cec: add proper support for CDC-Only CEC devicesHans Verkuil
CDC-Only CEC devices are CEC devices that can only handle CDC messages, all other messages are ignored. Add a flag to signal that this is a CDC-Only device and act accordingly. Also add helper functions to identify if a CEC device is configured as a CDC-Only device, a second TV, a switch or a processor, since these variations cannot be determined by the logical address alone. Change-Id: I9b814a5da3bca913d784bfe5fc508cdf06a5fea4 Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com> Git-commit: a69a168a1bd470cb8a8c5f2ff4b54463de615226 Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git Signed-off-by: Ray Zhang <rayz@codeaurora.org>
2017-05-25[media] cec: add CEC_MSG_FL_REPLY_TO_FOLLOWERSHans Verkuil
Give the caller more control over how replies to a transmit are handled. By default the reply will only go to the filehandle that called CEC_TRANSMIT. If this new flag is set, then the reply will also go to all followers. Change-Id: I3464ff0980bf5625ebd869eeeafced07c760f741 Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com> Git-commit: adc0c622783978ab0c740af77f98fc8f65c87d66 Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git [rayz@codeaurora.org: remove documents in the original patch to fix conflicts] Signed-off-by: Ray Zhang <rayz@codeaurora.org>
2017-05-25[media] cec: add flag to cec_log_addrs to enable RC passthroughHans Verkuil
By default the CEC_MSG_USER_CONTROL_PRESSED/RELEASED messages are passed on to the follower(s) only. If the new CEC_LOG_ADDRS_FL_ALLOW_RC_PASSTHRU flag is set in the flags field of struct cec_log_addrs then these messages are also passed on to the remote control input subsystem and they will appear as keystrokes. This used to be the default behavior, but now you have to explicitly enable it. This is done to force the caller to think about possible security issues (e.g. if these messages are used to enter passwords). Change-Id: I349b67e4456cefa604c58c3cb2d94f004d206e00 Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com> Git-commit: f4062625ede8f0280d8246437f4070c8eb7fe9f3 Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git [rayz@codeaurora.org: remove documents in the original patch to fix conflicts] Signed-off-by: Ray Zhang <rayz@codeaurora.org>
2017-05-25[media] cec-funcs.h: add missing vendor-specific messagesHans Verkuil
The cec-funcs.h header was missing support for these three vendor-specific messages: CEC_MSG_VENDOR_COMMAND CEC_MSG_VENDOR_COMMAND_WITH_ID CEC_MSG_VENDOR_REMOTE_BUTTON_DOWN Add wrappers for these messages. I originally postponed adding these wrappers due to the fact that the argument is just a byte array which cec-ctl couldn't handle at the time, and then I just forgot to add them once the CEC framework was finalized. It wasn't until an attempt to transmit a vendor specific command was made that I realized that these wrappers were missing. Change-Id: I0fb17f79f179310110310d372513aea475970054 Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com> Git-commit: 4808f721627c2a23b5d749f9bbd20d4529ea2b8d Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git Signed-off-by: Ray Zhang <rayz@codeaurora.org>
2017-05-25[media] cec: add CEC_LOG_ADDRS_FL_ALLOW_UNREG_FALLBACK flagHans Verkuil
Currently if none of the requested logical addresses can be claimed, the framework will fall back to the Unregistered logical address. Add a flag to enable this explicitly. By default it will just go back to the unconfigured state. Usually Unregistered is not something you want since the functionality is very limited. Unless the application has support for this, it will fail to work correctly. So require that the application explicitly requests this. Change-Id: Ic658a6cf7bdd127172701a5a5354222dbacdc7ea Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com> Git-commit: dcceb1eaf210096831b14471bc87678375b086ed Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git [rayz@codeaurora.org: remove the documents in original patch to fix conflicts] Signed-off-by: Ray Zhang <rayz@codeaurora.org>
2017-05-25[media] cec-funcs.h: add reply argument for Record On/OffHans Verkuil
A reply parameter is added to the cec_msg_record_on/off functions in cec-funcs.h. The standard mandates that Record Status shall be replied to Record On, and it may be replied to Record Off. Change-Id: Ic143eb3706b4da9d414390b14ab93307eec25a40 Signed-off-by: Johan Fjeldtvedt <jaffe1@gmail.com> Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com> Git-commit: 31dc8b7302f1e48952ec8e90cd49dca843146cd0 Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git Signed-off-by: Ray Zhang <rayz@codeaurora.org>
2017-05-25[media] cec-funcs.h: fix typo: && should be &Hans Verkuil
Fix typo where logical AND was used instead of bitwise AND. Change-Id: Ic184559541646f87052b78d54efedcd1b0a2ce40 Reported-by: David Binderman <linuxdev.baldrick@gmail.com> Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com> Git-commit: 9ebf1945d757433a089ab3ee940673503e3e11ec Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git Signed-off-by: Ray Zhang <rayz@codeaurora.org>
2017-05-25[media] cec: rename cec_devnode fhs_lock to just lockHans Verkuil
This lock will be used to protect more than just the fhs list. So rename it to just 'lock'. Change-Id: I6a2623b1231154be2a4d764ad2086fc73015a3af Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com> Git-commit: 62148f0930a8e9bd5c5614f8387222f0220d7d47 Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git Signed-off-by: Ray Zhang <rayz@codeaurora.org>
2017-05-25[media] cec: limit the size of the transmit queueHans Verkuil
The size of the transmit queue was unlimited, which meant that in non-blocking mode you could flood the CEC adapter with messages to be transmitted. Limit this to 18 messages. Also print the number of pending transmits and the timeout value in the status debugfs file. Change-Id: I5cdadee7854e62d5a823b7dc53448860ba73228a Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com> Git-commit: 11065f8531ed33d5e847a36ad64231ee599d4996 Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git Signed-off-by: Ray Zhang <rayz@codeaurora.org>
2017-05-25[media] cec: split the timestamp into an rx and tx timestampHans Verkuil
When transmitting a message and waiting for a reply it would be good to know the time between when the message was transmitted and when the reply arrived. With only one timestamp field it was set to when the reply arrived and the original transmit time was overwritten. Just taking the timestamp in userspace right before CEC_TRANSMIT is called is not reliable, since the actual transmit can be delayed if the CEC bus is busy. Only the driver can fill this in accurately. So split up the ts field into an rx_ts and a tx_ts. Also move the status fields to after the 'reply' field: they were placed in a strange position and make much more sense when grouped with the other status-related fields. This patch also makes sure that the timestamp is taken as soon as possible. Change-Id: I643006cc32cbc6073b6ce8fa7ae03b63b3b0e266 Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com> Git-commit: 980e0b36b55985dd0a37acd25d29c8f21482db32 Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git Signed-off-by: Ray Zhang <rayz@codeaurora.org>
2017-05-25[media] cec-funcs.h: add missing 'reply' for short audio descriptorHans Verkuil
The cec_msg_request_short_audio_descriptor function was missing the reply argument. That's needed if you want the framework to wait for the reply message. Change-Id: Id099aa3ec932beb7d49af56cd9f761ee66b2727e Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com> Git-commit: 9ad52b4db79d168867a2ca105eca00fb9cb28fe5 Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git Signed-off-by: Ray Zhang <rayz@codeaurora.org>
2017-05-25[media] cec-funcs.h: add missing const modifierHans Verkuil
The cec_ops_* functions never touch cec_msg, so mark it as const. This was done for some of the cec_ops_ functions, but not all. Change-Id: Ibf4c85faac86588e937107bd1bc7648841060bab Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com> Git-commit: 0c1f8569942695b7a2735301efe45ecd69e2a41f Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git Signed-off-by: Ray Zhang <rayz@codeaurora.org>
2017-05-25[media] cec-funcs.h: add length checksHans Verkuil
Add msg->len sanity checks to fix static checker warning: include/linux/cec-funcs.h:1154 cec_ops_set_osd_string() warn: setting length 'msg->len - 3' to negative one Change-Id: I3482a21f7e29b1b9f44832e598a86709f8764fe5 Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Reported-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com> Git-commit: 0cb1f1e44cf5b013dd0991f509e332ac77ce2ddd Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git Signed-off-by: Ray Zhang <rayz@codeaurora.org>
2017-05-24[media] cec.h/cec-funcs.h: add option to use BSD licenseHans Verkuil
Like the videodev2.h and other headers, explicitly allow these headers to be used with the BSD license. Change-Id: I8f9ae52ed90337ca1f697dbf310a774f50eb154d Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com> Git-commit: 12655445a2adc292db3352bbe80e43bd243517aa Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git Signed-off-by: Ray Zhang <rayz@codeaurora.org>
2017-05-24cnss: save the cc source to platform driverPaul Zhang
There is a design limitation in host driver. Driver sends regulatory_hint_user for both user-space and 11d country to kernel. So when wiphy re-registration happens, kernel tells the source as USER even for 11d. And per driver logic the 11d needs to be disabled if INI gCountryCodePriority is set. To mitigate this issue, storing the country source in the platform driver. CRs-Fixed: 2051651 Change-Id: I335a046a886ac3ce35cf96eb71231bfe75d33c60 Signed-off-by: Paul Zhang <paulz@codeaurora.org>
2017-05-24mmc: core: extend SDR104 workaround for other pathsSahitya Tummala
UHS-I SD cards support SDR104 mode which runs the SD card interface clock upto 208 MHz. But we may see repeated CRC errors in SDR104 with some SDCC controllers. If this happens, commit <aafc430b36f3> ("mmc: sd: reduce the bus speed in case of multiple CRC errors") would reinit the card to lower speed (SDR50) hoping that CRC error rate would reduce at lower clock speed (100MHz for SDR50). As the error may happen for any cmd, this change tries to fix several other paths - clock scaling, mmc_rescan, non-data commands error path. Change-Id: I8ccbbf7e330cde3862d9660d3be4d67fb00d97ca Signed-off-by: Sahitya Tummala <stummala@codeaurora.org> Signed-off-by: Subhash Jadavani <subhashj@codeaurora.org> Signed-off-by: Veerabhadrarao Badiganti <vbadigan@codeaurora.org>
2017-05-23soc: qcom: glink: Add new APIs to toggle RX thread priorityChris Lew
Low latency use cases are failing because glink RX thread to handle the TX Done command is not being scheduled during high system load. These new APIs allow clients to specify if they need the RX glink thread to be Realtime CRs-Fixed: 2050701 Change-Id: I6bd4023394e9ee617797826687f34abaee3fe65d Signed-off-by: Chris Lew <clew@codeaurora.org>
2017-05-23soc: qcom: ssr: Add subsys_set_error APIMeghana Ashok
Adding a new API subsys_set_error() which can indicate reason why a subsystem failed to come up. This error reason can be useful for some userspace helper application to take appropriate action. Change-Id: I6df3580befd48a6b83bb8fd1099475da42fc9cf2 Signed-off-by: Meghana Ashok <meghanaa@codeaurora.org>
2017-05-22ASoC: msm: add q6asm api for transcode loopback supportSiddartha Shaik
Transcode loopback api can be used by client to configure compress loopback. CRs-fixed: 2049714 Change-Id: I7286fbdfa89375d517f3dad7d04e1d2a360d6f7e Signed-off-by: Siddartha Shaik <sshaik@codeaurora.org>
2017-05-22[media] cec: add HDMI CEC framework (core)Hans Verkuil
The added HDMI CEC framework provides a generic kernel interface for HDMI CEC devices. Note that the CEC framework is added to staging/media and that the cec.h and cec-funcs.h headers are not exported yet. While the kABI is mature, I would prefer to allow the uABI some more time before it is mainlined in case it needs more tweaks. This adds the cec-core.c, media/cec.h and cec-priv.h sources. Change-Id: Iccc9ce1e7c1c04aa7693c3ba73027d92b50b3bbc Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> [k.debski@samsung.com: Merged CEC Updates commit by Hans Verkuil] [k.debski@samsung.com: Merged Update author commit by Hans Verkuil] [k.debski@samsung.com: code cleanup and fixes] [k.debski@samsung.com: add missing CEC commands to match spec] [k.debski@samsung.com: add RC framework support] [k.debski@samsung.com: move and edit documentation] [k.debski@samsung.com: add vendor id reporting] [k.debski@samsung.com: reorder of API structs and add reserved fields] [k.debski@samsung.com: fix handling of events and fix 32/64bit timespec problem] [k.debski@samsung.com: add sequence number handling] [k.debski@samsung.com: add passthrough mode] [k.debski@samsung.com: fix CEC defines, add missing CEC 2.0 commands] Signed-off-by: Kamil Debski <kamil@wypas.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com> Git-commit: a56960e8b406d36b612776c79134b954adc2ca18 Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git Signed-off-by: Ray Zhang <rayz@codeaurora.org>
2017-05-22[media] cec-funcs.h: static inlines to pack/unpack CEC messagesHans Verkuil
This public header contains static inlines to pack and unpack CEC messages. It is for use in both the kernel and in userspace. Since the CEC framework will initially be in staging this header is not yet in include/uapi. Once the framework is moved out of staging this header should be moved to uapi at the same time. Change-Id: I3a6eaf417787e9bfd6e8dc06bedbee03f9c3552a Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com> Git-commit: 50f7d5a65e5a31e92a9d46663770cd9509f939a2 Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git Signed-off-by: Ray Zhang <rayz@codeaurora.org>
2017-05-22[media] cec.h: add cec headerHans Verkuil
This header contains the CEC public API. Since the CEC framework will initially be part of staging this header is kept out of include/uapi for the time being until the CEC framework will be moved out of staging. Change-Id: I8ad69b57531e65fc9919f92b473280dd821f1272 Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com> Git-commit: 3132583e5bd7cb56dffb2c04128ec4db12c32027 Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git Signed-off-by: Ray Zhang <rayz@codeaurora.org>
2017-05-22[media] cec-edid: add module for EDID CEC helper functionsHans Verkuil
The cec-edid module contains helper functions to find and manipulate the CEC physical address inside an EDID. Even if the CEC support itself is disabled, drivers will still need these functions. Which is the reason this is module is separate from the upcoming CEC framework. Change-Id: Ia20fb7ef771c0455d369029738c509d59f5e4adc Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com> Git-commit: 29fb44a58ac12bffe4c225f95afdc22364db070e Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git Signed-off-by: Ray Zhang <rayz@codeaurora.org>
2017-05-18ASoC: msm: qdsp6v2: Add IEC61937 compressed HDMI pass-thoughBen Romberger
Add support for IEC61937 which is an audio packaging standard used for compressed HDMI pass-through. Any audio format can be sent through HDMI pass-through formatted as IEC61937. Change-Id: I09821add306e2aeae6530cecbac189471a55e589 Signed-off-by: Ben Romberger <bromberg@codeaurora.org>
2017-05-16time: Remove CONFIG_TIMER_STATSKees Cook
Currently CONFIG_TIMER_STATS exposes process information across namespaces: kernel/time/timer_list.c print_timer(): SEQ_printf(m, ", %s/%d", tmp, timer->start_pid); /proc/timer_list: #11: <0000000000000000>, hrtimer_wakeup, S:01, do_nanosleep, cron/2570 Given that the tracer can give the same information, this patch entirely removes CONFIG_TIMER_STATS. Change-Id: I66e06ae2d6e32c309824310d3d9bf54d1047eab1 Suggested-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Kees Cook <keescook@chromium.org> Acked-by: John Stultz <john.stultz@linaro.org> Cc: Nicolas Pitre <nicolas.pitre@linaro.org> Cc: linux-doc@vger.kernel.org Cc: Lai Jiangshan <jiangshanlai@gmail.com> Cc: Shuah Khan <shuah@kernel.org> Cc: Xing Gao <xgao01@email.wm.edu> Cc: Jonathan Corbet <corbet@lwn.net> Cc: Jessica Frazelle <me@jessfraz.com> Cc: kernel-hardening@lists.openwall.com Cc: Nicolas Iooss <nicolas.iooss_linux@m4x.org> Cc: "Paul E. McKenney" <paulmck@linux.vnet.ibm.com> Cc: Petr Mladek <pmladek@suse.com> Cc: Richard Cochran <richardcochran@gmail.com> Cc: Tejun Heo <tj@kernel.org> Cc: Michal Marek <mmarek@suse.com> Cc: Josh Poimboeuf <jpoimboe@redhat.com> Cc: Dmitry Vyukov <dvyukov@google.com> Cc: Oleg Nesterov <oleg@redhat.com> Cc: "Eric W. Biederman" <ebiederm@xmission.com> Cc: Olof Johansson <olof@lixom.net> Cc: Andrew Morton <akpm@linux-foundation.org> Cc: linux-api@vger.kernel.org Cc: Arjan van de Ven <arjan@linux.intel.com> Link: http://lkml.kernel.org/r/20170208192659.GA32582@beast Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Git-commit: dfb4357da6ddbdf57d583ba64361c9d792b0e0b1 Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git [ohaugan@codeaurora.org: Fixed merge conflicts] Signed-off-by: Olav Haugan <ohaugan@codeaurora.org>
2017-05-16Merge "soc: qcom: Fix checks for QMI response values"Linux Build Service Account
2017-05-16Merge "ASoC: msm: add support for new ADSP event APIs"Linux Build Service Account
2017-05-15soc: qcom: Fix checks for QMI response valuesPuja Gupta
The return values from QMI could be compared directly and was incorrectly interpreted in service locator and notifier. Also initialize structure in service locator so as to not have garbage values in them. Change-Id: I7f8f27857706e9508b64289d9263c79494c17a8d Signed-off-by: Puja Gupta <pujag@codeaurora.org>
2017-05-15Merge remote-tracking branch 'origin/tmp-285c137' into msm-4.4Kyle Yan
* origin/tmp-285c137: Linux 4.4.68 block: get rid of blk_integrity_revalidate() drm/ttm: fix use-after-free races in vm fault handling f2fs: sanity check segment count bnxt_en: allocate enough space for ->ntp_fltr_bmap ipv6: reorder ip6_route_dev_notifier after ipv6_dev_notf ipv6: initialize route null entry in addrconf_init() rtnetlink: NUL-terminate IFLA_PHYS_PORT_NAME string ipv4, ipv6: ensure raw socket message is big enough to hold an IP header tcp: do not inherit fastopen_req from parent tcp: fix wraparound issue in tcp_lp bpf, arm64: fix jit branch offset related to ldimm64 tcp: do not underestimate skb->truesize in tcp_trim_head() ALSA: hda - Fix deadlock of controller device lock at unbinding staging: emxx_udc: remove incorrect __init annotations staging: wlan-ng: add missing byte order conversion brcmfmac: Make skb header writable before use brcmfmac: Ensure pointer correctly set if skb data location changes MIPS: R2-on-R6 MULTU/MADDU/MSUBU emulation bugfix scsi: mac_scsi: Fix MAC_SCSI=m option when SCSI=m serial: 8250_omap: Fix probe and remove for PM runtime phy: qcom-usb-hs: Add depends on EXTCON USB: serial: io_edgeport: fix descriptor error handling USB: serial: mct_u232: fix modem-status error handling USB: serial: quatech2: fix control-message error handling USB: serial: ftdi_sio: fix latency-timer error handling USB: serial: ark3116: fix open error handling USB: serial: ti_usb_3410_5052: fix control-message error handling USB: serial: io_edgeport: fix epic-descriptor handling USB: serial: ssu100: fix control-message error handling USB: serial: digi_acceleport: fix incomplete rx sanity check USB: serial: keyspan_pda: fix receive sanity checks usb: chipidea: Handle extcon events properly usb: chipidea: Only read/write OTGSC from one place usb: host: ohci-exynos: Decrese node refcount on exynos_ehci_get_phy() error paths usb: host: ehci-exynos: Decrese node refcount on exynos_ehci_get_phy() error paths KVM: nVMX: do not leak PML full vmexit to L1 KVM: nVMX: initialize PML fields in vmcs02 Revert "KVM: nested VMX: disable perf cpuid reporting" x86/platform/intel-mid: Correct MSI IRQ line for watchdog device kprobes/x86: Fix kernel panic when certain exception-handling addresses are probed clk: Make x86/ conditional on CONFIG_COMMON_CLK x86/pci-calgary: Fix iommu_free() comparison of unsigned expression >= 0 x86/ioapic: Restore IO-APIC irq_chip retrigger callback mwifiex: Avoid skipping WEP key deletion for AP mwifiex: remove redundant dma padding in AMSDU mwifiex: debugfs: Fix (sometimes) off-by-1 SSID print ARM: OMAP5 / DRA7: Fix HYP mode boot for thumb2 build leds: ktd2692: avoid harmless maybe-uninitialized warning power: supply: bq24190_charger: Handle fault before status on interrupt power: supply: bq24190_charger: Don't read fault register outside irq_handle_thread() power: supply: bq24190_charger: Call power_supply_changed() for relevant component power: supply: bq24190_charger: Install irq_handler_thread() at end of probe() power: supply: bq24190_charger: Call set_mode_host() on pm_resume() power: supply: bq24190_charger: Fix irq trigger to IRQF_TRIGGER_FALLING powerpc/powernv: Fix opal_exit tracepoint opcode cpupower: Fix turbo frequency reporting for pre-Sandy Bridge cores ARM: 8452/3: PJ4: make coprocessor access sequences buildable in Thumb2 mode 9p: fix a potential acl leak ANDROID: android-base.cfg: remove spurious CONFIG_MODULES line ANDROID: memory_state_time: fix undefined behavior with missing DT properties ANDROID: rfkill: fix unused function warning ANDROID: make PF_KEY SHA256 use RFC-compliant truncation. ANDROID: sdcardfs: fix sdcardfs_destroy_inode for the inode RCU approach ANDROID: android-base.cfg: remove NETFILTER_XT_MATCH_QUOTA2_LOG ANDROID: sdcardfs: Don't iput if we didn't igrab ANDROID: Add untag hacks to inet_release function Change-Id: I6d750f8bb186774ff9630beeb0ed8e680af26231 Signed-off-by: Kyle Yan <kyan@codeaurora.org>
2017-05-15msm: Initial ais driver for automotive cameraTerence Ho
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>
2017-05-15Merge 4.4.68 into android-4.4Greg Kroah-Hartman
Changes in 4.4.68 9p: fix a potential acl leak ARM: 8452/3: PJ4: make coprocessor access sequences buildable in Thumb2 mode cpupower: Fix turbo frequency reporting for pre-Sandy Bridge cores powerpc/powernv: Fix opal_exit tracepoint opcode power: supply: bq24190_charger: Fix irq trigger to IRQF_TRIGGER_FALLING power: supply: bq24190_charger: Call set_mode_host() on pm_resume() power: supply: bq24190_charger: Install irq_handler_thread() at end of probe() power: supply: bq24190_charger: Call power_supply_changed() for relevant component power: supply: bq24190_charger: Don't read fault register outside irq_handle_thread() power: supply: bq24190_charger: Handle fault before status on interrupt leds: ktd2692: avoid harmless maybe-uninitialized warning ARM: OMAP5 / DRA7: Fix HYP mode boot for thumb2 build mwifiex: debugfs: Fix (sometimes) off-by-1 SSID print mwifiex: remove redundant dma padding in AMSDU mwifiex: Avoid skipping WEP key deletion for AP x86/ioapic: Restore IO-APIC irq_chip retrigger callback x86/pci-calgary: Fix iommu_free() comparison of unsigned expression >= 0 clk: Make x86/ conditional on CONFIG_COMMON_CLK kprobes/x86: Fix kernel panic when certain exception-handling addresses are probed x86/platform/intel-mid: Correct MSI IRQ line for watchdog device Revert "KVM: nested VMX: disable perf cpuid reporting" KVM: nVMX: initialize PML fields in vmcs02 KVM: nVMX: do not leak PML full vmexit to L1 usb: host: ehci-exynos: Decrese node refcount on exynos_ehci_get_phy() error paths usb: host: ohci-exynos: Decrese node refcount on exynos_ehci_get_phy() error paths usb: chipidea: Only read/write OTGSC from one place usb: chipidea: Handle extcon events properly USB: serial: keyspan_pda: fix receive sanity checks USB: serial: digi_acceleport: fix incomplete rx sanity check USB: serial: ssu100: fix control-message error handling USB: serial: io_edgeport: fix epic-descriptor handling USB: serial: ti_usb_3410_5052: fix control-message error handling USB: serial: ark3116: fix open error handling USB: serial: ftdi_sio: fix latency-timer error handling USB: serial: quatech2: fix control-message error handling USB: serial: mct_u232: fix modem-status error handling USB: serial: io_edgeport: fix descriptor error handling phy: qcom-usb-hs: Add depends on EXTCON serial: 8250_omap: Fix probe and remove for PM runtime scsi: mac_scsi: Fix MAC_SCSI=m option when SCSI=m MIPS: R2-on-R6 MULTU/MADDU/MSUBU emulation bugfix brcmfmac: Ensure pointer correctly set if skb data location changes brcmfmac: Make skb header writable before use staging: wlan-ng: add missing byte order conversion staging: emxx_udc: remove incorrect __init annotations ALSA: hda - Fix deadlock of controller device lock at unbinding tcp: do not underestimate skb->truesize in tcp_trim_head() bpf, arm64: fix jit branch offset related to ldimm64 tcp: fix wraparound issue in tcp_lp tcp: do not inherit fastopen_req from parent ipv4, ipv6: ensure raw socket message is big enough to hold an IP header rtnetlink: NUL-terminate IFLA_PHYS_PORT_NAME string ipv6: initialize route null entry in addrconf_init() ipv6: reorder ip6_route_dev_notifier after ipv6_dev_notf bnxt_en: allocate enough space for ->ntp_fltr_bmap f2fs: sanity check segment count drm/ttm: fix use-after-free races in vm fault handling block: get rid of blk_integrity_revalidate() Linux 4.4.68 Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
2017-05-15drm/msm: profile submit_time in nanosecond resolutionSharat Masetty
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>
2017-05-14block: get rid of blk_integrity_revalidate()Ilya Dryomov
commit 19b7ccf8651df09d274671b53039c672a52ad84d upstream. Commit 25520d55cdb6 ("block: Inline blk_integrity in struct gendisk") introduced blk_integrity_revalidate(), which seems to assume ownership of the stable pages flag and unilaterally clears it if no blk_integrity profile is registered: if (bi->profile) disk->queue->backing_dev_info->capabilities |= BDI_CAP_STABLE_WRITES; else disk->queue->backing_dev_info->capabilities &= ~BDI_CAP_STABLE_WRITES; It's called from revalidate_disk() and rescan_partitions(), making it impossible to enable stable pages for drivers that support partitions and don't use blk_integrity: while the call in revalidate_disk() can be trivially worked around (see zram, which doesn't support partitions and hence gets away with zram_revalidate_disk()), rescan_partitions() can be triggered from userspace at any time. This breaks rbd, where the ceph messenger is responsible for generating/verifying CRCs. Since blk_integrity_{un,}register() "must" be used for (un)registering the integrity profile with the block layer, move BDI_CAP_STABLE_WRITES setting there. This way drivers that call blk_integrity_register() and use integrity infrastructure won't interfere with drivers that don't but still want stable pages. Fixes: 25520d55cdb6 ("block: Inline blk_integrity in struct gendisk") Cc: "Martin K. Petersen" <martin.petersen@oracle.com> Cc: Christoph Hellwig <hch@lst.de> Cc: Mike Snitzer <snitzer@redhat.com> Tested-by: Dan Williams <dan.j.williams@intel.com> Signed-off-by: Ilya Dryomov <idryomov@gmail.com> [idryomov@gmail.com: backport to < 4.11: bdi is embedded in queue] Signed-off-by: Jens Axboe <axboe@fb.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2017-05-14f2fs: sanity check segment countJin Qian
commit b9dd46188edc2f0d1f37328637860bb65a771124 upstream. F2FS uses 4 bytes to represent block address. As a result, supported size of disk is 16 TB and it equals to 16 * 1024 * 1024 / 2 segments. Signed-off-by: Jin Qian <jinqian@google.com> Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>