On Mon, Jun 12, 2023 at 10:28:46PM +0300, Abel Vesa wrote: > Now that there is a new dedicated ICE driver, drop the ufs-qcom-ice and > use the new ICE api provided by the Qualcomm soc driver ice. The platforms > that already have ICE support will use the API as library since there will > not be a devicetree node, but instead they have reg range. In this case, > the of_qcom_ice_get will return an ICE instance created for the consumer's > device. But if there are platforms that do not have ice reg in the > consumer devicetree node and instead provide a dedicated ICE devicetree > node, the of_qcom_ice_get will look up the device based on qcom,ice > property and will get the ICE instance registered by the probe function > of the ice driver. > > The ICE clock is now handle by the new driver. This is done by enabling > it on the creation of the ICE instance and then enabling/disabling it on > UFS runtime resume/suspend. > > Signed-off-by: Abel Vesa <abel.vesa@xxxxxxxxxx> > --- > drivers/ufs/host/Kconfig | 2 +- > drivers/ufs/host/Makefile | 4 +- > drivers/ufs/host/ufs-qcom-ice.c | 244 -------------------------------- > drivers/ufs/host/ufs-qcom.c | 99 ++++++++++++- > drivers/ufs/host/ufs-qcom.h | 32 +---- > 5 files changed, 104 insertions(+), 277 deletions(-) > delete mode 100644 drivers/ufs/host/ufs-qcom-ice.c > > diff --git a/drivers/ufs/host/Kconfig b/drivers/ufs/host/Kconfig > index 8793e3433580..16624ba08050 100644 > --- a/drivers/ufs/host/Kconfig > +++ b/drivers/ufs/host/Kconfig > @@ -59,7 +59,7 @@ config SCSI_UFS_QCOM > depends on SCSI_UFSHCD_PLATFORM && ARCH_QCOM > depends on GENERIC_MSI_IRQ > depends on RESET_CONTROLLER > - select QCOM_SCM if SCSI_UFS_CRYPTO > + select QCOM_INLINE_CRYPTO_ENGINE if SCSI_UFS_CRYPTO > help > This selects the QCOM specific additions to UFSHCD platform driver. > UFS host on QCOM needs some vendor specific configuration before > diff --git a/drivers/ufs/host/Makefile b/drivers/ufs/host/Makefile > index d7c5bf7fa512..4573aead02eb 100644 > --- a/drivers/ufs/host/Makefile > +++ b/drivers/ufs/host/Makefile > @@ -3,9 +3,7 @@ > obj-$(CONFIG_SCSI_UFS_DWC_TC_PCI) += tc-dwc-g210-pci.o ufshcd-dwc.o tc-dwc-g210.o > obj-$(CONFIG_SCSI_UFS_DWC_TC_PLATFORM) += tc-dwc-g210-pltfrm.o ufshcd-dwc.o tc-dwc-g210.o > obj-$(CONFIG_SCSI_UFS_CDNS_PLATFORM) += cdns-pltfrm.o > -obj-$(CONFIG_SCSI_UFS_QCOM) += ufs_qcom.o > -ufs_qcom-y += ufs-qcom.o > -ufs_qcom-$(CONFIG_SCSI_UFS_CRYPTO) += ufs-qcom-ice.o > +obj-$(CONFIG_SCSI_UFS_QCOM) += ufs-qcom.o The change from ufs_qcom.o to ufs-qcom.o here makes ufs_qcom.ko turn into ufs-qcom.ko. That broke a (fragile :P ) initramfs development script I play with. Not sure if that's any sort of contract with userspace or not, but thought I'd report it at least in case someone has a strong opinion. Thanks, Andrew
