Commit 8bb74d36 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Martin K. Petersen

scsi: hisi_sas: fix SATA dependency

Removing the 'select SCSI_SAS_LIBSAS' statement in Kconfig resulted in a
link failure in configurations that have hisi_sas built-in but libsas as
a loadable module:

drivers/scsi/built-in.o: In function `hisi_sas_scan_finished':
hisi_sas_main.c:(.text+0x37ce9): undefined reference to `sas_drain_work'
drivers/scsi/built-in.o: In function `hisi_sas_slave_configure':
hisi_sas_main.c:(.text+0x37d17): undefined reference to `sas_slave_configure'
hisi_sas_main.c:(.text+0x37d40): undefined reference to `sas_change_queue_depth'
drivers/scsi/built-in.o: In function `hisi_sas_remove':

All other libsas users have the 'select' statement, so we should do the
same here for consistency. For all I can tell, the patch that added the
sata softreset does not actually introduce a dependency on SCSI_SAS_ATA
but instead adds calls into libata itself, so we can express that with a
more specific dependency.

We cannot have 'select SCSI_SAS_LIBSAS; depends on SCSI_SAS_ATA' as that
would cause a dependency loop.

Fixes: 7c594f04 ("scsi: hisi_sas: add softreset function for SATA disk")
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Acked-by: default avatarJohn Garry <john.garry@huawei.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent d985c6ea
...@@ -2,7 +2,8 @@ config SCSI_HISI_SAS ...@@ -2,7 +2,8 @@ config SCSI_HISI_SAS
tristate "HiSilicon SAS" tristate "HiSilicon SAS"
depends on HAS_DMA && HAS_IOMEM depends on HAS_DMA && HAS_IOMEM
depends on ARM64 || COMPILE_TEST depends on ARM64 || COMPILE_TEST
depends on SCSI_SAS_ATA select SCSI_SAS_LIBSAS
select BLK_DEV_INTEGRITY select BLK_DEV_INTEGRITY
depends on ATA
help help
This driver supports HiSilicon's SAS HBA This driver supports HiSilicon's SAS HBA
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment