OSDN Git Service

sagit-ice-cold/kernel_xiaomi_msm8998.git
6 years agomm/Kconfig: Enable MEMORY_HOTPLUG for arm64
Arun KS [Wed, 20 Sep 2017 07:50:41 +0000 (13:20 +0530)]
mm/Kconfig: Enable MEMORY_HOTPLUG for arm64

Add arm64 to the list of architectures which supports
memory hotplug.

Change-Id: Iefeb8294bf06eaebb17a3b3aa8b33bb3b7133099
Signed-off-by: Arun KS <arunks@codeaurora.org>
Signed-off-by: Srivatsa Vaddagiri <vatsa@codeaurora.org>
6 years agoarm64: Add "remove" probe driver for memory hot-remove
Andrea Reale [Fri, 28 Apr 2017 08:50:16 +0000 (14:20 +0530)]
arm64: Add "remove" probe driver for memory hot-remove

Allows to remove sections of memory that have been previously offlined
from userspace.

This is symmetric to the "memory probe" interface, as described in
Documentation/memory-hotplug.txt. It can be used to manually notify the
OS that one memory section has been removed.

Please, remind that a memory section can only be removed after it has
been logically off-lined; trying to remove a section which has not been
previously off-lined is not supported and will have undefined (but most
likely very bad) behaviour.

To offline a section one can:

To use the remove interface to remove the section:

where 0xYYYYYY is the physical address of the memory section to remove.

Change-Id: I1ab2fafe17b2697a5c667feae25c4ac0655f394e
Signed-off-by: Andrea Reale <ar@linux.vnet.ibm.com>
Signed-off-by: Maciej Bielski <m.bielski@virtualopensystems.com>
Patch-mainline: linux-kernel @ 11 Apr 2017, 18:25
Signed-off-by: Srivatsa Vaddagiri <vatsa@codeaurora.org>
6 years agoarm64: Hot-remove implementation for arm64
Andrea Reale [Fri, 28 Apr 2017 08:48:26 +0000 (14:18 +0530)]
arm64: Hot-remove implementation for arm64

- arch_remove_memory interface
- kernel page tables cleanup
- vmemmap_free implementation for arm64

Change-Id: I8945b6b91ed7012abc1478de266302427ebeb639
Signed-off-by: Andrea Reale <ar@linux.vnet.ibm.com>
Signed-off-by: Maciej Bielski <m.bielski@virtualopensystems.com>
Patch-mainline: linux-kernel @ 11 Apr 2017, 18:25
Signed-off-by: Srivatsa Vaddagiri <vatsa@codeaurora.org>
Signed-off-by: Arun KS <arunks@codeaurora.org>
6 years agoarm64: Memory hotplug support for arm64 platform
Maciej Bielski [Fri, 28 Apr 2017 08:44:14 +0000 (14:14 +0530)]
arm64: Memory hotplug support for arm64 platform

This is a second and improved version of the patch previously released
in [3].

It builds on the work by Scott Branden [2] and, henceforth,
it needs to be applied on top of Scott's patches [2].
Comments are very welcome.

Changes from the original patchset and known issues:

- Compared to Scott's original patchset, this work adds the mapping of
  the new hotplugged pages into the kernel page tables. This is done by
  copying the old swapper_pg_dir over a new page, adding the new mappings,
  and then switching to the newly built pg_dir (see `hotplug_paging` in
  arch/arm64/mmu.c). There might be better ways to to this: suggestions
  are more than welcome.

- The stub function for `arch_remove_memory` has been removed for now; we
  are working in parallel on memory hot remove, and we plan to contribute
  it as a separate patch.

- Corresponding Kconfig flags have been added;

- Note that this patch does not work when NUMA is enabled; in fact,
  the function `memory_add_physaddr_to_nid` does not have an
  implementation when the NUMA flag is on: this function is supposed to
  return the nid the hotplugged memory should be associated with. However
  it is not really clear to us  yet what the semantics of this function
  in the context of a NUMA system should be. A quick and dirty fix would
  be to always attach to the first available NUMA node.

- In arch/arm64/mm/init.c `arch_add_memory`, we are doing a hack with the
  nomap memory block flags to satisfy preconditions and postconditions of
  `__add_pages` and postconditions of `arch_add_memory`. Compared to
  memory hotplug implementation for other architectures, the "issue"
  seems to be in the implemenation of `pfn_valid`. Suggestions on how
  to cleanly avoid this hack are welcome.

This patchset can be tested by starting the kernel with the `mem=X` flag, where
X is less than the total available physical memory and has to be multiple of
MIN_MEMORY_BLOCK_SIZE. We also tested it on a customised version of QEMU
capable to emulate physical hotplug on arm64 platform.

To enable the feature the CONFIG_MEMORY_HOTPLUG compilation flag
needs to be set to true. Then, after memory is physically hotplugged,
the standard two steps to make it available (as also documented in
Documentation/memory-hotplug.txt) are:

(1) Notify memory hot-add
  echo '0xYY000000' > /sys/devices/system/memory/probe

where 0xYY000000 is the first physical address of the new memory section.

(2) Online new memory block(s)
    echo online > /sys/devices/system/memory/memoryXXX/state
    -- or --
    echo online_movable > /sys/devices/system/memory/memoryXXX/state

where XXX corresponds to the ids of newly added blocks.

Onlining can optionally be automatic at hot-add notification by enabling
the global flag:
echo online > /sys/devices/system/memory/auto_online_blocks
or by setting the corresponding config flag in the kernel build.

Again, any comment is highly appreciated.

[1] https://lkml.org/lkml/2016/11/17/49
[2] https://lkml.org/lkml/2016/12/1/811
[3] https://lkml.org/lkml/2016/12/14/188

