Skip to contentSkip to conversation

always enable CONFIG_PDC202XX_FORCE

PATCH In review Adrian Bunk 3 participants 5 messages Jan 22, 2006 – Apr 7, 2006 libata

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 always enable CONFIG_PDC202XX_FORCE

This patch removes the CONFIG_PDC202XX_FORCE=n case.

---

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(-)
drivers/ide/Kconfig renamed from drivers/ide/Kconfig.old +0 -7
@@ -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
drivers/ide/pci/pdc202xx_new.c renamed from drivers/ide/pci/pdc202xx_new.c.old +0 -6
@@ -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",
drivers/ide/pci/pdc202xx_old.c renamed from drivers/ide/pci/pdc202xx_old.c.old +0 -15
@@ -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,
 	}
#1 lore raw

Hello.

Quoted 13 lines · Adrian Bunk

This patch removes the CONFIG_PDC202XX_FORCE=n case.

---

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]

Quoted 13 lines
drivers/ide/pci/pdc202xx_old.c renamed from drivers/ide/pci/pdc202xx_old.c.old +0 -3
@@ -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 */

drivers/ide/pci/pdc202xx_old.c line 801

Quoted 9 lines
drivers/ide/pci/pdc202xx_old.c renamed from drivers/ide/pci/pdc202xx_old.c.old +0 -3
@@ -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?

Quoted 21 lines
drivers/ide/pci/pdc202xx_old.c renamed from drivers/ide/pci/pdc202xx_old.c.old +0 -6
@@ -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,

drivers/ide/pci/pdc202xx_old.c line 833

Quoted 9 lines
drivers/ide/pci/pdc202xx_old.c renamed from drivers/ide/pci/pdc202xx_old.c.old +0 -3
@@ -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

#2 lore raw
Quoted 37 lines · Sergei Shtylylov

Hello.

Quoted 13 lines · Adrian Bunk

This patch removes the CONFIG_PDC202XX_FORCE=n case.

---

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]

Quoted 17 lines
drivers/ide/pci/pdc202xx_old.c 2006-01-14 20:44:21.000000000 +0100 renamed from drivers/ide/pci/pdc202xx_old.c.old 2006-01-14 20:44:01.000000000 +0100 +0 -4
@@ -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
Quoted 8 lines

drivers/ide/pci/pdc202xx_old.c 2006-01-14 20:44:21.000000000 +0100 line 801

Quoted 5 lines
drivers/ide/pci/pdc202xx_old.c 2006-01-14 20:44:21.000000000 +0100 renamed from drivers/ide/pci/pdc202xx_old.c.old 2006-01-14 20:44:01.000000000 +0100 +0 -2
-             .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

#3 lore raw

PATCH 1/1 remove the obsolete IDEPCI_FLAG_FORCE_PDC

Quoted 9 lines · Bartlomiej Zolnierkiewicz

On 3/27/06, Sergei Shtylylov <[email protected]> wrote:
...

Quoted 4 lines
Quoted 1 line

.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...

IOW, we want the patch below?

Quoted 1 line

Bartlomiej

cu
Adrian

<-- snip -->

This patch removes the obsolete IDEPCI_FLAG_FORCE_PDC.

Noted by Sergei Shtylylov <[email protected]>

---

 drivers/ide/pci/pdc202xx_old.c |    2 --
 drivers/ide/setup-pci.c        |   13 -------------
 include/linux/ide.h            |    1 -
 3 files changed, 16 deletions(-)
include/linux/ide.h renamed from include/linux/ide.h.old +0 -1
@@ -1221,7 +1221,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 {
drivers/ide/pci/pdc202xx_old.c renamed from drivers/ide/pci/pdc202xx_old.c.old +0 -2
@@ -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,
drivers/ide/setup-pci.c renamed from drivers/ide/setup-pci.c.old +0 -13
@@ -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;
@@ -592,21 +591,9 @@
 	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;
#4 lore raw

Re: [2.6 patch] remove the obsolete IDEPCI_FLAG_FORCE_PDC

Quoted 5 lines · Adrian Bunk
Quoted 4 lines · Bartlomiej Zolnierkiewicz

On 3/27/06, Sergei Shtylylov <[email protected]> wrote:
...

Quoted 2 lines
Quoted 1 line

.flags = IDEPCI_FLAG_FORCE_PDC,

Quoted 7 lines
Quoted 5 lines
Quoted 2 lines

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...

IOW, we want the patch below?

Yes. Could you please add my ACK and forward it to akpm?

Quoted 82 lines
Quoted 1 line

Bartlomiej

cu
Adrian

<-- snip -->

This patch removes the obsolete IDEPCI_FLAG_FORCE_PDC.

Noted by Sergei Shtylylov <[email protected]>

---

 drivers/ide/pci/pdc202xx_old.c |    2 --
 drivers/ide/setup-pci.c        |   13 -------------
 include/linux/ide.h            |    1 -
 3 files changed, 16 deletions(-)
include/linux/ide.h 2006-04-07 00:52:03.000000000 +0200 renamed from include/linux/ide.h.old 2006-04-07 00:51:49.000000000 +0200 +0 -1
@@ -1221,7 +1221,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 {
drivers/ide/pci/pdc202xx_old.c 2006-04-07 00:52:19.000000000 +0200 renamed from drivers/ide/pci/pdc202xx_old.c.old 2006-04-07 00:52:13.000000000 +0200 +0 -2
@@ -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,
drivers/ide/setup-pci.c 2006-04-07 00:54:28.000000000 +0200 renamed from drivers/ide/setup-pci.c.old 2006-04-07 00:52:27.000000000 +0200 +0 -13
@@ -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;
@@ -592,21 +591,9 @@
        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;