[PATCH] Mark Workbit NinjaSCSI driver non 64bit

[PATCH] Mark Workbit NinjaSCSI driver non 64bit

[Andi Kleen]

Judging from the warnings it spews out on a 64bit compilation on AMD64
it is not 64bit clean.  Mark it as such in Kconfig.

Better would be of course to fix it.

-Andi

diff -burpN -X ../KDIFX linux-2.6.1-rc1/drivers/scsi/Kconfig linux-2.6.1-rc1-amd64/drivers/scsi/Kconfig
--- linux-2.6.1-rc1/drivers/scsi/Kconfig	2004-01-01 06:25:23.000000000 +0100
+++ linux-2.6.1-rc1-amd64/drivers/scsi/Kconfig	2004-01-01 06:56:50.000000000 +0100
@@ -1388,7 +1388,7 @@ config SCSI_ULTRASTOR
 
 config SCSI_NSP32
 	tristate "Workbit NinjaSCSI-32Bi/UDE support"
-	depends on PCI && SCSI
+	depends on PCI && SCSI && !64BIT
 	help
 	  This is support for the Workbit NinjaSCSI-32Bi/UDE PCI/Cardbus
 	  SCSI host adapter. Please read the SCSI-HOWTO, available from

Re: [PATCH] Mark Workbit NinjaSCSI driver non 64bit

[GOTO Masanori]

Hi Andi,

At Thu, 1 Jan 2004 22:58:35 +0100,
Andi Kleen wrote:
> Judging from the warnings it spews out on a 64bit compilation on AMD64
> it is not 64bit clean.  Mark it as such in Kconfig.
> 
> Better would be of course to fix it.

Thanks for your report.  I compiled and exactly I saw some warnings on
amd64 machine.  I checked all warnings, and these warnings are
trivial, they can be easily fixed.  I attached the patch to fix
warnings.  Nsp32 is PCI device driver, so it should also work on amd64
architecture.



--- drivers/scsi/nsp32.h.orig	2004-01-03 08:34:30.000000000 +0900
+++ drivers/scsi/nsp32.h	2004-01-03 08:34:48.000000000 +0900
@@ -667,10 +667,5 @@
 }
 #endif
 
-/* for Kernel 2.6 */
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0))
-# define __devinitdata /* */
-#endif
-
 #endif /* _NSP32_H */
 /* end */
--- drivers/scsi/nsp32_io.h.orig	2004-01-03 08:35:07.000000000 +0900
+++ drivers/scsi/nsp32_io.h	2004-01-03 08:41:47.000000000 +0900
@@ -173,7 +173,7 @@
 
 /*==============================================*/
 
-static inline unsigned char nsp32_mmio_index_read1(unsigned int base,
+static inline unsigned char nsp32_mmio_index_read1(unsigned long base,
 						   unsigned int reg)
 {
 	volatile unsigned short *index_ptr, *data_ptr;
@@ -185,7 +185,7 @@
 	return readb(data_ptr);
 }
 
-static inline void nsp32_mmio_index_write1(unsigned int  base,
+static inline void nsp32_mmio_index_write1(unsigned long base,
 					   unsigned int  reg,
 					   unsigned char val)
 {
@@ -198,8 +198,8 @@
 	writeb(val, data_ptr );
 }
 
-static inline unsigned short nsp32_mmio_index_read2(unsigned int base,
-						    unsigned int reg)
+static inline unsigned short nsp32_mmio_index_read2(unsigned long base,
+						    unsigned int  reg)
 {
 	volatile unsigned short *index_ptr, *data_ptr;
 
@@ -210,7 +210,7 @@
 	return le16_to_cpu(readw(data_ptr));
 }
 
-static inline void nsp32_mmio_index_write2(unsigned int   base,
+static inline void nsp32_mmio_index_write2(unsigned long  base,
 					   unsigned int   reg,
 					   unsigned short val)
 {




Regards,
-- gotom

> 
> -Andi
> 
> diff -burpN -X ../KDIFX linux-2.6.1-rc1/drivers/scsi/Kconfig linux-2.6.1-rc1-amd64/drivers/scsi/Kconfig
> --- linux-2.6.1-rc1/drivers/scsi/Kconfig	2004-01-01 06:25:23.000000000 +0100
> +++ linux-2.6.1-rc1-amd64/drivers/scsi/Kconfig	2004-01-01 06:56:50.000000000 +0100
> @@ -1388,7 +1388,7 @@ config SCSI_ULTRASTOR
>  
>  config SCSI_NSP32
>  	tristate "Workbit NinjaSCSI-32Bi/UDE support"
> -	depends on PCI && SCSI
> +	depends on PCI && SCSI && !64BIT
>  	help
>  	  This is support for the Workbit NinjaSCSI-32Bi/UDE PCI/Cardbus
>  	  SCSI host adapter. Please read the SCSI-HOWTO, available from

Re: [PATCH] Mark Workbit NinjaSCSI driver non 64bit

[Andi Kleen]

On Sun, Jan 04, 2004 at 03:08:59AM +0900, GOTO Masanori wrote:
> At Thu, 1 Jan 2004 22:58:35 +0100,
> Andi Kleen wrote:
> > Judging from the warnings it spews out on a 64bit compilation on AMD64
> > it is not 64bit clean.  Mark it as such in Kconfig.
> > 
> > Better would be of course to fix it.
> 
> Thanks for your report.  I compiled and exactly I saw some warnings on
> amd64 machine.  I checked all warnings, and these warnings are
> trivial, they can be easily fixed.  I attached the patch to fix
> warnings.  Nsp32 is PCI device driver, so it should also work on amd64
> architecture.

Thanks.

Did you test if it works on the AMD64 machine? Sometimes there are 64bit
issues that don't show as warnings.

-Andi

Re: [PATCH] Mark Workbit NinjaSCSI driver non 64bit

[GOTO Masanori]

Hi,

At Sun, 4 Jan 2004 00:27:19 +0100,
Andi Kleen wrote:
> On Sun, Jan 04, 2004 at 03:08:59AM +0900, GOTO Masanori wrote:
> > At Thu, 1 Jan 2004 22:58:35 +0100,
> > Andi Kleen wrote:
> > > Judging from the warnings it spews out on a 64bit compilation on AMD64
> > > it is not 64bit clean.  Mark it as such in Kconfig.
> > > 
> > > Better would be of course to fix it.
> > 
> > Thanks for your report.  I compiled and exactly I saw some warnings on
> > amd64 machine.  I checked all warnings, and these warnings are
> > trivial, they can be easily fixed.  I attached the patch to fix
> > warnings.  Nsp32 is PCI device driver, so it should also work on amd64
> > architecture.
> 
> Thanks.
> 
> Did you test if it works on the AMD64 machine? Sometimes there are 64bit
> issues that don't show as warnings.

I can login almost all architecture machine, but unfortunately I have
no 64bit with PCI machine at home at present.  However, possibly I
have an opportunity to touch amd64 machine, so I will try to test
nsp32 on amd64.

BTW, at least I have taken care about ILP32 vs LP64, so even if it
does not work on amd64, it's not hard to make ok, I believe.

Regards,
-- gotom