PATCH: 2 small patches against 2.4.15-pre6 (sym2 + email change) (fwd)

From: "Gérard Roudier" <groudier@free.fr>
To: Marcelo Tosatti <marcelo@conectiva.com.br>
Cc: Linux <linux-kernel@vger.kernel.org>
Subject: PATCH: 2 small patches against 2.4.15-pre6 (sym2 + email change) (fwd)
Date: Tue, 27 Nov 2001 19:46:13 +0100 (CET)	[thread overview]
Message-ID: <20011127191808.S2714-300000@gerard> (raw)

[-- Attachment #1: Type: TEXT/PLAIN, Size: 2334 bytes --]


Hi Marcelo,

I didn't see these patches applied by previous kernel maintainer, neither
received any ack nor nack about from. You may let me know if something
gets wrong with them. Btw, I have another one after those ones.

Note that I am used of the "no news means bad news" when patches for linux
development are in concern, but I guess that I am not the only guy who
will be glad if usual good practice of "no news means good news" would
also apply there. Let me hope that this will be changed as it has been
with 2.0 and 2.2 kernel maintainance. :)

By the way, I missed the postings that made you the maintainer of 2.4
kernel neither saw any comments from Alan about. I am sure that you will
do the best you can and will do a very good work, but I feel a bit
frustrated not to know the reasons of this decision. If you can point me
to the corresponding articles, I will be very interested in.

Thanks to people who tried, did or are doing Linux kernel maintainance as
I think that maintainance is a very important process at least as
important as development (I want to write a lot more, in fact...).

Good luck and TIA.
  Gérard.


---------- Forwarded message ----------
Date: Sun, 18 Nov 2001 19:06:28 +0100 (CET)
From: Gérard Roudier <groudier@free.fr>
To: Linus Torvalds <torvalds@transmeta.com>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Subject: PATCH: 2 small patches against 2.4.15-pre6 (sym2 + email change)


Linus,

I have attached 2 small patches against linux-2.4.15-pre6 to this email.

roudier-email-for-2.4.15-pre6.patch:
  This patch changes my email address in CREDITS, MAINTAINERS and
  old sym53c8xx and ncr53c8xx drivers related files. It also bumps
  Copyright up to year 2001 for these driver files.

sym-2.1.17-for-2.4.15-pre6.patch:
  This patch is the result of the feed-back I got after the inclusion of
  sym-2 into the main kernel stream. It fixes notably a couple of harmless
  warnings. The only significant change applies to the allocation of
  a 256 entries hash lists array that is now allocated separately from the
  host data structure. This was needed on PPC64 / 4 KB page size, for the
  driver not to try to allocate more than 1 PAGE at a time.

Thanks in advance for including these changes in next kernel release.

Regards,
  Gérard.

[-- Attachment #2: Type: TEXT/PLAIN, Size: 7475 bytes --]

--- /home/linux/v2.4/linux/CREDITS	Sun Nov 18 17:01:35 2001
+++ linux/CREDITS	Sun Nov 18 17:26:30 2001
@@ -2495,7 +2495,7 @@
 S: Australia
 
 N: Gerard Roudier
-E: groudier@iplus.fr
+E: groudier@free.fr
 D: Contributed to asynchronous read-ahead improvement
 S: 21 Rue Carnot
 S: 95170 Deuil La Barre
--- /home/linux/v2.4/linux/MAINTAINERS	Sun Nov 18 17:01:35 2001
+++ linux/MAINTAINERS	Sun Nov 18 17:40:03 2001
@@ -918,6 +918,12 @@
 W:     http://www.sistina.com/lvm
 S:     Maintained 
 
+LSILOGIC/SYMBIOS/NCR 53C8XX and 53C1010 PCI-SCSI drivers
+P:	Gerard Roudier
+M:	groudier@free.fr
+L:	linux-scsi@vger.kernel.org
+S:	Maintained
+
 M68K
 P:	Jes Sorensen
 M:	jes@trained-monkey.org
--- /home/linux/v2.4/linux/drivers/scsi/README.ncr53c8xx	Sun Aug 19 17:08:26 2001
+++ linux/drivers/scsi/README.ncr53c8xx	Sun Nov 18 17:22:52 2001
@@ -1,6 +1,6 @@
 The Linux NCR53C8XX/SYM53C8XX drivers README file
 
-Written by Gerard Roudier <groudier@club-internet.fr>
+Written by Gerard Roudier <groudier@free.fr>
 21 Rue Carnot
 95170 DEUIL LA BARRE - FRANCE
 
@@ -87,7 +87,7 @@
 
 The initial Linux ncr53c8xx driver has been a port of the ncr driver from 
 FreeBSD that has been achieved in November 1995 by:
-          Gerard Roudier              <groudier@club-internet.fr>
+          Gerard Roudier              <groudier@free.fr>
 
 The original driver has been written for 386bsd and FreeBSD by:
           Wolfgang Stanglmeier        <wolf@cologne.de>
@@ -1287,7 +1287,7 @@
 be sure I will receive it.  Obviously, a bug in the driver code is
 possible.
 
-     My email address: Gerard Roudier <groudier@club-internet.fr>
+     My email address: Gerard Roudier <groudier@free.fr>
 
 Allowing disconnections is important if you use several devices on
 your SCSI bus but often causes problems with buggy devices.
--- /home/linux/v2.4/linux/drivers/scsi/ncr53c8xx.c	Sun Nov 18 17:01:30 2001
+++ linux/drivers/scsi/ncr53c8xx.c	Sun Nov 18 17:20:08 2001
@@ -22,7 +22,7 @@
 **  This driver has been ported to Linux from the FreeBSD NCR53C8XX driver
 **  and is currently maintained by
 **
-**          Gerard Roudier              <groudier@club-internet.fr>
+**          Gerard Roudier              <groudier@free.fr>
 **
 **  Being given that this driver originates from the FreeBSD version, and
 **  in order to keep synergy on both, any suggested enhancements and corrections
@@ -63,7 +63,7 @@
 **  August 18 1997 by Cort <cort@cs.nmt.edu>:
 **     Support for Power/PC (Big Endian).
 **
-**  June 20 1998 by Gerard Roudier <groudier@club-internet.fr>:
+**  June 20 1998 by Gerard Roudier
 **     Support for up to 64 tags per lun.
 **     O(1) everywhere (C and SCRIPTS) for normal cases.
 **     Low PCI traffic for command handling when on-chip RAM is present.
--- /home/linux/v2.4/linux/drivers/scsi/ncr53c8xx.h	Sun Apr  8 14:10:13 2001
+++ linux/drivers/scsi/ncr53c8xx.h	Sun Nov 18 17:19:18 2001
@@ -22,7 +22,7 @@
 **  This driver has been ported to Linux from the FreeBSD NCR53C8XX driver
 **  and is currently maintained by
 **
-**          Gerard Roudier              <groudier@club-internet.fr>
+**          Gerard Roudier              <groudier@free.fr>
 **
 **  Being given that this driver originates from the FreeBSD version, and
 **  in order to keep synergy on both, any suggested enhancements and corrections
--- /home/linux/v2.4/linux/drivers/scsi/sym53c8xx.c	Sun Nov 18 17:01:33 2001
+++ linux/drivers/scsi/sym53c8xx.c	Sun Nov 18 18:21:32 2001
@@ -1,7 +1,7 @@
 /******************************************************************************
 **  High Performance device driver for the Symbios 53C896 controller.
 **
-**  Copyright (C) 1998-2000  Gerard Roudier <groudier@club-internet.fr>
+**  Copyright (C) 1998-2001  Gerard Roudier <groudier@free.fr>
 **
 **  This driver also supports all the Symbios 53C8XX controller family, 
 **  except 53C810 revisions < 16, 53C825 revisions < 16 and all 
@@ -32,7 +32,7 @@
 **  The Linux port of the FreeBSD ncr driver has been achieved in 
 **  november 1995 by:
 **
-**          Gerard Roudier              <groudier@club-internet.fr>
+**          Gerard Roudier              <groudier@free.fr>
 **
 **  Being given that this driver originates from the FreeBSD version, and
 **  in order to keep synergy on both, any suggested enhancements and corrections
--- /home/linux/v2.4/linux/drivers/scsi/sym53c8xx.h	Wed Oct  3 22:13:53 2001
+++ linux/drivers/scsi/sym53c8xx.h	Sun Nov 18 18:22:05 2001
@@ -1,7 +1,7 @@
 /******************************************************************************
 **  High Performance device driver for the Symbios 53C896 controller.
 **
-**  Copyright (C) 1998-2000  Gerard Roudier <groudier@club-internet.fr>
+**  Copyright (C) 1998-2001  Gerard Roudier <groudier@free.fr>
 **
 **  This driver also supports all the Symbios 53C8XX controller family, 
 **  except 53C810 revisions < 16, 53C825 revisions < 16 and all 
@@ -32,7 +32,7 @@
 **  The Linux port of the FreeBSD ncr driver has been achieved in 
 **  november 1995 by:
 **
-**          Gerard Roudier              <groudier@club-internet.fr>
+**          Gerard Roudier              <groudier@free.fr>
 **
 **  Being given that this driver originates from the FreeBSD version, and
 **  in order to keep synergy on both, any suggested enhancements and corrections
--- /home/linux/v2.4/linux/drivers/scsi/sym53c8xx_comm.h	Sun Nov 18 17:01:33 2001
+++ linux/drivers/scsi/sym53c8xx_comm.h	Sun Nov 18 18:21:43 2001
@@ -1,7 +1,7 @@
 /******************************************************************************
 **  High Performance device driver for the Symbios 53C896 controller.
 **
-**  Copyright (C) 1998-2000  Gerard Roudier <groudier@club-internet.fr>
+**  Copyright (C) 1998-2001  Gerard Roudier <groudier@free.fr>
 **
 **  This driver also supports all the Symbios 53C8XX controller family, 
 **  except 53C810 revisions < 16, 53C825 revisions < 16 and all 
@@ -32,7 +32,7 @@
 **  The Linux port of the FreeBSD ncr driver has been achieved in 
 **  november 1995 by:
 **
-**          Gerard Roudier              <groudier@club-internet.fr>
+**          Gerard Roudier              <groudier@free.fr>
 **
 **  Being given that this driver originates from the FreeBSD version, and
 **  in order to keep synergy on both, any suggested enhancements and corrections
--- /home/linux/v2.4/linux/drivers/scsi/sym53c8xx_defs.h	Sun Nov 18 17:01:33 2001
+++ linux/drivers/scsi/sym53c8xx_defs.h	Sun Nov 18 18:21:54 2001
@@ -1,7 +1,7 @@
 /******************************************************************************
 **  High Performance device driver for the Symbios 53C896 controller.
 **
-**  Copyright (C) 1998-2000  Gerard Roudier <groudier@club-internet.fr>
+**  Copyright (C) 1998-2001  Gerard Roudier <groudier@free.fr>
 **
 **  This driver also supports all the Symbios 53C8XX controller family, 
 **  except 53C810 revisions < 16, 53C825 revisions < 16 and all 
@@ -32,7 +32,7 @@
 **  The Linux port of the FreeBSD ncr driver has been achieved in 
 **  november 1995 by:
 **
-**          Gerard Roudier              <groudier@club-internet.fr>
+**          Gerard Roudier              <groudier@free.fr>
 **
 **  Being given that this driver originates from the FreeBSD version, and
 **  in order to keep synergy on both, any suggested enhancements and corrections

[-- Attachment #3: Type: TEXT/PLAIN, Size: 2938 bytes --]

--- /home/linux/v2.4/linux/drivers/scsi/sym53c8xx_2/ChangeLog.txt	Sun Nov 18 17:01:36 2001
+++ linux/drivers/scsi/sym53c8xx_2/ChangeLog.txt	Sun Nov 18 19:10:56 2001
@@ -128,3 +128,11 @@
 	* version sym-2.1.16-20011028
 	- Slightly simplify driver configuration.
 	- Prepare a new patch against linux-2.4.13.
+
+Sat Nov 17 10:00 2001 Gerard Roudier 
+	* version sym-2.1.17
+	- Fix a couple of gcc/gcc3 warnings.
+	- Allocate separately from the HCB the array for CCBs hashed by DSA.
+	  All driver memory allocations are now not greater than 1 PAGE 
+	  even on PPC64 / 4KB PAGE surprising setup.
+
--- /home/linux/v2.4/linux/drivers/scsi/sym53c8xx_2/sym_glue.h	Sun Nov 18 17:01:36 2001
+++ linux/drivers/scsi/sym53c8xx_2/sym_glue.h	Sun Nov 18 18:16:39 2001
@@ -77,7 +77,6 @@
 #include <linux/errno.h>
 #include <linux/pci.h>
 #include <linux/string.h>
-#include <linux/malloc.h>
 #include <linux/mm.h>
 #include <linux/ioport.h>
 #include <linux/time.h>
--- /home/linux/v2.4/linux/drivers/scsi/sym53c8xx_2/sym_hipd.c	Sun Nov 18 17:01:36 2001
+++ linux/drivers/scsi/sym53c8xx_2/sym_hipd.c	Sun Nov 18 18:31:27 2001
@@ -50,7 +50,7 @@
  * SUCH DAMAGE.
  */
 
-#define SYM_DRIVER_NAME	"sym-2.1.16a"
+#define SYM_DRIVER_NAME	"sym-2.1.17"
 
 #ifdef __FreeBSD__
 #include <dev/sym/sym_glue.h>
@@ -4691,6 +4691,7 @@
 	OUTL_DSP (SCRIPTA_BA (np, clrack));
 	return;
 out_stuck:
+	return;
 }
 
 /*
@@ -5226,6 +5227,7 @@
 
 	return;
 fail:
+	return;
 }
 
 /*
@@ -5788,6 +5790,13 @@
 		goto attach_failed;
 
 	/*
+	 *  Allocate the array of lists of CCBs hashed by DSA.
+	 */
+	np->ccbh = sym_calloc(sizeof(ccb_p *)*CCB_HASH_SIZE, "CCBH");
+	if (!np->ccbh)
+		goto attach_failed;
+
+	/*
 	 *  Initialyze the CCB free and busy queues.
 	 */
 	sym_que_init(&np->free_ccbq);
