Revert "scsi: ufs-qcom-ice: add Inline Crypto Engine (ICE) support for UFS"
Subsystems (2)
PATCH 1/1 Revert "scsi: ufs-qcom-ice: add Inline Crypto Engine (ICE) support for UFS"
This reverts commit 54acb89a8d8682d99ee8594f9ce0dd863a2df80d.
Since ICE driver hasn't been uploaded to upstream, ICE support for UFS driver could not be functional at this time. Therefore this change should be reverted.
--- drivers/scsi/ufs/Kconfig | 12 - drivers/scsi/ufs/Makefile | 1 - drivers/scsi/ufs/ufs-qcom-ice.c | 520 ---------------------------------------- drivers/scsi/ufs/ufs-qcom-ice.h | 113 --------- drivers/scsi/ufs/ufs-qcom.c | 56 +---- drivers/scsi/ufs/ufs-qcom.h | 25 -- 6 files changed, 1 insertion(+), 726 deletions(-) delete mode 100644 drivers/scsi/ufs/ufs-qcom-ice.c delete mode 100644 drivers/scsi/ufs/ufs-qcom-ice.h
drivers/scsi/ufs/Kconfig +0 -12
@@ -83,15 +83,3 @@ config SCSI_UFS_QCOM Select this if you have UFS controller on QCOM chipset. If unsure, say N. - -config SCSI_UFS_QCOM_ICE - bool "QCOM specific hooks to Inline Crypto Engine for UFS driver" - depends on SCSI_UFS_QCOM && CRYPTO_DEV_QCOM_ICE - help - This selects the QCOM specific additions to support Inline Crypto - Engine (ICE). - ICE accelerates the crypto operations and maintains the high UFS - performance. - - Select this if you have ICE supported for UFS on QCOM chipset. - If unsure, say N.
drivers/scsi/ufs/Makefile +0 -1
@@ -1,6 +1,5 @@ # UFSHCD makefile obj-$(CONFIG_SCSI_UFS_QCOM) += ufs-qcom.o -obj-$(CONFIG_SCSI_UFS_QCOM_ICE) += ufs-qcom-ice.o obj-$(CONFIG_SCSI_UFSHCD) += ufshcd.o obj-$(CONFIG_SCSI_UFSHCD_PCI) += ufshcd-pci.o obj-$(CONFIG_SCSI_UFSHCD_PLATFORM) += ufshcd-pltfrm.o
drivers/scsi/ufs/ufs-qcom-ice.c deleted +0 -520
520 lines not on this page · raw message
drivers/scsi/ufs/ufs-qcom-ice.h deleted +0 -113
113 lines not on this page · raw message
drivers/scsi/ufs/ufs-qcom.c +1 -55
99 lines not on this page · raw message
drivers/scsi/ufs/ufs-qcom.h +0 -25
@@ -151,30 +151,6 @@ struct ufs_qcom_bus_vote {struct device_attribute max_bus_bw; }; -/** -* struct ufs_qcom_ice_data - ICE related information -* @vops: pointer to variant operations of ICE -* @async_done: completion for supporting ICE's driver asynchronous nature -* @pdev: pointer to the proper ICE platform device -* @state: UFS-ICE interface's internal state (see -* ufs-qcom-ice.h for possible internal states) -* @quirks: UFS-ICE interface related quirks -*/ -struct ufs_qcom_ice_data { -struct qcom_ice_variant_ops *vops; -struct completion async_done; -struct platform_device *pdev; -int state; - -/* -* If UFS host controller should handle cryptographic engine's -* errors, enables this quirk. -*/ -#define UFS_QCOM_ICE_QUIRK_HANDLE_CRYPTO_ENGINE_ERRORS UFS_BIT(0) - -u16 quirks; -}; -struct ufs_qcom_host {struct phy *generic_phy;struct ufs_hba *hba;
@@ -185,7 +161,6 @@ struct ufs_qcom_host {struct clk *rx_l1_sync_clk;struct clk *tx_l1_sync_clk;bool is_lane_clks_enabled; -struct ufs_qcom_ice_data ice; };#define ufs_qcom_is_link_off (hba) ufshcd_is_link_off(hba)
Signature · 1 line
1.8.5.2