PATCH: 2 small patches against 2.4.15-pre6 (sym2 + email change) (fwd)
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 <[email protected]>
To: Linus Torvalds <[email protected]>
Cc: Alan Cox <[email protected]>
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.
CREDITS renamed from home/linux/v2.4/linux/CREDITS +1 -1
@@ -2495,7 +2495,7 @@ S: Australia N: Gerard Roudier -E: [email protected] +E: [email protected] D: Contributed to asynchronous read-ahead improvement S: 21 Rue Carnot S: 95170 Deuil La Barre
MAINTAINERS renamed from home/linux/v2.4/linux/MAINTAINERS +6 -0
@@ -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: [email protected] +L: [email protected] +S: Maintained + M68K P: Jes Sorensen M: [email protected]
drivers/scsi/README.ncr53c8xx renamed from home/linux/v2.4/linux/drivers/scsi/README.ncr53c8xx +3 -3
@@ -1,6 +1,6 @@ The Linux NCR53C8XX/SYM53C8XX drivers README file -Written by Gerard Roudier <[email protected]> +Written by Gerard Roudier <[email protected]> 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 <[email protected]> + Gerard Roudier <[email protected]> The original driver has been written for 386bsd and FreeBSD by: Wolfgang Stanglmeier <[email protected]>
@@ -1287,7 +1287,7 @@ be sure I will receive it. Obviously, a bug in the driver code is possible. - My email address: Gerard Roudier <[email protected]> + My email address: Gerard Roudier <[email protected]> Allowing disconnections is important if you use several devices on your SCSI bus but often causes problems with buggy devices.
drivers/scsi/ncr53c8xx.c renamed from home/linux/v2.4/linux/drivers/scsi/ncr53c8xx.c +2 -2
@@ -22,7 +22,7 @@ ** This driver has been ported to Linux from the FreeBSD NCR53C8XX driver ** and is currently maintained by ** -** Gerard Roudier <[email protected]> +** Gerard Roudier <[email protected]> ** ** 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 <[email protected]>: ** Support for Power/PC (Big Endian). ** -** June 20 1998 by Gerard Roudier <[email protected]>: +** 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.
drivers/scsi/ncr53c8xx.h renamed from home/linux/v2.4/linux/drivers/scsi/ncr53c8xx.h +1 -1
@@ -22,7 +22,7 @@ ** This driver has been ported to Linux from the FreeBSD NCR53C8XX driver ** and is currently maintained by ** -** Gerard Roudier <[email protected]> +** Gerard Roudier <[email protected]> ** ** Being given that this driver originates from the FreeBSD version, and ** in order to keep synergy on both, any suggested enhancements and corrections
drivers/scsi/sym53c8xx.c renamed from home/linux/v2.4/linux/drivers/scsi/sym53c8xx.c +2 -2
@@ -1,7 +1,7 @@/****************************************************************************** ** High Performance device driver for the Symbios 53C896 controller. ** -** Copyright (C) 1998-2000 Gerard Roudier <[email protected]> +** Copyright (C) 1998-2001 Gerard Roudier <[email protected]> ** ** 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 <[email protected]> +** Gerard Roudier <[email protected]> ** ** Being given that this driver originates from the FreeBSD version, and ** in order to keep synergy on both, any suggested enhancements and corrections
drivers/scsi/sym53c8xx.h renamed from home/linux/v2.4/linux/drivers/scsi/sym53c8xx.h +2 -2
@@ -1,7 +1,7 @@/****************************************************************************** ** High Performance device driver for the Symbios 53C896 controller. ** -** Copyright (C) 1998-2000 Gerard Roudier <[email protected]> +** Copyright (C) 1998-2001 Gerard Roudier <[email protected]> ** ** 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 <[email protected]> +** Gerard Roudier <[email protected]> ** ** Being given that this driver originates from the FreeBSD version, and ** in order to keep synergy on both, any suggested enhancements and corrections
drivers/scsi/sym53c8xx_comm.h renamed from home/linux/v2.4/linux/drivers/scsi/sym53c8xx_comm.h +2 -2
@@ -1,7 +1,7 @@/****************************************************************************** ** High Performance device driver for the Symbios 53C896 controller. ** -** Copyright (C) 1998-2000 Gerard Roudier <[email protected]> +** Copyright (C) 1998-2001 Gerard Roudier <[email protected]> ** ** 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 <[email protected]> +** Gerard Roudier <[email protected]> ** ** Being given that this driver originates from the FreeBSD version, and ** in order to keep synergy on both, any suggested enhancements and corrections
drivers/scsi/sym53c8xx_defs.h renamed from home/linux/v2.4/linux/drivers/scsi/sym53c8xx_defs.h +2 -2
@@ -1,7 +1,7 @@/****************************************************************************** ** High Performance device driver for the Symbios 53C896 controller. ** -** Copyright (C) 1998-2000 Gerard Roudier <[email protected]> +** Copyright (C) 1998-2001 Gerard Roudier <[email protected]> ** ** 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 <[email protected]> +** Gerard Roudier <[email protected]> ** ** Being given that this driver originates from the FreeBSD version, and ** in order to keep synergy on both, any suggested enhancements and corrections
drivers/scsi/sym53c8xx_2/ChangeLog.txt renamed from home/linux/v2.4/linux/drivers/scsi/sym53c8xx_2/ChangeLog.txt +8 -0
@@ -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. +
drivers/scsi/sym53c8xx_2/sym_glue.h renamed from home/linux/v2.4/linux/drivers/scsi/sym53c8xx_2/sym_glue.h +0 -1
@@ -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>
drivers/scsi/sym53c8xx_2/sym_hipd.c renamed from home/linux/v2.4/linux/drivers/scsi/sym53c8xx_2/sym_hipd.c +12 -1
@@ -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" );
drivers/scsi/sym53c8xx_2/sym_hipd.h renamed from home/linux/v2.4/linux/drivers/scsi/sym53c8xx_2/sym_hipd.h +2 -1
@@ -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 */
drivers/scsi/sym53c8xx_2/sym_nvram.c renamed from home/linux/v2.4/linux/drivers/scsi/sym53c8xx_2/sym_nvram.c +4 -4
@@ -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.
Quoted 6 lines · Gérard Roudier
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.
This link should be fine for you :
http://advogato.org/article/370.html
Christophe
Quoted 9 lines · christophe barbé
Quoted 6 lines · Gérard Roudier
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.
Quoted 3 lines
This link should be fine for you :
Thanks a lot.
It is exactly the kind of article I was looking for.
Gérard.
Quoted 9 lines · christophe barb?
Quoted 6 lines · G?rard Roudier
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.
Quoted 4 lines
This link should be fine for you :
This doesn't really show *why* he was chosen. Marcello hasn't gotten much press in the past.
Yes, it does look like a big change from the outside. Even for LKML readers ;)
MF
Quoted 2 lines · Gérard Roudier
Hi Marcelo,
Hi,
Sorry for the delay, I saved this mail to my pending list... :)
Quoted 11 lines
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. :)
Quoted 5 lines
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.
Well, basically, it seems Alan got tired of maintenance... :)
You can take a look at Alan's diary for more stuff.
Quoted 5 lines
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.
About the two patches you mention, can you please send me them ?
PATCH: 2 small patches against 2.4.17-pre2 (sym2 + email change)
Hi Marcelo,
Quoted 3 lines · Marcelo Tosatti
On Tue, 27 Nov 2001, Gérard Roudier wrote:
Sorry for the delay, I saved this mail to my pending list... :)
No problem, Marcelo and thanks very much for the reply.
I just switched to your 2.4.17-pre2 kernel and updated my patches accordingly (attached).
Here is the log of sym-2 driver changes (patch #2):
* 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.
* version sym-2.1.17a
- Use u_long instead of U32 for the IO base cookie. This is more consistent with what archs are expecting.
- Use MMIO per default for Power PC instead of some fake normal IO, as Paul Mackerras stated that MMIO works fine now on this arch.
There are no real fixes. Most changes are conveniences for PPCs.
The patch #1 that updates my email address is more important since my old email address will be no longer valid in a couple of weeks. This patch also adds an entry in MAINTAINERS, btw.
[...]
Quoted 1 line
Well, basically, it seems Alan got tired of maintenance... :)
This may well have happened between linux-2.4.9 and linux-2.4.10. :)
Quoted 1 line
You can take a look at Alan's diary for more stuff.
Will do, thanks. But in fact, I just wanted to read something from Alan about the maintainance baton being passed to you and I have been supplied an URL that fitted just fine.
Regards,
Gérard.
CREDITS renamed from home/linux/v2.4/linux/CREDITS +1 -1
@@ -2502,7 +2502,7 @@ S: Australia N: Gerard Roudier -E: [email protected] +E: [email protected] D: Contributed to asynchronous read-ahead improvement S: 21 Rue Carnot S: 95170 Deuil La Barre
MAINTAINERS renamed from home/linux/v2.4/linux/MAINTAINERS +6 -0
@@ -924,6 +924,12 @@ W: http://www.sistina.com/lvm S: Maintained +LSILOGIC/SYMBIOS/NCR 53C8XX and 53C1010 PCI-SCSI drivers +P: Gerard Roudier +M: [email protected] +L: [email protected] +S: Maintained + M68K P: Jes Sorensen M: [email protected]
drivers/scsi/README.ncr53c8xx renamed from home/linux/v2.4/linux/drivers/scsi/README.ncr53c8xx +3 -3
@@ -1,6 +1,6 @@ The Linux NCR53C8XX/SYM53C8XX drivers README file -Written by Gerard Roudier <[email protected]> +Written by Gerard Roudier <[email protected]> 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 <[email protected]> + Gerard Roudier <[email protected]> The original driver has been written for 386bsd and FreeBSD by: Wolfgang Stanglmeier <[email protected]>
@@ -1287,7 +1287,7 @@ be sure I will receive it. Obviously, a bug in the driver code is possible. - My email address: Gerard Roudier <[email protected]> + My email address: Gerard Roudier <[email protected]> Allowing disconnections is important if you use several devices on your SCSI bus but often causes problems with buggy devices.
drivers/scsi/ncr53c8xx.c renamed from home/linux/v2.4/linux/drivers/scsi/ncr53c8xx.c +2 -2
@@ -22,7 +22,7 @@ ** This driver has been ported to Linux from the FreeBSD NCR53C8XX driver ** and is currently maintained by ** -** Gerard Roudier <[email protected]> +** Gerard Roudier <[email protected]> ** ** 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 <[email protected]>: ** Support for Power/PC (Big Endian). ** -** June 20 1998 by Gerard Roudier <[email protected]>: +** 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.
drivers/scsi/ncr53c8xx.h renamed from home/linux/v2.4/linux/drivers/scsi/ncr53c8xx.h +1 -1
@@ -22,7 +22,7 @@ ** This driver has been ported to Linux from the FreeBSD NCR53C8XX driver ** and is currently maintained by ** -** Gerard Roudier <[email protected]> +** Gerard Roudier <[email protected]> ** ** Being given that this driver originates from the FreeBSD version, and ** in order to keep synergy on both, any suggested enhancements and corrections
drivers/scsi/sym53c8xx.c renamed from home/linux/v2.4/linux/drivers/scsi/sym53c8xx.c +2 -2
@@ -1,7 +1,7 @@/****************************************************************************** ** High Performance device driver for the Symbios 53C896 controller. ** -** Copyright (C) 1998-2000 Gerard Roudier <[email protected]> +** Copyright (C) 1998-2001 Gerard Roudier <[email protected]> ** ** 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 <[email protected]> +** Gerard Roudier <[email protected]> ** ** Being given that this driver originates from the FreeBSD version, and ** in order to keep synergy on both, any suggested enhancements and corrections
drivers/scsi/sym53c8xx.h renamed from home/linux/v2.4/linux/drivers/scsi/sym53c8xx.h +2 -2
@@ -1,7 +1,7 @@/****************************************************************************** ** High Performance device driver for the Symbios 53C896 controller. ** -** Copyright (C) 1998-2000 Gerard Roudier <[email protected]> +** Copyright (C) 1998-2001 Gerard Roudier <[email protected]> ** ** 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 <[email protected]> +** Gerard Roudier <[email protected]> ** ** Being given that this driver originates from the FreeBSD version, and ** in order to keep synergy on both, any suggested enhancements and corrections
drivers/scsi/sym53c8xx_comm.h renamed from home/linux/v2.4/linux/drivers/scsi/sym53c8xx_comm.h +2 -2
@@ -1,7 +1,7 @@/****************************************************************************** ** High Performance device driver for the Symbios 53C896 controller. ** -** Copyright (C) 1998-2000 Gerard Roudier <[email protected]> +** Copyright (C) 1998-2001 Gerard Roudier <[email protected]> ** ** 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 <[email protected]> +** Gerard Roudier <[email protected]> ** ** Being given that this driver originates from the FreeBSD version, and ** in order to keep synergy on both, any suggested enhancements and corrections
drivers/scsi/sym53c8xx_defs.h renamed from home/linux/v2.4/linux/drivers/scsi/sym53c8xx_defs.h +2 -2
@@ -1,7 +1,7 @@/****************************************************************************** ** High Performance device driver for the Symbios 53C896 controller. ** -** Copyright (C) 1998-2000 Gerard Roudier <[email protected]> +** Copyright (C) 1998-2001 Gerard Roudier <[email protected]> ** ** 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 <[email protected]> +** Gerard Roudier <[email protected]> ** ** Being given that this driver originates from the FreeBSD version, and ** in order to keep synergy on both, any suggested enhancements and corrections
drivers/scsi/sym53c8xx_2/ChangeLog.txt renamed from home/linux/v2.4/linux/drivers/scsi/sym53c8xx_2/ChangeLog.txt +18 -0
@@ -128,3 +128,21 @@ * 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. + +Sat Dec 01 18:00 2001 Gerard Roudier + * version sym-2.1.17a + - Use u_long instead of U32 for the IO base cookie. This is more + consistent with what archs are expecting. + - Use MMIO per default for Power PC instead of some fake normal IO, + as Paul Mackerras stated that MMIO works fine now on this arch. + + + +
drivers/scsi/sym53c8xx_2/sym53c8xx.h renamed from home/linux/v2.4/linux/drivers/scsi/sym53c8xx_2/sym53c8xx.h +5 -5
@@ -130,17 +130,17 @@#if !defined(HOSTS_C )/* -* Use normal IO if configured. Forced for alpha and powerpc. -* Powerpc fails copying to on-chip RAM using memcpy_toio(). +* Use normal IO if configured. +* Normal IO forced for alpha. * Forced to MMIO for sparc. */ #if defined(__alpha__)#define SYM_CONF_IOMAPPED -#elif defined(__powerpc__) -#define SYM_CONF_IOMAPPED -#define SYM_OPT_NO_BUS_MEMORY_MAPPING #elif defined(__sparc__)#undef SYM_CONF_IOMAPPED +/* #elif defined(__powerpc__) */ +/* #define SYM_CONF_IOMAPPED */ +/* #define SYM_OPT_NO_BUS_MEMORY_MAPPING */ #elif defined(CONFIG_SCSI_SYM53C8XX_IOMAPPED )#define SYM_CONF_IOMAPPED #endif
drivers/scsi/sym53c8xx_2/sym_glue.c renamed from home/linux/v2.4/linux/drivers/scsi/sym53c8xx_2/sym_glue.c +5 -5
@@ -2456,8 +2456,8 @@u_char pci_fix_up =SYM_SETUP_PCI_FIX_UP ;u_char revision;u_int irq; -u_long base, base_2, io_port; -u_long base_c, base_2_c; +u_long base, base_2, base_io; +u_long base_c, base_2_c, io_port;int i;sym_chip *chip;
@@ -2474,7 +2474,7 @@ device_id =PciDeviceId (pdev); irq =PciIrqLine (pdev); - i =pci_get_base_address (pdev,0 , &io_port); + i =pci_get_base_address (pdev,0 , &base_io); io_port =pci_get_base_cookie (pdev,0 ); base_c =pci_get_base_cookie (pdev, i);
@@ -2492,9 +2492,9 @@/* * If user excluded this chip, donnot initialize it. */ -if (io_port) { +if (base_io) {for (i =0 ; i <8 ; i++) { -if (sym_driver_setup.excludes[i] == io_port) +if (sym_driver_setup.excludes[i] == base_io)return -1 ; } }
drivers/scsi/sym53c8xx_2/sym_glue.h renamed from home/linux/v2.4/linux/drivers/scsi/sym53c8xx_2/sym_glue.h +1 -2
@@ -77,7 +77,6 @@#include <linux/errno.h> #include <linux/pci.h> #include <linux/string.h> -#include <linux/slab.h> #include <linux/mm.h> #include <linux/ioport.h> #include <linux/time.h>
@@ -463,7 +462,7 @@vm_offset_t mmio_va;/* MMIO kernel virtual address */ vm_offset_t ram_va;/* RAM kernel virtual address */ -u32 io_port;/* IO port address */ +u_long io_port;/* IO port address cookie */ u_short io_ws;/* IO window size */ int irq;/* IRQ number */
drivers/scsi/sym53c8xx_2/sym_hipd.c renamed from home/linux/v2.4/linux/drivers/scsi/sym53c8xx_2/sym_hipd.c +12 -1
@@ -50,7 +50,7 @@* SUCH DAMAGE. */ -#define SYM_DRIVER_NAME "sym-2.1.16a" +#define SYM_DRIVER_NAME "sym-2.1.17a"#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" );
drivers/scsi/sym53c8xx_2/sym_hipd.h renamed from home/linux/v2.4/linux/drivers/scsi/sym53c8xx_2/sym_hipd.h +2 -1
@@ -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 */
drivers/scsi/sym53c8xx_2/sym_nvram.c renamed from home/linux/v2.4/linux/drivers/scsi/sym53c8xx_2/sym_nvram.c +4 -4
@@ -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.
Re: PATCH: 2 small patches against 2.4.17-pre2 (sym2 + email change)
Quoted 3 lines · Gérard Roudier
* version sym-2.1.17a
- Useu_longinstead of U32 for the IO base cookie. This is more consistent with what archs are expecting.
Well... if you want to speak of style, no arch uses 'u_long'... rather they use 'unsigned long' :)
Signature · 3 lines
Jeff Garzik | Only so many songs can be sung Building 1024 | with two lips, two lungs, and one tongue. MandrakeSoft | - nomeansno
Re: PATCH: 2 small patches against 2.4.17-pre2 (sym2 + email change)
Quoted 7 lines · Jeff Garzik
Quoted 3 lines · Gérard Roudier
* version sym-2.1.17a
- Useu_longinstead of U32 for the IO base cookie. This is more consistent with what archs are expecting.Well... if you want to speak of style, no arch uses '
u_long'... rather they use 'unsigned long' :)
I don't at any mailing list that has something to do with programming. :)
Gérard.
PS: This email should not have gone to the list. I missed to remove the
LKML from the cc.