* [2.6 patch] always enable CONFIG_PDC202XX_FORCE
2006-01-14 17:47 ` Bartlomiej Zolnierkiewicz
@ 2006-01-14 19:55 ` Adrian Bunk
2006-01-15 1:07 ` Alan Cox
0 siblings, 1 reply; 8+ messages in thread
From: Adrian Bunk @ 2006-01-14 19:55 UTC (permalink / raw)
To: Bartlomiej Zolnierkiewicz
Cc: Alan Cox, linux-kernel, linux-ide, Andrey J. Melnikoff
On Sat, Jan 14, 2006 at 06:47:31PM +0100, Bartlomiej Zolnierkiewicz wrote:
> On 1/14/06, Alan Cox <alan@lxorguk.ukuu.org.uk> wrote:
> > On Sad, 2006-01-14 at 16:21 +0100, Adrian Bunk wrote:
> > > Split PDC202XX_FORCE selection into two independ option and allow user
> > > select it only for specific driver.
> >
> > Seems pointless. We should always grab the raid cards. The option itself
> > is a mistake
>
> Alan is right, these cards should always be grabbed in 2.6.x kernels.
> This option is a leftover from earlier 2.4.x days when Promise binary
> driver was available for using software RAID.
>
> Could somebody submit a patch removing CONFIG_PDC202XX_FORCE?
Patch below.
> Bartlomiej
cu
Adrian
<-- snip -->
This patch removes the CONFIG_PDC202XX_FORCE=n case.
Signed-off-by: Adrian Bunk <bunk@stusta.de>
---
drivers/ide/Kconfig | 7 -------
drivers/ide/pci/pdc202xx_new.c | 6 ------
drivers/ide/pci/pdc202xx_old.c | 15 ---------------
3 files changed, 28 deletions(-)
--- linux-2.6.15-mm4-full/drivers/ide/Kconfig.old 2006-01-14 20:43:13.000000000 +0100
+++ linux-2.6.15-mm4-full/drivers/ide/Kconfig 2006-01-14 20:43:23.000000000 +0100
@@ -673,13 +673,6 @@
config BLK_DEV_PDC202XX_NEW
tristate "PROMISE PDC202{68|69|70|71|75|76|77} support"
-# FIXME - probably wants to be one for old and for new
-config PDC202XX_FORCE
- bool "Enable controller even if disabled by BIOS"
- depends on BLK_DEV_PDC202XX_NEW
- help
- Enable the PDC202xx controller even if it has been disabled in the BIOS setup.
-
config BLK_DEV_SVWKS
tristate "ServerWorks OSB4/CSB5/CSB6 chipsets support"
help
--- linux-2.6.15-mm4-full/drivers/ide/pci/pdc202xx_new.c.old 2006-01-14 20:43:30.000000000 +0100
+++ linux-2.6.15-mm4-full/drivers/ide/pci/pdc202xx_new.c 2006-01-14 20:43:51.000000000 +0100
@@ -420,9 +420,6 @@
.init_hwif = init_hwif_pdc202new,
.channels = 2,
.autodma = AUTODMA,
-#ifndef CONFIG_PDC202XX_FORCE
- .enablebits = {{0x50,0x02,0x02}, {0x50,0x04,0x04}},
-#endif
.bootable = OFF_BOARD,
},{ /* 3 */
.name = "PDC20271",
@@ -447,9 +444,6 @@
.init_hwif = init_hwif_pdc202new,
.channels = 2,
.autodma = AUTODMA,
-#ifndef CONFIG_PDC202XX_FORCE
- .enablebits = {{0x50,0x02,0x02}, {0x50,0x04,0x04}},
-#endif
.bootable = OFF_BOARD,
},{ /* 6 */
.name = "PDC20277",
--- linux-2.6.15-mm4-full/drivers/ide/pci/pdc202xx_old.c.old 2006-01-14 20:44:01.000000000 +0100
+++ linux-2.6.15-mm4-full/drivers/ide/pci/pdc202xx_old.c 2006-01-14 20:44:21.000000000 +0100
@@ -786,9 +786,6 @@
.init_dma = init_dma_pdc202xx,
.channels = 2,
.autodma = AUTODMA,
-#ifndef CONFIG_PDC202XX_FORCE
- .enablebits = {{0x50,0x02,0x02}, {0x50,0x04,0x04}},
-#endif
.bootable = OFF_BOARD,
.extra = 16,
},{ /* 1 */
@@ -799,9 +796,6 @@
.init_dma = init_dma_pdc202xx,
.channels = 2,
.autodma = AUTODMA,
-#ifndef CONFIG_PDC202XX_FORCE
- .enablebits = {{0x50,0x02,0x02}, {0x50,0x04,0x04}},
-#endif
.bootable = OFF_BOARD,
.extra = 48,
.flags = IDEPCI_FLAG_FORCE_PDC,
@@ -813,9 +807,6 @@
.init_dma = init_dma_pdc202xx,
.channels = 2,
.autodma = AUTODMA,
-#ifndef CONFIG_PDC202XX_FORCE
- .enablebits = {{0x50,0x02,0x02}, {0x50,0x04,0x04}},
-#endif
.bootable = OFF_BOARD,
.extra = 48,
},{ /* 3 */
@@ -826,9 +817,6 @@
.init_dma = init_dma_pdc202xx,
.channels = 2,
.autodma = AUTODMA,
-#ifndef CONFIG_PDC202XX_FORCE
- .enablebits = {{0x50,0x02,0x02}, {0x50,0x04,0x04}},
-#endif
.bootable = OFF_BOARD,
.extra = 48,
.flags = IDEPCI_FLAG_FORCE_PDC,
@@ -840,9 +828,6 @@
.init_dma = init_dma_pdc202xx,
.channels = 2,
.autodma = AUTODMA,
-#ifndef CONFIG_PDC202XX_FORCE
- .enablebits = {{0x50,0x02,0x02}, {0x50,0x04,0x04}},
-#endif
.bootable = OFF_BOARD,
.extra = 48,
}
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [2.6 patch] always enable CONFIG_PDC202XX_FORCE
2006-01-14 19:55 ` [2.6 patch] always enable CONFIG_PDC202XX_FORCE Adrian Bunk
@ 2006-01-15 1:07 ` Alan Cox
2006-01-15 1:50 ` Adrian Bunk
0 siblings, 1 reply; 8+ messages in thread
From: Alan Cox @ 2006-01-15 1:07 UTC (permalink / raw)
To: Adrian Bunk
Cc: Bartlomiej Zolnierkiewicz, linux-kernel, linux-ide,
Andrey J. Melnikoff
On Sad, 2006-01-14 at 20:55 +0100, Adrian Bunk wrote:
> This patch removes the CONFIG_PDC202XX_FORCE=n case.
NAK. The Y case is the one you want to keep
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [2.6 patch] always enable CONFIG_PDC202XX_FORCE
2006-01-15 1:07 ` Alan Cox
@ 2006-01-15 1:50 ` Adrian Bunk
0 siblings, 0 replies; 8+ messages in thread
From: Adrian Bunk @ 2006-01-15 1:50 UTC (permalink / raw)
To: Alan Cox
Cc: Bartlomiej Zolnierkiewicz, linux-kernel, linux-ide,
Andrey J. Melnikoff
On Sun, Jan 15, 2006 at 01:07:29AM +0000, Alan Cox wrote:
> On Sad, 2006-01-14 at 20:55 +0100, Adrian Bunk wrote:
> > This patch removes the CONFIG_PDC202XX_FORCE=n case.
>
> NAK. The Y case is the one you want to keep
Removing the N case is the same as keeping the Y case...
cu
Adrian
--
"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon Seed
^ permalink raw reply [flat|nested] 8+ messages in thread
* [2.6 patch] always enable CONFIG_PDC202XX_FORCE
@ 2006-01-22 17:12 Adrian Bunk
2006-03-27 14:25 ` Sergei Shtylylov
0 siblings, 1 reply; 8+ messages in thread
From: Adrian Bunk @ 2006-01-22 17:12 UTC (permalink / raw)
To: Bartlomiej Zolnierkiewicz; +Cc: Alan Cox, linux-kernel, linux-ide
This patch removes the CONFIG_PDC202XX_FORCE=n case.
Signed-off-by: Adrian Bunk <bunk@stusta.de>
---
This patch was already sent on:
- 14 Jan 2006
drivers/ide/Kconfig | 7 -------
drivers/ide/pci/pdc202xx_new.c | 6 ------
drivers/ide/pci/pdc202xx_old.c | 15 ---------------
3 files changed, 28 deletions(-)
--- linux-2.6.15-mm4-full/drivers/ide/Kconfig.old 2006-01-14 20:43:13.000000000 +0100
+++ linux-2.6.15-mm4-full/drivers/ide/Kconfig 2006-01-14 20:43:23.000000000 +0100
@@ -673,13 +673,6 @@
config BLK_DEV_PDC202XX_NEW
tristate "PROMISE PDC202{68|69|70|71|75|76|77} support"
-# FIXME - probably wants to be one for old and for new
-config PDC202XX_FORCE
- bool "Enable controller even if disabled by BIOS"
- depends on BLK_DEV_PDC202XX_NEW
- help
- Enable the PDC202xx controller even if it has been disabled in the BIOS setup.
-
config BLK_DEV_SVWKS
tristate "ServerWorks OSB4/CSB5/CSB6 chipsets support"
help
--- linux-2.6.15-mm4-full/drivers/ide/pci/pdc202xx_new.c.old 2006-01-14 20:43:30.000000000 +0100
+++ linux-2.6.15-mm4-full/drivers/ide/pci/pdc202xx_new.c 2006-01-14 20:43:51.000000000 +0100
@@ -420,9 +420,6 @@
.init_hwif = init_hwif_pdc202new,
.channels = 2,
.autodma = AUTODMA,
-#ifndef CONFIG_PDC202XX_FORCE
- .enablebits = {{0x50,0x02,0x02}, {0x50,0x04,0x04}},
-#endif
.bootable = OFF_BOARD,
},{ /* 3 */
.name = "PDC20271",
@@ -447,9 +444,6 @@
.init_hwif = init_hwif_pdc202new,
.channels = 2,
.autodma = AUTODMA,
-#ifndef CONFIG_PDC202XX_FORCE
- .enablebits = {{0x50,0x02,0x02}, {0x50,0x04,0x04}},
-#endif
.bootable = OFF_BOARD,
},{ /* 6 */
.name = "PDC20277",
--- linux-2.6.15-mm4-full/drivers/ide/pci/pdc202xx_old.c.old 2006-01-14 20:44:01.000000000 +0100
+++ linux-2.6.15-mm4-full/drivers/ide/pci/pdc202xx_old.c 2006-01-14 20:44:21.000000000 +0100
@@ -786,9 +786,6 @@
.init_dma = init_dma_pdc202xx,
.channels = 2,
.autodma = AUTODMA,
-#ifndef CONFIG_PDC202XX_FORCE
- .enablebits = {{0x50,0x02,0x02}, {0x50,0x04,0x04}},
-#endif
.bootable = OFF_BOARD,
.extra = 16,
},{ /* 1 */
@@ -799,9 +796,6 @@
.init_dma = init_dma_pdc202xx,
.channels = 2,
.autodma = AUTODMA,
-#ifndef CONFIG_PDC202XX_FORCE
- .enablebits = {{0x50,0x02,0x02}, {0x50,0x04,0x04}},
-#endif
.bootable = OFF_BOARD,
.extra = 48,
.flags = IDEPCI_FLAG_FORCE_PDC,
@@ -813,9 +807,6 @@
.init_dma = init_dma_pdc202xx,
.channels = 2,
.autodma = AUTODMA,
-#ifndef CONFIG_PDC202XX_FORCE
- .enablebits = {{0x50,0x02,0x02}, {0x50,0x04,0x04}},
-#endif
.bootable = OFF_BOARD,
.extra = 48,
},{ /* 3 */
@@ -826,9 +817,6 @@
.init_dma = init_dma_pdc202xx,
.channels = 2,
.autodma = AUTODMA,
-#ifndef CONFIG_PDC202XX_FORCE
- .enablebits = {{0x50,0x02,0x02}, {0x50,0x04,0x04}},
-#endif
.bootable = OFF_BOARD,
.extra = 48,
.flags = IDEPCI_FLAG_FORCE_PDC,
@@ -840,9 +828,6 @@
.init_dma = init_dma_pdc202xx,
.channels = 2,
.autodma = AUTODMA,
-#ifndef CONFIG_PDC202XX_FORCE
- .enablebits = {{0x50,0x02,0x02}, {0x50,0x04,0x04}},
-#endif
.bootable = OFF_BOARD,
.extra = 48,
}
^ permalink raw reply [flat|nested] 8+ messages in thread
* [2.6 patch] always enable CONFIG_PDC202XX_FORCE
@ 2006-01-28 23:04 Adrian Bunk
0 siblings, 0 replies; 8+ messages in thread
From: Adrian Bunk @ 2006-01-28 23:04 UTC (permalink / raw)
To: Andrew Morton
Cc: Bartlomiej Zolnierkiewicz, Alan Cox, linux-kernel, linux-ide
This patch removes the CONFIG_PDC202XX_FORCE=n case.
Signed-off-by: Adrian Bunk <bunk@stusta.de>
---
This patch was already sent on:
- 22 Jan 2006
- 14 Jan 2006
drivers/ide/Kconfig | 7 -------
drivers/ide/pci/pdc202xx_new.c | 6 ------
drivers/ide/pci/pdc202xx_old.c | 15 ---------------
3 files changed, 28 deletions(-)
--- linux-2.6.15-mm4-full/drivers/ide/Kconfig.old 2006-01-14 20:43:13.000000000 +0100
+++ linux-2.6.15-mm4-full/drivers/ide/Kconfig 2006-01-14 20:43:23.000000000 +0100
@@ -673,13 +673,6 @@
config BLK_DEV_PDC202XX_NEW
tristate "PROMISE PDC202{68|69|70|71|75|76|77} support"
-# FIXME - probably wants to be one for old and for new
-config PDC202XX_FORCE
- bool "Enable controller even if disabled by BIOS"
- depends on BLK_DEV_PDC202XX_NEW
- help
- Enable the PDC202xx controller even if it has been disabled in the BIOS setup.
-
config BLK_DEV_SVWKS
tristate "ServerWorks OSB4/CSB5/CSB6 chipsets support"
help
--- linux-2.6.15-mm4-full/drivers/ide/pci/pdc202xx_new.c.old 2006-01-14 20:43:30.000000000 +0100
+++ linux-2.6.15-mm4-full/drivers/ide/pci/pdc202xx_new.c 2006-01-14 20:43:51.000000000 +0100
@@ -420,9 +420,6 @@
.init_hwif = init_hwif_pdc202new,
.channels = 2,
.autodma = AUTODMA,
-#ifndef CONFIG_PDC202XX_FORCE
- .enablebits = {{0x50,0x02,0x02}, {0x50,0x04,0x04}},
-#endif
.bootable = OFF_BOARD,
},{ /* 3 */
.name = "PDC20271",
@@ -447,9 +444,6 @@
.init_hwif = init_hwif_pdc202new,
.channels = 2,
.autodma = AUTODMA,
-#ifndef CONFIG_PDC202XX_FORCE
- .enablebits = {{0x50,0x02,0x02}, {0x50,0x04,0x04}},
-#endif
.bootable = OFF_BOARD,
},{ /* 6 */
.name = "PDC20277",
--- linux-2.6.15-mm4-full/drivers/ide/pci/pdc202xx_old.c.old 2006-01-14 20:44:01.000000000 +0100
+++ linux-2.6.15-mm4-full/drivers/ide/pci/pdc202xx_old.c 2006-01-14 20:44:21.000000000 +0100
@@ -786,9 +786,6 @@
.init_dma = init_dma_pdc202xx,
.channels = 2,
.autodma = AUTODMA,
-#ifndef CONFIG_PDC202XX_FORCE
- .enablebits = {{0x50,0x02,0x02}, {0x50,0x04,0x04}},
-#endif
.bootable = OFF_BOARD,
.extra = 16,
},{ /* 1 */
@@ -799,9 +796,6 @@
.init_dma = init_dma_pdc202xx,
.channels = 2,
.autodma = AUTODMA,
-#ifndef CONFIG_PDC202XX_FORCE
- .enablebits = {{0x50,0x02,0x02}, {0x50,0x04,0x04}},
-#endif
.bootable = OFF_BOARD,
.extra = 48,
.flags = IDEPCI_FLAG_FORCE_PDC,
@@ -813,9 +807,6 @@
.init_dma = init_dma_pdc202xx,
.channels = 2,
.autodma = AUTODMA,
-#ifndef CONFIG_PDC202XX_FORCE
- .enablebits = {{0x50,0x02,0x02}, {0x50,0x04,0x04}},
-#endif
.bootable = OFF_BOARD,
.extra = 48,
},{ /* 3 */
@@ -826,9 +817,6 @@
.init_dma = init_dma_pdc202xx,
.channels = 2,
.autodma = AUTODMA,
-#ifndef CONFIG_PDC202XX_FORCE
- .enablebits = {{0x50,0x02,0x02}, {0x50,0x04,0x04}},
-#endif
.bootable = OFF_BOARD,
.extra = 48,
.flags = IDEPCI_FLAG_FORCE_PDC,
@@ -840,9 +828,6 @@
.init_dma = init_dma_pdc202xx,
.channels = 2,
.autodma = AUTODMA,
-#ifndef CONFIG_PDC202XX_FORCE
- .enablebits = {{0x50,0x02,0x02}, {0x50,0x04,0x04}},
-#endif
.bootable = OFF_BOARD,
.extra = 48,
}
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [2.6 patch] always enable CONFIG_PDC202XX_FORCE
2006-01-22 17:12 Adrian Bunk
@ 2006-03-27 14:25 ` Sergei Shtylylov
2006-03-27 14:40 ` Bartlomiej Zolnierkiewicz
0 siblings, 1 reply; 8+ messages in thread
From: Sergei Shtylylov @ 2006-03-27 14:25 UTC (permalink / raw)
To: Adrian Bunk; +Cc: Bartlomiej Zolnierkiewicz, Alan Cox, linux-kernel, linux-ide
Hello.
Adrian Bunk wrote:
> This patch removes the CONFIG_PDC202XX_FORCE=n case.
> Signed-off-by: Adrian Bunk <bunk@stusta.de>
> ---
>
> This patch was already sent on:
> - 14 Jan 2006
>
> drivers/ide/Kconfig | 7 -------
> drivers/ide/pci/pdc202xx_new.c | 6 ------
> drivers/ide/pci/pdc202xx_old.c | 15 ---------------
> 3 files changed, 28 deletions(-)
[skipped]
> --- linux-2.6.15-mm4-full/drivers/ide/pci/pdc202xx_old.c.old 2006-01-14 20:44:01.000000000 +0100
> +++ linux-2.6.15-mm4-full/drivers/ide/pci/pdc202xx_old.c 2006-01-14 20:44:21.000000000 +0100
> @@ -786,9 +786,6 @@
> .init_dma = init_dma_pdc202xx,
> .channels = 2,
> .autodma = AUTODMA,
> -#ifndef CONFIG_PDC202XX_FORCE
> - .enablebits = {{0x50,0x02,0x02}, {0x50,0x04,0x04}},
> -#endif
> .bootable = OFF_BOARD,
> .extra = 16,
> },{ /* 1 */
> @@ -799,9 +796,6 @@
> .init_dma = init_dma_pdc202xx,
> .channels = 2,
> .autodma = AUTODMA,
> -#ifndef CONFIG_PDC202XX_FORCE
> - .enablebits = {{0x50,0x02,0x02}, {0x50,0x04,0x04}},
> -#endif
> .bootable = OFF_BOARD,
> .extra = 48,
> .flags = IDEPCI_FLAG_FORCE_PDC,
A late question: wasn't that IDEPCI_FLAG_FORCE_PDC flag there for the same
purpose -- to bypass enablebits check? Wasn't it enough?
> @@ -813,9 +807,6 @@
> .init_dma = init_dma_pdc202xx,
> .channels = 2,
> .autodma = AUTODMA,
> -#ifndef CONFIG_PDC202XX_FORCE
> - .enablebits = {{0x50,0x02,0x02}, {0x50,0x04,0x04}},
> -#endif
> .bootable = OFF_BOARD,
> .extra = 48,
> },{ /* 3 */
> @@ -826,9 +817,6 @@
> .init_dma = init_dma_pdc202xx,
> .channels = 2,
> .autodma = AUTODMA,
> -#ifndef CONFIG_PDC202XX_FORCE
> - .enablebits = {{0x50,0x02,0x02}, {0x50,0x04,0x04}},
> -#endif
> .bootable = OFF_BOARD,
> .extra = 48,
> .flags = IDEPCI_FLAG_FORCE_PDC,
> @@ -840,9 +828,6 @@
> .init_dma = init_dma_pdc202xx,
> .channels = 2,
> .autodma = AUTODMA,
> -#ifndef CONFIG_PDC202XX_FORCE
> - .enablebits = {{0x50,0x02,0x02}, {0x50,0x04,0x04}},
> -#endif
> .bootable = OFF_BOARD,
> .extra = 48,
> }
WBR, Sergei
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [2.6 patch] always enable CONFIG_PDC202XX_FORCE
2006-03-27 14:25 ` Sergei Shtylylov
@ 2006-03-27 14:40 ` Bartlomiej Zolnierkiewicz
0 siblings, 0 replies; 8+ messages in thread
From: Bartlomiej Zolnierkiewicz @ 2006-03-27 14:40 UTC (permalink / raw)
To: Sergei Shtylylov; +Cc: Adrian Bunk, Alan Cox, linux-kernel, linux-ide
On 3/27/06, Sergei Shtylylov <sshtylyov@ru.mvista.com> wrote:
> Hello.
>
> Adrian Bunk wrote:
>
> > This patch removes the CONFIG_PDC202XX_FORCE=n case.
>
> > Signed-off-by: Adrian Bunk <bunk@stusta.de>
>
> > ---
> >
> > This patch was already sent on:
> > - 14 Jan 2006
> >
> > drivers/ide/Kconfig | 7 -------
> > drivers/ide/pci/pdc202xx_new.c | 6 ------
> > drivers/ide/pci/pdc202xx_old.c | 15 ---------------
> > 3 files changed, 28 deletions(-)
>
> [skipped]
>
> > --- linux-2.6.15-mm4-full/drivers/ide/pci/pdc202xx_old.c.old 2006-01-14 20:44:01.000000000 +0100
> > +++ linux-2.6.15-mm4-full/drivers/ide/pci/pdc202xx_old.c 2006-01-14 20:44:21.000000000 +0100
> > @@ -786,9 +786,6 @@
> > .init_dma = init_dma_pdc202xx,
> > .channels = 2,
> > .autodma = AUTODMA,
> > -#ifndef CONFIG_PDC202XX_FORCE
> > - .enablebits = {{0x50,0x02,0x02}, {0x50,0x04,0x04}},
> > -#endif
> > .bootable = OFF_BOARD,
> > .extra = 16,
> > },{ /* 1 */
> > @@ -799,9 +796,6 @@
> > .init_dma = init_dma_pdc202xx,
> > .channels = 2,
> > .autodma = AUTODMA,
> > -#ifndef CONFIG_PDC202XX_FORCE
> > - .enablebits = {{0x50,0x02,0x02}, {0x50,0x04,0x04}},
> > -#endif
> > .bootable = OFF_BOARD,
> > .extra = 48,
> > .flags = IDEPCI_FLAG_FORCE_PDC,
>
> A late question: wasn't that IDEPCI_FLAG_FORCE_PDC flag there for the same
> purpose -- to bypass enablebits check? Wasn't it enough?
It was for the same purpose but it wasn't enough,
now this flag can die...
Bartlomiej
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [2.6 patch] always enable CONFIG_PDC202XX_FORCE
@ 2006-04-04 0:10 Tobias Oed
0 siblings, 0 replies; 8+ messages in thread
From: Tobias Oed @ 2006-04-04 0:10 UTC (permalink / raw)
To: linux-ide; +Cc: tobiasoed, bzolnier
> > On 3/27/06, Sergei Shtylylov <sshtylyov@ru.mvista.com> wrote:
> > Hello.
> >
> > Adrian Bunk wrote:
> >
> > > This patch removes the CONFIG_PDC202XX_FORCE=n case.
> >
> > > Signed-off-by: Adrian Bunk <bunk@stusta.de>
> >
> > > ---
> > >
> > > This patch was already sent on:
> > > - 14 Jan 2006
> > >
> > > drivers/ide/Kconfig | 7 -------
> > > drivers/ide/pci/pdc202xx_new.c | 6 ------
> > > drivers/ide/pci/pdc202xx_old.c | 15 ---------------
> > > 3 files changed, 28 deletions(-)
> >
> > [skipped]
> >
> > > --- linux-2.6.15-mm4-full/drivers/ide/pci/pdc202xx_old.c.old
>2006-01-14 20:44:01.000000000 +0100
> > > +++ linux-2.6.15-mm4-full/drivers/ide/pci/pdc202xx_old.c
>2006-01-14 20:44:21.000000000 +0100
> > > @@ -786,9 +786,6 @@
> > > .init_dma = init_dma_pdc202xx,
> > > .channels = 2,
> > > .autodma = AUTODMA,
> > > -#ifndef CONFIG_PDC202XX_FORCE
> > > - .enablebits = {{0x50,0x02,0x02}, {0x50,0x04,0x04}},
> > > -#endif
> > > .bootable = OFF_BOARD,
> > > .extra = 16,
> > > },{ /* 1 */
> > > @@ -799,9 +796,6 @@
> > > .init_dma = init_dma_pdc202xx,
> > > .channels = 2,
> > > .autodma = AUTODMA,
> > > -#ifndef CONFIG_PDC202XX_FORCE
> > > - .enablebits = {{0x50,0x02,0x02}, {0x50,0x04,0x04}},
> > > -#endif
> > > .bootable = OFF_BOARD,
> > > .extra = 48,
> > > .flags = IDEPCI_FLAG_FORCE_PDC,
> >
> > A late question: wasn't that IDEPCI_FLAG_FORCE_PDC flag there for
>the same
> > purpose -- to bypass enablebits check? Wasn't it enough?
>
>It was for the same purpose but it wasn't enough,
>now this flag can die...
>
>Bartlomiej
Here is a patch to remove the IDEPCI_FLAG_FORCE_PDC flag. Lightly tested
with
my onboard pdc20265.
Tobias.
Signed-off-by: Tobias Oed <tobiasoed@hotmail.com>
diff -r -u linux-2.6.16.orig/drivers/ide/pci/pdc202xx_old.c
linux-2.6.16.clean/drivers/ide/pci/pdc202xx_old.c
--- linux-2.6.16.orig/drivers/ide/pci/pdc202xx_old.c 2006-03-20
06:53:29.000000000 +0100
+++ linux-2.6.16.clean/drivers/ide/pci/pdc202xx_old.c 2006-04-04
01:29:19.000000000 +0200
@@ -798,7 +798,6 @@
.autodma = AUTODMA,
.bootable = OFF_BOARD,
.extra = 48,
- .flags = IDEPCI_FLAG_FORCE_PDC,
},{ /* 2 */
.name = "PDC20263",
.init_setup = init_setup_pdc202ata4,
@@ -819,7 +818,6 @@
.autodma = AUTODMA,
.bootable = OFF_BOARD,
.extra = 48,
- .flags = IDEPCI_FLAG_FORCE_PDC,
},{ /* 4 */
.name = "PDC20267",
.init_setup = init_setup_pdc202xx,
diff -r -u linux-2.6.16.orig/drivers/ide/setup-pci.c
linux-2.6.16.clean/drivers/ide/setup-pci.c
--- linux-2.6.16.orig/drivers/ide/setup-pci.c 2006-03-20
06:53:29.000000000 +0100
+++ linux-2.6.16.clean/drivers/ide/setup-pci.c 2006-04-04
01:33:11.000000000 +0200
@@ -580,7 +580,6 @@
int port;
int at_least_one_hwif_enabled = 0;
ide_hwif_t *hwif, *mate = NULL;
- static int secondpdc = 0;
u8 tmp;
index->all = 0xf0f0;
@@ -591,22 +590,10 @@
for (port = 0; port <= 1; ++port) {
ide_pci_enablebit_t *e = &(d->enablebits[port]);
-
- /*
- * If this is a Promise FakeRaid controller,
- * the 2nd controller will be marked as
- * disabled while it is actually there and enabled
- * by the bios for raid purposes.
- * Skip the normal "is it enabled" test for those.
- */
- if ((d->flags & IDEPCI_FLAG_FORCE_PDC) &&
- (secondpdc++==1) && (port==1))
- goto controller_ok;
if (e->reg && (pci_read_config_byte(dev, e->reg, &tmp) ||
(tmp & e->mask) != e->val))
continue; /* port not enabled */
-controller_ok:
if (d->channels <= port)
break;
diff -r -u linux-2.6.16.orig/include/linux/ide.h
linux-2.6.16.clean/include/linux/ide.h
--- linux-2.6.16.orig/include/linux/ide.h 2006-03-20
06:53:29.000000000 +0100
+++ linux-2.6.16.clean/include/linux/ide.h 2006-04-04
01:29:31.000000000 +0200
@@ -1219,7 +1219,6 @@
enum {
/* Uses ISA control ports not PCI ones. */
IDEPCI_FLAG_ISA_PORTS = (1 << 0),
- IDEPCI_FLAG_FORCE_PDC = (1 << 1),
};
typedef struct ide_pci_device_s {
_________________________________________________________________
Express yourself instantly with MSN Messenger! Download today - it's FREE!
http://messenger.msn.click-url.com/go/onm00200471ave/direct/01/
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2006-04-04 0:10 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-01-28 23:04 [2.6 patch] always enable CONFIG_PDC202XX_FORCE Adrian Bunk
-- strict thread matches above, loose matches on Subject: below --
2006-04-04 0:10 Tobias Oed
2006-01-22 17:12 Adrian Bunk
2006-03-27 14:25 ` Sergei Shtylylov
2006-03-27 14:40 ` Bartlomiej Zolnierkiewicz
2006-01-14 15:21 [2.6 patch] Fix PDC202XX_FORCE kconfig selection Adrian Bunk
2006-01-14 16:13 ` Alan Cox
2006-01-14 17:47 ` Bartlomiej Zolnierkiewicz
2006-01-14 19:55 ` [2.6 patch] always enable CONFIG_PDC202XX_FORCE Adrian Bunk
2006-01-15 1:07 ` Alan Cox
2006-01-15 1:50 ` Adrian Bunk
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).