* PATCH 2.6.11-rc4 rename IOMAPPED config option
@ 2005-02-21 1:07 Grant Grundler
2005-02-21 1:11 ` Jeff Garzik
0 siblings, 1 reply; 8+ messages in thread
From: Grant Grundler @ 2005-02-21 1:07 UTC (permalink / raw)
To: willy; +Cc: linux-scsi
Willy,
I'm always confused by what CONFIG_SCSI_SYM53C8XX_IOMAPPED
is supposed to mean. When enabled, the driver uses IO Port space.
But "IOMAPPED" is just too close to "Memory Mapped IO" (MMIO).
Following patch renames this to SCSI_SYM53C8XX_USE_MMIO.
I don't need to read the config help to understand what this means.
Signed-off-by: Grant Grundler <grundler@parisc-linux.org>
thanks,
grant
Index: drivers/scsi/Kconfig
===================================================================
RCS file: /var/cvs/linux-2.6/drivers/scsi/Kconfig,v
retrieving revision 1.32
diff -u -p -r1.32 Kconfig
--- drivers/scsi/Kconfig 3 Feb 2005 11:44:46 -0000 1.32
+++ drivers/scsi/Kconfig 21 Feb 2005 00:46:18 -0000
@@ -1016,13 +1016,15 @@ config SCSI_SYM53C8XX_MAX_TAGS
possible. The driver supports up to 256 queued commands per device.
This value is used as a compiled-in hard limit.
-config SCSI_SYM53C8XX_IOMAPPED
- bool "use port IO"
+config SCSI_SYM53C8XX_USE_MMIO
+ bool "use MMIO space"
depends on SCSI_SYM53C8XX_2
+ default y
help
- If you say Y here, the driver will use port IO to access
- the card. This is significantly slower then using memory
- mapped IO. Most people should answer N.
+ If you say Y here, the driver will use MMIO address space
+ to access the card. IO Port space access is significantly
+ slower than MMIO space access.
+ Most people should answer Y.
config SCSI_IPR
tristate "IBM Power Linux RAID adapter support"
Index: drivers/scsi/sym53c8xx_2/sym53c8xx.h
===================================================================
RCS file: /var/cvs/linux-2.6/drivers/scsi/sym53c8xx_2/sym53c8xx.h,v
retrieving revision 1.14
diff -u -p -r1.14 sym53c8xx.h
--- drivers/scsi/sym53c8xx_2/sym53c8xx.h 8 Jan 2005 22:11:08 -0000 1.14
+++ drivers/scsi/sym53c8xx_2/sym53c8xx.h 21 Feb 2005 00:46:18 -0000
@@ -42,10 +42,6 @@
#include <linux/config.h>
-#ifdef CONFIG_SCSI_SYM53C8XX_IOMAPPED
-#define SYM_CONF_IOMAPPED
-#endif
-
/*
* DMA addressing mode.
*
Index: drivers/scsi/sym53c8xx_2/sym_glue.c
===================================================================
RCS file: /var/cvs/linux-2.6/drivers/scsi/sym53c8xx_2/sym_glue.c,v
retrieving revision 1.84
diff -u -p -r1.84 sym_glue.c
--- drivers/scsi/sym53c8xx_2/sym_glue.c 20 Feb 2005 23:49:27 -0000 1.84
+++ drivers/scsi/sym53c8xx_2/sym_glue.c 21 Feb 2005 00:46:18 -0000
@@ -1915,7 +1915,7 @@ sym_init_device(struct pci_dev *pdev, st
i = pci_get_base_address(pdev, 1, &device->s.base);
pci_get_base_address(pdev, i, &device->s.base_2);
-#ifdef CONFIG_SCSI_SYM53C8XX_IOMAPPED
+#ifndef CONFIG_SCSI_SYM53C8XX_USE_MMIO
device->s.ioaddr = pci_iomap(pdev, 0, pci_resource_len(pdev, 0));
#else
device->s.ioaddr = pci_iomap(pdev, 1, pci_resource_len(pdev, 1));
Index: drivers/scsi/sym53c8xx_2/sym_hipd.c
===================================================================
RCS file: /var/cvs/linux-2.6/drivers/scsi/sym53c8xx_2/sym_hipd.c,v
retrieving revision 1.48
diff -u -p -r1.48 sym_hipd.c
--- drivers/scsi/sym53c8xx_2/sym_hipd.c 16 Feb 2005 20:54:02 -0000 1.48
+++ drivers/scsi/sym53c8xx_2/sym_hipd.c 21 Feb 2005 00:46:18 -0000
@@ -1044,7 +1044,7 @@ static int sym_prepare_setting(struct sy
*
* Has to be called with interrupts disabled.
*/
-#ifndef SYM_CONF_IOMAPPED
+#ifdef CONFIG_SCSI_SYM53C8XX_USE_MMIO
static int sym_regtest (struct sym_hcb *np)
{
register volatile u32 data;
@@ -1073,7 +1073,7 @@ static int sym_snooptest (struct sym_hcb
{
u32 sym_rd, sym_wr, sym_bk, host_rd, host_wr, pc, dstat;
int i, err=0;
-#ifndef SYM_CONF_IOMAPPED
+#ifdef CONFIG_SCSI_SYM53C8XX_USE_MMIO
err |= sym_regtest (np);
if (err) return (err);
#endif
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: PATCH 2.6.11-rc4 rename IOMAPPED config option
2005-02-21 1:07 PATCH 2.6.11-rc4 rename IOMAPPED config option Grant Grundler
@ 2005-02-21 1:11 ` Jeff Garzik
2005-02-21 2:02 ` Matthew Wilcox
0 siblings, 1 reply; 8+ messages in thread
From: Jeff Garzik @ 2005-02-21 1:11 UTC (permalink / raw)
To: Grant Grundler; +Cc: willy, linux-scsi
Grant Grundler wrote:
> --- drivers/scsi/Kconfig 3 Feb 2005 11:44:46 -0000 1.32
> +++ drivers/scsi/Kconfig 21 Feb 2005 00:46:18 -0000
Patch doesn't apply with -p1.
> --- drivers/scsi/sym53c8xx_2/sym_glue.c 20 Feb 2005 23:49:27 -0000 1.84
> +++ drivers/scsi/sym53c8xx_2/sym_glue.c 21 Feb 2005 00:46:18 -0000
> @@ -1915,7 +1915,7 @@ sym_init_device(struct pci_dev *pdev, st
> i = pci_get_base_address(pdev, 1, &device->s.base);
> pci_get_base_address(pdev, i, &device->s.base_2);
>
> -#ifdef CONFIG_SCSI_SYM53C8XX_IOMAPPED
> +#ifndef CONFIG_SCSI_SYM53C8XX_USE_MMIO
> device->s.ioaddr = pci_iomap(pdev, 0, pci_resource_len(pdev, 0));
> #else
> device->s.ioaddr = pci_iomap(pdev, 1, pci_resource_len(pdev, 1));
This file does not include <linux/config.h>.
> Index: drivers/scsi/sym53c8xx_2/sym_hipd.c
> ===================================================================
> RCS file: /var/cvs/linux-2.6/drivers/scsi/sym53c8xx_2/sym_hipd.c,v
> retrieving revision 1.48
> diff -u -p -r1.48 sym_hipd.c
> --- drivers/scsi/sym53c8xx_2/sym_hipd.c 16 Feb 2005 20:54:02 -0000 1.48
> +++ drivers/scsi/sym53c8xx_2/sym_hipd.c 21 Feb 2005 00:46:18 -0000
> @@ -1044,7 +1044,7 @@ static int sym_prepare_setting(struct sy
> *
> * Has to be called with interrupts disabled.
> */
> -#ifndef SYM_CONF_IOMAPPED
> +#ifdef CONFIG_SCSI_SYM53C8XX_USE_MMIO
ditto
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: PATCH 2.6.11-rc4 rename IOMAPPED config option
2005-02-21 1:11 ` Jeff Garzik
@ 2005-02-21 2:02 ` Matthew Wilcox
2005-02-21 2:09 ` Jeff Garzik
0 siblings, 1 reply; 8+ messages in thread
From: Matthew Wilcox @ 2005-02-21 2:02 UTC (permalink / raw)
To: Jeff Garzik; +Cc: Grant Grundler, willy, linux-scsi
On Sun, Feb 20, 2005 at 08:11:58PM -0500, Jeff Garzik wrote:
> Patch doesn't apply with -p1.
Doesn't matter; I can cope with both.
> >--- drivers/scsi/sym53c8xx_2/sym_glue.c 20 Feb 2005 23:49:27 -0000
> >1.84
>
> This file does not include <linux/config.h>.
Doesn't need to -- sym_glue.h does.
> >--- drivers/scsi/sym53c8xx_2/sym_hipd.c 16 Feb 2005 20:54:02 -0000
> >1.48
>
> ditto
ditto.
--
"Next the statesmen will invent cheap lies, putting the blame upon
the nation that is attacked, and every man will be glad of those
conscience-soothing falsities, and will diligently study them, and refuse
to examine any refutations of them; and thus he will by and by convince
himself that the war is just, and will thank God for the better sleep
he enjoys after this process of grotesque self-deception." -- Mark Twain
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: PATCH 2.6.11-rc4 rename IOMAPPED config option
2005-02-21 2:02 ` Matthew Wilcox
@ 2005-02-21 2:09 ` Jeff Garzik
2005-02-21 2:14 ` Matthew Wilcox
2005-02-23 20:55 ` Grant Grundler
0 siblings, 2 replies; 8+ messages in thread
From: Jeff Garzik @ 2005-02-21 2:09 UTC (permalink / raw)
To: Matthew Wilcox; +Cc: Grant Grundler, willy, linux-scsi
On Mon, Feb 21, 2005 at 02:02:21AM +0000, Matthew Wilcox wrote:
> On Sun, Feb 20, 2005 at 08:11:58PM -0500, Jeff Garzik wrote:
> > Patch doesn't apply with -p1.
>
> Doesn't matter; I can cope with both.
Irrelevant. It matters to automated patch snarfers, lkml.org users, etc.
> > >--- drivers/scsi/sym53c8xx_2/sym_glue.c 20 Feb 2005 23:49:27 -0000
> > >1.84
> >
> > This file does not include <linux/config.h>.
>
> Doesn't need to -- sym_glue.h does.
>
> > >--- drivers/scsi/sym53c8xx_2/sym_hipd.c 16 Feb 2005 20:54:02 -0000
> > >1.48
> >
> > ditto
>
> ditto.
Incorrect. <linux/config.h> is not a standard include; you need to
include linux/config.h in each file that uses a CONFIG_xxx define.
Jeff
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: PATCH 2.6.11-rc4 rename IOMAPPED config option
2005-02-21 2:09 ` Jeff Garzik
@ 2005-02-21 2:14 ` Matthew Wilcox
2005-02-21 2:16 ` Jeff Garzik
2005-02-23 20:55 ` Grant Grundler
1 sibling, 1 reply; 8+ messages in thread
From: Matthew Wilcox @ 2005-02-21 2:14 UTC (permalink / raw)
To: Jeff Garzik; +Cc: Matthew Wilcox, Grant Grundler, willy, linux-scsi
On Sun, Feb 20, 2005 at 09:09:36PM -0500, Jeff Garzik wrote:
> Incorrect. <linux/config.h> is not a standard include; you need to
> include linux/config.h in each file that uses a CONFIG_xxx define.
sym_hipd.c includes "sym_glue.h"
sym_glue.h includes <linux/config.h>
There is no problem.
--
"Next the statesmen will invent cheap lies, putting the blame upon
the nation that is attacked, and every man will be glad of those
conscience-soothing falsities, and will diligently study them, and refuse
to examine any refutations of them; and thus he will by and by convince
himself that the war is just, and will thank God for the better sleep
he enjoys after this process of grotesque self-deception." -- Mark Twain
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: PATCH 2.6.11-rc4 rename IOMAPPED config option
2005-02-21 2:14 ` Matthew Wilcox
@ 2005-02-21 2:16 ` Jeff Garzik
2005-02-21 2:26 ` Matthew Wilcox
0 siblings, 1 reply; 8+ messages in thread
From: Jeff Garzik @ 2005-02-21 2:16 UTC (permalink / raw)
To: Matthew Wilcox; +Cc: Grant Grundler, willy, linux-scsi
On Mon, Feb 21, 2005 at 02:14:05AM +0000, Matthew Wilcox wrote:
> On Sun, Feb 20, 2005 at 09:09:36PM -0500, Jeff Garzik wrote:
> > Incorrect. <linux/config.h> is not a standard include; you need to
> > include linux/config.h in each file that uses a CONFIG_xxx define.
>
> sym_hipd.c includes "sym_glue.h"
> sym_glue.h includes <linux/config.h>
> There is no problem.
Irrelevant. Go look at how config.h stuff works.
linux/config.h is a special case with special rules.
The rule is: include linux/config.h _in the file_ where CONFIG_xxx
symbol is used.
Jeff
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: PATCH 2.6.11-rc4 rename IOMAPPED config option
2005-02-21 2:16 ` Jeff Garzik
@ 2005-02-21 2:26 ` Matthew Wilcox
0 siblings, 0 replies; 8+ messages in thread
From: Matthew Wilcox @ 2005-02-21 2:26 UTC (permalink / raw)
To: Jeff Garzik; +Cc: Matthew Wilcox, Grant Grundler, willy, linux-scsi
On Sun, Feb 20, 2005 at 09:16:31PM -0500, Jeff Garzik wrote:
> On Mon, Feb 21, 2005 at 02:14:05AM +0000, Matthew Wilcox wrote:
> > On Sun, Feb 20, 2005 at 09:09:36PM -0500, Jeff Garzik wrote:
> > > Incorrect. <linux/config.h> is not a standard include; you need to
> > > include linux/config.h in each file that uses a CONFIG_xxx define.
> >
> > sym_hipd.c includes "sym_glue.h"
> > sym_glue.h includes <linux/config.h>
> > There is no problem.
>
> Irrelevant. Go look at how config.h stuff works.
>
> linux/config.h is a special case with special rules.
>
> The rule is: include linux/config.h _in the file_ where CONFIG_xxx
> symbol is used.
Jeff, you're smoking crack. I just read fixdep.c and looked at
drivers/scsi/sym53c8xx_2/.sym_hipd.o.cmd . You're wrong.
--
"Next the statesmen will invent cheap lies, putting the blame upon
the nation that is attacked, and every man will be glad of those
conscience-soothing falsities, and will diligently study them, and refuse
to examine any refutations of them; and thus he will by and by convince
himself that the war is just, and will thank God for the better sleep
he enjoys after this process of grotesque self-deception." -- Mark Twain
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: PATCH 2.6.11-rc4 rename IOMAPPED config option
2005-02-21 2:09 ` Jeff Garzik
2005-02-21 2:14 ` Matthew Wilcox
@ 2005-02-23 20:55 ` Grant Grundler
1 sibling, 0 replies; 8+ messages in thread
From: Grant Grundler @ 2005-02-23 20:55 UTC (permalink / raw)
To: Jeff Garzik; +Cc: Matthew Wilcox, Grant Grundler, linux-scsi
On Sun, Feb 20, 2005 at 09:09:36PM -0500, Jeff Garzik wrote:
> Irrelevant. It matters to automated patch snarfers, lkml.org users, etc.
Jeff,
I just cut the patch using standard cvs diff.
I know SubmittingPatches wants -p0 but I also knew
that willy doesn't mind -p1 and he's the maintainer.
> Incorrect. <linux/config.h> is not a standard include; you need to
> include linux/config.h in each file that uses a CONFIG_xxx define.
ok - I prefer files directly include the headers they depend on.
I'll add that and resubmit next week. Then willy can reject that
if he wants. :^)
thanks,
grant
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2005-02-23 20:54 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2005-02-21 1:07 PATCH 2.6.11-rc4 rename IOMAPPED config option Grant Grundler
2005-02-21 1:11 ` Jeff Garzik
2005-02-21 2:02 ` Matthew Wilcox
2005-02-21 2:09 ` Jeff Garzik
2005-02-21 2:14 ` Matthew Wilcox
2005-02-21 2:16 ` Jeff Garzik
2005-02-21 2:26 ` Matthew Wilcox
2005-02-23 20:55 ` Grant Grundler
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox