diff mbox

scsi: lpfc: fix linking against modular NVMe support

Message ID 20170321131017.2207105-1-arnd@arndb.de (mailing list archive)
State Changes Requested, archived
Headers show

Commit Message

Arnd Bergmann March 21, 2017, 1:09 p.m. UTC
When LPFC is built-in but NVMe is a loadable module, we fail to
link the kernel:

drivers/scsi/built-in.o: In function `lpfc_nvme_create_localport':
(.text+0x156a82): undefined reference to `nvme_fc_register_localport'
drivers/scsi/built-in.o: In function `lpfc_nvme_destroy_localport':
(.text+0x156eaa): undefined reference to `nvme_fc_unregister_remoteport'

We can avoid this either by forcing lpfc to be a module, or by disabling
NVMe support in this case. This implements the former.

Fixes: 7d7080335f8d ("scsi: lpfc: Finalize Kconfig options for nvme")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
 drivers/scsi/Kconfig | 2 ++
 1 file changed, 2 insertions(+)

Comments

James Smart March 22, 2017, 2:23 a.m. UTC | #1
Arnd,

All of the build issues, including building as modules, should have been 
resolved by the following patch:
http://www.spinics.net/lists/linux-scsi/msg106102.html

Am I missing something ?

-- james


On 3/21/2017 6:09 AM, Arnd Bergmann wrote:
> When LPFC is built-in but NVMe is a loadable module, we fail to
> link the kernel:
>
> drivers/scsi/built-in.o: In function `lpfc_nvme_create_localport':
> (.text+0x156a82): undefined reference to `nvme_fc_register_localport'
> drivers/scsi/built-in.o: In function `lpfc_nvme_destroy_localport':
> (.text+0x156eaa): undefined reference to `nvme_fc_unregister_remoteport'
>
> We can avoid this either by forcing lpfc to be a module, or by disabling
> NVMe support in this case. This implements the former.
>
> Fixes: 7d7080335f8d ("scsi: lpfc: Finalize Kconfig options for nvme")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---
>   drivers/scsi/Kconfig | 2 ++
>   1 file changed, 2 insertions(+)
>
> diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
> index 3c52867dfe28..d145e0d90227 100644
> --- a/drivers/scsi/Kconfig
> +++ b/drivers/scsi/Kconfig
> @@ -1241,6 +1241,8 @@ config SCSI_LPFC
>   	tristate "Emulex LightPulse Fibre Channel Support"
>   	depends on PCI && SCSI
>   	depends on SCSI_FC_ATTRS
> +	depends on NVME_TARGET_FC || NVME_TARGET_FC=n
> +	depends on NVME_FC || NVME_FC=n
>   	select CRC_T10DIF
>   	---help---
>             This lpfc driver supports the Emulex LightPulse
James Smart March 22, 2017, 2:25 a.m. UTC | #2
Note: the patch I referenced 
(http://www.spinics.net/lists/linux-scsi/msg106102.html) replaced the 
one I think you referenced below 
(http://www.spinics.net/lists/linux-scsi/msg106024.html)

-- james


On 3/21/2017 7:23 PM, James Smart wrote:
> Arnd,
>
> All of the build issues, including building as modules, should have 
> been resolved by the following patch:
> http://www.spinics.net/lists/linux-scsi/msg106102.html
>
> Am I missing something ?
>
> -- james
>
>
> On 3/21/2017 6:09 AM, Arnd Bergmann wrote:
>> When LPFC is built-in but NVMe is a loadable module, we fail to
>> link the kernel:
>>
>> drivers/scsi/built-in.o: In function `lpfc_nvme_create_localport':
>> (.text+0x156a82): undefined reference to `nvme_fc_register_localport'
>> drivers/scsi/built-in.o: In function `lpfc_nvme_destroy_localport':
>> (.text+0x156eaa): undefined reference to `nvme_fc_unregister_remoteport'
>>
>> We can avoid this either by forcing lpfc to be a module, or by disabling
>> NVMe support in this case. This implements the former.
>>
>> Fixes: 7d7080335f8d ("scsi: lpfc: Finalize Kconfig options for nvme")
>> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
>> ---
>>   drivers/scsi/Kconfig | 2 ++
>>   1 file changed, 2 insertions(+)
>>
>> diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
>> index 3c52867dfe28..d145e0d90227 100644
>> --- a/drivers/scsi/Kconfig
>> +++ b/drivers/scsi/Kconfig
>> @@ -1241,6 +1241,8 @@ config SCSI_LPFC
>>       tristate "Emulex LightPulse Fibre Channel Support"
>>       depends on PCI && SCSI
>>       depends on SCSI_FC_ATTRS
>> +    depends on NVME_TARGET_FC || NVME_TARGET_FC=n
>> +    depends on NVME_FC || NVME_FC=n
>>       select CRC_T10DIF
>>       ---help---
>>             This lpfc driver supports the Emulex LightPulse
>
diff mbox

Patch

diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
index 3c52867dfe28..d145e0d90227 100644
--- a/drivers/scsi/Kconfig
+++ b/drivers/scsi/Kconfig
@@ -1241,6 +1241,8 @@  config SCSI_LPFC
 	tristate "Emulex LightPulse Fibre Channel Support"
 	depends on PCI && SCSI
 	depends on SCSI_FC_ATTRS
+	depends on NVME_TARGET_FC || NVME_TARGET_FC=n
+	depends on NVME_FC || NVME_FC=n
 	select CRC_T10DIF
 	---help---
           This lpfc driver supports the Emulex LightPulse