Change-Id: I545807e3121c159aaa2f917ea914ee98f38fb296
Signed-off-by: Maciej Bielski <m.bielski@virtualopensystems.com>
Signed-off-by: Andrea Reale <ar@linux.vnet.ibm.com>
Patch-mainline: linux-kernel @ 11 Apr 2017, 18:25
Signed-off-by: Srivatsa Vaddagiri <vatsa@codeaurora.org>
[arunks@codeaurora.org: fix to pass checker test]
Signed-off-by: Arun KS <arunks@codeaurora.org>
6 years agoarm64: memory-hotplug: Add MEMORY_HOTPLUG, MEMORY_HOTREMOVE, MEMORY_PROBE
Scott Branden [Fri, 28 Apr 2017 08:39:53 +0000 (14:09 +0530)]
arm64: memory-hotplug: Add MEMORY_HOTPLUG, MEMORY_HOTREMOVE, MEMORY_PROBE

Add memory-hotplug support for ARM64 platform.

This requires addition of
ARCH_ENABLE_MEMORY_HOTPLUG and ARCH_ENABLE_MEMORY_HOTREMOVE config options.

MEMORY_PROBE config option is added to support
/sys/devices/system/memory/probe functionality.

In addition architecture specific arch_add_memory and
arch_remove memory management functions are added.

Change-Id: I1fc4e8c93cfe1b9722b2fc8d811390e6cdfa7995
Signed-off-by: Scott Branden <scott.branden@broadcom.com>
Patch-mainline: linux-kernel @ 11 Apr 2017, 18:24
Signed-off-by: Srivatsa Vaddagiri <vatsa@codeaurora.org>
6 years agoMerge "msm: camera: isp: don't set stripe_rd reload bit during hw reset"
Linux Build Service Account [Mon, 20 Nov 2017 23:38:49 +0000 (15:38 -0800)]
Merge "msm: camera: isp: don't set stripe_rd reload bit during hw reset"

6 years agoMerge "USB: core: Add USB_DEVICE_ERROR uevent for enumeration timeout"
Linux Build Service Account [Mon, 20 Nov 2017 23:38:48 +0000 (15:38 -0800)]
Merge "USB: core: Add USB_DEVICE_ERROR uevent for enumeration timeout"

6 years agoMerge "cnss2: fix PCIe D3hot when suspending link"
Linux Build Service Account [Sun, 19 Nov 2017 15:45:23 +0000 (07:45 -0800)]
Merge "cnss2: fix PCIe D3hot when suspending link"

6 years agoMerge "FROMLIST: binder: fix proc->files use-after-free"
Linux Build Service Account [Sun, 19 Nov 2017 15:45:22 +0000 (07:45 -0800)]
Merge "FROMLIST: binder: fix proc->files use-after-free"

6 years agoMerge "ais: query field info and pass to user space"
Linux Build Service Account [Sun, 19 Nov 2017 15:45:21 +0000 (07:45 -0800)]
Merge "ais: query field info and pass to user space"

6 years agoMerge "msm: kgsl: Update the dispatcher timer properly"
Linux Build Service Account [Sun, 19 Nov 2017 15:45:20 +0000 (07:45 -0800)]
Merge "msm: kgsl: Update the dispatcher timer properly"

6 years agoMerge "clk: qcom: mdss: fix the divider programming for DisplayPort PLL"
Linux Build Service Account [Sun, 19 Nov 2017 15:45:19 +0000 (07:45 -0800)]
Merge "clk: qcom: mdss: fix the divider programming for DisplayPort PLL"

6 years agoMerge "msm: camera: Version changes for new csid on msm8953"
Linux Build Service Account [Sun, 19 Nov 2017 15:45:18 +0000 (07:45 -0800)]
Merge "msm: camera: Version changes for new csid on msm8953"

6 years agoMerge "msm: camera: Changing return condition after NULL check"
Linux Build Service Account [Sun, 19 Nov 2017 15:45:17 +0000 (07:45 -0800)]
Merge "msm: camera: Changing return condition after NULL check"

6 years agoMerge "msm: vidc: Fix instance formats initialization issue"
Linux Build Service Account [Sun, 19 Nov 2017 15:45:16 +0000 (07:45 -0800)]
Merge "msm: vidc: Fix instance formats initialization issue"

6 years agoMerge "msm: mdss: dp: fix programming of DisplayPort SDP registers"
Linux Build Service Account [Sun, 19 Nov 2017 15:45:15 +0000 (07:45 -0800)]
Merge "msm: mdss: dp: fix programming of DisplayPort SDP registers"

6 years agoMerge "msm: mdss: adjust mdss_mdp_get_plane_sizes parameters init order"
Linux Build Service Account [Sun, 19 Nov 2017 15:45:13 +0000 (07:45 -0800)]
Merge "msm: mdss: adjust mdss_mdp_get_plane_sizes parameters init order"

6 years agoMerge "msm: kgsl: Use the bind lock when dumping entries"
Linux Build Service Account [Sun, 19 Nov 2017 15:45:12 +0000 (07:45 -0800)]
Merge "msm: kgsl: Use the bind lock when dumping entries"

6 years agoMerge "msm: ais: sensor: actuator: avoid accessing out of bound memory"
Linux Build Service Account [Sun, 19 Nov 2017 15:45:11 +0000 (07:45 -0800)]
Merge "msm: ais: sensor: actuator: avoid accessing out of bound memory"

6 years agoMerge "drivers: qdsp6v2: Add mutex unlock to properly release lock"
Linux Build Service Account [Sun, 19 Nov 2017 15:45:10 +0000 (07:45 -0800)]
Merge "drivers: qdsp6v2: Add mutex unlock to properly release lock"

6 years agoMerge "security: pfe: Return proper error code"
Linux Build Service Account [Sun, 19 Nov 2017 15:45:09 +0000 (07:45 -0800)]
Merge "security: pfe: Return proper error code"

