Commit graph

893,362 commits

Author SHA1 Message Date
Siddharth Gupta
1362ad85e2 cfg80211: reg: Reset to upstream
Reset net/wireless to upstream commit 460f3fd8a4 ("Merge
android11-5.4.61+ (d240b69) into msm-5.4"). This change re-introduces
removal of support for built-in regdb by commit 7478b98826 ("Revert
"cfg80211: reg: remove support for built-in regdb"").

Change-Id: Id6e87eb589d246448e005d0daed1edd57473e880
Signed-off-by: Siddharth Gupta <sidgup@codeaurora.org>
2020-10-29 16:21:03 -07:00
Blagovest Kolenichev
d9a7f5879a Merge android11-5.4.61+ (874de1d) into msm-5.4
* refs/heads/tmp-874de1d:
  ANDROID: GKI: enable CONFIG_CPU_FREQ_STAT and more thermal configs
  ANDROID: ABI: Update allowed list for QCOM
  ANDROID: sched: add restrict vendor hook to modify load balance behavior
  ANDROID: GKI: Update abi_gki_aarch64_oneplus
  ANDROID: scs: use vmapped shadow stacks by default
  ANDROID: ABI: update allowed list for QCOM
  UPSTREAM: sched/fair/util_est: Implement faster ramp-up EWMA on utilization increases
  ANDROID: GKI: Update abi_gki_aarch64_exynos
  ANDROID: kbuild: disable GCOV with CFI
  ANDROID: GKI: add built-in PCIE_DW_PLAT_EP
  ANDROID: PCI: dwc: export symbols for ep driver
  ANDROID: recordmcount: avoid STT_FILE as base for mcount offset relocation
  ANDROID: iommu: Enable CONFIG_IOMMU_IO_PGTABLE_ARMV7S
  BACKPORT: FROMLIST: iommu/io-pgtable-arm-v7s: Quad lvl1 pgtable for MediaTek
  BACKPORT: FROMLIST: iommu/io-pgtable-arm-v7s: Add cfg as a param in some macros
  BACKPORT: FROMLIST: iommu/io-pgtable-arm-v7s: Extend PA34 for MediaTek
  BACKPORT: FROMLIST: iommu/io-pgtable-arm-v7s: Use ias to check the valid iova in unmap
  ANDROID: ABI: Update allowed list for QCOM
  ANDROID: modules: fix suspicious rcu usage

 Conflicts:
	kernel/sched/fair.c
	kernel/sched/features.h

Change-Id: I5d8dc058a0aca2b90ca702f18f71f663af9774fc
Signed-off-by: Blagovest Kolenichev <bkolenichev@codeaurora.org>
2020-10-29 15:36:09 -07:00
Elliot Berman
508a6c80d7 checkpatch: Handle quotes within commit reference descriptions
Checkpatch tests that commit references follow the format:

  commit 19c146a64c ("checkpatch: make sure a commit reference
description uses parentheses")

If a commit is a revert commit, its title line is frequently like:
  Revert "checkpatch: make sure a commit reference uses parantheses"

Checkpatch doesn't handle quotation marks in commit message properly, so
use a lookahead to detect the "), which is less frequently found in
commit message title lines. Since a lookahead is used, commits with ")
in the title line, such as commit 8ac68dc455d9 ("revert: 1320a4052ea1
("audit: trigger accompanying records when no rules present")"), is
handled properly.

There is at least one case not properly handled, where the title spans
two lines and there is a ") on the first line. There are approximately 5
such possible commits on 5.9-rc8.

Change-Id: Ia3355103aa6d15d4109fa11155d07b14bd7d9f0f
Signed-off-by: Elliot Berman <eberman@codeaurora.org>
2020-10-29 15:29:50 -07:00
Carter Cooper
bf7caa0231 msm: kgsl: Add support for RDPM frequency register writes
Write the RDPM frequency register for GPU and GMU frequency changes.

Change-Id: I58f1f388859212663cb4d324c83e53dcfce4cbaf
Signed-off-by: Carter Cooper <ccooper@codeaurora.org>
2020-10-29 13:31:40 -07:00
Blagovest Kolenichev
1eba98287b Merge android11-5.4.61+ (e17d9fc) into msm-5.4
* refs/heads/tmp-e17d9fc:
  ANDROID: GKI: Enable CONFIG_X86_X2APIC
  ANDROID: GKI: update xiaomi symbol list
  ANDROID: GKI: fix ABI breakage in module.h
  UPSTREAM: modules: inherit TAINT_PROPRIETARY_MODULE
  UPSTREAM: modules: return licensing information from find_symbol
  UPSTREAM: modules: rename the licence field in struct symsearch to license
  UPSTREAM: modules: unexport __module_address
  UPSTREAM: modules: unexport __module_text_address
  UPSTREAM: modules: mark each_symbol_section static
  UPSTREAM: modules: mark find_symbol static
  UPSTREAM: modules: mark ref_module static
  ANDROID: GKI: Update abi_gki_aarch64_exynos
  ANDROID: ABI: update allowed list for QCOM
  UPSTREAM: binder: fix UAF when releasing todo list

Change-Id: I6db85b4587d3b60f386c58fd6b1589746e9281c5
Signed-off-by: Blagovest Kolenichev <bkolenichev@codeaurora.org>
2020-10-29 10:35:10 -07:00
qctecmdr
b20ec664b6 Merge "defconfig: sdxlemur: Enable CONFIG_QPNP_SMB5" 2020-10-29 10:12:28 -07:00
qctecmdr
365f0b4c06 Merge "input: qcom-hv-haptics: correct register values when toggling RC_CLK_CAL" 2020-10-29 10:12:28 -07:00
qctecmdr
489010dce7 Merge "mmc: cqhci: Port two trivial fixes in cqhci from earlier kernels" 2020-10-29 10:12:28 -07:00
qctecmdr
ab12fbd666 Merge "rtc: Disable alarm irq if alarm time is in the past" 2020-10-29 10:12:27 -07:00
qctecmdr
a7c4fa6f46 Merge "soc: qcom: Conditional compile page/slub minidumps" 2020-10-29 10:12:27 -07:00
qctecmdr
79e5a6f4c3 Merge "msm: ipa3: Enable dynamic switch between WDI2 and WDI3" 2020-10-29 10:12:27 -07:00
qctecmdr
fa744a0fbd Merge "iommu: arm-smmu: Fail device attach when SMR write fails" 2020-10-29 10:12:27 -07:00
qctecmdr
71c6027501 Merge "cpuidle: lpm-levels: Store per core next hrtimer wakeup" 2020-10-29 10:12:26 -07:00
Greg Kroah-Hartman
a273b843ac ANDROID: ABI: update allowed list for galaxy
Update Galaxy list of symbols with ones that are already in the .xml
file to make further patches much smaller and easier to review.

Bug: 171954519
Cc: Jeehong Kim <jhez.kim@samsung.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Ic30a89e6254cddb7669a473e06263d2aef8f9703
2020-10-29 17:42:30 +01:00
Hareesh Gundu
f268123486 msm: kgsl: Fix NR_KERNEL_MISC_RECLAIMABLE page stats issue
We do call _kgsl_pool_get_page() when pool is empty through
page pool allocation path. This will cause incorrect page
stats accounting for NR_KERNEL_MISC_RECLAIMABLE. Hence Add
a NULL check before page stats to fix it.

Change-Id: I5823177d7e242db25aeca2da5a9ddf6d1982859b
Signed-off-by: Hareesh Gundu <hareeshg@codeaurora.org>
2020-10-29 21:20:56 +05:30
Puranam V G Tejaswi
a578ac96d8 msm: kgsl: Do not fail after drawobj is added to context queue
After a drawobj is added to context drawqueue, if kmem_cache_alloc
fails, we destroy the drawobj. This could lead to use-after-free if
the context gets detached and drawobj is already destroyed meanwhile.
Avoid this by doing allocation before the drawobj is added to the queue.

Change-Id: I6d1f989b7795669f85756284db790f00f5fc2b9f
Signed-off-by: Puranam V G Tejaswi <pvgtejas@codeaurora.org>
2020-10-29 20:07:54 +05:30
Sayali Lokhande
9bc7ed61dc f2fs: Fix double free issue for s_encoding
In case of error in fsync data recovery during mount,
sb->s_encoding is freed but not set to NULL, resulting
in double free issue in f2fs_put_super during unmount.

Log: Object already free
[ 1447.382542] INFO: Allocated in kvmalloc_node+0x58/0x9c
   age=351740 cpu=7 pid=695
[ 1447.382544] kvmalloc_node+0x58/0x9c
[ 1447.382549] f2fs_build_node_manager+0x244/0x4f0
[ 1447.382554] f2fs_fill_super+0x14f4/0x1c04
[ 1447.382557] mount_bdev+0x178/0x1d8
[ 1447.382558] f2fs_mount+0x18/0x24
[ 1447.382562] legacy_get_tree+0x4c/0xac
[ 1447.382563] vfs_get_tree+0x4c/0x118
[ 1447.382566] do_mount+0x678/0xcc4
[ 1447.382568] ksys_mount+0x98/0xdc
<>
[ 1447.382580] INFO: Freed in kvfree+0x38/0x44
  age=16 cpu=7 pid=1
[ 1447.382582] kvfree+0x38/0x44
[ 1447.382584] f2fs_destroy_node_manager+0x2f4/0x38c
[ 1447.382585] f2fs_put_super+0x198/0x2b4
[ 1447.382588] generic_shutdown_super+0x8c/0x140
[ 1447.382589] kill_block_super+0x20/0x50
[ 1447.382591] kill_f2fs_super+0xc0/0x108
[ 1447.382593] deactivate_locked_super+0x78/0x11c
[ 1447.382595] deactivate_super+0x80/0xa4
[ 1447.382596] cleanup_mnt+0x11c/0x158
[ 1447.382598] __cleanup_mnt+0x14/0x20

This change sets s_encoding to NULL after its freed
to avoid double free issue.

Change-Id: I017ba5386e76c81d7e545d3eefc2ed02dc6522cc
Signed-off-by: Sayali Lokhande <sayalil@codeaurora.org>
2020-10-29 19:08:00 +05:30
Akshay Pandit
1491577868 uapi: ipa: Support uc header proc ctx for DSCP insertion
Add UC header proc ctx support for inserting DSCP in layer 3 header.

Change-Id: I0912d11982bc465183b4605b0c3035e428a42608
Signed-off-by: Akshay Pandit <pandit@codeaurora.org>
2020-10-29 15:59:35 +05:30
Sangmoon Kim
6ca1e28c7f FROMLIST: char: misc: increase DYNAMIC_MINORS value
DYNAMIC_MINORS value has been set to 64.
Due to this reason, we are facing a module loading fail problem of
device driver like below.

 [   45.712771] pdic_misc_init - return error : -16

We need to increase this value for registering more misc devices.

Signed-off-by: Sangmoon Kim <sangmoon.kim@samsung.com>

Bug: 171370390
Link: https://lore.kernel.org/lkml/20201029070552.GA3062343@kroah.com/
Change-Id: I04ab486ce7674dde3118506c3d783f0e4e211bac
Signed-off-by: Sangmoon Kim <sangmoon.kim@samsung.com>
2020-10-29 17:07:39 +09:00
Rohan Sethi
4cc9960429 msm: kgsl: Disable gpu_llc flags by default
Set default value of flags gpu_llc_slice_enable and
gpuhtw_llc_slice_enable to false and disable change
via sysfs nodes.

Change-Id: I1446a04b25a793cdebf5428de2e84870a6b33b7c
Signed-off-by: Rohan Sethi <rohsethi@codeaurora.org>
2020-10-29 12:07:53 +05:30
Mayank Grover
3c23fa3a9a qcom: qcom_ipcc: request ipcc irq IRQF_NO_SUSPEND
Request ipcc irq with irqf no suspend flag.
This is required as to handle IPCC interrupt,
during suspend phase.

Change-Id: I5c34c5d446bd2cc2187550455071f35637a2c4b3
Signed-off-by: Mayank Grover <groverm@codeaurora.org>
2020-10-29 12:00:30 +05:30
Jiten Patel
fe56f2d9ab soc: qcom: Fix smcinvoke_obj->fd assignment
Removed conditional assignment of
smcinvoke_obj->fd. This handles the condition
when fd created in get_uhandle_from_tzhandle is
less than zero.

Change-Id: I824795ba2f14bbf363d86ef21499f71d74f45537
Signed-off-by: Jiten Patel <jitepate@codeaurora.org>
2020-10-29 11:57:16 +05:30
Pranay Raj Anand
7b6f9fce60 soc: qcom: Fix presence of garbage value in 32 msb of smcinvoke_obj->fd
The function get_uhandle_from_tzhandle is passed a temporary
fd of type int32_t instead of passing a typecasted
smcinvoke_obj->fd which of type int64_t. This will prevent any
garbage value to remain in 32 msb after successful creation
of the new fd.

Change-Id: I695a85fd7762f7eca0d46721ac60c8cd1b59f163
Signed-off-by: Pranay Raj Anand <prajanan@codeaurora.org>
2020-10-29 11:54:18 +05:30
Naman Padhiar
70e9a936d4 icnss2: Send power save enter/exit via SMP2P
Send power save enter/exit via SMP2P instead of QMI.

Change-Id: I8aeeab3efd2f7c39e4e7ac134af98c58827ff6d5
Signed-off-by: Naman Padhiar <npadhiar@codeaurora.org>
2020-10-28 23:02:22 -07:00
Sahitya Tummala
03b72b1544 f2fs: fix indefinite loop scanning for free nid
If the sbi->ckpt->next_free_nid is not NAT block aligned and if there
are free nids in that NAT block between the start of the block and
next_free_nid, then those free nids will not be scanned in scan_nat_page().
This results into mismatch between nm_i->available_nids and the sum of
nm_i->free_nid_count of all NAT blocks scanned. And nm_i->available_nids
will always be greater than the sum of free nids in all the blocks.
Under this condition, if we use all the currently scanned free nids,
then it will loop forever in f2fs_alloc_nid() as nm_i->available_nids
is still not zero but nm_i->free_nid_count of that partially scanned
NAT block is zero.

Fix this to align the nm_i->next_scan_nid to the first nid of the
corresponding NAT block.

Change-Id: Ib979f5529a531ee6f4960eaadebc4d7340317bf5
Signed-off-by: Sahitya Tummala <stummala@codeaurora.org>
2020-10-28 22:05:07 -07:00
Sai Harshini Nimmala
f89f67ece0 soc/qcom/hyp_core_ctl: Track VPM Group state for VM
VM has to go into suspend state outside of use case boundary. Delay in
transitioning to system suspend or spurious wake-ups after the use case
is completed will result in a system regression.
Adding a mechanism to track both the scenarios of delay in system
suspend and spurious wake-ups of the VM by checking the VPM Group state
associated with the VM.

Change-Id: I2a5990989033ffd3cc57ae1cba93b8ba6b63a3c7
Signed-off-by: Sai Harshini Nimmala <snimmala@codeaurora.org>
2020-10-28 20:58:26 -07:00
Manikandan Mohan
5f9b42108a cnss2: Donot reserve TCS register space for WLAN
Since TCS resource is shared between BT and WLAN, remove
reservation of TCS register space in cnss2.

Change-Id: I38f40ccad491bdfcac814de13f3cc6099d91d032
Signed-off-by: Manikandan Mohan <manikand@codeaurora.org>
2020-10-28 17:27:33 -07:00
Shaik Sajida Bhanu
469f70ba93 mmc: cqhci: Enable ICE error interrupts
Enable general and invalid crypto error encounterd with command
queue engine during data transfer.

Change-Id: Idfaefcc44ece3144896619d6426bfc70eb4cc2cf
Signed-off-by: Shaik Sajida Bhanu <sbhanu@codeaurora.org>
2020-10-28 22:21:03 +05:30
Yogesh Lal
26f207101b gki: Adding GKI_VERSION to fetch corresponding images
Adding GKI_VERSION to kernel source it and
will be maintain in sync with LTS version.
And point to latest GKI images corresponding
to latest LTS tag.

Format of directory holding GKI images will be as
LTS_<LTS version>_<12 character sha key of LTS change>

Example: LTS_5.4.61_8540985fd2ad.

Change-Id: I182e35395e9c870a97982963c749ecf5622cf52a
Signed-off-by: Yogesh Lal <ylal@codeaurora.org>
2020-10-28 21:58:11 +05:30
Abir Ghosh
3511d06529 qbt_handler: Memset userspace struct to zero
Explicitly memset struct to zero before sending
to userspace. This is to prevent padded bytes
from possibly leaking kernel memory contents to
userspace.

Change-Id: Id3e873164430c34195344884b2899e61aa060dfc
Signed-off-by: Abir Ghosh <abirg@codeaurora.org>
2020-10-28 07:33:00 -07:00
Sarthak Garg
d3028e1ef5 mmc: cqhci: Port two trivial fixes in cqhci from earlier kernels
This is a squash of below two minor fixes:

8fec754f57a8 mmc: cmdq: trigger get queue status after dcmd
327fd3225911 mmc: cqhci: CQ Register changes for v5.0 onwards.

Change-Id: I1bb6cae5a647c4ea189a992d5ace7b6c1e3a1c87
Signed-off-by: Sarthak Garg <sartgarg@codeaurora.org>
2020-10-28 18:48:24 +05:30
Wei Wang
874de1d962 ANDROID: GKI: enable CONFIG_CPU_FREQ_STAT and more thermal configs
Bug: 170274669
Bug: 169727445
Bug: 171854825
Signed-off-by: Wei Wang <wvw@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I20d2848b97d2c3d1d80ad8c6d61d6de2cf306153
2020-10-28 12:18:07 +01:00
Shaik Sajida Bhanu
b1ddd6f5b5 mmc: core: Add IPC logging config for mmc
This change adds IPC logging config option for eMMC
and SD card to log significant events used in debugging.

Change-Id: I9fab24bb0fedd57446f96a2b980b29b5dd72e46e
Signed-off-by: Shaik Sajida Bhanu <sbhanu@codeaurora.org>
2020-10-28 15:42:08 +05:30
Yuanfang Zhang
837d016628 coresight: tmc: fix spinlock bad magic/usb_qdss_close
Modify the sequence of ETR disable,drvdata->mode is set to
CS_MODE_DISABLE before calling usb_qdss_close().

Change-Id: I575867cee95f4db5ba155a2619ab1eca954d6387
Signed-off-by: Yuanfang Zhang <zhangyuanfang@codeaurora.org>
2020-10-28 17:49:09 +08:00
Shaik Sajida Bhanu
7810687661 mmc: Add IPC tracing events for eMMC and SD card
This changes adds IPC tracing events for eMMC and SD card
to trace significant events used for debug purpose.

Change-Id: I9b2f86110e9be8a914c51b8796fef5a0ef2c06ad
Signed-off-by: Shaik Sajida Bhanu <sbhanu@codeaurora.org>
2020-10-28 14:39:43 +05:30
Guixiong Wei
381424fcbb rtc: Disable alarm irq if alarm time is in the past
If device is boot up by rtc alarm, the alarm irq will still be
enabled and the alarm time is smaller than current rtc time before
any alarm is set or canceled. If device is powered off now, it will
boot up automatically as the alarm irq is enabled.

So disable alarm irq if alarm is enabled and alarm time is in the
past.

Change-Id: I53dc7cdb1fa7c56eea07ed01d1f6cb63f0bb8a8d
Signed-off-by: Guixiong Wei <guixiong@codeaurora.org>
2020-10-27 20:43:15 -07:00
Tao,Zhang
4700692ee8 coresight: tmc: Configure cti trigger number in device tree
Configure flush and reset cti trigger number in device tree.
Replace configuring cti trigger number by hard code since some
platforms don't have same cti trigger number.

Change-Id: Ib26802b3bd3449566954752b100d6ea188e98e13
Signed-off-by: Tao,Zhang <taozha@codeaurora.org>
2020-10-28 11:06:55 +08:00
Mao Jinlong
902bc613cd coresight-tmc-etr: Check if page is valid before dma_map_page
Check if page is valid before dma_map_page to avoid the exception.

Change-Id: Ia92c7c86c437615f2a314511049bd4ffb655a41c
Signed-off-by: Mao Jinlong <jinlmao@codeaurora.org>
2020-10-28 10:56:53 +08:00
qctecmdr
5b47848843 Merge "msm: ipa4: Add changes to support PCIe addr for WDI2 over GSI" 2020-10-27 18:33:27 -07:00
qctecmdr
e988a4dce1 Merge "trace: f2fs: Fix kasan slab-out-of-bounds" 2020-10-27 18:33:27 -07:00
qctecmdr
804651c838 Merge "usb: phy: Add snapshot of USB QUSB PHY driver" 2020-10-27 18:33:27 -07:00
qctecmdr
116de19c62 Merge "arm64: defconfig: Add initial defconfig fragments for gen3auto" 2020-10-27 18:33:27 -07:00
qctecmdr
7f4ee4ba8b Merge "dt-bindings: clock: Update clock ids of GCC for YUPIK" 2020-10-27 18:33:26 -07:00
qctecmdr
10adaac106 Merge "haven: irq_lend: handle irq accept failure case" 2020-10-27 18:33:26 -07:00
qctecmdr
69f2bb9251 Merge "msm: pcie: update with link power on check for user PCIe resume" 2020-10-27 18:33:26 -07:00
qctecmdr
13851368ba Merge "ANDROID: scs: use vmapped shadow stacks by default" 2020-10-27 18:33:25 -07:00
Mike Tipton
62df61cdac clk: qcom: Add sync-state callback for clk-aop-qmp
Add sync-state callback for the clk-aop-qmp driver to ensure its clocks
don't turn off before all consumers probe. This also addresses
performance issues during boot since a large number of amba devices
toggle the QDSS clock in their probe function. Keeping the clock enabled
until all consumers probe means we don't make multiple expensive
round-trips to AOP.

Change-Id: Ic8ae6e563c4083c5cb7bfa9d5e18e17d58a3bb24
Signed-off-by: Mike Tipton <mdtipton@codeaurora.org>
2020-10-27 17:53:17 -07:00
Kishore Sri venkata Ganesh Bolisetty
b90aa177cb ANDROID: ABI: Update allowed list for QCOM
Add the following symbols to QCOM allowed-list:
-- cpufreq_get_policy

Bug: 171781675
Change-Id: I11699b631dc61b6ddcb245ae3f01ae41ee1314c7
Signed-off-by: Kishore Sri venkata Ganesh Bolisetty <bsrivenk@codeaurora.org>
Signed-off-by: Raghavendra Rao Ananta <rananta@codeaurora.org>
2020-10-27 17:23:27 -07:00
Mike Tipton
5a585e4703 clk: qcom: lahaina: Fix providers left active in suspend
The PM framework prevents runtime_suspend() callbacks after
device_prepare() is called by calling pm_runtime_get_noresume(), which
increments the usage_count. If consumers don't disable their clocks
until after device_prepare(), then the clock provider will remain active
since usage_count=1. This results in regulator votes persisting after
suspend, which blocks system low power modes.

Register for the standard pm_runtime_force_suspend() and
pm_runtime_force_resume() callbacks, which force the device into suspend
even if usage_count=1. Register them in suspend_late, since consumer
clock votes will be removed earlier in suspend.

Change-Id: I73d46bdcc1664239001b7a38ed4aeadba75e57a7
Signed-off-by: Mike Tipton <mdtipton@codeaurora.org>
2020-10-27 15:31:12 -07:00
Guru Das Srinagesh
8d707dbbb2 defconfig: sdxlemur: Enable CONFIG_QPNP_SMB5
Enable CONFIG_QPNP_SMB5 to enable the charger peripheral present in
PM7250B.

Change-Id: I7e60a792e298a208e4361ac65d9ae995008aec49
Signed-off-by: Guru Das Srinagesh <gurus@codeaurora.org>
2020-10-27 11:00:30 -07:00