Commit graph

884,750 commits

Author SHA1 Message Date
qctecmdr
92fd4ddff3 Merge "msm: cvp:fix potential prop_array idx out range" 2020-07-02 22:46:56 -07:00
qctecmdr
81c099aed2 Merge "ABI: Update whitelist" 2020-07-02 22:46:56 -07:00
qctecmdr
52c24cbf41 Merge "msm: kgsl: Fix kgsl_state_is_awake for gmu targets" 2020-07-02 22:46:55 -07:00
qctecmdr
5267e2c6f8 Merge "iommu: Remove iommu_debugfs_top" 2020-07-02 22:14:46 -07:00
qctecmdr
9a8fa3bef0 Merge "arm64: Enable a bunch of android recommended configs" 2020-07-02 22:14:45 -07:00
qctecmdr
472dad2bc9 Merge "defconfig: arm64: Disable SDCARD_FS for Lahaina" 2020-07-02 22:14:45 -07:00
qctecmdr
10d4fc23ab Merge "msm: ipa: Add more ipa API to ipa framework" 2020-07-02 22:14:45 -07:00
qctecmdr
0ea391bae1 Merge "input: qcom-hv-haptics: restore RC calibration mode after FIFO playing" 2020-06-26 19:54:05 -07:00
qctecmdr
3dd4d83071 Merge "msm: adsprpc: limit number of cached buffers" 2020-06-26 19:54:05 -07:00
qctecmdr
ff524f07c1 Merge "msm: cvp: add trace utililty for systrace profiling" 2020-06-26 19:54:05 -07:00
qctecmdr
de04ebc9bc Merge "dt-bindings: clock: Add support for clock ids for SDXLEMUR" 2020-06-26 19:54:04 -07:00
qctecmdr
0cce5e66e8 Merge "defconfig: Enable MPM driver for Holi" 2020-06-26 19:54:04 -07:00
qctecmdr
8f161b7b67 Merge "power: smb1355: Add snapshot of SMB1355 charger driver" 2020-06-26 17:34:07 -07:00
qctecmdr
ee8ac78d1c Merge "config: Enable module signature in generic defconfig" 2020-06-26 17:34:07 -07:00
qctecmdr
79e3420f98 Merge "defconfig: msm: Disable CONFIG_MSM_TZ_LOG from perf builds" 2020-06-26 17:34:06 -07:00
qctecmdr
95d17c2e1d Merge "scsi: ufshcd: Properly set the device Icc Level" 2020-06-26 17:34:06 -07:00
qctecmdr
8119c34119 Merge "soc: qcom: hwkm: Re-format cmd packet for system kdf" 2020-06-26 17:34:05 -07:00
David Ng
0097194c07 defconfig: arm64: Disable SDCARD_FS for Lahaina
Disable SDCARD_FS for Android compliance for full switchover
to fusefs.

Change-Id: I54921f9651dec266b1aae51f075c95c71e670f34
Signed-off-by: David Ng <dave@codeaurora.org>
2020-06-26 15:55:05 -07:00
Siddharth Gupta
5db100cd26 ABI: Update whitelist
Common change to add required symbols to the whitelist.

Change-Id: I799bb1b8b2e637d6a5570ff82b8040447a9bf0e7
Signed-off-by: Siddharth Gupta <sidgup@codeaurora.org>
Signed-off-by: Raghavendra Rao Ananta <rananta@codeaurora.org>
2020-06-26 10:10:59 -07:00
Raghavendra Kakarla
7ad3e81608 defconfig: Enable MPM driver for Holi
Enable MPM interrupt controller driver to program
the APSS wakeup capable interrupts to RPM MSG RAM.

Change-Id: Ic62b0f82cc4c6172924625ee6e5eda3e6358c613
Signed-off-by: Raghavendra Kakarla <rkakarla@codeaurora.org>
2020-06-26 03:09:45 -07:00
Naveen Yadav
9ad0572fd9 dt-bindings: clock: Add support for clock ids for SDXLEMUR
Add clock IDs for GCC and APSSCC clients to be able to request
for clocks from these clock controllers.

Change-Id: Ifc6acdbd05398e2f501cdc2cfb8694b16eb9b866
Signed-off-by: Naveen Yadav <naveenky@codeaurora.org>
2020-06-26 14:09:32 +05:30
Prerna Kalla
128b900f89 defconfig: msm: Disable CONFIG_MSM_TZ_LOG from perf builds
DEBUGFS will be disabled on android R perf builds. Since tz logs
are dependent on debugfs, CONFIG_MSM_TZ_LOG needs to be removed
as well.

Change-Id: I88211eb98cfbf64b2fe444c8fc0d4e122bebf7cb
Signed-off-by: Prerna Kalla <prernak@codeaurora.org>
2020-06-26 00:17:23 -07:00
Isaac J. Manjarres
af3b847f20 iommu: Remove iommu_debugfs_top
iommu_debugfs_top was introduced in earlier kernel versions when
IOMMU_DEBUGFS was not present. Now that IOMMU_DEBUGFS is present,
and exposes iommu_debugfs_dir, which is logically equivalent to
iommu_debugfs_top, there is no point in keeping it around, so
remove it.

Change-Id: I7032e370ccfd32f9d2b9046fecd98b4c6388450f
Signed-off-by: Isaac J. Manjarres <isaacm@codeaurora.org>
2020-06-25 23:36:58 -07:00
Isaac J. Manjarres
f759692d36 iommu: Refactor IOMMU pagetable page accounting into a config option
Refactor IOMMU pagetable page accounting code into a config option
so that it only includes additional headers in configurations where
the page accounting feature is needed. Doing so prevents the
definition of certain structures from being expanded, which can
affect the CRC value generated for exported symbols in module.symvers.

Change-Id: Idd6fc0e1cbb46ace211971ac142be491d0a5ab09
Signed-off-by: Isaac J. Manjarres <isaacm@codeaurora.org>
2020-06-25 23:36:03 -07:00
Gaurav Kashyap
fd16bf9689 soc: qcom: hwkm: Re-format cmd packet for system kdf
1. Fix to format context correctly as expected by
   hardware for system KDF.
   HWKM reverses bytes at a 8-byte boundary while getting
   the context from cryptolib. Reformat the context in the
   command packet in such a way that HWKM receives it in the
   correct order. Also, pad the context to a 8-byte multiple
   as the way HW would pad it is not expected.
2. Use context for FBE to match with the one
   for VTS test cases.

Change-Id: I3c13c91b0dfc85aef406b05694dbd22afb0b2e0b
Signed-off-by: Gaurav Kashyap <gaurkash@codeaurora.org>
2020-06-25 20:47:05 -07:00
qctecmdr
6e625d330f Merge "mm: Fix sleeping while atomic during speculative page fault" 2020-06-25 19:09:40 -07:00
qctecmdr
1f2a0ad6f9 Merge "Merge android-5.4-stable.32 (724ffa0) into msm-5.4" 2020-06-25 14:38:28 -07:00
qctecmdr
7727556160 Merge "ufs: sysfs: Use snprintf instead of sprintf" 2020-06-25 04:55:02 -07:00
qctecmdr
a8c8cc0763 Merge "msm: cvp: Increase delay during AXI reset pulse" 2020-06-25 04:55:01 -07:00
qctecmdr
bba2f13464 Merge "power: smb1398: Add snapshot of driver" 2020-06-25 04:55:01 -07:00
qctecmdr
5027ca7013 Merge "memshare: Add debug logs to track subsystem notification" 2020-06-25 04:55:01 -07:00
qctecmdr
29909395db Merge "msm: kgsl: Add support to toggle GPU GX CPR loop enable" 2020-06-25 04:55:00 -07:00
qctecmdr
080901e562 Merge "cpufreq: qcom: cpufreq-hw: Remove enable of GT_IRQ for EPSS" 2020-06-25 04:55:00 -07:00
qctecmdr
cac85f094b Merge "scsi: Block reset attempts to UFS through scsi ioctl" 2020-06-25 01:48:41 -07:00
qctecmdr
524546f263 Merge "scsi: ufs: Record last intr status and its timestamp" 2020-06-24 22:34:01 -07:00
qctecmdr
adc8e47e36 Merge "mmc: Kconfig: Change MMC_SDHCI_MSM to be static module" 2020-06-24 22:34:01 -07:00
qctecmdr
fac58968a5 Merge "soc: qcom: hwkm: check key size before unwrap" 2020-06-24 22:34:01 -07:00
Shyam Kumar Thella
17d59b158f power: smb1355: Add snapshot of SMB1355 charger driver
Add snapshot of smb1355 charger driver as of msm-4.19
'commit 9f2b8d8b1a ("trace: increase caller depth for preempt/irqs
disable events")'.

