Commit graph

600767 commits

Author SHA1 Message Date
Linux Build Service Account
bf2009f9d8 Merge "soc: qcom: pil: Disable a clock to maintain clock state across modem SSR" 2018-08-10 11:08:39 -07:00
Linux Build Service Account
5af3bac064 Merge "diag: Add NULL checks for the mask and mask pointer" 2018-08-10 11:08:38 -07:00
Linux Build Service Account
0712c44637 Merge "soc: qcom: pil: Remove a register read as it causes an unclocked access" 2018-08-10 11:08:36 -07:00
Anant Goel
c4273f6c0c soc: qcom: pil: Disable a clock to maintain clock state across modem SSR
A disable and unprepare is called on a clock which is voted for, but never
unvoted for. By disabling and unpreparing this clock, the clock state is
maintained the same across modem restarts.

Change-Id: I4d6cb219ac718de4b7bad593d7f7aa9fd67b1cef
Signed-off-by: Anant Goel <anantg@codeaurora.org>
2018-08-09 23:26:26 -07:00
Manoj Prabhu B
0b3dc1a93e diag: Add NULL checks for the mask and mask pointer
The chances of accessing uninitialized mask is prevented
by adding null pointer checks for the mask structure and its
member pointer.

Change-Id: Ibf0467228794b773fc2537d34f1da6719bbb975a
Signed-off-by: Manoj Prabhu B <bmanoj@codeaurora.org>
2018-08-09 21:59:04 -07:00
Linux Build Service Account
c691d29c1a Merge "sched: walt: fix out-of-bounds access" 2018-08-09 19:19:43 -07:00
Linux Build Service Account
239c94bb32 Merge "msm: ipa: Add WLAN FW SSR event" 2018-08-09 19:19:42 -07:00
Linux Build Service Account
7e0b4a018d Merge "arm64: hibernate: Support DEBUG_PAGEALLOC" 2018-08-09 19:19:35 -07:00
Linux Build Service Account
66c9443b80 Merge "arm64: Create sections.h" 2018-08-09 19:19:33 -07:00
Anant Goel
cdd6ec91e1 soc: qcom: pil: Remove a register read as it causes an unclocked access
A read of a register during the software fatal error handling is removed.
This read causes an unclocked access which prevents the modem subsystem
from succssfully restarting.

Change-Id: I8338830573e55af2e5c9d0f688756d975a3302af
Signed-off-by: Anant Goel <anantg@codeaurora.org>
2018-08-09 18:46:11 -07:00
Linux Build Service Account
a829ffa673 Merge "msm: camera: cpp: Check for valid tx level" 2018-08-09 08:19:06 -07:00
Mohammed Javid
b96d7a6b84 msm: ipa: Add WLAN FW SSR event
Add WLAN FW SSR event to handle FW rejuvenate
scenario.

Change-Id: I417d46cc07f455792906a18f4b6dc8e5ca8ca3de
Acked-by: Pooja Kumari <kumarip@qti.qualcomm.com>
Signed-off-by: Mohammed Javid <mjavid@codeaurora.org>
2018-08-09 00:00:59 -07:00
Pratap Nirujogi
a98c0c6552 msm: camera: cpp: Check for valid tx level
TX and RX FIFOs of Microcontroller are used to exchange commands
and messages between Micro FW and CPP driver. TX FIFO depth is
16 32-bit words, incase of errors there is a chance of overflow.
To prevent possible out of bound access, TX FIFO depth or
level is checked for MAX depth before accessing the FIFO.

Change-Id: I5adf39b46ff10e358c4a2c03a2de07d44b99cedb
Signed-off-by: Pratap Nirujogi <pratapn@codeaurora.org>
2018-08-09 11:36:18 +05:30
Linux Build Service Account
0f9b5738c5 Merge "msm: ADSPRPC: Disable CDSP loader" 2018-08-08 18:28:49 -07:00
Linux Build Service Account
b0dc81a983 Merge "media: camera: Fix Major and Minor number" 2018-08-08 18:28:47 -07:00
Linux Build Service Account
ae2dd2807d Merge "ARM: dts: msm: disable pm8994 adc on vplatform" 2018-08-08 02:39:39 -07:00
Linux Build Service Account
51568631aa Merge "diag: Add missing protection while accessing session's info" 2018-08-08 02:39:38 -07:00
Linux Build Service Account
6d53b9684a Merge "ARM: dts: msm: Remove blsp1_uart2 on msm8996 ivi vplatform" 2018-08-08 02:39:35 -07:00
Linux Build Service Account
8963a5a4aa Merge "uio: msm_sharedmem: Add stub shutdown function" 2018-08-08 02:39:33 -07:00
Neeraj Soni
b98ee859fc media: camera: Fix Major and Minor number
Fix TA Major and Minor number.

Change-Id: I65a800ec8d84445efc05b9763062d476b1d0f27a
Signed-off-by: Neeraj Soni <neersoni@codeaurora.org>
2018-08-08 02:30:14 -07:00
John Dias
bd4ac8e584 sched: walt: fix out-of-bounds access
A computation in update_top_tasks() is indexing
off the end of a top_tasks array. There's code
to limit the index in the computation, but it's
insufficient.

Bug: 110529282
Change-Id: Idb5ff5e5800c014394bcb04638844bf1e057a40c
Signed-off-by: John Dias <joaodias@google.com>
[pkondeti@codeaurora.org: Backported to 4.4 for HMP scheduler]
Signed-off-by: Pavankumar Kondeti <pkondeti@codeaurora.org>
2018-08-08 09:09:01 +05:30
Zhiqiang Tu
d612b3792d ARM: dts: msm: disable pm8994 adc on vplatform
Disable adc since they are not needed.

Change-Id: I5e08ae819f8c5c8a25eca4e523b214606105cb65
Signed-off-by: Zhiqiang Tu <ztu@codeaurora.org>
2018-08-08 10:16:49 +08:00
Zhiqiang Tu
731d27ce78 ARM: dts: msm: Remove blsp1_uart2 on msm8996 ivi vplatform
Remove blsp1_uart since it is not needed.

Change-Id: Id0327fc601f87376eebfbe6d3cfb06b84ed9a407
Signed-off-by: Zhiqiang Tu <ztu@codeaurora.org>
2018-08-07 19:14:12 -07:00
Anant Goel
ca463d4e79 uio: msm_sharedmem: Add stub shutdown function
A stub shutdown function is added as the default
implementation. This function is used by targets
that do not need to free their memory when the
driver is shutdown.

Change-Id: I073cda4fee7a1c6c34c5ba72d9ba73478ef2d90d
Signed-off-by: Anant Goel <anantg@codeaurora.org>
2018-08-07 18:04:35 -07:00
James Morse
66859cc29f arm64: hibernate: Support DEBUG_PAGEALLOC
DEBUG_PAGEALLOC removes the valid bit of page table entries to prevent
any access to unallocated memory. Hibernate uses this as a hint that those
pages don't need to be saved/restored. This patch adds the
kernel_page_present() function it uses.

hibernate.c copies the resume kernel's linear map for use during restore.
Add _copy_pte() to fill-in the holes made by DEBUG_PAGEALLOC in the resume
kernel, so we can restore data the original kernel had at these addresses.

Finally, DEBUG_PAGEALLOC means the linear-map alias of KERNEL_START to
KERNEL_END may have holes in it, so we can't lazily clean this whole
area to the PoC. Only clean the new mmuoff region, and the kernel/kvm
idmaps.

This reverts commit da24eb1f3f9e2c7b75c5f8c40d8e48e2c4789596.

Change-Id: I862226802c9c726590c89e3d9e8062ed680309f3
Reported-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: James Morse <james.morse@arm.com>
Git-Commit: 5ebe3a44cc744d11cb60d8438106a9322b7c04dc
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
Signed-off-by: Arun KS <arunks@codeaurora.org>
2018-08-07 15:56:05 -07:00
James Morse
8357b00fc7 arm64: vmlinux.ld: Add mmuoff data sections and move mmuoff text into idmap
Resume from hibernate needs to clean any text executed by the kernel with
the MMU off to the PoC. Collect these functions together into the
.idmap.text section as all this code is tightly coupled and also needs
the same cleaning after resume.

Data is more complicated, secondary_holding_pen_release is written with
the MMU on, clean and invalidated, then read with the MMU off. In contrast
__boot_cpu_mode is written with the MMU off, the corresponding cache line
is invalidated, so when we read it with the MMU on we don't get stale data.
These cache maintenance operations conflict with each other if the values
are within a Cache Writeback Granule (CWG) of each other.
Collect the data into two sections .mmuoff.data.read and .mmuoff.data.write,
the linker script ensures mmuoff.data.write section is aligned to the
architectural maximum CWG of 2KB.

Change-Id: I3f5add863896e0acaa54dd11929fc1d553d402f4
Signed-off-by: James Morse <james.morse@arm.com>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Reviewed-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Git-Commit: b61130381120398876b86282082ad9f24976dfcf
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
Signed-off-by: Arun KS <arunks@codeaurora.org>
2018-08-07 15:54:46 -07:00
James Morse
12ba466b44 arm64: Create sections.h
Each time new section markers are added, kernel/vmlinux.ld.S is updated,
and new extern char __start_foo[] definitions are scattered through the
tree.

Create asm/include/sections.h to collect these definitions (and include
the existing asm-generic version).

Change-Id: I40cf712810291cde8f362fc41bb572b2e94daca1
Signed-off-by: James Morse <james.morse@arm.com>
Reviewed-by: Mark Rutland <mark.rutland@arm.com>
Tested-by: Mark Rutland <mark.rutland@arm.com>
Git-Commit: ee78fdc71db1ce9a437b9ca17e31063996b71ec1
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
Signed-off-by: Arun KS <arunks@codeaurora.org>
2018-08-07 15:54:38 -07:00
Ard Biesheuvel
f66e94abb3 arm64: kernel: avoid literal load of virtual address with MMU off
Literal loads of virtual addresses are subject to runtime relocation when
CONFIG_RELOCATABLE=y, and given that the relocation routines run with the
MMU and caches enabled, literal loads of relocated values performed with
the MMU off are not guaranteed to return the latest value unless the
memory covering the literal is cleaned to the PoC explicitly.

So defer the literal load until after the MMU has been enabled, just like
we do for primary_switch() and secondary_switch() in head.S.

Change-Id: I11b1884662f37bc2664f286f6278e4a6af2d5c76
Fixes: 1e48ef7fcc37 ("arm64: add support for building vmlinux as a relocatable PIE binary")
Cc: <stable@vger.kernel.org> # 4.6+
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Acked-by: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Git-Commit: bc9f3d7788a88d080a30599bde68f383daf8f8a5
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
Signed-off-by: Arun KS <arunks@codeaurora.org>
2018-08-07 15:54:26 -07:00
Linux Build Service Account
9656c6c641 Merge "ipa: update wlan upstream iface name" 2018-08-07 15:24:16 -07:00
Linux Build Service Account
53e0e0d476 Merge "msm: mdss: Change function from disbale_irq_nosync to disbale_irq" 2018-08-07 15:24:14 -07:00
Linux Build Service Account
ea4876dedd Merge "ASoC: wcd934x-dsp-cntl: initialize local char array val" 2018-08-07 15:24:12 -07:00
Linux Build Service Account
5143a7f32c Merge "diag: Protect md_info structure while reallocation" 2018-08-07 15:24:10 -07:00
Linux Build Service Account
991119cca5 Merge "msm: ipa3: using rate limit api for ioctl calls" 2018-08-07 15:24:09 -07:00
Linux Build Service Account
74482c64af Merge "msm: ipa3: fix hdr offset issue" 2018-08-07 15:24:06 -07:00
Mohammed Javid
f605473d7c ipa: update wlan upstream iface name
Update WLAN upstream name to support STA SAP scenario
with wlan1 iface.

Change-Id: I0223c5b4aff8dfe24562a2c6d4ac581a7843224e
Acked-by: Pooja Kumari <kumarip@qti.qualcomm.com>
Signed-off-by: Mohammed Javid <mjavid@codeaurora.org>
2018-08-07 10:32:51 -07:00
Hardik Arya
280b89e72c diag: Add missing protection while accessing session's info
Currently, mutex protection is missing while accessing md session's
info via macro. The patch adds proper protection before accessing
the same.

Change-Id: I17b18183407279447229783fd0165337bd173423
Signed-off-by: Hardik Arya <harya@codeaurora.org>
2018-08-07 17:54:41 +05:30
Linux Build Service Account
42570c93ec Merge "msm: kgsl: unload/reload zap shader" 2018-08-06 21:52:26 -07:00
Linux Build Service Account
7f6b5aa038 Merge "cnss2: Clear flag CNSS_DRIVER_UNLOADING after unregister driver finished" 2018-08-06 21:52:22 -07:00
Linux Build Service Account
5e1e802655 Merge "cnss2: Skip PCIe link suspend if link has already been suspended" 2018-08-06 21:52:18 -07:00
Xiaoyu Ye
1767f08490 ASoC: wcd934x-dsp-cntl: initialize local char array val
Due to the local char array that stores the codec dsp control command
is not initialized, an invalid command could cause the stack content
to be printed out in kernel dmesg. Initialize the array with memset.

Change-Id: I9573958fbe308c170c203a6a50a94d0540f3e7ce
Signed-off-by: Xiaoyu Ye <benyxy@codeaurora.org>
2018-08-06 15:58:53 -07:00
Mohammed Javid
55dbd938ac msm: ipa3: using rate limit api for ioctl calls
ipav3 ioctl calls input arguments validation failed cases,
replacing IPAERR()/IPAHAL_ERR() with IPAERR_RL()/IPAHAL_ERR_RL()
marco for controlling logs printing on the console.

Change-Id: I0b48b4a2f8b37c71aebe82c7b747b1d8f6c1e143
Acked-by: Pooja Kumari <kumarip@qti.qualcomm.com>
Acked-by: Ashok Vuyyuru <avuyyuru@qti.qualcomm.com>
Signed-off-by: Mohammed Javid <mjavid@codeaurora.org>
2018-08-07 00:52:23 +05:30
Skylar Chang
12626bc2e3 msm: ipa3: fix hdr offset issue
Hdr offset calculation is wrong when
driver received clean-up ioctl from
user-space. The fix is to find right
hdr offset to commit ned headers.

Change-Id: I70878a19b64c3defa6101bd68d435f0b74bcfb9b
Acked-by: Pooja Kumari <kumarip@qti.qualcomm.com>
Signed-off-by: Mohammed Javid <mjavid@codeaurora.org>
Signed-off-by: Skylar Chang <chiaweic@codeaurora.org>
2018-08-06 15:05:25 +05:30
Kai Liu
6afee6e21a cnss2: Clear flag CNSS_DRIVER_UNLOADING after unregister driver finished
Flag CNSS_DRIVER_UNLOADING is set when unregister wlan started, but it's
cleared in cnss_shutdown, which is also used in other call flow. Clear this
flag after unregister finished.

Change-Id: I0b5d63e5570c2604ff66d7852d7c7ca1c008a475
Signed-off-by: Kai Liu <kaliu@codeaurora.org>
2018-08-05 22:04:53 +08:00
Linux Build Service Account
11ee621aea Merge "soc: qcom: hab: fix some NULL pointer dereference issues" 2018-08-03 04:05:50 -07:00
Linux Build Service Account
611769cb2e Merge "usb: dwc3-msm: Queue resume_work unconditionally on pm_resume" 2018-08-03 04:05:47 -07:00
Linux Build Service Account
066d4578b9 Merge "msm: vidc: Increase minimum input buffer count for HEVC decode" 2018-08-03 04:05:43 -07:00
Linux Build Service Account
6febdef874 Merge "soc: qcom: hab: add hab statistics support" 2018-08-03 04:05:37 -07:00
Linux Build Service Account
45874436ca Merge "diag: Read the HSIC data in a work queue" 2018-08-03 04:05:29 -07:00
Yong Ding
949999a18d soc: qcom: hab: fix some NULL pointer dereference issues
With this patch, some potential NULL pointer dereference
issues are resolved. For example, if an invalid MMID
(MultiMedia ID defined by HAB driver) is gotten but we
fail to directly return with an error, the vchan variable
as NULL pointer will be dereferenced.

Change-Id: I92f9c5d08f99ef9db3e6a8b2ecdc0f074c8e8bff
Signed-off-by: Yong Ding <yongding@codeaurora.org>
2018-08-03 15:10:47 +08:00
Paras Nagda
88955d3b16 msm: vidc: Increase minimum input buffer count for HEVC decode
Increase minimum input buffer count for HEVC decode to 5 to
avoid hang when the DPB is not full and FW keeps
waiting for FTB although sufficient ETB are being queued.

CRs-Fixed: 2252419

Change-Id: Id344cd896aeac46765e250e715d14a6c835b4221
Signed-off-by: Paras Nagda <pnagda@codeaurora.org>
2018-08-02 23:06:04 -07:00