Commit graph

892,261 commits

Author SHA1 Message Date
qctecmdr
e2f18ef14c Merge "defconfig: Enable relay fs for lahaina" 2020-11-17 05:57:28 -08:00
qctecmdr
75d5a41f25 Merge "usb: misc: nb7vpq904m: disable chip when boot up without cable" 2020-11-17 05:57:28 -08:00
qctecmdr
8c62bda756 Merge "msm: pcie: correct PCIe target link speed mask macro" 2020-11-17 05:57:28 -08:00
qctecmdr
bba465d5c1 Merge "Add support for EMMC storage type" 2020-11-17 05:57:27 -08:00
qctecmdr
5f551b3328 Merge "Kconfig: have ENABLE_VMALLOC_SAVING depend on QGKI" 2020-11-16 19:15:08 -08:00
qctecmdr
4104c0f498 Merge "input: touchscreen: focaltech: toggle reset gpio during error" 2020-11-16 19:15:08 -08:00
qctecmdr
8b249d7cb9 Merge "Merge android11-5.4.61+ (dc2d5a0) into msm-5.4" 2020-11-16 19:15:08 -08:00
qctecmdr
58329ca148 Merge "clk: qcom: Add the debug mux information for SM8150" 2020-11-15 17:44:56 -08:00
qctecmdr
b8bfad925d Merge "exfat: add super block operations" 2020-11-15 08:04:36 -08:00
qctecmdr
5869c90e4f Merge "soc: qcom: qmi_interface: Parse all control packets" 2020-11-15 08:04:35 -08:00
qctecmdr
3de3dfe933 Merge "net: neuron: channel: Check buffer boundaries" 2020-11-15 08:04:35 -08:00
qctecmdr
174db10e47 Merge "arm: qcom: Add initial platform for Monaco and Scuba" 2020-11-15 04:36:26 -08:00
qctecmdr
5ca720a4d8 Merge "power: supply: qcom: Add module dependency on TYPEC" 2020-11-15 04:36:25 -08:00
qctecmdr
aad412cb4f Merge "soc: qcom: minidump: Change the way to locate log_buf" 2020-11-15 04:36:25 -08:00
qctecmdr
1843c1a799 Merge "staging: exfat: remove staging version of exfat filesystem" 2020-11-15 04:36:25 -08:00
qctecmdr
f94ed13be9 Merge "exfat: add in-memory and on-disk structures and headers" 2020-11-15 04:36:25 -08:00
qctecmdr
7f23279eb1 Merge "dt-bindings: iio: Add scale function for PM2250 S3 die temp" 2020-11-15 01:08:07 -08:00
qctecmdr
8ff49d4085 Merge "defconfig: Enable required defconfigs for sdxlemur target" 2020-11-15 01:08:06 -08:00
qctecmdr
1bee375fee Merge "clk: qcom: lahaina: Fix providers left active in suspend" 2020-11-15 01:08:06 -08:00
qctecmdr
a4b6932845 Merge "input: touchscreen: st: cancel pending firmware update" 2020-11-15 01:08:05 -08:00
qctecmdr
d35e872fd1 Merge "clk: qcom: alpha-pll: Export required symbols from alpla-pll" 2020-11-14 21:07:20 -08:00
qctecmdr
b7a4fe5073 Merge "pci: msm: Move rpmsg lock after command completion" 2020-11-14 17:35:49 -08:00
qctecmdr
723156f03e Merge "mhi: uci: Add channel mutex lock for read and write file ops" 2020-11-14 17:35:48 -08:00
qctecmdr
04dd99b363 Merge "icnss2: Avoid sending modem shutdown indication to fw if it is down" 2020-11-14 17:35:48 -08:00
qctecmdr
17b81f1df7 Merge "msm: pcie: switch API for tuning EQ preset request vector configuration" 2020-11-14 17:35:47 -08:00
qctecmdr
da9ad9f15c Merge "msm: ipa_fwmk: Provide api for mhi driver to update state" 2020-11-14 17:35:46 -08:00
Wu Gao
e0e474a32e defconfig: Enable relay fs for lahaina
Required to enable CFR on lahaina, and CFR is based on relay file
system. So add the configure to enable relay fs.

Change-Id: Ic62be9a54a3ea38e9f8831ae7472390d6490f680
Signed-off-by: Wu Gao <wugao@codeaurora.org>
2020-11-14 21:33:58 +08:00
qctecmdr
761f457a49 Merge "soc: qcom: smp2p: Add memory barrier for irq_pending" 2020-11-14 01:35:45 -08:00
qctecmdr
a5b3c5962b Merge "power: qpnp-smb5: Update legacy cable detection logic in bootup" 2020-11-14 01:35:45 -08:00
qctecmdr
b28b8c7ed2 Merge "mmc: core: Enable force hw reset" 2020-11-14 01:35:44 -08:00
qctecmdr
5a842fda18 Merge "cfg80211: reg: Reset to upstream" 2020-11-14 01:35:44 -08:00
qctecmdr
9dd8c088c1 Merge "msm: kgsl: Increase GMU log size to 16 KB" 2020-11-14 01:35:44 -08:00
qctecmdr
5dcc7b616a Merge "mmc: sdhci-msm: Toggle fifo write clk after ungating sdcc clk" 2020-11-14 01:35:44 -08:00
Vaibhav Agrawal
57ff131901 Add support for EMMC storage type
Add support for parsing EMMC specific address for hwkm
slave in cqhci crypto driver. Add similar support
in ufs crypto driver as well to get UFS specific address.
Remove support for parsing the hwkm slave address from dtsi
node from hwkm driver as it will be received as part of
hwkm_init(). Enable/disable cqhci crypto from cqhci_enable and
cqhci_disable instead of __cqhci_enable and __cqhci_disable.

Test:
1. Device booted upto UI with File Based Encryption enabled.
2. Key insertion using fscryptctl tool.
3. Created new files under /data and checked retention across
   multiple re-boots.
4. vts_kernel_encryption_test tests.
5. check_encryption test for verifying metadata encryption.
6. Bootup wth qgki compiled build.
7. Bootup on holi and shima UFS device.
8. Setting encryption policy and read/write of data over multiple
   reboots, using fscryptctl tool.

Change-Id: I1f437ebf8a3f4cd008027d708ccacc02dfb14d07
Signed-off-by: Vaibhav Agrawal <vagrawa@codeaurora.org>
2020-11-13 23:36:21 -08:00
qctecmdr
f16a067bfd Merge "msm: kgsl: Check for gmu prealloc failure only in case of prealloc request" 2020-11-13 07:49:42 -08:00
qctecmdr
21a0aa1700 Merge "soc: spcom: fix race during spcom channel create" 2020-11-13 07:49:42 -08:00
qctecmdr
0e8beccdf8 Merge "msm: ipa: create ipa_client for ethernet" 2020-11-13 07:49:42 -08:00
qctecmdr
8de574033a Merge "drivers: pinctrl: Add pinctrl support for NIGHTJAR target" 2020-11-13 07:49:41 -08:00
qctecmdr
693ade15ed Merge "scsi: ufs: update UFS initialization sequence" 2020-11-13 07:49:41 -08:00
qctecmdr
23320c8319 Merge "defconfig: holi: Enable memshare driver on holi_debug" 2020-11-13 07:49:41 -08:00
qctecmdr
e5ff1a7c5a Merge "kernel: arch: Enable qcedev as gki module" 2020-11-13 07:49:41 -08:00
qctecmdr
144d7633f1 Merge "mmc: sdhci-msm: Reset host->pwr and POWER_CONTROL register" 2020-11-13 07:49:40 -08:00
Blagovest Kolenichev
98c101df75 Merge android11-5.4.61+ (dc2d5a0) into msm-5.4
* refs/heads/tmp-dc2d5a0:
  ANDROID: ABI: Update allowed list for QCOM
  ANDROID: ABI: Update allowed list for QCOM
  ANDROID: modules: cfi cleanup for module load failure
  ANDROID: Temporarily disable XFRM_USER_COMPAT filtering
  ANDROID: ABI: Update allowed list for QCOM
  ANDROID: ABI: update allowed list for QCOM
  ANDROID: fix kernelci build-break due to stop_ipi hook
  BACKPORT: rcu/tree: Export rcu_idle_{enter,exit} to modules
  ANDROID: GKI: Add some symbols to symbol list
  ANDROID: arm64: smp: fix Lockdep warning: RCU used illegally from idle CPU.
  ANDROID: Fix build-break caused by android_rvh_nf_conn_alloc hook
  ANDROID: GKI: Enable DEBUG_INFO_DWARF4
  ANDROID: cfi: ensure RCU is watching in __cfi_slowpath
  UPSTREAM: mm/sl[uo]b: export __kmalloc_track(_node)_caller
  BACKPORT: xfrm/compat: Translate 32-bit user_policy from sockptr
  UPSTREAM: xfrm/compat: Add 32=>64-bit messages translator
  UPSTREAM: xfrm/compat: Attach xfrm dumps to 64=>32 bit translator
  UPSTREAM: xfrm/compat: Add 64=>32-bit messages translator
  BACKPORT: xfrm: Provide API to register translator module
  ANDROID: ABI: update allowed list for galaxy
  ANDROID: Update the KMI_GENERATION after KMI changes on October 31
  ANDROID: Input: bump SW_MAX up to 0x3f
  ANDROID: GKI: ABI update for Oct 31 KABI break
  ANDROID: GKI: add Android ABI padding to struct nf_conn
  ANDROID: GKI: add vendor padding variable in struct skb_shared_info
  ANDROID: GKI: net: add vendor hooks for 'struct nf_conn' lifecycle
  ANDROID: GKI: add vendor padding variable in struct nf_conn
  ANDROID: GKI: net: add vendor hooks for 'struct sock' lifecycle
  ANDROID: GKI: add vendor padding variable in struct sock
  ANDROID: fuse: Add support for d_canonical_path
  ANDROID: vfs: add d_canonical_path for stacked filesystem support
  ANDROID: fscrypt: prevent fscrypt_operations from affecting KMI
  Revert "ANDROID: GKI: fix ABI breakage in module.h"
  ANDROID: ABI: update allowed list for galaxy
  FROMLIST: char: misc: increase DYNAMIC_MINORS value

 Conflicts:
	net/netfilter/nf_conntrack_core.c

Change-Id: I0687237ba5f07f291a5f3b49ee2057071fcb2717
Signed-off-by: Blagovest Kolenichev <bkolenichev@codeaurora.org>
2020-11-13 03:55:57 -08:00
Sudarshan Rajagopalan
64dc8285c8 Kconfig: have ENABLE_VMALLOC_SAVING depend on QGKI
Enable the config ENABLE_VMALLOC_SAVING only when QGKI
config is enabled.

Change-Id: Ic688d27bb31702a60be72b22033cfe1eed5efadc
Signed-off-by: Sudarshan Rajagopalan <sudaraja@codeaurora.org>
2020-11-13 01:06:09 -08:00
qctecmdr
7c71d182c4 Merge "msm: kgsl: Fix NR_KERNEL_MISC_RECLAIMABLE page stats issue" 2020-11-12 20:42:06 -08:00
qctecmdr
9c05303631 Merge "msm: kgsl: constify structs with function pointers" 2020-11-12 20:42:06 -08:00
qctecmdr
4fc1d397c4 Merge "arm64: defconfig: Set qrtr wakeup for genericarmv8" 2020-11-12 20:42:05 -08:00
qctecmdr
9443b83e3e Merge "net: cnss2: Add second element to avoid OOB issue" 2020-11-12 20:42:05 -08:00
qctecmdr
b56d745861 Merge "clk: qcom: gcc: Register the DFS clocks for HOLI" 2020-11-12 20:42:05 -08:00
Chris Lew
ca1c9dc6bf net: neuron: channel: Check buffer boundaries
Sanitize the ring buffer length read from the other side to ensure
the bounds match the memory that is mapped.

Change-Id: Ifdac3e0dee11374e61ede3a2cfb82e1957c6a2b2
Signed-off-by: Chris Lew <clew@codeaurora.org>
2020-11-12 15:09:46 -08:00