public inbox for linux-scsi@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH] scsi: SCSI_ISCI needs to select SCSI_SAS_HOST_SMP, fixes build error
@ 2011-09-23 22:43 Randy Dunlap
  2011-09-23 23:43 ` Dan Williams
  0 siblings, 1 reply; 3+ messages in thread
From: Randy Dunlap @ 2011-09-23 22:43 UTC (permalink / raw)
  To: scsi; +Cc: JBottomley, Andrew Morton, intel-linux-scu, Linus Torvalds

From: Randy Dunlap <rdunlap@xenotime.net>

SCSI_ISCI needs to select SCSI_SAS_HOST_SMP to ensure that all
needed symbols are available to it.

Fixes this build error:
ERROR: "try_test_sas_gpio_gp_bit" [drivers/scsi/isci/isci.ko] undefined!

Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
---
 drivers/scsi/Kconfig |    1 +
 1 file changed, 1 insertion(+)

Found in linux-next, but also applies to mainline.

--- next-2011-0923.orig/drivers/scsi/Kconfig
+++ next-2011-0923/drivers/scsi/Kconfig
@@ -847,6 +847,7 @@ config SCSI_ISCI
 	# (temporary): known alpha quality driver
 	depends on EXPERIMENTAL
 	select SCSI_SAS_LIBSAS
+	select SCSI_SAS_HOST_SMP
 	---help---
 	  This driver supports the 6Gb/s SAS capabilities of the storage
 	  control unit found in the Intel(R) C600 series chipset.

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] scsi: SCSI_ISCI needs to select SCSI_SAS_HOST_SMP, fixes build error
  2011-09-23 22:43 [PATCH] scsi: SCSI_ISCI needs to select SCSI_SAS_HOST_SMP, fixes build error Randy Dunlap
@ 2011-09-23 23:43 ` Dan Williams
  2011-09-24  0:23   ` Randy Dunlap
  0 siblings, 1 reply; 3+ messages in thread
From: Dan Williams @ 2011-09-23 23:43 UTC (permalink / raw)
  To: Randy Dunlap
  Cc: scsi, JBottomley, Andrew Morton, intel-linux-scu, Linus Torvalds

[-- Attachment #1: Type: text/plain, Size: 1620 bytes --]

On Fri, Sep 23, 2011 at 3:43 PM, Randy Dunlap <rdunlap@xenotime.net> wrote:
> From: Randy Dunlap <rdunlap@xenotime.net>
>
> SCSI_ISCI needs to select SCSI_SAS_HOST_SMP to ensure that all
> needed symbols are available to it.
>
> Fixes this build error:
> ERROR: "try_test_sas_gpio_gp_bit" [drivers/scsi/isci/isci.ko] undefined!
>
> Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>

Thanks Randy!

Here's a replacement patch (also attached), that just stubs out that
routine in the !SCSI_SAS_HOST_SMP case.

>From 645ea60066251c2728197bf7a1048d885626936f Mon Sep 17 00:00:00 2001
From: Dan Williams <dan.j.williams@intel.com>
Date: Fri, 23 Sep 2011 16:28:53 -0700
Subject: [PATCH] libsas: fix try_test_sas_gpio_gp_bit() build error

If the user has disabled CONFIG_SCSI_SAS_HOST_SMP then libsas drivers
will not be receiving smp-gpio frames and do not need this lookup code.

Reported-by: Randy Dunlap <rdunlap@xenotime.net>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
---
 include/scsi/libsas.h |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/include/scsi/libsas.h b/include/scsi/libsas.h
index 44f5634..0d78bfa 100644
--- a/include/scsi/libsas.h
+++ b/include/scsi/libsas.h
@@ -407,7 +407,14 @@ static inline unsigned int to_sas_gpio_od(int
device, int bit)
 	return 3 * device + bit;
 }

+#ifdef CONFIG_SCSI_SAS_HOST_SMP
 int try_test_sas_gpio_gp_bit(unsigned int od, u8 *data, u8 index, u8 count);
+#else
+static inline int try_test_sas_gpio_gp_bit(unsigned int od, u8 *data,
u8 index, u8 count)
+{
+	return -1;
+}
+#endif

 /* ---------- Tasks ---------- */
 /*
-- 
1.7.6

[-- Attachment #2: 0001-libsas-fix-try_test_sas_gpio_gp_bit-build-error.patch --]
[-- Type: application/octet-stream, Size: 1113 bytes --]

From 645ea60066251c2728197bf7a1048d885626936f Mon Sep 17 00:00:00 2001
From: Dan Williams <dan.j.williams@intel.com>
Date: Fri, 23 Sep 2011 16:28:53 -0700
Subject: [PATCH] libsas: fix try_test_sas_gpio_gp_bit() build error

If the user has disabled CONFIG_SCSI_SAS_HOST_SMP then libsas drivers
will not be receiving smp-gpio frames and do not need this lookup code.

Reported-by: Randy Dunlap <rdunlap@xenotime.net>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
---
 include/scsi/libsas.h |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/include/scsi/libsas.h b/include/scsi/libsas.h
index 44f5634..0d78bfa 100644
--- a/include/scsi/libsas.h
+++ b/include/scsi/libsas.h
@@ -407,7 +407,14 @@ static inline unsigned int to_sas_gpio_od(int device, int bit)
 	return 3 * device + bit;
 }
 
+#ifdef CONFIG_SCSI_SAS_HOST_SMP
 int try_test_sas_gpio_gp_bit(unsigned int od, u8 *data, u8 index, u8 count);
+#else
+static inline int try_test_sas_gpio_gp_bit(unsigned int od, u8 *data, u8 index, u8 count)
+{
+	return -1;
+}
+#endif
 
 /* ---------- Tasks ---------- */
 /*
-- 
1.7.6


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [PATCH] scsi: SCSI_ISCI needs to select SCSI_SAS_HOST_SMP, fixes build error
  2011-09-23 23:43 ` Dan Williams
@ 2011-09-24  0:23   ` Randy Dunlap
  0 siblings, 0 replies; 3+ messages in thread
From: Randy Dunlap @ 2011-09-24  0:23 UTC (permalink / raw)
  To: Dan Williams
  Cc: scsi, JBottomley, Andrew Morton, intel-linux-scu, Linus Torvalds

On 09/23/2011 04:43 PM, Dan Williams wrote:
> On Fri, Sep 23, 2011 at 3:43 PM, Randy Dunlap <rdunlap@xenotime.net> wrote:
>> From: Randy Dunlap <rdunlap@xenotime.net>
>>
>> SCSI_ISCI needs to select SCSI_SAS_HOST_SMP to ensure that all
>> needed symbols are available to it.
>>
>> Fixes this build error:
>> ERROR: "try_test_sas_gpio_gp_bit" [drivers/scsi/isci/isci.ko] undefined!
>>
>> Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
> 
> Thanks Randy!
> 
> Here's a replacement patch (also attached), that just stubs out that
> routine in the !SCSI_SAS_HOST_SMP case.

Yes, that works too.

Acked-by: Randy Dunlap <rdunlap@xenotime.net>

Thanks.

> From 645ea60066251c2728197bf7a1048d885626936f Mon Sep 17 00:00:00 2001
> From: Dan Williams <dan.j.williams@intel.com>
> Date: Fri, 23 Sep 2011 16:28:53 -0700
> Subject: [PATCH] libsas: fix try_test_sas_gpio_gp_bit() build error
> 
> If the user has disabled CONFIG_SCSI_SAS_HOST_SMP then libsas drivers
> will not be receiving smp-gpio frames and do not need this lookup code.
> 
> Reported-by: Randy Dunlap <rdunlap@xenotime.net>
> Signed-off-by: Dan Williams <dan.j.williams@intel.com>
> ---
>  include/scsi/libsas.h |    7 +++++++
>  1 files changed, 7 insertions(+), 0 deletions(-)
> 
> diff --git a/include/scsi/libsas.h b/include/scsi/libsas.h
> index 44f5634..0d78bfa 100644
> --- a/include/scsi/libsas.h
> +++ b/include/scsi/libsas.h
> @@ -407,7 +407,14 @@ static inline unsigned int to_sas_gpio_od(int
> device, int bit)
>  	return 3 * device + bit;
>  }
> 
> +#ifdef CONFIG_SCSI_SAS_HOST_SMP
>  int try_test_sas_gpio_gp_bit(unsigned int od, u8 *data, u8 index, u8 count);
> +#else
> +static inline int try_test_sas_gpio_gp_bit(unsigned int od, u8 *data,
> u8 index, u8 count)
> +{
> +	return -1;
> +}
> +#endif
> 
>  /* ---------- Tasks ---------- */
>  /*


-- 
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2011-09-24  0:23 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-09-23 22:43 [PATCH] scsi: SCSI_ISCI needs to select SCSI_SAS_HOST_SMP, fixes build error Randy Dunlap
2011-09-23 23:43 ` Dan Williams
2011-09-24  0:23   ` Randy Dunlap

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox