2014-06-26 13:45:01

by Arnd Bergmann

Subject: [PATCH] [SCSI] hpsa: fix non-x86 builds

commit 28e134464734 "[SCSI] hpsa: enable unit attention reporting"
turns on unit attention notifications, but got the change wrong for
all architectures other than x86, which now store an uninitialized
value into the device register.

Gcc helpfully warns about this:

../drivers/scsi/hpsa.c: In function 'hpsa_set_driver_support_bits':
../drivers/scsi/hpsa.c:6373:17: warning: 'driver_support' is used uninitialized in this function [-Wuninitialized]
driver_support |= ENABLE_UNIT_ATTN;
^

This moves the #ifdef so only the prefetch-enable is conditional
on x86, not also reading the initial register contents.


Signed-off-by: Arnd Bergmann <[email protected]>
Fixes: 28e134464734 "[SCSI] hpsa: enable unit attention reporting"
Cc: Stephen M. Cameron <[email protected]>
Cc: [email protected] # v3.14+

diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
index 31184b3..d0e487c 100644
--- a/drivers/scsi/hpsa.c
+++ b/drivers/scsi/hpsa.c
@@ -6365,9 +6365,9 @@ static inline void hpsa_set_driver_support_bits(struct ctlr_info *h)
{
u32 driver_support;

-#ifdef CONFIG_X86
- /* Need to enable prefetch in the SCSI core for 6400 in x86 */
driver_support = readl(&(h->cfgtable->driver_support));
+ /* Need to enable prefetch in the SCSI core for 6400 in x86 */
+#ifdef CONFIG_X86
driver_support |= ENABLE_SCSI_PREFETCH;
#endif
driver_support |= ENABLE_UNIT_ATTN;

2014-06-26 14:35:40

by Stephen M. Cameron

Subject: Re: [PATCH] [SCSI] hpsa: fix non-x86 builds

On Thu, Jun 26, 2014 at 03:44:52PM +0200, Arnd Bergmann wrote:
> commit 28e134464734 "[SCSI] hpsa: enable unit attention reporting"
> turns on unit attention notifications, but got the change wrong for
> all architectures other than x86, which now store an uninitialized
> value into the device register.
>
> Gcc helpfully warns about this:
>
> ../drivers/scsi/hpsa.c: In function 'hpsa_set_driver_support_bits':
> ../drivers/scsi/hpsa.c:6373:17: warning: 'driver_support' is used uninitialized in this function [-Wuninitialized]
> driver_support |= ENABLE_UNIT_ATTN;
> ^
>
> This moves the #ifdef so only the prefetch-enable is conditional
> on x86, not also reading the initial register contents.
>
>
> Signed-off-by: Arnd Bergmann <[email protected]>
> Fixes: 28e134464734 "[SCSI] hpsa: enable unit attention reporting"
> Cc: Stephen M. Cameron <[email protected]>
> Cc: [email protected] # v3.14+
>
> diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
> index 31184b3..d0e487c 100644
> --- a/drivers/scsi/hpsa.c
> +++ b/drivers/scsi/hpsa.c
> @@ -6365,9 +6365,9 @@ static inline void hpsa_set_driver_support_bits(struct ctlr_info *h)
> {
> u32 driver_support;
>
> -#ifdef CONFIG_X86
> - /* Need to enable prefetch in the SCSI core for 6400 in x86 */
> driver_support = readl(&(h->cfgtable->driver_support));
> + /* Need to enable prefetch in the SCSI core for 6400 in x86 */
> +#ifdef CONFIG_X86
> driver_support |= ENABLE_SCSI_PREFETCH;
> #endif
> driver_support |= ENABLE_UNIT_ATTN;

Thanks.

-- steve

2014-07-03 08:46:57

by Christoph Hellwig

Subject: Re: [PATCH] [SCSI] hpsa: fix non-x86 builds

On Thu, Jun 26, 2014 at 09:34:45AM -0500, [email protected] wrote:
> Thanks.

Do you plan to include this with the next hpsa update, or should I take
this as an ACK and apply it?

2014-07-03 13:20:24

by Stephen M. Cameron

Subject: Re: [PATCH] [SCSI] hpsa: fix non-x86 builds

On Thu, Jul 03, 2014 at 01:43:48AM -0700, Christoph Hellwig wrote:
> On Thu, Jun 26, 2014 at 09:34:45AM -0500, [email protected] wrote:
> > Thanks.
>
> Do you plan to include this with the next hpsa update, or should I take
> this as an ACK and apply it?

Take it as an ACK. I should have been clearer.

-- steve