Commit graph

810749 commits

Author SHA1 Message Date
qctecmdr
3d0a48c8be Merge "power: smb1398: Update the max-ilim current settings" 2020-04-26 04:01:43 -07:00
qctecmdr
ce6258af81 Merge "cnss2: Clear host driver ops if register driver gets killed" 2020-04-26 04:01:42 -07:00
qctecmdr
561cc65bbe Merge "msm: kgsl: Fix compilation issue for 32bit" 2020-04-26 04:01:42 -07:00
qctecmdr
5364f87177 Merge "clk: qcom: gpucc-scuba: Configure gpu_cc_gx_cxo_clk to be always-on" 2020-04-26 04:01:42 -07:00
qctecmdr
0153d71892 Merge "clk: qcom: debugcc-scuba: Update GCC debug mux parent list" 2020-04-26 04:01:41 -07:00
qctecmdr
891a60e626 Merge "adsprpc: Validate fds pointer before de-referencing it" 2020-04-26 04:01:41 -07:00
qctecmdr
bc44cb9b6d Merge "usb: dwc3: Add boundary check while traversing the TRB ring buffer" 2020-04-26 04:01:41 -07:00
qctecmdr
f6b3aa8de5 Merge "vmscan: Support multiple kswapd threads per node" 2020-04-26 04:01:40 -07:00
qctecmdr
8b0b9fb02d Merge "spi-geni-qcom: Add shared_ee dtsi property for spi driver" 2020-04-26 04:01:40 -07:00
qctecmdr
1577e26571 Merge "iommu: arm-smmu: Add atos self test" 2020-04-26 04:01:40 -07:00
qctecmdr
31353b3e11 Merge "cnss2: Add code to pick hang data offset based on deviceID" 2020-04-26 04:01:40 -07:00
Neeraj Soni
784e3ecf12 defconfig: Enable new file encryption framework
Following flags are needed to support block crypto based inline
encryption framework:
1. CONFIG_BLK_INLINE_ENCRYPTION=y.
2. CONFIG_SCSI_UFS_CRYPTO=y.
3. CONFIG_SCSI_UFS_CRYPTO_QTI=y.
4. CONFIG_DM_DEFAULT_KEY=y.
5. CONFIG_MMC_CQHCI_CRYPTO=y.
6. CONFIG_MMC_CQHCI_CRYPTO_QTI=y.
7. CONFIG_QTI_CRYPTO_COMMON=y.
8. CONFIG_QTI_CRYPTO_TZ=y.
9. CONFIG_FS_ENCRYPTION_INLINE_CRYPT=y.

Change-Id: Ia583c514b51e6fa66a9d1c5bda9610e5646ce61a
Signed-off-by: Neeraj Soni <neersoni@codeaurora.org>
2020-04-24 15:24:19 -07:00
Neeraj Soni
8a9f52cf23 dm: Support legacy on disk format in dm-default-key
Version 1.0.0 did not add iv_offset to dun and did not mandate
sector size. This resulted in different on disk data format
compared to what version 2.1.0 will support. To support OTA upgrades with
legacy data format, adapt the sector size and iv_offset if legacy
encryption algorithm is used.

Change-Id: I3b7a0279bcb98c3cba9dec3f572c12d618fdc816
Signed-off-by: Neeraj Soni <neersoni@codeaurora.org>
2020-04-24 15:24:18 -07:00
Neeraj Soni
ccf8d65680 fscrypt: support legacy inline crypto mode
Add support for legacy inline crypto mode in new v2 FBE
framework to make on disk data format compatible
to new v2 framework.

Change-Id: I3c1384604ee8e022db151299850b0dc330b6a17d
Signed-off-by: Neeraj Soni <neersoni@codeaurora.org>
2020-04-24 15:24:17 -07:00
Neeraj Soni
8dddfe0053 mmc: host Fix the offset for ICE address
ICE address space was added to command queue address
space in eMMC JEDEC v5.2 spec so adapt the offset of
crypto registers accordingly.

Change-Id: I4740b2afa37d7dfb6ea0e4280b88dc0bdff9ca87
Signed-off-by: Neeraj Soni <neersoni@codeaurora.org>
2020-04-24 15:24:15 -07:00
Neeraj Soni
d2be354ea5 mmc: host: Add variant ops for cqhci crypto
QTI implementation for block keyslot manager and
crypto vops for crypto support in CQHCI.

Change-Id: I9b64f85ca97c269a6ecd6fde2bb693745d4c43d4
Signed-off-by: Neeraj Soni <neersoni@codeaurora.org>
2020-04-24 15:24:13 -07:00
Neeraj Soni
72f3d6b134 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.

Change-Id: I6860cd29d6f044f559385d438048b850faf9a8be
Signed-off-by: Neeraj Soni <neersoni@codeaurora.org>
2020-04-24 15:24:12 -07:00
Neeraj Soni
d442e7acba 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.

Change-Id: I72b85d572d7c76b966e34b80e7e8eca83a2bb35f
Signed-off-by: Neeraj Soni <neersoni@codeaurora.org>
2020-04-24 15:24:11 -07:00
Neeraj Soni
0cee057a9d mmc: cqhci: eMMC JEDEC v5.2 crypto spec addition
Add crypto capability registers and structs defined in v5.2 of
JEDEC eMMC specification in prepration to add support for inline
encryption to eMMC controllers.

Change-Id: I8a42be348ca06cffbe841e590c4348990c9d7a08
Signed-off-by: Neeraj Soni <neersoni@codeaurora.org>
2020-04-24 15:24:10 -07:00
Pradeep P V K
82652c55e0 mmc: host: Use request queue pointer for mmc crypto
To use block crypto based inline encryption mechanism
storage device driver should create a keyslot manager
and register it with device request queue. To achieve this
pass request queue pointer during host controller initialization
where request queue can be updated with keyslot manager.

Change-Id: I71f0005a1ad8867b6210e92878b8c112d436688e
Signed-off-by: Pradeep P V K <ppvk@codeaurora.org>
2020-04-24 15:24:09 -07:00
Gaurav Kashyap
1685c847c6 Variant ops for UFS crypto and new crypto lib
Add QTI implementation for variant ops required for inline
encryption with wrapped key support. These include UFS
crypto ops and KSM ops. Also add crypto common library to cater
to different key programing mechanisms.

Change-Id: Ica930a8a806a78d4c2d074639cbed355b895a459
Signed-off-by: Gaurav Kashyap <gaurkash@codeaurora.org>
Signed-off-by: Neeraj Soni <neersoni@codeaurora.org>
2020-04-24 15:24:08 -07:00
Blagovest Kolenichev
5ab849bce4 Merge 'File and metadata encryption changes from android-4.19.96-107' into msm-4.19
This brings fs/crypto and block/crypto support changes and fixes for new
FBE framework to work with inline encryption hardware. Also it enables
dm-default-key driver and wrapped key support changes for metadata encryption.

Conflicts:
	block/blk-merge.c
	drivers/scsi/ufs/ufshcd.h
	fs/ext4/inode.c

Change-Id: Id9349c76c5deb6dabc365bc85d0431ac6c0966fe
Signed-off-by: Neeraj Soni <neersoni@codeaurora.org>
Signed-off-by: Blagovest Kolenichev <bkolenichev@codeaurora.org>
2020-04-24 15:22:03 -07:00
Blagovest Kolenichev
f1598eab74 Merge crypto changes from android-4.19.79-95 into msm-4.19
Conflicts:
	block/blk-merge.c
	drivers/scsi/ufs/ufs-qcom.c
	drivers/scsi/ufs/ufshcd.c
	drivers/scsi/ufs/ufshcd.h
	fs/ext4/inode.c
	fs/f2fs/data.c
	include/linux/fscrypt.h

Change-Id: Id3b033dbc5886ddb83f235ff80e19755d2b962e2
Signed-off-by: Blagovest Kolenichev <bkolenichev@codeaurora.org>
Signed-off-by: Neeraj Soni <neersoni@codeaurora.org>
2020-04-24 15:21:22 -07:00
Gaurav Kashyap
80fb628d55 Revert existing FBE changes for ICE FBE
Revert existing FBE kernel changes for ICE upstream.
Revert UFS qcom specific ice changes.
Revert all sdhci related ICE changes formatted.
defconfig: Remove old FBE/ICE defconfigs.

Change-Id: I4d77927b6373b3bb3edfe3b060d1de272a54a426
Signed-off-by: Gaurav Kashyap <gaurkash@codeaurora.org>
Signed-off-by: Neeraj Soni <neersoni@codeaurora.org>
2020-04-24 15:19:09 -07:00
Yue Ma
778eea249e cnss2: Clear host driver ops if register driver gets killed
Avoid any host driver ops access after register driver gets killed
by marking it as NULL.

Change-Id: Idd268d5d8d31569c4272fde566866c4d79bc1cad
Signed-off-by: Yue Ma <yuem@codeaurora.org>
2020-04-24 15:14:16 -07:00
Mohammed Siddiq
8a08533b6f cnss2: Add code to pick hang data offset based on deviceID
Add code to pick hang data offset based on deviceID.

Change-Id: I865fc90ea558d2626672b51c5cecadfdf93358b3
Signed-off-by: Mohammed Siddiq <msiddiq@codeaurora.org>
2020-04-24 22:44:00 +05:30
Udipto Goswami
1fddf36d00 usb: f_qdss: Fix watchdog bark issue on wait_for_completion
The coresight driver is freeing up d_req as part of notify
from write_complete. Accessing write_done form qdss_close,
wait_for_completion will be stuck there causing watchdog
bark.

Fix this by making f_qdss independent of coresight & bridge
driver from initializing complete. Initialization of
completion now occurs from alloc_req.

Change-Id: Ie6b1cd445ed6bb38c1a555f6c4c41068090e4fac
Signed-off-by: Udipto Goswami <ugoswami@codeaurora.org>
2020-04-24 20:01:51 +05:30
Prudhvi Yarlagadda
072f1aabae spi-geni-qcom: Add shared_ee dtsi property for spi driver
When shared_ee dtsi flag is set then don't depend on the
shared_se checks in prepare/unprepare transfer
hardware and runtime resume/suspend APIs of spi driver. Also
use runtime resume/suspend calls from prepare/unprepare
message so that dual EE use case for spi will not be effected.

This change is to help in the cases where spi can be used
from secure and non-secure use cases. Spi framework
calls unprepare transfer hardware from a kthread after the
spi_pump_message call is completed and by that time spi driver
might be getting used from a secure use case and at the same time
unprepare transfer hardware is selecting the pinctrl to sleep state.

Change-Id: Ic8ea126ca5cddd3ca45c080a39841dd6ec1f6760
Signed-off-by: Prudhvi Yarlagadda <pyarlaga@codeaurora.org>
2020-04-24 06:35:53 -07:00
Udipto Goswami
165216c7a9 usb: f_qdss: Remove QDSS read functionality as not in use
Removing the APIs related to ctrl_read since those are
not used by any client of f_qdss.

Change-Id: Idf7f1ffd8afe8a72f83e036a7986d35f2f71bea8
Signed-off-by: Udipto Goswami <ugoswami@codeaurora.org>
2020-04-24 17:29:16 +05:30
qctecmdr
e5d467d756 Merge "usb: qusb: Fix incorrect charger detection by HS PHY on bootup" 2020-04-24 04:44:22 -07:00
Manoj Prabhu B
9bee2c96c5 diag: Configure diag over STM for APPS by HW ACCEL command
Extend support to configure diag over STM using HW ACCEL command
for APPS.

Change-Id: Ifd9bf9867e910e9df4e1b6bddd94012c82f2be4f
Signed-off-by: Manoj Prabhu B <bmanoj@codeaurora.org>
2020-04-24 12:34:43 +05:30
Kiran Gunda
d9ac20b30f power: smb1398: Update the max-ilim current settings
Update the max current limit configuration as per the
hardware capability.

	- max-lim for master only config - 5A
	- max-ilim for master and slave config - 10A

While at it, update the min-ilim setting to 750mA as per
the hardware recommendation.

Change-Id: I08793aafd0b416a597c3b51afff4ef624129f731
Signed-off-by: Kiran Gunda <kgunda@codeaurora.org>
2020-04-24 12:03:44 +05:30
Sriharsha Allenki
c08760a6ad usb: qusb: Fix incorrect charger detection by HS PHY on bootup
The need for the core to be brought out of low power mode
and put it back in low power mode during the boot up
to ensure that the core is in a proper known state is
interfering with the charger detection sequence of the
HS PHY.

Normally on platforms where the PMIC charger does the
charger detection this was prevented with the dpdm
regulator is_enabled check. But on platforms where the
USB HS PHY does the charger detection, the PMIC does not
enable the DPDM regulator, so the glue driver goes ahead
and put the core in known low power state.

Fix this by setting the dpdm_enable to true when the
charger detection sequence is started and clear the
dpdm_enable and notify the DISABLE_EVENT to glue driver
after the charger detection is done.

Change-Id: Ic7e2ec54b483b925797a72270831808fcb2c8bcd
Signed-off-by: Sriharsha Allenki <sallenki@codeaurora.org>
2020-04-24 12:01:29 +05:30
Archana Sriram
a4a3694611 msm: kgsl: Fix compilation issue for 32bit
Include cacheflush.h header to fix 32bit
compilation failure.

Change-Id: I1121485491551373eefa9714ac0f25df4b004d9c
Signed-off-by: Archana Sriram <apsrir@codeaurora.org>
2020-04-24 10:58:04 +05:30
Prakash Gupta
f8f4ed550e iommu: arm-smmu: Add atos self test
Add atos self test to perform atos for different sids. To enable,
set CONFIG_ARM_SMMU_SELFTEST and arm_smmu.selftest=1 and set the
sids and masks in arm_smmu.selftestsids in the below format
smmu_name,no_of_sids,sid:mask.

for eg: arm_smmu.selftestsids=kgsl,0x1,0x7:0x400,apps,0x2,
	0x1:0x0,0x51f:0x0

Change-Id: I74134ed712e06a17b1570256e2ee3820df2f4457
Signed-off-by: Charan Teja Reddy <charante@codeaurora.org>
Signed-off-by: Prakash Gupta <guptap@codeaurora.org>
Signed-off-by: Vijayanand Jitta <vjitta@codeaurora.org>
2020-04-24 09:54:37 +05:30
qctecmdr
b7cbb1aa77 Merge "mfd: qcom-i2c-pmic: Toggle STAT pin at init" 2020-04-23 20:40:59 -07:00
qctecmdr
ab1d562c25 Merge "input: touchscreen: nt36xxx: Disable WAKEUP_GESTURE" 2020-04-23 20:40:58 -07:00
qctecmdr
8730849010 Merge "icnss2: Add platform driver code for QDSS on moselle" 2020-04-23 20:40:57 -07:00
qctecmdr
efe6d111d2 Merge "i3c: i3c-master-qcom-geni: Support for 3.4 Mhz,400 Khz" 2020-04-23 10:28:18 -07:00
qctecmdr
c113e78bb4 Merge "qcom/l2cache_counters: Enable event creation for any cluster" 2020-04-23 10:28:17 -07:00
qctecmdr
a8d96598d8 Merge "msm: kgsl: Set gmu fault inside gmu_snapshot" 2020-04-23 10:28:17 -07:00
Ravikishore Pampana
a3ef577205 dt-bindings: msm: Add bindings isp and pxl path feature ids
Define isp hw and isp hw pix path feature ids. This feature
information used for some target skus to check the particular
isp hw instance supported or not during the probe time.
Define feature type disable or enable. Some features are enable
type, If bit is set in the fuse register means feature is enabled.
Some features are disabled type,  If bit is set in the fuse
register means feature is disabled.

Change-Id: Ib1c4df6326859ba9b5c8700337a9b9a24b300fb1
Signed-off-by: Ravikishore Pampana <rpampana@codeaurora.org>
2020-04-23 19:15:36 +05:30
Mukesh Ojha
21e8c73ceb qcom/l2cache_counters: Enable event creation for any cluster
If all the cpu's in a cluster are offline, pmu events are not
getting created for offline/inactive cluster. As the counter
registers are memory mapped, pmu event enable/read for
offline/inactive cluster, should be allowed from an online
cpu in online/active cluster. Once a cpu comes back online
from offline/inactive cluster, migrate cluster pmu events.

Change-Id: I653b15f44ecf98be54da272c350e28e769c0a24e
Signed-off-by: Mukesh Ojha <mojha@codeaurora.org>
2020-04-23 02:53:22 -07:00
Srinivasarao P
158b3cd1d7 Makefile: Suppress few warnings with clang
Enable -Wno-unsequenced option to suppress these warnings on clang
compilation.

Change-Id: Ib6c81b4d489ccc1715e1f0d23833b8463a39f834
Signed-off-by: Srinivasarao P <spathi@codeaurora.org>
[snaseem@codeaurora.org: Resolve trivial merge conflict.]
Signed-off-by: Shadab Naseem <snaseem@codeaurora.org>
2020-04-23 14:13:28 +05:30
Swetha Chikkaboraiah
b24755bf45 arm64: Add config option for sdm660
Add option ARCH_SDM660 to enable compilation for SDM660
target.

Change-Id: Icfa0131e873d644d18b1dfbb6fec81e1b9009834
Signed-off-by: Swetha Chikkaboraiah <schikk@codeaurora.org>
2020-04-22 23:47:34 -07:00
Swetha Chikkaboraiah
476cb68dc9 soc: qcom: socinfo: Add soc information for SDM660
Add socinfo support for SDM660 SoC and update the
bindings for the same.

Change-Id: Ieed54fda37e88192809b0d63da049802538c1997
Signed-off-by: Swetha Chikkaboraiah <schikk@codeaurora.org>
2020-04-22 23:43:54 -07:00
qctecmdr
b4adb10331 Merge "Revert "defconfig: enable framebuffer console for kona"" 2020-04-22 22:25:53 -07:00
qctecmdr
5b197f2122 Merge "usb: xhci: Fix NULL pointer dereference as part of queue" 2020-04-22 22:25:53 -07:00
qctecmdr
03eb7985fd Merge "cnss2: Add SRAM dump in pci dump collection" 2020-04-22 22:25:52 -07:00
qctecmdr
d7c445c448 Merge "coresight: tmc-etr: fix etr smmu unmap issue" 2020-04-22 22:25:52 -07:00