Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758940AbdCVINj (ORCPT ); Wed, 22 Mar 2017 04:13:39 -0400 Received: from mail-oi0-f68.google.com ([209.85.218.68]:32954 "EHLO mail-oi0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758913AbdCVIMp (ORCPT ); Wed, 22 Mar 2017 04:12:45 -0400 MIME-Version: 1.0 In-Reply-To: <79d9052f-c55b-b9a8-d5ae-a66b00c2f8e7@broadcom.com> References: <20170321131017.2207105-1-arnd@arndb.de> <2d13017a-0342-c22a-5944-991a4b21f053@broadcom.com> <79d9052f-c55b-b9a8-d5ae-a66b00c2f8e7@broadcom.com> From: Arnd Bergmann Date: Wed, 22 Mar 2017 09:12:43 +0100 X-Google-Sender-Auth: h33swVJvW1aH1RoSkFEUJipSUOU Message-ID: Subject: Re: [PATCH] scsi: lpfc: fix linking against modular NVMe support To: James Smart Cc: "James E.J. Bottomley" , "Martin K. Petersen" , Hannes Reinecke , Finn Thain , Johannes Thumshirn , James Smart , linux-scsi@vger.kernel.org, Linux Kernel Mailing List Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2850 Lines: 82 On Wed, Mar 22, 2017 at 3:25 AM, James Smart wrote: > > 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 ? > > 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) The build error I fixed was on yesterday's linux-next, which has the http://www.spinics.net/lists/linux-scsi/msg106102.html patch, this is the one I referenced as 7d7080335f8d ("scsi: lpfc: Finalize Kconfig options for nvme"). The earlier version from linux-next-20170310 (there was no linux-next last week) had the same bug but needed a different workaround: diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig index 4bf55b5d78be..52245eb83295 100644 --- a/drivers/scsi/Kconfig +++ b/drivers/scsi/Kconfig @@ -1256,12 +1256,14 @@ config SCSI_LPFC_DEBUG_FS config LPFC_NVME_INITIATOR bool "Emulex LightPulse Fibre Channel NVME Initiator Support" depends on SCSI_LPFC && NVME_FC + depends on SCSI_LPFC=m || NVME_FC=y ---help--- This enables NVME Initiator support in the Emulex lpfc driver. config LPFC_NVME_TARGET bool "Emulex LightPulse Fibre Channel NVME Initiator Support" depends on SCSI_LPFC && NVME_TARGET_FC + depends on SCSI_LPFC=m || NVME_TARGET_FC=y ---help--- This enables NVME Target support in the Emulex lpfc driver. Target enablement must still be enabled on a per adapter As a side-note, the patch introduces a slightly unusual construct using #if (IS_ENABLED(CONFIG_NVME_FC)). This can usually expressed in a more readable way like this: --- a/drivers/scsi/lpfc/lpfc_nvme.c +++ b/drivers/scsi/lpfc/lpfc_nvme.c @@ -2190,13 +2192,12 @@ lpfc_nvme_create_localport(struct lpfc_vport *vport) void lpfc_nvme_destroy_localport(struct lpfc_vport *vport) { -#if (IS_ENABLED(CONFIG_NVME_FC)) struct nvme_fc_local_port *localport; struct lpfc_nvme_lport *lport; struct lpfc_nvme_rport *rport = NULL, *rport_next = NULL; int ret; - if (vport->nvmei_support == 0) + if (!IS_ENABLED(CONFIG_NVME_FC) || vport->nvmei_support == 0) return; localport = vport->localport; @@ -2243,7 +2244,6 @@ lpfc_nvme_destroy_localport(struct lpfc_vport *vport) "Failed, status x%x\n", ret); } -#endif } void You could also use if(IS_REACHABLE()) here to work around the link error when CONFIG_NVME_FC=m, but that would make things a little more confusing for users as it is not immediately clear why it fails to work at runtime. Arnd