@@ -5978,6 +5987,8 @@
 			sym_mfree_dma(cp, sizeof(*cp), "CCB");
 		}
 	}
+	if (np->ccbh)
+		sym_mfree(np->ccbh, sizeof(ccb_p *)*CCB_HASH_SIZE, "CCBH");
 
 	if (np->badluntbl)
 		sym_mfree_dma(np->badluntbl, 256,"BADLUNTBL");
--- /home/linux/v2.4/linux/drivers/scsi/sym53c8xx_2/sym_hipd.h	Sun Nov 18 17:01:36 2001
+++ linux/drivers/scsi/sym53c8xx_2/sym_hipd.h	Sun Nov 18 17:49:09 2001
@@ -1068,7 +1068,8 @@
 	/*
 	 *  CCB lists and queue.
 	 */
-	ccb_p ccbh[CCB_HASH_SIZE];	/* CCB hashed by DSA value	*/
+	ccb_p *ccbh;			/* CCBs hashed by DSA value	*/
+					/* CCB_HASH_SIZE lists of CCBs	*/
 	SYM_QUEHEAD	free_ccbq;	/* Queue of available CCBs	*/
 	SYM_QUEHEAD	busy_ccbq;	/* Queue of busy CCBs		*/
 
--- /home/linux/v2.4/linux/drivers/scsi/sym53c8xx_2/sym_nvram.c	Sun Nov 18 17:01:36 2001
+++ linux/drivers/scsi/sym53c8xx_2/sym_nvram.c	Sun Nov 18 17:49:12 2001
@@ -505,10 +505,10 @@
 	return retv;
 }
 
-#undef SET_BIT 0
-#undef CLR_BIT 1
-#undef SET_CLK 2
-#undef CLR_CLK 3
+#undef SET_BIT
+#undef CLR_BIT
+#undef SET_CLK
+#undef CLR_CLK
 
 /*
  *  Try reading Symbios NVRAM.
