summaryrefslogtreecommitdiff
path: root/Documentation (follow)
Commit message (Collapse)AuthorAge
...
| * | | | | | | | | regulator: rpm-smd-regulator: add support for load based mode controlDavid Collins2017-06-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support to request PWM or AUTO mode for BoB and SMPS type regulators based upon the aggregated consumer load current. This can be used in cases where a consumer needs to force PWM mode operation. CRs-Fixed: 2054771 Change-Id: Iaf4353fb60468c91f958a968d844b3c1c012e54c Signed-off-by: David Collins <collinsd@codeaurora.org> Signed-off-by: Tirupathi Reddy <tirupath@codeaurora.org>
* | | | | | | | | | Merge "msm: mdss: control avdd enable gpio when doing panel reset"Linux Build Service Account2017-06-07
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | msm: mdss: control avdd enable gpio when doing panel resetYahui Wang2017-05-31
| | |_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avdd enable gpio maybe used for AMOLED panel to control avdd output. This gpio should be enabled/disabled when panel does unblank/blank once to avoid panel electric leakage. Change-Id: I18f0f6491f0ff97df5556e74a686a18b262708df Signed-off-by: Yahui Wang <yahuiw@codeaurora.org>
* | | | | | | | | | Merge "msm: cec: Use CEC notifier framework in adapter driver"Linux Build Service Account2017-06-06
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | |
| * | | | | | | | | msm: cec: Use CEC notifier framework in adapter driverRay Zhang2017-06-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable CEC notifier support in CEC adapter driver, so the adapter could get notification whenever physical address is available. This removes the requirement for userspace to manually set physical address. CRs-Fixed: 2041335 Change-Id: I337c189d625922391374d3cdeb1f2840ad829cd7 Signed-off-by: Ray Zhang <rayz@codeaurora.org>
* | | | | | | | | | Merge "iommu/arm-smmu: Add support for regulator deferred disable"Linux Build Service Account2017-06-05
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | iommu/arm-smmu: Add support for regulator deferred disablePrakash Gupta2017-06-05
| | |_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In case of unmap call, regulator is enabled/disabled. This may introduce additional delay. For clients who do not detach, it's not possible to keep regulator vote while smmu is attached. Add support for regulator deferred disable. The time delay for deferred disable can be set using dt property qcom,deferred-regulator-disable-delay in ms. Change-Id: I462e1999bd81f6332169b24749632d7b247c75c5 Signed-off-by: Prakash Gupta <guptap@codeaurora.org>
* | | | | | | | | | Merge "msm: cec: Add CEC adapter driver for SDE hardware"Linux Build Service Account2017-06-05
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | msm: cec: Add CEC adapter driver for SDE hardwareRay Zhang2017-06-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This CEC adapter driver using CEC framework provides CEC support for SDE hardware. CEC is a protocol that provides high-level control functions between various audiovisual products. This adapter is the hardware implementation of CEC protocol, and its major functionality is to send and to receive CEC messages. CRs-Fixed: 2041335 Change-Id: I73bc9c63b78d61f5449a37cadcfeda976d5456b0 Signed-off-by: Ray Zhang <rayz@codeaurora.org>
* | | | | | | | | | Merge "mhi: core: Bind devices with variable PCIe device IDs with same ↵Linux Build Service Account2017-06-05
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | device node"
| * | | | | | | | | mhi: core: Bind devices with variable PCIe device IDs with same device nodeSujeev Dias2017-06-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order to bind devices with variable PCIe device IDs with same device tree node, make PCIe device ID optional parameter in device tree node. If PCIe device ID not specified in device tree, any device can be bind with the node. CRs-Fixed: 2040899 Change-Id: Iaedcb40db15fa0e8c5c30eb147c904a10cd7569d Signed-off-by: Sujeev Dias <sdias@codeaurora.org>
* | | | | | | | | | Merge "ARM: dts: msm: Early mount of vendor partition for msm8998"Linux Build Service Account2017-06-04
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | ARM: dts: msm: Early mount of vendor partition for msm8998Imran Khan2017-06-01
| | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support to early mount vendor partition so that venodr modules can be loaded during early init. Change-Id: I668a7c3b1716816d497b7f170b554dfe8960701c Signed-off-by: Imran Khan <kimran@codeaurora.org>
* | | | | | | | | Merge "qpnp-fg-gen3: configure ESR timers dynamically based on charge ↵Linux Build Service Account2017-06-01
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | termination"
| * | | | | | | | | qpnp-fg-gen3: configure ESR timers dynamically based on charge terminationSubbaraman Narayanamurthy2017-05-31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With ESR discharge timer retry, max having same value, ESR pulse can fire frequently when battery FET is open past charge termination. This frequent ESR pulses increase power consumption when the device is idle. Upon charge termination, change the ESR discharging timer retry to 0 so that ESR pulse can fire less frequently saving power. Add support for this through fg_esr_timer_config() based on end of charge and sleep conditions. Currently, retry/max for ESR charging and discharging timers are configured with the same value specified through device tree. Extend the device tree property to take in different retry/max values for those timers. Change-Id: Ib30b8ae7d893b5cab00ed83dd7318b53e3b63ac1 Signed-off-by: Subbaraman Narayanamurthy <subbaram@codeaurora.org>
* | | | | | | | | | Merge "drivers: firmware: psci: Set ARM32 cpuidle ops"Linux Build Service Account2017-06-01
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | drivers: firmware: psci: Set ARM32 cpuidle opsMaulik Shah2017-05-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ARM64 uses cpu enable-method property as "psci" whereas for ARM32 this needs to be "arm,psci". Use "psci" as enable-method for ARM32 and initialize cpuidle ops to be used by LPM driver for ARM32. Change-Id: I1bafc2460b3f62c6d7688d5bb7aa9cffa03bf917 Signed-off-by: Maulik Shah <mkshah@codeaurora.org>
* | | | | | | | | | | ASoC: msm: Add transcode loopback driverSiddartha Shaik2017-05-30
| |_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add DSP transcode loopback. Userspace can use this driver to support TX to RX audio HW DSP loopback. CRs-Fixed: 2049714 Change-Id: Ie83f5ca2c626c8fffbec4624f3e35c6c179d4c8c Signed-off-by: Siddartha Shaik <sshaik@codeaurora.org>
* | | | | | | | | | Merge "time: Remove CONFIG_TIMER_STATS"Linux Build Service Account2017-05-26
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | |
| * | | | | | | | | time: Remove CONFIG_TIMER_STATSKees Cook2017-05-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | | | | | | | Merge "ARM: dts: msm: Specify SC interrupts for LAB/IBB in pmi8998"Linux Build Service Account2017-05-26
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | regulator: qpnp-labibb-regulator: Restart LAB/IBB after SC faultFenglin Wu2017-05-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PBS will be triggered in PMIC hardware to disable LAB/IBB regulators when a SC(short circuit) error is happened. The regulators won't be restart in hardware and they will be kept disabled always after that. Restart LAB/IBB regulator in the software if SC IRQ is detected, but stop doing this if the SC IRQ had fired frequently. CRs-Fixed: 2002373 Change-Id: I5db2b70999d043395e070bc9d61015477455cce9 Signed-off-by: Fenglin Wu <fenglinw@codeaurora.org>
* | | | | | | | | | | Merge "leds: qpnp-flash-v2: Add support for LPG strobe"Linux Build Service Account2017-05-26
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / |/| | | | | | | | | |
| * | | | | | | | | | leds: qpnp-flash-v2: Add support for LPG strobeSubbaraman Narayanamurthy2017-05-09
| | |_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Flash LED3 can be configured for LPG strobe in addition to the existing HW or SW strobe types. LPG strobe works the same way as HW strobe except the strobing is controlled by LPG output instead of a GPIO. To accommodate this, device tree property "qcom,hw-strobe-sel" got renamed to "qcom,strobe-sel". While at it, configure hardware strobe option only when the option is specified through device tree. Change-Id: I9351d7b7cd8c57ff7707a4ada6c5bdfa42772390 Signed-off-by: Subbaraman Narayanamurthy <subbaram@codeaurora.org>
* | | | | | | | | | Merge "msm_11ad: fix device-tree property name"Linux Build Service Account2017-05-25
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | msm_11ad: fix device-tree property nameHamad Kadmany2017-05-22
| | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change keep_radio_on_during_sleep DT property to follow the naming convention. Change-Id: I6450cfdfe38a4cf5b1b1ccb40b5506a34aeb076a Signed-off-by: Hamad Kadmany <hkadmany@codeaurora.org> Signed-off-by: Maya Erez <merez@codeaurora.org>
* | | | | | | | | | Merge "power: qpnp-smb2: remove workaround for USBIN supplied VCONN"Linux Build Service Account2017-05-25
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | power: qpnp-smb2: remove workaround for USBIN supplied VCONNNicholas Troast2017-05-09
| | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | VCONN is supplied by USBIN on MTP8998 which causes removal issues when PMI8998 is in source mode and VCONN is enabled. The workaround is to ensure VCONN is disabled when OTG is disabled which has implications on PD power role swap when PMI8998 is sourcing VCONN. The reference schematic has been updated to address this issue therefore the workaround should be removed. Change-Id: Ibe2309f3618d840340bd083cca0df8a8644dd9c8 Signed-off-by: Nicholas Troast <ntroast@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 "ARM: dts: msm: Add support for multiple neutrino on msm8996"Linux Build Service Account2017-05-20
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | ARM: dts: msm: Add support for multiple neutrino on msm8996Jaiju Yesudasan2017-05-10
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add new nodes for multiple neutrino interfaces. This is for differentiating multiple neutrino interfaces connected to different RC. CRs-Fixed: 1060701 Change-Id: I6f9f7c050d5736fdf3e6bf45257ae410b7190c3b Signed-off-by: Jaiju Yesudasan <cjaijuy@codeaurora.org>
* | | | | | | | Merge "usb: phy: qusb: Support specifying vdda33 levels from device tree"Linux Build Service Account2017-05-16
|\ \ \ \ \ \ \ \
| * | | | | | | | usb: phy: qusb: Support specifying vdda33 levels from device treeJack Pham2017-05-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The specific voltage levels for the vdda33 regulator may vary depending on the target. Add an optional device tree property to allow specifying a 3-tuple of voltages for minimum, operating and maximum voltage levels. The minimum level is used when simply powering on, whereas the operating level is used when initializing the PHY. Change-Id: Ia5d301efdb6964434a01264e7aa19421a41e98ca Signed-off-by: Jack Pham <jackp@codeaurora.org>
* | | | | | | | | Merge "msm_11ad: add support to PCIe D3hot in system suspend"Linux Build Service Account2017-05-16
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | msm_11ad: add support to PCIe D3hot in system suspendMaya Erez2017-05-15
| | |_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Transition to D3 hot in system suspend allows the wil6210 device to preserve the active connections in system suspend. Change-Id: I4c24551f91ee7e59d4bfee02b0911c31ae0a05b1 Signed-off-by: Maya Erez <merez@codeaurora.org>
* | | | | | | | | Merge "ASoC: msm: qdsp6v2: Add TDM master slave select setting"Linux Build Service Account2017-05-16
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | |
| * | | | | | | | ASoC: msm: qdsp6v2: Add TDM master slave select settingKarthikeyan Mani2017-05-04
| | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add TDM clock id setting in TDM parent node to select between IBIT and EBIT for TDM operation. Move dtsi entries from child to parent that are common to the group. CRs-fixed: 1116515 Change-Id: I663eb926818c2aae1eaea8c78bdc0a973ecd0ae3 Signed-off-by: Karthikeyan Mani <kmani@codeaurora.org>
* | | | | | | | qpnp-smb2: Add software based glitch filter for OTG detectionAshay Jaiswal2017-05-12
| |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the USB_ID line is pulled low for a very short time there is a possibility that the SW misses rising edge(removal) event. This may lead to the state where charger is stuck in the boost-mode forever. Fix this my adding a SW based glitch logic which checks for the USB_ID after a SW debounce time and then notifies its presence/removal to the USB driver. CRs-Fixed: 2044958 Change-Id: I31974f7d68b435bbef329278cedbd726ada02e3f Signed-off-by: Ashay Jaiswal <ashayj@codeaurora.org>
* | | | | | | Merge "soc: qcom: qpnp-haptic: add support for auto mode"Linux Build Service Account2017-05-11
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | soc: qcom: qpnp-haptic: add support for auto modeSubbaraman Narayanamurthy2017-05-09
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Based on the duration of the pattern, haptics mode and other parameters needs to be configured dynamically for a better performance and ease of use. Add support for this through device tree property "qcom,lra-auto-mode". Add support to configure some parameters like auto resonance mode, LRA high-Z period, calibration period, vmax along with an option to override the settings done by auto_mode configuration. Change-Id: I4706fed4e3ca97d190f907769fd4a9899479b330 Signed-off-by: Subbaraman Narayanamurthy <subbaram@codeaurora.org>
* | | | | | 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>
| | * | | clk: sunxi: Add apb0 gates for H3Krzysztof Adamski2017-05-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 6e17b4181603d183d20c73f4535529ddf2a2a020 upstream. This patch adds support for APB0 in H3. It seems to be compatible with earlier SOCs. apb0 gates controls R_ block peripherals (R_PIO, R_IR, etc). Since this gates behave just like any Allwinner clock gate, add a generic compatible that can be reused if we don't have any clock to protect. Signed-off-by: Krzysztof Adamski <k@japko.eu> [Maxime: Removed the H3 compatible from the simple-gates driver, reworked the commit log a bit] Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> Cc: Julia Lawall <julia.lawall@lip6.fr> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* | | | | Merge "Revert "smb138x: introduce support for smb1355""Linux Build Service Account2017-05-03
|\ \ \ \ \
| * | | | | Revert "smb138x: introduce support for smb1355"Abhijeet Dharmapurikar2017-05-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 566b44214cc08786375ac8266ee387e431413078 (smb138x: introduce support for smb1355). This is not required since smb1355 support is moved to its own driver. Change-Id: Ibad8595c09a865e273adb6f30d6a75f931220131 Signed-off-by: Abhijeet Dharmapurikar <adharmap@codeaurora.org>
* | | | | | Merge "Merge branch 'android-4.4@e4528dd' into branch 'msm-4.4'"Linux Build Service Account2017-05-03
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'android-4.4@e4528dd' into branch 'msm-4.4'Blagovest Kolenichev2017-05-02
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * refs/heads/tmp-e4528dd: Linux 4.4.65 perf/core: Fix concurrent sys_perf_event_open() vs. 'move_group' race ping: implement proper locking staging/android/ion : fix a race condition in the ion driver vfio/pci: Fix integer overflows, bitmask check tipc: check minimum bearer MTU netfilter: nfnetlink: correctly validate length of batch messages xc2028: avoid use after free mnt: Add a per mount namespace limit on the number of mounts tipc: fix socket timer deadlock tipc: fix random link resets while adding a second bearer gfs2: avoid uninitialized variable warning hostap: avoid uninitialized variable use in hfa384x_get_rid tty: nozomi: avoid a harmless gcc warning tipc: correct error in node fsm tipc: re-enable compensation for socket receive buffer double counting tipc: make dist queue pernet tipc: make sure IPv6 header fits in skb headroom ANDROID: uid_sys_stats: fix access of task_uid(task) BACKPORT: f2fs: sanity check log_blocks_per_seg Linux 4.4.64 tipc: fix crash during node removal block: fix del_gendisk() vs blkdev_ioctl crash x86, pmem: fix broken __copy_user_nocache cache-bypass assumptions hv: don't reset hv_context.tsc_page on crash Drivers: hv: balloon: account for gaps in hot add regions Drivers: hv: balloon: keep track of where ha_region starts Tools: hv: kvp: ensure kvp device fd is closed on exec kvm: arm/arm64: Fix locking for kvm_free_stage2_pgd x86/mce/AMD: Give a name to MCA bank 3 when accessed with legacy MSRs powerpc/kprobe: Fix oops when kprobed on 'stdu' instruction ubi/upd: Always flush after prepared for an update mac80211: reject ToDS broadcast data frames mmc: sdhci-esdhc-imx: increase the pad I/O drive strength for DDR50 card ACPI / power: Avoid maybe-uninitialized warning Input: elantech - add Fujitsu Lifebook E547 to force crc_enabled VSOCK: Detach QP check should filter out non matching QPs. Drivers: hv: vmbus: Reduce the delay between retries in vmbus_post_msg() Drivers: hv: get rid of timeout in vmbus_open() Drivers: hv: don't leak memory in vmbus_establish_gpadl() s390/mm: fix CMMA vs KSM vs others CIFS: remove bad_network_name flag cifs: Do not send echoes before Negotiate is complete ring-buffer: Have ring_buffer_iter_empty() return true when empty tracing: Allocate the snapshot buffer before enabling probe KEYS: fix keyctl_set_reqkey_keyring() to not leak thread keyrings KEYS: Change the name of the dead type to ".dead" to prevent user access KEYS: Disallow keyrings beginning with '.' to be joined as session keyrings ANDROID: sdcardfs: Call lower fs's revalidate ANDROID: sdcardfs: Avoid setting GIDs outside of valid ranges ANDROID: sdcardfs: Copy meta-data from lower inode Revert "Revert "Android: sdcardfs: Don't do d_add for lower fs"" ANDROID: sdcardfs: Use filesystem specific hash ANDROID: AVB error handler to invalidate vbmeta partition. ANDROID: Update init/do_mounts_dm.c to the latest ChromiumOS version. Revert "[RFC]cgroup: Change from CAP_SYS_NICE to CAP_SYS_RESOURCE for cgroup migration permissions" Conflicts: drivers/md/Makefile Change-Id: I8f5ed53cb8b6cc66914f10c6ac820003b87b8759 Signed-off-by: Blagovest Kolenichev <bkolenichev@codeaurora.org>
| | * | | | | Merge 4.4.65 into android-4.4Greg Kroah-Hartman2017-04-30
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes in 4.4.65: tipc: make sure IPv6 header fits in skb headroom tipc: make dist queue pernet tipc: re-enable compensation for socket receive buffer double counting tipc: correct error in node fsm tty: nozomi: avoid a harmless gcc warning hostap: avoid uninitialized variable use in hfa384x_get_rid gfs2: avoid uninitialized variable warning tipc: fix random link resets while adding a second bearer tipc: fix socket timer deadlock mnt: Add a per mount namespace limit on the number of mounts xc2028: avoid use after free netfilter: nfnetlink: correctly validate length of batch messages tipc: check minimum bearer MTU vfio/pci: Fix integer overflows, bitmask check staging/android/ion : fix a race condition in the ion driver ping: implement proper locking perf/core: Fix concurrent sys_perf_event_open() vs. 'move_group' race Linux 4.4.65 Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
| | | * | | | mnt: Add a per mount namespace limit on the number of mountsEric W. Biederman2017-04-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit d29216842a85c7970c536108e093963f02714498 upstream. CAI Qian <caiqian@redhat.com> pointed out that the semantics of shared subtrees make it possible to create an exponentially increasing number of mounts in a mount namespace. mkdir /tmp/1 /tmp/2 mount --make-rshared / for i in $(seq 1 20) ; do mount --bind /tmp/1 /tmp/2 ; done Will create create 2^20 or 1048576 mounts, which is a practical problem as some people have managed to hit this by accident. As such CVE-2016-6213 was assigned. Ian Kent <raven@themaw.net> described the situation for autofs users as follows: > The number of mounts for direct mount maps is usually not very large because of > the way they are implemented, large direct mount maps can have performance > problems. There can be anywhere from a few (likely case a few hundred) to less > than 10000, plus mounts that have been triggered and not yet expired. > > Indirect mounts have one autofs mount at the root plus the number of mounts that > have been triggered and not yet expired. > > The number of autofs indirect map entries can range from a few to the common > case of several thousand and in rare cases up to between 30000 and 50000. I've > not heard of people with maps larger than 50000 entries. > > The larger the number of map entries the greater the possibility for a large > number of active mounts so it's not hard to expect cases of a 1000 or somewhat > more active mounts. So I am setting the default number of mounts allowed per mount namespace at 100,000. This is more than enough for any use case I know of, but small enough to quickly stop an exponential increase in mounts. Which should be perfect to catch misconfigurations and malfunctioning programs. For anyone who needs a higher limit this can be changed by writing to the new /proc/sys/fs/mount-max sysctl. Tested-by: CAI Qian <caiqian@redhat.com> Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com> [bwh: Backported to 4.4: adjust context] Signed-off-by: Ben Hutchings <ben.hutchings@codethink.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>