scsi: ufs: Put SCSI host after remove it
PATCH 1/2 scsi: ufs: Put SCSI host after remove it
In reply to a message not in the archiveIn ufshcd_remove(), after SCSI host is removed, put it once so that its resources can be released.
Signed-off-by Can Guo <[email protected]>
--- drivers/scsi/ufs/ufshcd.c | 1 + 1 file changed, 1 insertion(+)
drivers/scsi/ufs/ufshcd.c +1 -0
@@ -8251,6 +8251,7 @@ void ufshcd_remove(struct ufs_hba *hba)ufs_bsg_remove (hba);ufs_sysfs_remove_nodes (hba->dev);scsi_remove_host (hba->host); +scsi_host_put (hba->host);/* disable interrupts */ ufshcd_disable_intr (hba, hba->intr_mask);ufshcd_hba_stop (hba, true);
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
PATCH 2/2 scsi: ufs: Modulize ufs-bsg
In reply to a message not in the archiveIn order to improve the flexibility of ufs-bsg, modulizing it is a good choice. This change introduces tristate to ufs-bsg to allow users compile it as an external module.
Signed-off-by Can Guo <[email protected]>
--- drivers/scsi/ufs/Kconfig | 3 ++- drivers/scsi/ufs/Makefile | 2 +- drivers/scsi/ufs/ufs_bsg.c | 49 +++++++++++++++++++++++++++++++++++++++++++--- drivers/scsi/ufs/ufs_bsg.h | 8 -------- drivers/scsi/ufs/ufshcd.c | 36 ++++++++++++++++++++++++++++++---- drivers/scsi/ufs/ufshcd.h | 7 ++++++- 6 files changed, 87 insertions(+), 18 deletions(-)
drivers/scsi/ufs/Kconfig +2 -1
@@ -38,6 +38,7 @@ config SCSI_UFSHCD select PM_DEVFREQ select DEVFREQ_GOV_SIMPLE_ONDEMAND select NLS + select BLK_DEV_BSGLIB ---help--- This selects the support for UFS devices in Linux, say Y and make sure that you know the name of your UFS host adapter (the card
@@ -143,7 +144,7 @@ config SCSI_UFS_TI_J721E If unsure, say N. config SCSI_UFS_BSG - bool "Universal Flash Storage BSG device node" + tristate "Universal Flash Storage BSG device node" depends on SCSI_UFSHCD select BLK_DEV_BSGLIB help
drivers/scsi/ufs/Makefile +1 -1
@@ -6,7 +6,7 @@ obj-$(CONFIG_SCSI_UFS_CDNS_PLATFORM) += cdns-pltfrm.o obj-$(CONFIG_SCSI_UFS_QCOM) += ufs-qcom.o obj-$(CONFIG_SCSI_UFSHCD) += ufshcd-core.o ufshcd-core-y += ufshcd.o ufs-sysfs.o -ufshcd-core-$(CONFIG_SCSI_UFS_BSG) += ufs_bsg.o +obj-$(CONFIG_SCSI_UFS_BSG) += ufs_bsg.o obj-$(CONFIG_SCSI_UFSHCD_PCI) += ufshcd-pci.o obj-$(CONFIG_SCSI_UFSHCD_PLATFORM) += ufshcd-pltfrm.o obj-$(CONFIG_SCSI_UFS_HISI) += ufs-hisi.o
drivers/scsi/ufs/ufs_bsg.c +46 -3
85 lines not on this page · raw message
drivers/scsi/ufs/ufs_bsg.h +0 -8
@@ -12,12 +12,4 @@#include "ufshcd.h" #include "ufs.h" -#ifdef CONFIG_SCSI_UFS_BSG -void ufs_bsg_remove (struct ufs_hba *hba); -int ufs_bsg_probe (struct ufs_hba *hba); -#else -static inline void ufs_bsg_remove (struct ufs_hba *hba) {} -static inline int ufs_bsg_probe (struct ufs_hba *hba) {return 0 ; } -#endif -#endif /* UFS_BSG_H */
drivers/scsi/ufs/ufshcd.c +32 -4
@@ -108,6 +108,22 @@ 16, 4, buf, __len, false); \ }while (0 ) +static LIST_HEAD(ufs_hba_list); +static DEFINE_MUTEX (ufs_hba_list_lock); + +void ufshcd_get_hba_list_lock (struct list_head **list) +{ +mutex_lock (&ufs_hba_list_lock); + *list = &ufs_hba_list; +} +EXPORT_SYMBOL_GPL (ufshcd_get_hba_list_lock); + +void ufshcd_put_hba_list_unlock (void ) +{ +mutex_unlock (&ufs_hba_list_lock); +} +EXPORT_SYMBOL_GPL (ufshcd_put_hba_list_unlock); +int ufshcd_dump_regs (struct ufs_hba *hba,size_t offset,size_t len,const char *prefix) {
@@ -2093,6 +2109,7 @@ int ufshcd_send_uic_cmd(struct ufs_hba *hba, struct uic_command *uic_cmd)ufshcd_release (hba);return ret; } +EXPORT_SYMBOL_GPL (ufshcd_send_uic_cmd);/** * ufshcd_map_sg - Map scatter-gather list to prdt
@@ -6024,6 +6041,7 @@ int ufshcd_exec_raw_upiu_cmd(struct ufs_hba *hba,return err; } +EXPORT_SYMBOL_GPL (ufshcd_exec_raw_upiu_cmd);/** * ufshcd_eh_device_reset_handler - device reset handler registered to
@@ -7043,9 +7061,6 @@ static int ufshcd_probe_hba(struct ufs_hba *hba) } hba->clk_scaling.is_allowed = true; } - -ufs_bsg_probe (hba); -scsi_scan_host (hba->host);pm_runtime_put_sync (hba->dev); }
@@ -8248,7 +8263,16 @@ int ufshcd_shutdown(struct ufs_hba *hba)*/ void ufshcd_remove (struct ufs_hba *hba) { -ufs_bsg_remove (hba); +struct device *bsg_dev = hba->bsg_dev; + +mutex_lock (&ufs_hba_list_lock); +list_del (&hba->list); +if (hba->bsg_queue) { +bsg_remove_queue (hba->bsg_queue); +device_del (bsg_dev); +put_device (bsg_dev); + } +mutex_unlock (&ufs_hba_list_lock);ufs_sysfs_remove_nodes (hba->dev);scsi_remove_host (hba->host);scsi_host_put (hba->host);
@@ -8494,6 +8518,10 @@ int ufshcd_init(struct ufs_hba *hba, void __iomem *mmio_base, unsigned int irq)async_schedule (ufshcd_async_scan, hba);ufs_sysfs_add_nodes (hba->dev); +mutex_lock (&ufs_hba_list_lock); +list_add_tail (&hba->list, &ufs_hba_list); +mutex_unlock (&ufs_hba_list_lock); +return 0 ; out_remove_scsi_host:
drivers/scsi/ufs/ufshcd.h +6 -1
@@ -74,6 +74,9 @@struct ufs_hba ; +void ufshcd_get_hba_list_lock (struct list_head **list); +void ufshcd_put_hba_list_unlock (void ); +enum dev_cmd_type {DEV_CMD_TYPE_NOP =0x0 ,DEV_CMD_TYPE_QUERY =0x1 ,
@@ -473,6 +476,7 @@ struct ufs_stats {/** * struct ufs_hba - per adapter private structure +* @list: Anchored at ufs_hba_list * @mmio_base: UFSHCI base register address * @ucdl_base_addr: UFS Command Descriptor base address * @utrdl_base_addr: UTP Transfer Request Descriptor base address
@@ -527,6 +531,7 @@ struct ufs_stats {* @scsi_block_reqs_cnt: reference counting for scsi block requests */ struct ufs_hba { +struct list_head list;void __iomem *mmio_base;/* Virtual memory reference */
@@ -734,7 +739,7 @@ struct ufs_hba {struct ufs_desc_size desc_size;atomic_t scsi_block_reqs_cnt; -struct device bsg_dev; +struct device *bsg_dev;struct request_queue *bsg_queue; };
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project