717956 Commits

Author SHA1 Message Date
Linux Build Service Account
61b3f460b1 Merge "alarmtimer: add rtc irq support for alarm" into msm-4.14 2018-04-12 14:29:42 -07:00
Linux Build Service Account
bf7ed3a20a Merge "iommu: arm-smmu: Implement eCATS translation fault errata workaround" into msm-4.14 2018-04-12 14:29:39 -07:00
Linux Build Service Account
e5c0638d29 Merge "ARM: dts: msm: Add wdsp glink node for sdmshrike" into msm-4.14 2018-04-12 14:29:35 -07:00
Linux Build Service Account
a6045f56f3 Merge "ARM: dts: msm: add ST touch node for SM8150" into msm-4.14 2018-04-12 14:29:33 -07:00
Linux Build Service Account
7a858f38ff Merge changes I9eb07dba,Ib55c200f into msm-4.14
* changes:
  trace/sched: Fix compilation for 32 bit systems
  sched: fix 32 bit compilation errors
2018-04-12 14:29:31 -07:00
Linux Build Service Account
76653a0d2c Merge "serial: msm_serial_hs: Remove unwanted header file inclusion" into msm-4.14 2018-04-12 14:29:30 -07:00
Linux Build Service Account
595fe08a42 Merge "ARM: dts: msm: add wil6210 device for sm8150 platforms" into msm-4.14 2018-04-12 14:29:27 -07:00
Linux Build Service Account
4452d7cb12 Merge "ARM: dts: msm: Update IMEM base address for sdm640" into msm-4.14 2018-04-12 14:29:25 -07:00
Linux Build Service Account
091617847d Merge "sched: Fix for 32 bit compilation issue" into msm-4.14 2018-04-12 14:29:22 -07:00
Linux Build Service Account
5b4fa2440f Merge "msm: ipa3: use atomic allocations for setup/teardown pipes" into msm-4.14 2018-04-12 14:29:20 -07:00
Linux Build Service Account
2b465df208 Merge "ARM: dts: msm: coresight: Add spss node for sm8150" into msm-4.14 2018-04-12 14:29:16 -07:00
Linux Build Service Account
03e4fd22e3 Merge "msm: ipa3: Added retry logic if memory allocate fails" into msm-4.14 2018-04-12 14:29:13 -07:00
Linux Build Service Account
f22faadc28 Merge "PM / devfreq: Introduce a sysfs lock" into msm-4.14 2018-04-12 14:29:10 -07:00
Linux Build Service Account
772a81c42c Merge "drivers: qcom: fix compilation errors" into msm-4.14 2018-04-12 14:29:07 -07:00
Mohammed Javid
ad437e5c38 msm: ipa3: use atomic allocations for setup/teardown pipes
Use GFP_ATOMIC flag for dma coherent allocations that can
be called from user space. This change is to allow allocations
even if the user space process has SIGKILL pending.

Change-Id: Ia544252c91e559c47428006ca0522a51a7ab59c0
Acked-by: Ashok Vuyyuru <avuyyuru@qti.qualcomm.com>
Signed-off-by: Mohammed Javid <mjavid@codeaurora.org>
2018-04-12 00:35:13 -07:00
Mohammed Javid
93b66a8afe msm: ipa3: Added retry logic if memory allocate fails
Observing the memory allocation fails if no free emergency
pool of memory not available. Added retry logic mechanism
to allocate memory max 10 retry count with the sleep of 100ms

Change-Id: I80f8872437352509d7526fc963c4bd1d7fb0ff06
Acked-by: Ashok Vuyyuru <avuyyuru@qti.qualcomm.com>
Signed-off-by: Mohammed Javid <mjavid@codeaurora.org>
2018-04-12 13:04:11 +05:30
Pavankumar Kondeti
3728ae4f44 trace/sched: Fix compilation for 32 bit systems
do_div() expects the dividend to be a 64 bit type. We are passing
an unsigned long to do_div() from sched_load_avg_task and
sched_load_avg_cpu trace points. This breaks compilation on
a 32 bit system.

Change-Id: I9eb07dba1e62b68d5fc8d12e3f478b22c4ba5e0d
Signed-off-by: Pavankumar Kondeti <pkondeti@codeaurora.org>
Git-commit: a2ee4e794559cf2ba17dd19117d18787e7c2838d
Git-repo: https://android.googlesource.com/kernel/common/
[cslingutla@codeaurora.org: Fixed trivial merge conflicts]
Signed-off-by: Lingutla Chandrasekhar <clingutla@codeaurora.org>
2018-04-12 11:34:41 +05:30
Lingutla Chandrasekhar
5641f26eed sched: fix 32 bit compilation errors
arch_update_cpu_capacity() is used without including the
corresponding header file, fix the compilation error by
including the header.

Change-Id: Ib55c200fb3d19603194cd119cabed75d7d7ce6ba
Signed-off-by: Lingutla Chandrasekhar <clingutla@codeaurora.org>
2018-04-12 11:34:08 +05:30
Maria Yu
5e4a6df770 sched: Fix for 32 bit compilation issue
Incompatible pointer type found by the compiler which
do_div need to have u64 for first parameter.

Change-Id: If44ee3569de70dd63debac46a25a96f0b558c29f
Signed-off-by: Maria Yu <aiquny@codeaurora.org>
Signed-off-by: Lingutla Chandrasekhar <clingutla@codeaurora.org>
2018-04-12 11:33:44 +05:30
Prateek Sood
17f7916917 ARM: dts: msm: Update IMEM base address for sdm640
Update base address of shared IMEM for sdm640.

Change-Id: I2061f57098c3a2d704e40db51cc23e4cc4727108
Signed-off-by: Prateek Sood <prsood@codeaurora.org>
2018-04-12 11:28:11 +05:30
Srinivas Ramana
af7e419a9e defconfig: msm: use codename for sdm640 defconfigs
use code name for sdm640 defconfig files so that
android builds doesn't have to expose soc name.

Change-Id: I603708d9a49439f7899b6bce36741c79dfd4df95
Signed-off-by: Srinivas Ramana <sramana@codeaurora.org>
2018-04-12 10:43:53 +05:30
Srinivas Ramana
eb9640dc66 ARM: dts: msm: Add device tree overlay for sdm640
Add device tree files required to build sdm640 with overlay support.

Change-Id: I51ccd9d34b859d0d3b5b3646586fcd27ee919d18
Signed-off-by: Srinivas Ramana <sramana@codeaurora.org>
2018-04-11 22:07:45 -07:00
Srinivas Ramana
b4fd8fc10f ARM: dts: msm: ADD llcc device node for sdm640
Add llcc device node on sdm640 to enable the llcc
driver and thereby llcc configurations.

Change-Id: I2fe84a52d93bab37542b6cb9aaa0fe19e80525ae
Signed-off-by: Srinivas Ramana <sramana@codeaurora.org>
2018-04-11 22:07:35 -07:00
Srinivas Ramana
3075a911f3 defconfig: msm: Enable LLCC driver for sdm640
Enable LLC driver in SDM640 defconfig to help program
LLCC configuration.

Change-Id: I9d9ae7902f2be92477163fba54939f5f744c30e9
Signed-off-by: Srinivas Ramana <sramana@codeaurora.org>
2018-04-11 22:07:29 -07:00
Srinivas Ramana
2b99dc1761 drivers: soc: qcom: Add sdm640 SoC llcc driver
Add LLCC driver which contains the configuration data required to
program the LLCC on SDM640 SoC. The configration data controls the
behavior of LLCC by setting priority, size, how the ways are allocated
when clients use the LLCC and so on. Platform specific driver calls into
the common LLCC driver to program this configuration.

Change-Id: Ie53c7087bd90dbdbc5c207c8994a93e6a8479941
Signed-off-by: Srinivas Ramana <sramana@codeaurora.org>
2018-04-11 22:06:54 -07:00
Mao Jinlong
2ad451a7da alarmtimer: add rtc irq support for alarm
Add the rtc irq support for alarmtimer to wakeup the
alarm during system suspend.

CRs-Fixed: 2261309
Change-Id: I41b774ed4e788359321e1c6a564551cc9cd40c8e
Signed-off-by: Mao Jinlong <jinlmao@codeaurora.org>
2018-04-12 10:48:21 +08:00
Linux Build Service Account
c745d32a3d Merge "coresight: byte-cntr: Add scatter-gather support for byte-counter" into msm-4.14 2018-04-11 17:54:51 -07:00
Linux Build Service Account
52f6e1ff5f Merge "coresight: tmc: add scatter-gather support for tmc etr" into msm-4.14 2018-04-11 17:54:49 -07:00
Linux Build Service Account
f39ac28768 Merge "msm: pcie: Add proper check before accessing variables" into msm-4.14 2018-04-11 17:54:47 -07:00
Linux Build Service Account
6296f8c435 Merge "iommu: arm-smmu: Support ECATS during context fault" into msm-4.14 2018-04-11 17:54:45 -07:00
Linux Build Service Account
625e85f5b7 Merge "usb: pd: Set PROP_PR_SWAP before forcing role" into msm-4.14 2018-04-11 17:54:42 -07:00
Linux Build Service Account
5502d80f55 Merge "ARM: dts: msm: Enable GPU per-process pagetables for SM8150" into msm-4.14 2018-04-11 17:54:39 -07:00
Linux Build Service Account
f4ab53a1ea Merge "ARM: dts: msm: enable DP MST mode for sm8150" into msm-4.14 2018-04-11 17:54:37 -07:00
Linux Build Service Account
f5735ba835 Merge "drm/msm/dp: fix atomic_best_enc select for DP MST connectors" into msm-4.14 2018-04-11 17:54:34 -07:00
Linux Build Service Account
be2aa3f840 Merge "ARM: dts: msm: use proper iommu SID value and mask for sm8150" into msm-4.14 2018-04-11 17:54:31 -07:00
Linux Build Service Account
c2807b7cca Merge "iommu: iommu-debug: Fix dma map bounds check" into msm-4.14 2018-04-11 17:54:28 -07:00
Linux Build Service Account
f6ca122ca5 Merge "ARM: dts: msm: Update the revision id for v1 chips on SM8150" into msm-4.14 2018-04-11 17:54:26 -07:00
Linux Build Service Account
f84cc82242 Merge changes Idf17998a,I57656152,I4edd234f into msm-4.14
* changes:
  defconfig: Enable WATCHDOG config for sdmshrike
  ARM: dts: msm: Add watchdog dt node for sdmshrike
  defconfig: Enable PIL driver on sdmshrike target
2018-04-11 17:54:23 -07:00
Linux Build Service Account
1c2e1097c5 Merge "ARM: dts: msm: Add LPASS PIL node for sdmshrike" into msm-4.14 2018-04-11 17:54:21 -07:00
Linux Build Service Account
0655d55b27 Merge "defconfig: Enable Secure Channel Manager(SCM) for sdmshrike" into msm-4.14 2018-04-11 17:54:16 -07:00
Linux Build Service Account
3b310e47ef Merge changes I46aba320,Idf10fc8c into msm-4.14
* changes:
  defconfig: sdmshrike: Enable configs required for Android
  ARM: dts: msm: Enable PSCI enable method for SDMSHRIKE
2018-04-11 15:55:45 -07:00
Chris Lew
f4fa3f4876 ARM: dts: msm: Add wdsp glink node for sdmshrike
Add device tree node to enable RPMSG GLINK communication to WDSP.
In addition to the normal glink properties, the wdsp glink node
must contain the addresses for the tx and rx fifo descriptors.

Change-Id: I6677949988092900e2064bd5ffccdf093f2aed6e
Signed-off-by: Chris Lew <clew@codeaurora.org>
2018-04-11 14:36:10 -07:00
Linux Build Service Account
6ecb7c9ca6 Merge "msm: vidc: Updating Video BW calculations for SM8150" into msm-4.14 2018-04-11 14:34:54 -07:00
Linux Build Service Account
fb2a311ccd Merge changes I3876c1cb,I12a0b93a,I211a255a into msm-4.14
* changes:
  sched: Fix compilation error with task_in_cum_window_demand for !SCHED_WALT
  sched/fair: move task_fits_max out of SCHED_WALT
  sched: fix compilation error in task_fits_capacity for !SCHED_WALT
2018-04-11 14:34:52 -07:00
Linux Build Service Account
af3e9ce3f4 Merge "msm: ipa4: USB_CONS QMB update" into msm-4.14 2018-04-11 14:34:50 -07:00
Linux Build Service Account
faa24414ef Merge "msm: kgsl: Enable hardware clock gating" into msm-4.14 2018-04-11 14:34:48 -07:00
Linux Build Service Account
ba4ca6b827 Merge "ARM: dts: msm: add refgen regulator device for sdmshrike" into msm-4.14 2018-04-11 14:34:45 -07:00
Linux Build Service Account
602ee04f2d Merge "uapi/media: Update yuv buffer size based on hardware requirement" into msm-4.14 2018-04-11 14:34:43 -07:00
Linux Build Service Account
06f42c16f0 Merge "staging: android: ion: Ensure ION supports concurrent CMO requests" into msm-4.14 2018-04-11 14:34:40 -07:00
Linux Build Service Account
f737791131 Merge "Revert "iommu/arm-smmu-v3: Implement shutdown method"" into msm-4.14 2018-04-11 14:34:38 -07:00