Commit graph

891,852 commits

Author SHA1 Message Date
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
Sami Tolvanen
bd3954f0a7 ANDROID: scs: use vmapped shadow stacks by default
Enable CONFIG_SHADOW_CALL_STACK_VMAP by default, and as we allocate
a full page for the stack, allow the kernel use all of it.

Bug: 169781940
Change-Id: Ie8eaa7f24e9bf10ff28a302ac98ad843b71c9c2a
Signed-off-by: Sami Tolvanen <samitolvanen@google.com>
Git-commit: 1eb128820e
Git-repo: https://android.googlesource.com/kernel/common/+/refs/heads/android11-5.4
Signed-off-by: Raghavendra Rao Ananta <rananta@codeaurora.org>
Signed-off-by: Gaurav Kohli <gkohli@codeaurora.org>
2020-10-27 13:23:45 +05:30
qctecmdr
7bac0bc013 Merge "soc: qcom: proxy_consumer: Add support for amba_driver" 2020-10-26 20:50:59 -07:00
Raghavendra Rao Ananta
74672e6b27 soc: qcom: proxy_consumer: Add support for amba_driver
The proxy consumer driver currently only supports proxy
probing for platform bus. However, there's a need to
proxy-probe coresight devices, which falls under ABMA bus.
Hence, extend the driver to support proxy probing for
"struct amba_driver" and add coresight-etm ids to the list.

Change-Id: I48da20ea18f61b5cc82ae0616a75c23af32481a2
Signed-off-by: Raghavendra Rao Ananta <rananta@codeaurora.org>
2020-10-26 11:01:10 -07:00
Raghavendra Rao Ananta
873068025a ANDROID: ABI: Update allowed list for QCOM
Add the following symbols to QCOM allowed-list:
-- amba_driver_register
-- amba_driver_unregister

Bug: 171409550
Change-Id: Iab997df4f8ebb2c39b993b60ee4eb0fa3100fbcd
Signed-off-by: Raghavendra Rao Ananta <rananta@codeaurora.org>
Git-commit: 95bd9e26f2
Git-repo: https://android.googlesource.com/kernel/common/+/refs/heads/android11-5.4
[rananta@codeaurora.org: Generate and add an internal ABI snapshot]
Signed-off-by: Raghavendra Rao Ananta <rananta@codeaurora.org>
2020-10-26 11:01:10 -07:00
Raghavendra Rao Ananta
f908c1019e soc: qcom: of_proxy_consumer: Add "qcom,jtagv8-mm"
Add "qcom,jtagv8-mm" to the list of proxy consumers, such that
the sync-state logic need not wait for the probe from the actual
driver if it's disabled.

Change-Id: I580a865ba3c4c298d76e29552eec854b33faea24
Signed-off-by: Raghavendra Rao Ananta <rananta@codeaurora.org>
2020-10-26 11:01:09 -07:00
qctecmdr
f4e98f0cf5 Merge "mmc: sdhci-msm: Update to enhanced SDCC5 DLL power up sequence" 2020-10-26 09:53:31 -07:00
qctecmdr
4b196d63cf Merge "Merge android11-5.4.61+ (8540985) into msm-5.4" 2020-10-26 07:17:41 -07:00
qctecmdr
a2e07b7fb8 Merge "msm: kgsl: Make clear_pending_transactions target specific" 2020-10-26 07:17:40 -07:00
Jun Li
5a50bc191e mmc: sdhci-msm: Update to enhanced SDCC5 DLL power up sequence
Update the DLL power up sequence according to the latest enhanced SDCC
DLL HSR document and SDCDC initialization sequence in HPG.

Final sequence:
Step 1 - Set PWRSAVE bit in MCI_CLK to '0' during reset
Step 2 - Disable CK_OUT
Setp 3 - Set CORE_DLL_CLOCK_DISABLE to '1'
Step 4 - Set RST & PDN to '1'
Step 5 - Set DLL_CONFIG_3
Step 6 - Set SDC4_USER_CTRL
Step 7 - Set SDC4_TEST_CTRL(SW can Skip this step)
Step 8 - Set DDR_CONFIG
Step 9 - Set DLL_CONFIG_2
Step 10 - Set DLL_CONFIG
Step 11 - Wait for 52 us
Step 12 - Set RST & PDN to '0'
Step 13 - Set RST to '1'
Step 14 - Set RST to '0'
Step 15 - Set CORE_DLL_CLOCK_DISABLE to '0'
Step 16 - Wait for 8000 input clock cycles
Step 17 - Enable CK_OUT
Step 18 - Check for Lock
Step 19 - If PWRSAVE is needed, set PWRSAVE to '1'.

