From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754028AbdC1OXN (ORCPT ); Tue, 28 Mar 2017 10:23:13 -0400 Received: from mout.kundenserver.de ([212.227.17.13]:52990 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752869AbdC1OXL (ORCPT ); Tue, 28 Mar 2017 10:23:11 -0400 From: Arnd Bergmann To: John Garry , "James E.J. Bottomley" , "Martin K. Petersen" Cc: Arnd Bergmann , Xiang Chen , linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] scsi: hisi_sas: fix SATA dependency Date: Tue, 28 Mar 2017 16:22:03 +0200 Message-Id: <20170328142212.1816773-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:XVOlfdnf/eOVGk6i8OFr8Jk9neWcFTc0j3ypDXwzyPNb7v7qoqX UpfJLCiDWMxShLfN/+HwPxQ+JMIGW2ceZ7ABAt3ERZH97cYFIWWS2gOx2U6j+KNUtjadgzt ZZSWIOqv1byckJTWbTomrwEqsTrx0DSfvYRQ4wmyrWzoATkl1qBIzsIQu3UOHmFBCkayqTv p8yaCd1DeZWyEQZOI7+wQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:uC+nZHed/oM=:RqpBKjz9PvdpDFE/Qo4A/c QeYZU+BSndhCJ8I+KAgGQ6yRbwEBiO/cbpH+4ovw8KGQK+2TigtVwPoX8XjETaINS4OeoNSdd wXsoAvEDsBsYVSvgMyX+ZByKokNFOPw7Tp6ByeUEGm0Uh2ihpHQN7BKhL9BUo6FfGFDP7U7Fj c9xzi7fq87SRnMoJm9Nd3veZ4oE6fTjVpiGmyYca2Bap55pPdUI3b77TjEax4fh1bnkiiJiBS JkREFMUiDXxNd9zGlxFw81swIz12IcK0UrfK9Hk2G56/Zpw9zvYBvqNuU9aj5eZocwdGWqBeU T6nwTsgeIOl2S+3UCI11jVyq34Eb/p/8aGSX7//ivve45/PwbMq9rr2WXekjLkeP8KWQ3NlLu Ebo7vRYNK894+93WnsHmp1eEs927rXXyStRcjJCNv9+OnjfwnOhtPam5qY24ZG8TyENMi4OuF VE8WClljEtR9irH3Om38Zz4oqQ7/iF2UZfBkfvLx9v9BhBdv2vpG46Z7vg/4xYgPv9E3Bfdyv kaBwmkfGSGjHFGilL1wPXgQhzmTHjuYEc1hq/UeY1lAS5u87XmTbv2SA1ZJgzAgfZ/Xn8Grlv ib+9eSg5SnwGdInAxYI5Qxxu1muzCAJMmwOQ81pgfkxtDIwOwse8cogAdLLIPcsOtFpQjGQsa zOa7Lgh6yypZ9mwIfcRNXZhJDkPpzykbLzvFRTy+hx7bCaVe0aSzKuzyvj4vfn279fxI= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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: 7c594f0407de ("scsi: hisi_sas: add softreset function for SATA disk") Signed-off-by: Arnd Bergmann --- drivers/scsi/hisi_sas/Kconfig | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/scsi/hisi_sas/Kconfig b/drivers/scsi/hisi_sas/Kconfig index ded2c201071d..374a329b91fc 100644 --- a/drivers/scsi/hisi_sas/Kconfig +++ b/drivers/scsi/hisi_sas/Kconfig @@ -2,7 +2,8 @@ config SCSI_HISI_SAS tristate "HiSilicon SAS" depends on HAS_DMA && HAS_IOMEM depends on ARM64 || COMPILE_TEST - depends on SCSI_SAS_ATA + select SCSI_SAS_LIBSAS select BLK_DEV_INTEGRITY + depends on ATA help This driver supports HiSilicon's SAS HBA -- 2.9.0