6 years agoMerge "ARM: dts: msm: Fix tavil codec reset issue on sdm660"
Linux Build Service Account [Sun, 19 Nov 2017 15:45:08 +0000 (07:45 -0800)]
Merge "ARM: dts: msm: Fix tavil codec reset issue on sdm660"

6 years agoMerge "ath10k: check the pipe credit update enabled flag before set"
Linux Build Service Account [Sat, 18 Nov 2017 08:35:27 +0000 (00:35 -0800)]
Merge "ath10k: check the pipe credit update enabled flag before set"

6 years agoMerge "power: qpnp-fg-gen3: update battery profile based on Rconn configuration"
Linux Build Service Account [Sat, 18 Nov 2017 08:35:25 +0000 (00:35 -0800)]
Merge "power: qpnp-fg-gen3: update battery profile based on Rconn configuration"

6 years agoMerge "DRM: SDE: Fix the spelling in DTS parser"
Linux Build Service Account [Sat, 18 Nov 2017 00:00:55 +0000 (16:00 -0800)]
Merge "DRM: SDE: Fix the spelling in DTS parser"

6 years agoMerge "ARM: dts: msm: Add support for MSM8996 Mizar platform"
Linux Build Service Account [Sat, 18 Nov 2017 00:00:54 +0000 (16:00 -0800)]
Merge "ARM: dts: msm: Add support for MSM8996 Mizar platform"

6 years agoath10k: check the pipe credit update enabled flag before set
Sarada Prasanna Garnayak [Sat, 11 Nov 2017 07:24:50 +0000 (12:54 +0530)]
ath10k: check the pipe credit update enabled flag before set

Check the credit update flag has enabled for the pipe
before setting the flag for credit report update request
on the wcn3990 WLAN module.

CRs-Fixed: 2141924
Change-Id: Ic628fa49934c110b7abccefb45a2a354dc462791
Signed-off-by: Sarada Prasanna Garnayak <sgarna@codeaurora.org>
6 years agoFROMLIST: binder: fix proc->files use-after-free
Todd Kjos [Fri, 10 Nov 2017 23:30:27 +0000 (15:30 -0800)]
FROMLIST: binder: fix proc->files use-after-free

(from https://patchwork.kernel.org/patch/10058587/)

proc->files cleanup is initiated by binder_vma_close. Therefore
a reference on the binder_proc is not enough to prevent the
files_struct from being released while the binder_proc still has
a reference. This can lead to an attempt to dereference the
stale pointer obtained from proc->files prior to proc->files
cleanup. This has been seen once in task_get_unused_fd_flags()
when __alloc_fd() is called with a stale "files".

The fix is to always use get_files_struct() to obtain struct_files
so that the refcount on the files_struct is used to prevent
a premature free. proc->files is removed since we get it every
time.

Bug: 69164715
Change-Id: I6431027d3d569e76913935c21885201505627982
Signed-off-by: Todd Kjos <tkjos@google.com>
Git-commit: 1d6b43334b45144beb0dc8236f9eb3b6cf3b2995
Git-repo: https://android.googlesource.com/kernel/common
Signed-off-by: Kyle Yan <kyan@codeaurora.org>
6 years agoMerge "msm: camera: Enable (2+1) lane csiphy combo mode"
Linux Build Service Account [Fri, 17 Nov 2017 03:11:13 +0000 (19:11 -0800)]
Merge "msm: camera: Enable (2+1) lane csiphy combo mode"

6 years agocnss2: fix PCIe D3hot when suspending link
jiad [Thu, 16 Nov 2017 08:54:09 +0000 (16:54 +0800)]
cnss2: fix PCIe D3hot when suspending link

When doing WLAN SSR tests on Rome PCIe platform, system hang
is observed. After debugging, setting D3hot to PCIe link when
suspending leads to the hang.

Setting D3hot is a new change, which is added for Napier platform.
But this code path shares with legacy Rome platform. In previous
implementations for Rome PCIe platforms, setting D3hot to link
is not needed.

Fix is to set D3hot for Napier specific platforms.

Change-Id: Ia6bcb1b898204c0a8fd63355dd1f0808021182c4
CRs-Fixed: 2145090
Signed-off-by: Jia Ding <jiad@codeaurora.org>
6 years agoDRM: SDE: Fix the spelling in DTS parser
Camus Wong [Mon, 13 Nov 2017 21:20:02 +0000 (16:20 -0500)]
DRM: SDE: Fix the spelling in DTS parser

Fix one of the mode properties' spelling error.

Change-Id: I6cb0f31aa62b825773b97099fcac3da8a2b94af6
Signed-off-by: Camus Wong <camusw@codeaurora.org>
6 years agoclk: qcom: mdss: fix the divider programming for DisplayPort PLL
Padmanabhan Komanduru [Wed, 15 Nov 2017 13:21:05 +0000 (18:51 +0530)]
clk: qcom: mdss: fix the divider programming for DisplayPort PLL

Fix the divider programming of DisplayPort PLL with the correct
value. Without this, display doesn't up fine with certain
resolutions on some sinks when link rate is 5.4 GHz.

Change-Id: I7c5a452a9df757240a1c6c3d371bd46a16f98efd
Signed-off-by: Padmanabhan Komanduru <pkomandu@codeaurora.org>
6 years agomsm: camera: Version changes for new csid on msm8953
Shankar Ravi [Thu, 17 Dec 2015 09:22:12 +0000 (14:52 +0530)]
msm: camera: Version changes for new csid on msm8953

msm8953 uses a new version of csid. Adding new
configuration file and making necessary driver changes.

Change-Id: I5c0ce7f43a4ccd55bd18461bc910e4dcb0c23bb0
Signed-off-by: Shankar Ravi <rshankar@codeaurora.org>
6 years agomsm: camera: Changing return condition after NULL check
Samyukta Mogily [Wed, 12 Oct 2016 12:43:50 +0000 (18:13 +0530)]
msm: camera: Changing return condition after NULL check

If return is inside the if condition, rc value is returned
only for that case. Hence shifting the return rc statement
outside the if loop, to return the value of rc for all cases.

Change-Id: I2f96cd0d301f580c0e7019746bade4e125661a36
CRs-Fixed: 1076948
Signed-off-by: Samyukta Mogily <smogily@codeaurora.org>
6 years agoSDE: Fix the minimum value in display property
Camus Wong [Sat, 11 Nov 2017 05:41:10 +0000 (00:41 -0500)]
SDE: Fix the minimum value in display property

The minium value of u32 is zero instead of -1.  -1 will become the
largest value in u32.

Change-Id: I20fcab7d5912d6da7c4afe1ec7a86333767b0bf1
Signed-off-by: Camus Wong <camusw@codeaurora.org>
6 years agomsm: mdss: adjust mdss_mdp_get_plane_sizes parameters init order
Benjamin Chan [Tue, 14 Nov 2017 05:27:17 +0000 (00:27 -0500)]
msm: mdss: adjust mdss_mdp_get_plane_sizes parameters init order

Parameter mdss_mdp_plane_sizes must be cleared to 0 before returning
under an error condition, otherwise caller function will use the
uninitialized mdss_mdp_plane_sizes values and caused incorrect
operation.

Change-Id: I856b17ce9e917cc450040463ec34b7309d34b9b5
Signed-off-by: Benjamin Chan <bkchan@codeaurora.org>
6 years agoARM: dts: msm: Add support for MSM8996 Mizar platform
Bharathraj Nagaraju [Wed, 2 Aug 2017 17:02:01 +0000 (10:02 -0700)]
ARM: dts: msm: Add support for MSM8996 Mizar platform

Add device tree files needed to support MSM8996 based
mizar platform.

Change-Id: Ife6c6659b981b37c6b9d9cbb0a0c106488f1e07f
Signed-off-by: Bharathraj Nagaraju <snbraj@codeaurora.org>
6 years agoUSB: core: Add USB_DEVICE_ERROR uevent for enumeration timeout
Chandana Kishori Chiluveru [Tue, 17 May 2016 06:13:54 +0000 (11:43 +0530)]
USB: core: Add USB_DEVICE_ERROR uevent for enumeration timeout

Some userspace modules expect USB driver to send event to userspace, when
usb device enumeration failure with device descriptor read errors.
Add USB_DEVICE_ERROR uevent in the USB driver to explicitly send the ERROR
uevent for such case.

Change-Id: I7128869ff0700ab90d4c949de24cd03c5c90e22e
Signed-off-by: Chandana Kishori Chiluveru <cchiluve@codeaurora.org>
6 years agoais: query field info and pass to user space
Andy Sun [Mon, 25 Sep 2017 02:08:42 +0000 (10:08 +0800)]
ais: query field info and pass to user space

Current path to query field info: SOF ISR -> tasklet -> query thread
with high priority -> ba driver -> adv7481.

Pass field type to user space if they are valid after verification.

Change-Id: Id9926236389200446092dc9abb688ee1f83ab0c3
Signed-off-by: Andy Sun <bins@codeaurora.org>
6 years agomsm: camera: isp: don't set stripe_rd reload bit during hw reset
Gaoxiang Chen [Tue, 31 Oct 2017 02:57:06 +0000 (10:57 +0800)]
msm: camera: isp: don't set stripe_rd reload bit during hw reset

During reset isp HW, don't set stripe_rd reload bit, otherwise
it might cause iommu page fault, which actually is a fasle alarm.

CRs-Fixed: 2135311
Change-Id: I9be0400640edbf687ecfe08edcfdc1c7f7de25b6
Signed-off-by: Gaoxiang Chen <gaochen@codeaurora.org>
6 years agomsm: kgsl: Use the bind lock when dumping entries
Lynus Vaz [Mon, 30 Oct 2017 12:20:43 +0000 (17:50 +0530)]
msm: kgsl: Use the bind lock when dumping entries

Take the bind lock when we dump information about sparse memory
allocations through the debugfs node.

Change-Id: I955d64d06a259a2bbe4d85a33d68887ee01aad07
Signed-off-by: Lynus Vaz <lvaz@codeaurora.org>
6 years agopower: qpnp-fg-gen3: update battery profile based on Rconn configuration
Subbaraman Narayanamurthy [Fri, 10 Nov 2017 23:37:29 +0000 (15:37 -0800)]
power: qpnp-fg-gen3: update battery profile based on Rconn configuration

Currently, Rconn is configured once in fg_hw_init() if it is not
configured already. However, if the driver loads the profile
later, it will overwrite the Rconn value configured during
fg_hw_init. To fix this problem, configure Rconn after handling
battery profile loading.

Usually the Rconn configuration is setup differently from what
the profile has for it. We check if the profile in SRAM is bit
to bit matching with the profile in device tree. We may come
across a mismatch for Rconn configuration and conclude that the
profile isn't matching. Fix this by initializing the Rconn
configuration in the profile read from device tree to the value
read from SRAM.

CRs-Fixed: 2142441
Change-Id: I2b7ac8cd6efe811527c29bc5cd0fa43b77da7b15
Signed-off-by: Subbaraman Narayanamurthy <subbaram@codeaurora.org>
6 years agoMerge "soc: qcom: service-locator: Update incorrect usage of qmi_send_req_wait"
Linux Build Service Account [Tue, 14 Nov 2017 17:45:25 +0000 (09:45 -0800)]
Merge "soc: qcom: service-locator: Update incorrect usage of qmi_send_req_wait"

6 years agodrivers: qdsp6v2: Add mutex unlock to properly release lock
Tanya Dixit [Thu, 26 Oct 2017 08:20:42 +0000 (13:50 +0530)]
drivers: qdsp6v2: Add mutex unlock to properly release lock

Add mutex unlock in function audio_effects_shared_ioctl
at appropriate place to prevent use after free.

CRs-Fixed: 2123291
Change-Id: Ie0d321dc8cc20a295d102a44faea7e5710834932
Signed-off-by: Tanya Dixit <tdixit@codeaurora.org>
6 years agosoc: qcom: service-locator: Update incorrect usage of qmi_send_req_wait
Kyle Yan [Tue, 7 Nov 2017 23:27:29 +0000 (15:27 -0800)]
soc: qcom: service-locator: Update incorrect usage of qmi_send_req_wait

qmi_send_req_wait expects timeout argument to be passed in ms and not
in jiffies. Update the call in service-locator to pass in the correct
argument.

Change-Id: Ib2f8deedf2fb2a561c30b0c8511bb1edd5a37361
Signed-off-by: Kyle Yan <kyan@codeaurora.org>
6 years agosoc: qcom: service-locator: Fix error message prints for receiving messages
Kyle Yan [Wed, 8 Nov 2017 06:14:39 +0000 (22:14 -0800)]
soc: qcom: service-locator: Fix error message prints for receiving messages

ENOMSG is not a real failure return code for qmi_recv_msg. Instead ENOMSG
signifies that we have finished reading the entirety of the message buffer.
Update the error condition to print errors only when any error message
other than ENOMSG is returned.

Change-Id: Id6b42df182cb02f2cbffaae9698363b7dafce4e4
Signed-off-by: Kyle Yan <kyan@codeaurora.org>
6 years agoMerge "power: qcom: msm-core: Add mutex lock for ioctl"
Linux Build Service Account [Mon, 13 Nov 2017 15:26:33 +0000 (07:26 -0800)]
Merge "power: qcom: msm-core: Add mutex lock for ioctl"

6 years agoMerge "ASoC: msm: qdsp6v2: Remove excess logs in compress driver"
Linux Build Service Account [Mon, 13 Nov 2017 15:26:32 +0000 (07:26 -0800)]
Merge "ASoC: msm: qdsp6v2: Remove excess logs in compress driver"

6 years agoMerge "adv7481: Changes to compile ADV7481 as a module"
Linux Build Service Account [Mon, 13 Nov 2017 15:26:31 +0000 (07:26 -0800)]
Merge "adv7481: Changes to compile ADV7481 as a module"

6 years agoMerge "usb: gadget: ffs: Defer freeing memory on free_inst if in use"
Linux Build Service Account [Mon, 13 Nov 2017 15:26:30 +0000 (07:26 -0800)]
Merge "usb: gadget: ffs: Defer freeing memory on free_inst if in use"

6 years agoMerge "ARM: dts: msm: add SLPI fw name property for msm8996"
Linux Build Service Account [Mon, 13 Nov 2017 15:26:29 +0000 (07:26 -0800)]
Merge "ARM: dts: msm: add SLPI fw name property for msm8996"

6 years agomsm: mdss: dp: fix programming of DisplayPort SDP registers
Padmanabhan Komanduru [Mon, 13 Nov 2017 13:45:07 +0000 (19:15 +0530)]
msm: mdss: dp: fix programming of DisplayPort SDP registers

Fix the programming of DisplayPort SDP registers primarily related
to Audio enable sequence. This would fix potential issues caused by
read/append/write operations on SDP registers which might corrupt
the parity/data bytes. This would lead to audio issues since the DP
controller would treat the corrupt SDP information as invalid data.

Change-Id: I55db6a70be0fdf94a60fd7cc8bf0d30702febef8
Signed-off-by: Padmanabhan Komanduru <pkomandu@codeaurora.org>
6 years agomsm: ais: sensor: actuator: avoid accessing out of bound memory
Rahul Sharma [Sun, 12 Nov 2017 11:40:59 +0000 (17:10 +0530)]
msm: ais: sensor: actuator: avoid accessing out of bound memory

Issue:
When total_steps is updated, after that, copy_from_user
fails with an error, then, i2c_reg_tbl is not allocated.
In this case, when calling msm_actuator_parse_i2c_params,
it lead to out-of-bound memory write.
Fix:
1) Assign total_steps to zero when error from copying.
2) Add NULL pointer check for i2c tbl.

Change-Id: I4df8557719533900a5c571fc00f9844943c8f7b1
Signed-off-by: Rahul Sharma <sharah@codeaurora.org>
6 years agopower: qcom: msm-core: Add mutex lock for ioctl
Maulik Shah [Fri, 10 Nov 2017 06:21:01 +0000 (11:51 +0530)]
power: qcom: msm-core: Add mutex lock for ioctl

There can be use after free with multiple ioctl calls.
Add mutex lock when updating userspace power.

Change-Id: Ieae08d05478a462b19cf7f91b64267177eaebe84
Signed-off-by: Maulik Shah <mkshah@codeaurora.org>
6 years agoadv7481: Changes to compile ADV7481 as a module
Rahul Sharma [Mon, 30 Oct 2017 11:01:53 +0000 (16:31 +0530)]
adv7481: Changes to compile ADV7481 as a module

ADV7481 driver is board-specific, and thus should be compiled
as a module. This is part of the kernel modularization requirement.

Change-Id: I38ab9efca34ac9f898c2b76843563d8f74c29320
Suggested-by: Resmi Rajendran <resmir@qti.qualcomm.com>
Signed-off-by: Rahul Sharma <sharah@codeaurora.org>
6 years agoASoC: wcd934x: reset ASRC after playback
Walter Yang [Wed, 25 Oct 2017 06:29:53 +0000 (14:29 +0800)]
ASoC: wcd934x: reset ASRC after playback

Reset ASRC after audio playback is completed to clear
the FIFO and avoid any noise being generated.

CRs-Fixed: 2129994
Change-Id: Ie45796e1bd68d5a8bd790490a65520358f26b811
Signed-off-by: Walter Yang <yandongy@codeaurora.org>
6 years agomsm: kgsl: Do not expose kernel pointer for global entries
Hareesh Gundu [Wed, 1 Nov 2017 13:17:45 +0000 (18:47 +0530)]
msm: kgsl: Do not expose kernel pointer for global entries

Add kernel pointer restriction while printing the global
page table entries through the debugfs.

Change-Id: Ia2ef4243248ece477e3f679c0027379686670928
Signed-off-by: Hareesh Gundu <hareeshg@codeaurora.org>
6 years agoMerge "drm/msm: add SRM support for HDCP 1.4"
Linux Build Service Account [Fri, 10 Nov 2017 15:55:28 +0000 (07:55 -0800)]
Merge "drm/msm: add SRM support for HDCP 1.4"

6 years agoARM: dts: msm: add SLPI fw name property for msm8996
Ananda Kishore [Fri, 10 Nov 2017 09:37:33 +0000 (15:07 +0530)]
ARM: dts: msm: add SLPI fw name property for msm8996

Add SLPI fw name property to support dynamic loading of SLPI
fw images based on the version info.

Change-Id: I31baf971106a7a076cf83bd72c4509d860b3e7cb
Signed-off-by: Ananda Kishore <kananda@codeaurora.org>
6 years agoMerge "msm: pcie: always recover cfg space during resume"
Linux Build Service Account [Fri, 10 Nov 2017 06:06:48 +0000 (22:06 -0800)]
Merge "msm: pcie: always recover cfg space during resume"

6 years agodrm/msm: add SRM support for HDCP 1.4
Abhinav Kumar [Wed, 8 Nov 2017 06:21:22 +0000 (22:21 -0800)]
drm/msm: add SRM support for HDCP 1.4

Add support for clients to notify SRM update
to HDCP 1.x driver.

Integrate the SRM validation check in the HDCP 1.x
authentication flow to check HDCP 1.x receiver/repeater
KSV against the SRM revoked list and fail the authentication
if the sink is found to be present in the list.

Change-Id: I6615122f785bde94cb746ec4df7ab63b9f878528
Signed-off-by: Abhinav Kumar <abhinavk@codeaurora.org>
6 years agomsm: pcie: always recover cfg space during resume
Sujeev Dias [Tue, 10 Oct 2017 17:57:48 +0000 (10:57 -0700)]
msm: pcie: always recover cfg space during resume

During linkdown pci host cannot save the config space
prior to suspending the link. If saved_state is null
recover rc config space using shadow recovery.

CRs-Fixed: 2141146
Change-Id: I6c6e817ae2c32d8040853fe22785040480aa76eb
Signed-off-by: Sujeev Dias <sdias@codeaurora.org>
6 years agoMerge "msm: vidc: Fix sequence change event properly"
Linux Build Service Account [Thu, 9 Nov 2017 17:58:57 +0000 (09:58 -0800)]
Merge "msm: vidc: Fix sequence change event properly"

6 years agoMerge "soc: qcom: msm_bus: Add debug logging for max bandwidth votes"
Linux Build Service Account [Thu, 9 Nov 2017 17:58:56 +0000 (09:58 -0800)]
Merge "soc: qcom: msm_bus: Add debug logging for max bandwidth votes"

6 years agoMerge "msm: mdss: do not do phy reset when HDMI power off"
Linux Build Service Account [Thu, 9 Nov 2017 17:58:55 +0000 (09:58 -0800)]
Merge "msm: mdss: do not do phy reset when HDMI power off"

6 years agoMerge "usb: gadget: f_qdss: Update usb string table based on channel name"
Linux Build Service Account [Thu, 9 Nov 2017 09:36:54 +0000 (01:36 -0800)]
Merge "usb: gadget: f_qdss: Update usb string table based on channel name"

6 years agoMerge "msm: sensor: actuator: avoid accessing out of bound memory"
Linux Build Service Account [Thu, 9 Nov 2017 09:36:53 +0000 (01:36 -0800)]
Merge "msm: sensor: actuator: avoid accessing out of bound memory"

6 years agoMerge "net: rmnet_data: Support recycling frames to real device"
Linux Build Service Account [Thu, 9 Nov 2017 09:36:52 +0000 (01:36 -0800)]
Merge "net: rmnet_data: Support recycling frames to real device"

6 years agoMerge "ARM: dts: msm: Add support for irs1645 eeprom on msm8998"
Linux Build Service Account [Thu, 9 Nov 2017 09:36:51 +0000 (01:36 -0800)]
Merge "ARM: dts: msm: Add support for irs1645 eeprom on msm8998"

6 years agoMerge "cnss2: Refactor callbacks for SSR framework"
Linux Build Service Account [Thu, 9 Nov 2017 09:36:50 +0000 (01:36 -0800)]
Merge "cnss2: Refactor callbacks for SSR framework"

6 years agoMerge "Merge android-4.4@ceee5bd (v4.4.95) into msm-4.4"
Linux Build Service Account [Thu, 9 Nov 2017 09:36:49 +0000 (01:36 -0800)]
Merge "Merge android-4.4@ceee5bd (v4.4.95) into msm-4.4"

6 years agoMerge "sched: restore discarded ifdef CONFIG_SCHED_WALT code"
Linux Build Service Account [Thu, 9 Nov 2017 09:36:48 +0000 (01:36 -0800)]
Merge "sched: restore discarded ifdef CONFIG_SCHED_WALT code"

6 years agoMerge "wil6210: drop RX probe reponses with low SNR"
Linux Build Service Account [Thu, 9 Nov 2017 09:36:46 +0000 (01:36 -0800)]
Merge "wil6210: drop RX probe reponses with low SNR"

6 years agoMerge "msm: cec: simplify TX message processing"
Linux Build Service Account [Thu, 9 Nov 2017 09:36:45 +0000 (01:36 -0800)]
Merge "msm: cec: simplify TX message processing"

6 years agoMerge "cec: Fix runtime BUG when (CONFIG_RC_CORE && !CEC_CAP_RC)"
Linux Build Service Account [Thu, 9 Nov 2017 09:36:44 +0000 (01:36 -0800)]
Merge "cec: Fix runtime BUG when (CONFIG_RC_CORE && !CEC_CAP_RC)"

6 years agoMerge "msm: ipa: Fix to use GFP_DMA flag"
Linux Build Service Account [Thu, 9 Nov 2017 09:36:43 +0000 (01:36 -0800)]
Merge "msm: ipa: Fix to use GFP_DMA flag"

6 years agomsm: sensor: actuator: avoid accessing out of bound memory
Haibin Liu [Tue, 24 Oct 2017 12:32:48 +0000 (20:32 +0800)]
msm: sensor: actuator: avoid accessing out of bound memory

Issue:
When total_steps is updated, after that, copy_from_user
fails with an error, then, i2c_reg_tbl is not allocated.
In this case, when calling msm_actuator_parse_i2c_params,
it lead to out-of-bound memory write.

Fix:
1) Assign total_steps to zero when error from copying.
2) Add NULL pointer check for i2c tbl.

CRs-Fixed: 2111672
Change-Id: Ib9dcb182356e2df8078c131edfd0791fa95a35e0
Signed-off-by: Haibin Liu <haibinl@codeaurora.org>
6 years agoMerge "NFC: Fix for core init cmd send failure"
Linux Build Service Account [Wed, 8 Nov 2017 20:55:16 +0000 (12:55 -0800)]
Merge "NFC: Fix for core init cmd send failure"

6 years agoMerge "spi: core: Add support for registering SPI slave controllers"
Linux Build Service Account [Wed, 8 Nov 2017 20:55:15 +0000 (12:55 -0800)]
Merge "spi: core: Add support for registering SPI slave controllers"

6 years agoMerge "regulator: qpnp: fix voltage min/max constraints check"
Linux Build Service Account [Wed, 8 Nov 2017 20:55:14 +0000 (12:55 -0800)]
Merge "regulator: qpnp: fix voltage min/max constraints check"

6 years agoMerge "dwc3: Do not perform core reinitialisation for host only mode"
Linux Build Service Account [Wed, 8 Nov 2017 20:55:13 +0000 (12:55 -0800)]
Merge "dwc3: Do not perform core reinitialisation for host only mode"

6 years agoARM: dts: msm: Add support for irs1645 eeprom on msm8998
Vivek Iyer [Mon, 23 Oct 2017 19:38:59 +0000 (12:38 -0700)]
ARM: dts: msm: Add support for irs1645 eeprom on msm8998

Add device tree entry needed to support eeprom on the
irs1645 sensor.

Change-Id: I88ad09c7da813e3b74d465392e8e40839d9c88a9
Signed-off-by: Vivek Iyer <viyer@codeaurora.org>
6 years agowil6210: drop RX probe reponses with low SNR
Dedy Lansky [Wed, 8 Nov 2017 10:43:53 +0000 (12:43 +0200)]
wil6210: drop RX probe reponses with low SNR

FW now reports SNR for RX management frames.
Drop probe responses with SNR lower than the configured threshold.

Change-Id: Ife1863b07aebe5cb6097420290c0c10b590c2da1
Signed-off-by: Dedy Lansky <dlansky@codeaurora.org>
6 years agowil6210: add sysfs for setting connect SNR threshold
Dedy Lansky [Wed, 8 Nov 2017 12:57:30 +0000 (14:57 +0200)]
wil6210: add sysfs for setting connect SNR threshold

snr_thresh sysfs can be used to set omni and direct SNR threshold for
connection.

Change-Id: I091a6b61a1a4cb98e0e8c0f70b2fff4d22486e61
Signed-off-by: Dedy Lansky <dlansky@codeaurora.org>
6 years agomsm: kgsl: Update the dispatcher timer properly
Lynus Vaz [Tue, 24 Oct 2017 10:17:44 +0000 (15:47 +0530)]
msm: kgsl: Update the dispatcher timer properly

The dispatcher timer should be updated if preemption is not in
progress. This schedules the dispatcher work in case the command
does not make progress.

Change-Id: I9ef55b12d7a4f07a3c5bba650e37453bd8f86ce3
Signed-off-by: Lynus Vaz <lvaz@codeaurora.org>
6 years agosecurity: pfe: Return proper error code
Neeraj Soni [Wed, 8 Nov 2017 11:19:51 +0000 (16:49 +0530)]
security: pfe: Return proper error code

ICE clock funciton masks the error code from
scm call. This might introduce unwanted issues
in device. Ensure to return proper error code
to storage frameworks.

Change-Id: Ibd7358c3b19d23d5995cf267f56ef3bacf166569
Signed-off-by: Neeraj Soni <neersoni@codeaurora.org>
6 years agoMerge "ARM: dts: msm: enable adv7533 bridge chip power rails on msm8996"
Linux Build Service Account [Wed, 8 Nov 2017 10:31:29 +0000 (02:31 -0800)]
Merge "ARM: dts: msm: enable adv7533 bridge chip power rails on msm8996"

6 years agoMerge "msm: camera: Check step position table for NULL pointer"
Linux Build Service Account [Wed, 8 Nov 2017 10:31:28 +0000 (02:31 -0800)]
Merge "msm: camera: Check step position table for NULL pointer"

6 years agoMerge "ARM: dts: msm: Add sdhc_2 on msm8996 virtual platform"
Linux Build Service Account [Wed, 8 Nov 2017 10:31:27 +0000 (02:31 -0800)]
Merge "ARM: dts: msm: Add sdhc_2 on msm8996 virtual platform"

6 years agoMerge "USB: configfs: Don't send DISCONNECT uevent during unbind"
Linux Build Service Account [Wed, 8 Nov 2017 10:31:25 +0000 (02:31 -0800)]
Merge "USB: configfs: Don't send DISCONNECT uevent during unbind"

6 years agoMerge "defconfig: arm64: msm: Enable MMC on msm8996 virtual plaform"
Linux Build Service Account [Wed, 8 Nov 2017 10:31:24 +0000 (02:31 -0800)]
Merge "defconfig: arm64: msm: Enable MMC on msm8996 virtual plaform"

6 years agoMerge "soc: qcom: scm: Remap scm busy error codes to -EBUSY"
Linux Build Service Account [Wed, 8 Nov 2017 10:31:23 +0000 (02:31 -0800)]
Merge "soc: qcom: scm: Remap scm busy error codes to -EBUSY"

6 years agomsm: mdss: do not do phy reset when HDMI power off
Yuan Zhao [Wed, 8 Nov 2017 07:51:14 +0000 (15:51 +0800)]
msm: mdss: do not do phy reset when HDMI power off

Do not need to do HDMI PHY reset here, because will do
that when HDMI cable connected again in HDMI mode setting
function.

Change-Id: Ifae7c35f72a9008980c207e0806ab7aaa57dfe07
Signed-off-by: Yuan Zhao <yzhao@codeaurora.org>
6 years agoNFC: Fix for core init cmd send failure
Gaurav Singhal [Fri, 13 Oct 2017 11:47:58 +0000 (17:17 +0530)]
NFC: Fix for core init cmd send failure

Due to delay of ~3 sec between core reset response
and core init cmd, i2c send fails as NFC controller
goes to deep sleep state if its idle for ~1sec.

Delay caused due to logs in driver probe sequence.

Delay is added after every gpio state change to
ensure, modified value is taken into consideration
and unnecessary delays are removed.

Change-Id: I4c6e8f867f641d6648139206244d67bb556e0099
Signed-off-by: Gaurav Singhal <gsinghal@codeaurora.org>
6 years agodwc3: Do not perform core reinitialisation for host only mode
Ajay Agarwal [Fri, 28 Jul 2017 05:26:24 +0000 (10:56 +0530)]
dwc3: Do not perform core reinitialisation for host only mode

Cuurently as a part of start host, after the block reset we
are performing core init and gadget restart of the dwc3
controller. This causes crash for host only controller where
ep0 and ep1 have not been initialised but are being
dereferenced. Also, HW reinitialisation is not required for
start or restart host routine.

Change-Id: Ie2b781ecb03a1d0a02c5f4305d518adc18dc6ade
Signed-off-by: Ajay Agarwal <ajaya@codeaurora.org>
6 years agospi: core: Add support for registering SPI slave controllers
Geert Uytterhoeven [Mon, 22 May 2017 13:11:41 +0000 (15:11 +0200)]
spi: core: Add support for registering SPI slave controllers

Add support for registering SPI slave controllers using the existing SPI
master framework:
  - SPI slave controllers must use spi_alloc_slave() instead of
    spi_alloc_master(), and should provide an additional callback
    "slave_abort" to abort an ongoing SPI transfer request,
  - SPI slave controllers are added to a new "spi_slave" device class,
  - SPI slave handlers can be bound to the SPI slave device represented
    by an SPI slave controller using a DT child node named "slave",
  - Alternatively, (un)binding an SPI slave handler to the SPI slave
    device represented by an SPI slave controller can be done by
    (un)registering the slave device through a sysfs virtual file named
    "slave".

From the point of view of an SPI slave protocol handler, an SPI slave
controller looks almost like an ordinary SPI master controller. The only
exception is that a transfer request will block on the remote SPI
master, and may be cancelled using spi_slave_abort().

Change-Id: I251c5b7247ee7088285e42dd3b3cdce9c56cb9f7
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Mark Brown <broonie@kernel.org>
Git-commit: 6c364062bfed3c34490e85bea52ff6e2d4f0f281
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
Signed-off-by: Alok Chauhan <alokc@codeaurora.org>
6 years agosoc: qcom: msm_bus: Add debug logging for max bandwidth votes
Odelu Kukatla [Tue, 7 Nov 2017 15:53:02 +0000 (21:23 +0530)]
soc: qcom: msm_bus: Add debug logging for max bandwidth votes

Max bandwidth vote on each bus device is required to be
printed when the device panics, so add a panic notifier
to print the max BW votes on each bus device.

Change-Id: I2256407638fe5085cb4b0f4d5a594dd00f4f3bce
Signed-off-by: Odelu Kukatla <okukatla@codeaurora.org>
6 years agoARM: dts: msm: enable adv7533 bridge chip power rails on msm8996
Rahul Sharma [Tue, 7 Nov 2017 09:53:07 +0000 (15:23 +0530)]
ARM: dts: msm: enable adv7533 bridge chip power rails on msm8996

msm8996 auto CDP platform missing vddio power supply to power up
adv7533 bridge chip for DSI interfaces, which converts DSI to HDMI
signal. This change adds power rails to adv7533.

Change-Id: Ieaea589803bbac1d42478fff16e8a4a833cf7426
Signed-off-by: Rahul Sharma <sharah@codeaurora.org>
6 years agoMerge "mmc: core: Return error if fallback to lower speed mode fails"
Linux Build Service Account [Tue, 7 Nov 2017 23:40:02 +0000 (15:40 -0800)]
Merge "mmc: core: Return error if fallback to lower speed mode fails"

6 years agoMerge "ARM: dts: msm: Change QDSS pipe index to 3 for SDM660"
Linux Build Service Account [Tue, 7 Nov 2017 23:40:01 +0000 (15:40 -0800)]
Merge "ARM: dts: msm: Change QDSS pipe index to 3 for SDM660"