Change-Id: I889937a1728b3ce039a802972f9668969fe96505
Signed-off-by: Jun Li <liju@codeaurora.org>
Signed-off-by: Sarthak Garg <sartgarg@codeaurora.org>
2020-10-26 13:27:17 +08:00
qctecmdr
cf0ffb9c2c Merge "dma-mapping.h: Fix CRC mismatch issues from including genalloc.h" 2020-10-25 19:42:00 -07:00
qctecmdr
45fb30f007 Merge "input: qcom-hv-haptics: only use 4-byte writes when refilling FIFO" 2020-10-25 19:42:00 -07:00
qctecmdr
65e751ed01 Merge "mmc: host: Add variant ops for cqhci crypto" 2020-10-25 11:05:49 -07:00
qctecmdr
a5532e7931 Merge "defconfig: msm: Enable CONFIG_UFS_DBG for Holi debug builds" 2020-10-25 02:33:22 -07:00
qctecmdr
f09654a8fe Merge "mtd: msm_qpic_nand: Use logical unit count in flash density" 2020-10-25 02:33:22 -07:00
qctecmdr
b12359c3dc Merge "mmc: Kconfig: select DEVFREQ_GOV_SIMPLE_ONDEMAND with SDHCI_MSM" 2020-10-25 02:33:21 -07:00
qctecmdr
70c6b344c7 Merge "soc: spcom: fix race during channel character dev creation" 2020-10-25 02:33:21 -07:00
qctecmdr
4764cf6f6e Merge "cnss2: Check if firmware asserts before power off for CBC" 2020-10-25 02:33:21 -07:00
qctecmdr
82ef587103 Merge "iommu/arm-smmu: Leave power resources enabled across unmap and sync ops" 2020-10-25 02:33:21 -07:00
Veera Vegivada
e25f80b327 pinctrl: qcom: Expose ufs_reset as gpio on sa8195
The ufs_reset pin is expected to be wired to the reset pin of the
primary UFS memory but is pretty much just a general purpose output pin.
Reorder the pins and expose it as gpio 204, so that the UFS driver can
toggle it.

Change-Id: Ifd0b430a4c057a4fa5c4a57fb484c71df18d7f1d
Signed-off-by: Veera Vegivada <vvegivad@codeaurora.org>
2020-10-24 17:35:27 +05:30
Saurabh Ambulkar
f4b1b0c872 pinctrl: qcom: Add initial pinctrl driver for sdmshrike
Add initial pinctrl driver to support pin configuration with
pinctrl framework for sdmshrike. This driver is a snapshot of
pinctrl-sdmshrike.c from msm-4.14 at commit id "54fbb7a2".

Change-Id: I8585c025cee91e5cce75598ed2e43cdc00bb769a
Signed-off-by: Saurabh Ambulkar <sambulka@codeaurora.org>
2020-10-24 17:34:52 +05:30
Vivek Kumar
0e8e0ee81e pinctrl: qcom: sm8150: Populate egpio variables in Pingroup
Populate egpio related variables in pingroup macro. This is
to make sure pincontrol-msm driver takes epgio bits into
account when it configures pinmux setting for any tlmm pin.

Change-Id: I828661fd2e05664b583dc40d3110096a95a489e8
Signed-off-by: Vivek Kumar <vivekuma@codeaurora.org>
2020-10-24 17:34:15 +05:30
Shreyas K K
898843087d arm64: Kconfig: Add config option for SA8195
Add option to enable the compilation for SA8195
platform.

Change-Id: I0866efa419c213d842448b35ee4a829785e7d954
Signed-off-by: Shreyas K K <shrekk@codeaurora.org>
2020-10-24 17:33:19 +05:30
Shreyas K K
30b16a09fa arm64: Kconfig: Add support for ARCH_SA8155
Add option "ARCH_SA8155" to enable compilation
for sa8155 target.

Change-Id: I55af2e604c946f8d0494ed6b9ad53aa42244b596
Signed-off-by: Shreyas K K <shrekk@codeaurora.org>
2020-10-24 17:32:24 +05:30
Konstantin Dorfman
e9db615eb4 soc: spcom: fix race during channel character dev creation
During char device creation, device counted by chdev_count and since
the device creation can happen from different contexts, need to guard the
flow.

This change introduces new lock for spcom_dev->chdev_count.

Change-Id: If59c3ae69d7366892583b2552cf276b6714eeb03
Signed-off-by: Konstantin Dorfman <kdorfman@codeaurora.org>
2020-10-23 13:09:15 -07:00
Isaac J. Manjarres
2c793736ae iommu/arm-smmu: Leave power resources enabled across unmap and sync ops
The votes for power resources can only be removed if there are no
outstanding TLB invalidation operations. This is true when the
downstream io-pgtable-arm optimizations are in use, as the code that
unmaps the memory from the IOMMU page tables ensures that all TLB
operations are complete before returning.

However, the upstream io-pgtable-arm implementation allows for a TLB
invalidation to be in progress when control is returned back to
arm_smmu_unmap(), at which point the votes for the power resources
will be removed. In cases where the GPU is in slumber, the GPU block
and GPU SMMU get powered down when the SMMU driver removes its votes.
This causes problems where unmapping buffers takes a long time.

For scenarios where it is not feasible to guarantee that TLB
invalidations have completed when control is returned to the
arm_smmu_unmap() function, leave the votes for power resources in place,
and rely on the subsequent sync operation to remove the votes.

Change-Id: Idc594cc69860b44a8eb56c72b5c592bf4799bf84
Signed-off-by: Isaac J. Manjarres <isaacm@codeaurora.org>
2020-10-23 11:43:56 -07:00
Veerabhadrarao Badiganti
50417ad061 defconfig: msm: Enable CONFIG_UFS_DBG for Holi debug builds
Enable CONFIG_UFS_DBG for Holi debug builds, so that UFS Ftrace
logs gets enabled in trace instances.

Change-Id: Id4171a386900931ae1c59853235a3fc2cbe3bc05
Signed-off-by: Veerabhadrarao Badiganti <vbadigan@codeaurora.org>
2020-10-23 22:35:08 +05:30
Pradeep P V K
3fb0bdab95 mtd: msm_qpic_nand: Use logical unit count in flash density
In an ONFI compliant devices, the flash parameters are calculated
by reading the onfi parameter page of the device.

Existing flash density is calculated based on a single logical
unit(LUN). This shows wrong density information on Multi LUN flashes.
So, always use number of LUNS value in flash density calculations.

Change-Id: Idba4d4e129e7fdcdab1e509bd8c3149f26fc11f2
Signed-off-by: Pradeep P V K <ppvk@codeaurora.org>
2020-10-23 09:26:58 -07:00
Isaac J. Manjarres
85d16b15f5 dma-mapping.h: Fix CRC mismatch issues from including genalloc.h
Commit 3a1bd738ef ("dma-mapping-fast: Do not clobber existing atomic
pool") included the genalloc.h header file in the dma-mapping.h header
file.

Including genalloc.h in dma-mapping.h expands the definition of the
gen_pool structure for all files that include dma-mapping.h.
This can cause a different CRC value to be generated for an exported
function symbol, if the function parameters or any of their descendant
members contain genpool structures, as the genpool structures may have
been previously forward declared, but now they are fully defined.

Remove the inclusion of genalloc.h in dma-mapping.h to fix this.

Change-Id: I83a3fad284649b91372168d845f30d9302f75c1d
Signed-off-by: Isaac J. Manjarres <isaacm@codeaurora.org>
2020-10-23 09:04:06 -07:00
Sarthak Garg
5863f4ce35 mmc: Kconfig: select DEVFREQ_GOV_SIMPLE_ONDEMAND with SDHCI_MSM
mmc_devfeq_clk_scaling structure uses devfreq_simple_ondemand_data
structure which gets enabled with CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND.

Select DEVFREQ_GOV_SIMPLE_ONDEMAND with SDHCI_MSM.

Change-Id: Iab438755768341b1bf836cc60f1c981f4c3daff9
Signed-off-by: Sarthak Garg <sartgarg@codeaurora.org>
2020-10-23 20:48:59 +05:30
Sarthak Garg
2dddb94b9c arm: defconfig: Enable SD/eMMC card driver for sdxlemur
Enable SD/eMMC card driver as a inbuilt module for sdxlemur target.
Also Enabled the required Block layer configs.

Change-Id: Ide938308ae659cbe558af341dd8697cab3b987d5
Signed-off-by: Sarthak Garg <sartgarg@codeaurora.org>
2020-10-23 20:39:25 +05:30
Fenglin Wu
c94df0b2f8 input: qcom-hv-haptics: only use 4-byte writes when refilling FIFO
The haptics module supports writing FIFO samples using 4-byte burst
mode as well as 1-byte mode. During FIFO refilling, if a 1-byte write
was used, then the hardware would fill zeros automatically after that
to keep the FIFO data 4-byte aligned. When this happened in the middle
of playing, the hardware inserted 0 values would cause spurs on the
haptics output. To fix this, only use 4-byte burst writes during FIFO
refilling until the end of the play.

Change-Id: I0441942585e0e0d5da62ec4a7123b2763b292739
Signed-off-by: Fenglin Wu <fenglinw@codeaurora.org>
2020-10-23 13:38:46 +08:00
Neeraj Soni
44934087b2 mmc: host: Add variant ops for cqhci crypto
QTI implementation for block keyslot manager and
crypto vops for crypto support in CQHCI.

Fixed compilation issues in cqhci-crypto-qti.c and merge
conflicts in sdhci-msm.c and Kconfig files.
(cherry picked from mainline kernel_msm-4.19 commit  5220e65f).

Conflicts:
       drivers/mmc/host/Kconfig
       drivers/mmc/host/sdhci-msm.c

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.

Change-Id: I9b64f85ca97c269a6ecd6fde2bb693745d4c43d4
Signed-off-by: Neeraj Soni <neersoni@codeaurora.org>
Signed-off-by: Vaibhav Agrawal <vagrawa@codeaurora.org>
2020-10-22 13:53:42 -07:00
Tony Truong
a85bf9cb8b msm: pcie: update with link power on check for user PCIe resume
Instead of checking PCIe S/W link state, check if the link is on
is on or off to determine whether PCIe resume should be allowed
or not. PCIe S/W link state is not enough to determine since
MSM_PCIE_LINK_DOWN state can be set for link on or off.

Change-Id: I23a27007eb90134c90d5a20034248697423ebeeb
Signed-off-by: Tony Truong <truong@codeaurora.org>
2020-10-22 13:08:18 -07:00
qctecmdr
fa43b983dd Merge "usb: dwc3: Fix re-enumeration of connected peripherals" 2020-10-22 10:48:52 -07:00
qctecmdr
e4ec2400a2 Merge "dt-bindings: msm: Add new path data types for SFE and IFE" 2020-10-22 10:48:52 -07:00
qctecmdr
06e29f4bf4 Merge "cnss2: Fix MAC address setup on late DMS server arrival" 2020-10-22 10:48:52 -07:00
qctecmdr
313972cbb2 Merge "net: netfilter: IRC DCC for private clients" 2020-10-22 10:48:52 -07:00
Neeraj Soni
cd86102b66 mmc: cqhci: Add inline crypto support to cqhci
Wire up cqhci.c with the eMMC Crypto API and support for block layer inline
encryption additions and the keyslot manager.

Ported and fixed the merged conflicts in cqhci.c file
Added new member in cqhci_host to get platform device from sdhci
during cqhci_pltfm_init().

(cherry picked from mainline kernel_msm-4.19 commit 2543833e).
Conflicts:
	drivers/mmc/host/cqhci.c

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.

Change-Id: I6860cd29d6f044f559385d438048b850faf9a8be
Signed-off-by: Neeraj Soni <neersoni@codeaurora.org>
Signed-off-by: Vaibhav Agrawal <vagrawa@codeaurora.org>
2020-10-22 10:15:43 -07:00
Neeraj Soni
bec27fe2bc mmc: cqhci: Add eMMC crypto APIs
Add functions to use eMMC inline encryption hardware capability
inline with JEDEC eMMC v5.2 specification and to work with
block keyslot manager. Also add crypto variant vops to handle
quirks in individual inline encryption hardware. The vops fallback
to default implementation which is JEDEC eMMC v5.2 compliant.

Fixed the merged conflict in Kconfig file.
Fixed compilation issue in cqhci-crypto.c file.
(cherry picked from mainline kernel_msm-4.19 commit 32f1d1ca).

Conflicts:
	drivers/mmc/host/Kconfig

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.

Change-Id: I72b85d572d7c76b966e34b80e7e8eca83a2bb35f
Signed-off-by: Neeraj Soni <neersoni@codeaurora.org>
Signed-off-by: Vaibhav Agrawal <vagrawa@codeaurora.org>
2020-10-22 10:10:58 -07:00
qctecmdr
8782ab8eed Merge "msm: kgsl: Stay in bounds when setting up legacy HFI queues" 2020-10-22 08:15:34 -07:00
qctecmdr
1712878e03 Merge "arm: defconfig: Enable I2C, SPS DMA and SPI BLSP configs" 2020-10-22 08:15:33 -07:00
qctecmdr
95657f408c Merge "usb: typec: Fix setting of invalid value of opmode" 2020-10-22 08:15:33 -07:00
qctecmdr
3c79e098e9 Merge "usb: dt-bindings: Remove target specific macro file" 2020-10-22 08:15:33 -07:00
qctecmdr
f4aa4355df Merge "mm: slub: update slab_alloc interface to capture slab stacks" 2020-10-22 08:15:33 -07:00
qctecmdr
6bd93187f4 Merge "mailbox: apcs-ipc: Add compatible string for mocaco and scuba" 2020-10-22 04:15:34 -07:00
qctecmdr
7a5dbe0098 Merge "usb: f_gsi: Don't set remote_wakeup_allowed to true by default" 2020-10-22 04:15:34 -07:00
qctecmdr
1deb1342d6 Merge "mmc: cqhci: eMMC JEDEC v5.2 crypto spec addition" 2020-10-22 04:15:34 -07:00
qctecmdr
dd78c0248f Merge "fsa4480: Avoid updating settings if unchanged" 2020-10-22 04:15:34 -07:00