Change-Id: I91f456c8385cb70d6e3dcface4239ea35140c080
Signed-off-by: Shyam Kumar Thella <sthella@codeaurora.org>
2020-06-25 10:02:21 +05:30
Prasad Sodagudi
f8faae4ef1 arm64: Enable a bunch of android recommended configs
Enable a bunch of config options are recommended
to be =y in the default and these are all android
recommended configs.

Change-Id: I728fdcafd1aabfbe536065b7db65b8b28701cc22
Signed-off-by: Prasad Sodagudi <psodagud@codeaurora.org>
2020-06-24 13:20:59 -07:00
Blagovest Kolenichev
72fdae88b0 Merge android-5.4-stable.32 (724ffa0) into msm-5.4
* refs/heads/tmp-724ffa0:
  Linux 5.4.32
  iommu/vt-d: Allow devices with RMRRs to use identity domain
  drm/i915: Fix ref->mutex deadlock in i915_active_wait()
  fbcon: fix null-ptr-deref in fbcon_switch
  blk-mq: Keep set->nr_hw_queues and set->map[].nr_queues in sync
  RDMA/cm: Update num_paths in cma_resolve_iboe_route error flow
  Bluetooth: RFCOMM: fix ODEBUG bug in rfcomm_dev_ioctl
  RDMA/siw: Fix passive connection establishment
  RDMA/cma: Teach lockdep about the order of rtnl and lock
  RDMA/ucma: Put a lock around every call to the rdma_cm layer
  include/uapi/linux/swab.h: fix userspace breakage, use __BITS_PER_LONG for swap
  ceph: canonicalize server path in place
  ceph: remove the extra slashes in the server path
  ARM: imx: only select ARM_ERRATA_814220 for ARMv7-A
  ARM: imx: Enable ARM_ERRATA_814220 for i.MX6UL and i.MX7D
  IB/mlx5: Replace tunnel mpls capability bits for tunnel_offloads
  IB/hfi1: Fix memory leaks in sysfs registration and unregistration
  IB/hfi1: Call kobject_put() when kobject_init_and_add() fails
  ASoC: jz4740-i2s: Fix divider written at incorrect offset in register
  platform/x86: intel_int0002_vgpio: Use acpi_register_wakeup_handler()
  ACPI: PM: Add acpi_[un]register_wakeup_handler()
  hwrng: imx-rngc - fix an error path
  tools/accounting/getdelays.c: fix netlink attribute length
  slub: improve bit diffusion for freelist ptr obfuscation
  uapi: rename ext2_swab() to swab() and share globally in swab.h
  usb: dwc3: gadget: Wrap around when skip TRBs
  random: always use batched entropy for get_random_u{32,64}
  s390: prevent leaking kernel address in BEAR
  r8169: change back SG and TSO to be disabled by default
  mlxsw: spectrum_flower: Do not stop at FLOW_ACTION_VLAN_MANGLE
  tun: Don't put_page() for all negative return values from XDP program
  slcan: Don't transmit uninitialized stack data in padding
  net: stmmac: dwmac1000: fix out-of-bounds mac address reg setting
  net_sched: fix a missing refcnt in tcindex_init()
  net_sched: add a temporary refcnt for struct tcindex_data
  net: phy: micrel: kszphy_resume(): add delay after genphy_resume() before accessing PHY registers
  net: dsa: mt7530: fix null pointer dereferencing in port5 setup
  net: dsa: bcm_sf2: Ensure correct sub-node is parsed
  net: dsa: bcm_sf2: Do not register slave MDIO bus with OF
  ipv6: don't auto-add link-local address to lag ports
  cxgb4: fix MPS index overwrite when setting MAC address
  net: phy: realtek: fix handling of RTL8105e-integrated PHY
  ANDROID: ABI/Whitelist: add display whitelist to unisoc whitelist
  ANDROID: Kconfig.gki Add SND_SOC_TOPOLOGY
  ANDROID: GKI: enable CONFIG_ARM_PSCI_CPUIDLE
  ANDROID: power: wakeup_reason: wake reason enhancements
  UPSTREAM: cpufreq: Make cpufreq_global_kobject static
  ANDROID: staging: ion: implement vmap for built-in heaps
  ANDROID: KABI: Update kABI after dropping CONFIG_PCIEPORTBUS from gki_defconfig
  ANDROID: gki_defconfig: Drop CONFIG_PCIEPORTBUS
  FROMLIST: power_supply: Add additional health properties to the header
  UPSTREAM: power: supply: core: Update sysfs-class-power ABI document
  ANDROID: GKI: update ABI for mmc changes
  UPSTREAM: mmc: sdhci-sprd: Set the missing MMC_CAP_WAIT_WHILE_BUSY flag
  UPSTREAM: mmc: host: hsq: Add missing MODULE_LICENSE() and MODULE_DESCRIPTION()
  UPSTREAM: mmc: host: sdhci-sprd: Add software queue support
  UPSTREAM: mmc: host: sdhci: Add a variable to defer to complete requests if needed
  UPSTREAM: mmc: host: sdhci: Add request_done ops for struct sdhci_ops
  UPSTREAM: mmc: core: Enable the MMC host software queue for the SD card
  UPSTREAM: mmc: Add MMC host software queue support
  FROMGIT: kbuild: mkcompile_h: Include $LD version in /proc/version
  ANDROID: ignore compiler tag __must_check for GENKSYMS
  UPSTREAM: mfd: sc27xx: Add USB charger type detection support
  UPSTREAM: Revert "gpio: eic-sprd: Use devm_platform_ioremap_resource()"
  UPSTREAM: pinctrl: sprd: Add pin high impedance mode support
  UPSTREAM: pinctrl: sprd: Use the correct pin output configuration
  UPSTREAM: nvmem: sprd: Determine double data programming from device data
  UPSTREAM: nvmem: sprd: Optimize the block lock operation
  UPSTREAM: nvmem: sprd: Fix the block lock operation
  UPSTREAM: dmaengine: sprd: Set request pending flag when DMA controller is active
  Linux 5.4.31
  mm: mempolicy: require at least one nodeid for MPOL_PREFERRED
  padata: always acquire cpu_hotplug_lock before pinst->lock
  net: Fix Tx hash bound checking
  i2c: i801: Do not add ICH_RES_IO_SMI for the iTCO_wdt device
  watchdog: iTCO_wdt: Make ICH_RES_IO_SMI optional
  watchdog: iTCO_wdt: Export vendorsupport
  tcp: fix TFO SYNACK undo to avoid double-timestamp-undo
  IB/hfi1: Ensure pq is not left on waitlist
  rxrpc: Fix sendmsg(MSG_WAITALL) handling
  iwlwifi: dbg: don't abort if sending DBGC_SUSPEND_RESUME fails
  iwlwifi: yoyo: don't add TLV offset when reading FIFOs
  iwlwifi: consider HE capability when setting LDPC
  net/mlx5e: kTLS, Fix wrong value in record tracker enum
  soc: mediatek: knows_txdone needs to be set in Mediatek CMDQ helper
  ALSA: hda/ca0132 - Add Recon3Di quirk to handle integrated sound on EVGA X99 Classified motherboard
  Revert "dm: always call blk_queue_split() in dm_process_bio()"
  power: supply: axp288_charger: Add special handling for HP Pavilion x2 10
  extcon: axp288: Add wakeup support
  nvmem: check for NULL reg_read and reg_write before dereferencing
  mei: me: add cedar fork device ids
  coresight: do not use the BIT() macro in the UAPI header
  PCI: sysfs: Revert "rescan" file renames
  misc: pci_endpoint_test: Avoid using module parameter to determine irqtype
  misc: pci_endpoint_test: Fix to support > 10 pci-endpoint-test devices
  misc: rtsx: set correct pcr_ops for rts522A
  brcmfmac: abort and release host after error
  padata: fix uninitialized return value in padata_replace()
  XArray: Fix xa_find_next for large multi-index entries
  net/mlx5e: kTLS, Fix TCP seq off-by-1 issue in TX resync flow
  tools/power turbostat: Fix 32-bit capabilities warning
  tools/power turbostat: Fix missing SYS_LPI counter on some Chromebooks
  tools/power turbostat: Fix gcc build warnings
  drm/amdgpu: fix typo for vcn1 idle check
  initramfs: restore default compression behavior
  drm/bochs: downgrade pci_request_region failure from error to warning
  drm/amd/display: Add link_rate quirk for Apple 15" MBP 2017
  kconfig: introduce m32-flag and m64-flag
  nvme-rdma: Avoid double freeing of async event data
  ANDROID: GKI: update ABI for SCHED_AUTOGROUP removal
  ANDROID: GKI: Remove SCHED_AUTOGROUP
  ANDROID: fscrypt: fall back to filesystem-layer crypto when needed
  ANDROID: block: require drivers to declare supported crypto key type(s)
  ANDROID: block: make blk_crypto_start_using_mode() properly check for support
  ANDROID: GKI: defconfig: modify debug configs
  ANDROID: kbuild: ensure __cfi_check is correctly aligned
  FROMLIST: kmod: make request_module() return an error when autoloading is disabled
  UPSTREAM: loop: Only freeze block queue when needed.
  UPSTREAM: loop: Only change blocksize when needed.
  ANDROID: GKI: Fix ABI for CMA page allocation
  ANDROID: GKI: mm: add cma pcp list
  ANDROID: GKI: cma: redirect page allocation to CMA
  ANDROID: Fix wq fp check for CFI builds
  ANDROID: Incremental fs: Fix remount
  ANDROID: Incremental fs: Protect get_fill_block, and add a field
  ANDROID: Incremental fs: Fix crash polling 0 size read_log
  ANDROID: Incremental fs: get_filled_blocks: better index_out
  UPSTREAM: sched/rt: cpupri_find: Trigger a full search as fallback
  UPSTREAM: sched/rt: Remove unnecessary push for unfit tasks
  UPSTREAM: sched/rt: Allow pulling unfitting task
  UPSTREAM: sched/rt: Optimize cpupri_find() on non-heterogenous systems
  UPSTREAM: sched/rt: Re-instate old behavior in select_task_rq_rt()
  UPSTREAM: sched/rt: cpupri_find: Implement fallback mechanism for !fit case
  ANDROID: staging: ion: move definition of attachment
  ANDROID: Incremental fs: Fix four resource bugs
  ANDROID: GKI: Removed cuttlefish configs

Conflicts:
	drivers/base/power/wakeup.c
	drivers/irqchip/irq-gic-v3.c
	include/linux/gfp.h
	include/linux/highmem.h
	include/linux/mmc/host.h
	include/linux/mmzone.h
	include/uapi/linux/coresight-stm.h
	kernel/sched/cpupri.c
	kernel/sched/rt.c
	mm/page_alloc.c
	scripts/module-lto.lds.S

Change-Id: I1845fe7d1d0cd48d91f689565324a794b1a29f10
Signed-off-by: Blagovest Kolenichev <bkolenichev@codeaurora.org>
2020-06-24 11:39:32 -07:00
George Shen
8ff219949a msm: cvp: Increase delay during AXI reset pulse
Per CVP HPG update on May 26th 2020.

Change-Id: I270d73200c77b0d1019b4b1935b2f3b43fac1546
Signed-off-by: George Shen <sqiao@codeaurora.org>
2020-06-24 11:01:41 -07:00
Asutosh Das
69ffb0e70b ufs: sysfs: Use snprintf instead of sprintf
Replaces sprintf with snprintf for security.

Change-Id: Ic9a140caabf6c3d4b13103214bfe41f336e2cf29
Signed-off-by: Asutosh Das <asutoshd@codeaurora.org>
2020-06-24 10:25:54 -07:00
qctecmdr
a25b03139e Merge "Revert "ALSA: PCM: volume API implementation"" 2020-06-24 10:04:12 -07:00
qctecmdr
c07da6b737 Merge "clk: qcom: gpucc: Add Support for GPUCC clock driver for SHIMA" 2020-06-24 10:04:12 -07:00
qctecmdr
0c70215a72 Merge "drivers: qcom: add system PM violators debug driver" 2020-06-24 10:04:11 -07:00
Manoj Prabhu B
e7f23f73cb memshare: Add debug logs to track subsystem notification
Enable debug logs to track the subsystem notification for a
peripheral SSR process.

Change-Id: Id8b12fb9b45e07b28a242c47e6c8148fe2154280
Signed-off-by: Manoj Prabhu B <bmanoj@codeaurora.org>
2020-06-24 19:41:24 +05:30
qctecmdr
9faf140cf6 Merge "mm: support vector address ranges for process_madvise" 2020-06-24 06:08:09 -07:00
qctecmdr
e093936a5f Merge "Revert "interconnect: qcom: Build icc-rpmh with qnoc-lahaina"" 2020-06-24 06:08:09 -07:00
qctecmdr
22264270c4 Merge "msm: kgsl: Do not clear dispatcher fault when adreno reset fails" 2020-06-24 06:08:06 -07:00
Taniya Das
7823a9b79a cpufreq: qcom: cpufreq-hw: Remove enable of GT_IRQ for EPSS
CPUFREQ SW does not require to enable the IRQ for EPSS, thus remove the
enable.

Change-Id: Ib1c10d755355c6f4df46a62568d2895e291e846a
Signed-off-by: Taniya Das <tdas@codeaurora.org>
2020-06-24 16:11:51 +05:30