PPC4xx ocp ide rewrite/cleanup
PATCH 1/1 PPC4xx ocp ide rewrite/cleanup
Hi,
this is a rewrite of the ibm4xx ocp ide driver. In its current state it doesn't compile with current 2.6 and is completely broken in many other aspects anyway.
Please consider applying (or tell me how the patch should be changed to qualify for applying :)
drivers/ide/Kconfig +4 -4
@@ -930,7 +930,7 @@ endchoice config BLK_DEV_IDE_STB04xxx - bool "STB04xxx (Redwood-5) IDE support" + tristate "STB04xxx (Redwood-5) IDE support" depends on BLK_DEV_IDE && REDWOOD_5 help This option provides support for IDE on IBM STB04xxx Redwood-5
@@ -1016,11 +1016,11 @@ endif config BLK_DEV_IDEDMA - def_bool BLK_DEV_IDEDMA_PCI || BLK_DEV_IDEDMA_PMAC || BLK_DEV_IDEDMA_ICS + def_bool BLK_DEV_IDEDMA_PCI || BLK_DEV_IDEDMA_PMAC || BLK_DEV_IDEDMA_ICS || BLK_DEV_IDE_STB04xxx config IDEDMA_IVB bool "IGNORE word93 Validation BITS" - depends on BLK_DEV_IDEDMA_PCI || BLK_DEV_IDEDMA_PMAC || BLK_DEV_IDEDMA_ICS + depends on BLK_DEV_IDEDMA_PCI || BLK_DEV_IDEDMA_PMAC || BLK_DEV_IDEDMA_ICS || BLK_DEV_IDE_STB04xxx ---help--- There are unclear terms in ATA-4 and ATA-5 standards how certain hardware (an 80c ribbon) should be detected. Different interpretations
@@ -1035,7 +1035,7 @@ It is normally safe to answer Y; however, the default is N. config IDEDMA_AUTO - def_bool IDEDMA_PCI_AUTO || IDEDMA_ICS_AUTO + def_bool IDEDMA_PCI_AUTO || IDEDMA_ICS_AUTO || BLK_DEV_IDE_STB04xxx endif
drivers/ide/Makefile +5 -0
@@ -38,6 +38,11 @@ # built-in only drivers from ppc/ ide-core-$(CONFIG_BLK_DEV_MPC8xx_IDE) += ppc/mpc8xx.o ide-core-$(CONFIG_BLK_DEV_IDE_PMAC) += ppc/pmac.o +ifeq ($(CONFIG_BLK_DEV_IDE_STB04xxx),y) +ide-core-$(CONFIG_BLK_DEV_IDE_STB04xxx) += ppc/ibm_ocp_ide.o +else +obj-$(CONFIG_BLK_DEV_IDE_STB04xxx) += ppc/ibm_ocp_ide.o +endif # built-in only drivers from h8300/ ide-core-$(CONFIG_H8300) += h8300/ide-h8300.o
drivers/ide/ppc/ibm_ocp_ide.c +551 -598
1,387 lines not on this page · raw message
Quoted 11 lines · Andre' Draszik
Hi,
this is a rewrite of the ibm4xx ocp ide driver. In its current state it doesn't compile with current 2.6 and is completely broken in many other aspects anyway.
Please consider applying (or tell me how the patch should be changed to qualify for applying :)Signed-off-by Andre' Draszik <[email protected]>diff -urN -X dontdiff linuxppc-2.5.orig/drivers/ide/Kconfig linuxppc-2.5/drivers/ide/Kconfig
I tried applying this to current linuxppc-2.5. All hunks are rejected. Can you double check this patch and resend?
-Matt
Hi,
Quoted 9 lines · Matt Porter
Quoted 4 lines · Andre' Draszik
Hi,
this is a rewrite of the ibm4xx ocp ide driver. In its current state it [...]
I tried applying this to current linuxppc-2.5. All hunks are rejected. Can you double check this patch and resend?
my kernel tree is
rsync -avz --delete source.mvista.com::linuxppc-2.5 linuxppc-2.5 and as of 16.02.05 23:44GMT the patch still applies. so did i really send a wrong patch or has the rsync mirror just not yet been updated? or is it a whitespace issue?
just checked - it's the last, so here's the patch, rediffed to 2.6.11-rc4, as attachment, not inline this time.
hope it works...
a.
drivers/ide/Kconfig +4 -4
@@ -930,7 +930,7 @@ endchoice config BLK_DEV_IDE_STB04xxx - bool "STB04xxx (Redwood-5) IDE support" + tristate "STB04xxx (Redwood-5) IDE support" depends on BLK_DEV_IDE && REDWOOD_5 help This option provides support for IDE on IBM STB04xxx Redwood-5
@@ -1016,11 +1016,11 @@ endif config BLK_DEV_IDEDMA - def_bool BLK_DEV_IDEDMA_PCI || BLK_DEV_IDEDMA_PMAC || BLK_DEV_IDEDMA_ICS + def_bool BLK_DEV_IDEDMA_PCI || BLK_DEV_IDEDMA_PMAC || BLK_DEV_IDEDMA_ICS || BLK_DEV_IDE_STB04xxx config IDEDMA_IVB bool "IGNORE word93 Validation BITS" - depends on BLK_DEV_IDEDMA_PCI || BLK_DEV_IDEDMA_PMAC || BLK_DEV_IDEDMA_ICS + depends on BLK_DEV_IDEDMA_PCI || BLK_DEV_IDEDMA_PMAC || BLK_DEV_IDEDMA_ICS || BLK_DEV_IDE_STB04xxx ---help--- There are unclear terms in ATA-4 and ATA-5 standards how certain hardware (an 80c ribbon) should be detected. Different interpretations
@@ -1035,7 +1035,7 @@ It is normally safe to answer Y; however, the default is N. config IDEDMA_AUTO - def_bool IDEDMA_PCI_AUTO || IDEDMA_ICS_AUTO + def_bool IDEDMA_PCI_AUTO || IDEDMA_ICS_AUTO || BLK_DEV_IDE_STB04xxx endif
drivers/ide/Makefile +5 -0
@@ -38,6 +38,11 @@ # built-in only drivers from ppc/ ide-core-$(CONFIG_BLK_DEV_MPC8xx_IDE) += ppc/mpc8xx.o ide-core-$(CONFIG_BLK_DEV_IDE_PMAC) += ppc/pmac.o +ifeq ($(CONFIG_BLK_DEV_IDE_STB04xxx),y) +ide-core-$(CONFIG_BLK_DEV_IDE_STB04xxx) += ppc/ibm_ocp_ide.o +else +obj-$(CONFIG_BLK_DEV_IDE_STB04xxx) += ppc/ibm_ocp_ide.o +endif # built-in only drivers from h8300/ ide-core-$(CONFIG_H8300) += h8300/ide-h8300.o
drivers/ide/ppc/ibm_ocp_ide.c +551 -598
1,387 lines not on this page · raw message
Quoted 13 lines · Andre' Draszik
Hi,
Quoted 9 lines · Matt Porter
Quoted 4 lines · Andre' Draszik
Hi,
this is a rewrite of the ibm4xx ocp ide driver. In its current state it [...]
I tried applying this to current linuxppc-2.5. All hunks are rejected. Can you double check this patch and resend?
Quoted 8 lines
my kernel tree is
rsync -avz --delete source.mvista.com::linuxppc-2.5 linuxppc-2.5 and as of 16.02.05 23:44GMT the patch still applies. so did i really send a wrong patch or has the rsync mirror just not yet been updated? or is it a whitespace issue?just checked - it's the last, so here's the patch, rediffed to 2.6.11-rc4, as attachment, not inline this time.
Ok, this worked...looks like your mailer mangled whitespace on the inlined patch. It applied to BK linuxppc-2.5 and I'll take a look in a bit. Ultimately, we need to get this driver into linux-2.5.
Thanks,
Matt
Quoted 19 lines · Andre' Draszik
Hi,
Quoted 9 lines · Matt Porter
Quoted 4 lines · Andre' Draszik
Hi,
this is a rewrite of the ibm4xx ocp ide driver. In its current state it [...]
I tried applying this to current linuxppc-2.5. All hunks are rejected. Can you double check this patch and resend?
my kernel tree is
rsync -avz --delete source.mvista.com::linuxppc-2.5 linuxppc-2.5 and as of 16.02.05 23:44GMT the patch still applies. so did i really send a wrong patch or has the rsync mirror just not yet been updated? or is it a whitespace issue?
Quoted 4 lines
just checked - it's the last, so here's the patch, rediffed to 2.6.11-rc4, as attachment, not inline this time.
hope it works...
Ok, this one looks good save a few minor things that need done:
1) Rename from ibm_ocp_ide.[c|h] to ibm_stb_ide.[c|h] We want rid of "ocp" in the file names since eventually 4xx will convert to platform devices.
2) Remove the #if 0'ed code...if it's not used it doesn't belong in there.
3) Run Lindent on the driver.
What systems have you tested on?
-Matt
Hi,
Quoted 1 line · Matt Porter
Ok, this one looks good save a few minor things that need done:
i will address these as soon as i have time again, i.e. on wednesday.
Quoted 3 lines
1) Rename from ibm_ocp_ide.[c|h] to ibm_stb_ide.[c|h] We want rid of "ocp" in the file names since eventually 4xx will convert to platform devices.
is diff -N appropriate for that and convenient for you? as said, i'm using the rsync mirror only, no bitkeeper.
Quoted 2 lines
2) Remove the #if 0'ed code...if it's not used it doesn't belong in there.
ok.
Quoted 1 line
3) Run Lindent on the driver.
ok.
Shall I send the new patch against the one I already sent or against the unpatched tree?
Quoted 1 line
What systems have you tested on?
On two different custom built boards both based on the redwood5 reference design.
a.