* enable-cdrom-dma-access-with-pdc20265_old.patch
@ 2006-09-23 14:43 Tobias Oed
2006-09-26 20:05 ` enable-cdrom-dma-access-with-pdc20265_old.patch Andrew Morton
0 siblings, 1 reply; 3+ messages in thread
From: Tobias Oed @ 2006-09-23 14:43 UTC (permalink / raw)
To: linux-kernel
Cc: tobiasoed, akpm, linux-ide, B.Zolnierkiewicz, alan, sshtylyov
[-- Attachment #1: Type: text/plain, Size: 2936 bytes --]
If it makes things easier my patch labeled
enable-cdrom-dma-access-with-pdc20265_old.patch in -mm
could be dropped in favour of what follows (against 2.6.18),
making the feature an EXPERIMENTAL config option.
Tobias
ps: I also attach the patch since I fear mail mangling (anyone care to send
me a gmail invite?)
--- linux-2.6.18-orig/drivers/ide/Kconfig 2006-09-23 16:20:16.000000000
+0200
+++ linux-2.6.18/drivers/ide/Kconfig 2006-09-23 16:21:29.000000000 +0200
@@ -670,6 +670,15 @@
If unsure, say N.
+config PDC202XX_ATAPI
+ bool "UDMA for cdroms (EXPERIMENTAL)"
+ depends on BLK_DEV_PDC202XX_OLD && EXPERIMENTAL
+ help
+ This option allows UDMA with cdrom drives attached to
+ a pdc202xx controller
+
+ If unsure, say N.
+
config BLK_DEV_PDC202XX_NEW
tristate "PROMISE PDC202{68|69|70|71|75|76|77} support"
--- linux-2.6.18-orig/drivers/ide/pci/pdc202xx_old.c 2006-09-23
16:17:35.000000000 +0200
+++ linux-2.6.18/drivers/ide/pci/pdc202xx_old.c 2006-09-23
15:52:56.000000000 +0200
@@ -48,6 +48,12 @@
#define PDC202_DEBUG_CABLE 0
#define PDC202XX_DEBUG_DRIVE_INFO 0
+#ifndef CONFIG_PDC202XX_ATAPI
+#define PDC202XX_CDROM_UDMA(drive) 0
+#else
+#define PDC202XX_CDROM_UDMA(drive) ((drive)->media == ide_cdrom)
+#endif
+
static const char *pdc_quirk_drives[] = {
"QUANTUM FIREBALLlct08 08",
"QUANTUM FIREBALLP KA6.4",
@@ -154,7 +160,8 @@
u8 AP, BP, CP, DP;
u8 TA = 0, TB = 0, TC = 0;
- if ((drive->media != ide_disk) && (speed < XFER_SW_DMA_0))
+ if (drive->media != ide_disk && !PDC202XX_CDROM_UDMA(drive) &&
+ speed < XFER_SW_DMA_0)
return -1;
pci_read_config_dword(dev, drive_pci, &drive_conf);
@@ -329,8 +336,7 @@
}
chipset_is_set:
-
- if (drive->media == ide_disk) {
+ if (drive->media == ide_disk || PDC202XX_CDROM_UDMA(drive)) {
pci_read_config_byte(dev, (drive_pci), &AP);
if (id->capability & 4) /* IORDY_EN */
pci_write_config_byte(dev, (drive_pci), AP|IORDY_EN);
@@ -385,7 +391,7 @@
{
if (drive->current_speed > XFER_UDMA_2)
pdc_old_enable_66MHz_clock(drive->hwif);
- if (drive->addressing == 1) {
+ if (drive->addressing == 1 || PDC202XX_CDROM_UDMA(drive)) {
struct request *rq = HWGROUP(drive)->rq;
ide_hwif_t *hwif = HWIF(drive);
unsigned long high_16 = hwif->dma_master;
@@ -405,7 +411,7 @@
static int pdc202xx_old_ide_dma_end(ide_drive_t *drive)
{
- if (drive->addressing == 1) {
+ if (drive->addressing == 1 || PDC202XX_CDROM_UDMA(drive)) {
ide_hwif_t *hwif = HWIF(drive);
unsigned long high_16 = hwif->dma_master;
unsigned long atapi_reg = high_16 + (hwif->channel ? 0x24 : 0x20);
@@ -519,6 +525,9 @@
hwif->ultra_mask = 0x3f;
hwif->mwdma_mask = 0x07;
hwif->swdma_mask = 0x07;
+#ifdef CONFIG_PDC202XX_ATAPI
+ hwif->atapi_dma = 1;
+#endif
hwif->err_stops_fifo = 1;
_________________________________________________________________
Search—Your way, your world, right now!
http://imagine-windowslive.com/minisites/searchlaunch/?locale=en-us&FORM=WLMTAG
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: config_dma.patch --]
[-- Type: text/x-patch; name="config_dma.patch", Size: 2476 bytes --]
--- linux-2.6.18-orig/drivers/ide/Kconfig 2006-09-23 16:20:16.000000000 +0200
+++ linux-2.6.18/drivers/ide/Kconfig 2006-09-23 16:21:29.000000000 +0200
@@ -670,6 +670,15 @@
If unsure, say N.
+config PDC202XX_ATAPI
+ bool "UDMA for cdroms (EXPERIMENTAL)"
+ depends on BLK_DEV_PDC202XX_OLD && EXPERIMENTAL
+ help
+ This option allows UDMA with cdrom drives attached to
+ a pdc202xx controller
+
+ If unsure, say N.
+
config BLK_DEV_PDC202XX_NEW
tristate "PROMISE PDC202{68|69|70|71|75|76|77} support"
--- linux-2.6.18-orig/drivers/ide/pci/pdc202xx_old.c 2006-09-23 16:17:35.000000000 +0200
+++ linux-2.6.18/drivers/ide/pci/pdc202xx_old.c 2006-09-23 15:52:56.000000000 +0200
@@ -48,6 +48,12 @@
#define PDC202_DEBUG_CABLE 0
#define PDC202XX_DEBUG_DRIVE_INFO 0
+#ifndef CONFIG_PDC202XX_ATAPI
+#define PDC202XX_CDROM_UDMA(drive) 0
+#else
+#define PDC202XX_CDROM_UDMA(drive) ((drive)->media == ide_cdrom)
+#endif
+
static const char *pdc_quirk_drives[] = {
"QUANTUM FIREBALLlct08 08",
"QUANTUM FIREBALLP KA6.4",
@@ -154,7 +160,8 @@
u8 AP, BP, CP, DP;
u8 TA = 0, TB = 0, TC = 0;
- if ((drive->media != ide_disk) && (speed < XFER_SW_DMA_0))
+ if (drive->media != ide_disk && !PDC202XX_CDROM_UDMA(drive) &&
+ speed < XFER_SW_DMA_0)
return -1;
pci_read_config_dword(dev, drive_pci, &drive_conf);
@@ -329,8 +336,7 @@
}
chipset_is_set:
-
- if (drive->media == ide_disk) {
+ if (drive->media == ide_disk || PDC202XX_CDROM_UDMA(drive)) {
pci_read_config_byte(dev, (drive_pci), &AP);
if (id->capability & 4) /* IORDY_EN */
pci_write_config_byte(dev, (drive_pci), AP|IORDY_EN);
@@ -385,7 +391,7 @@
{
if (drive->current_speed > XFER_UDMA_2)
pdc_old_enable_66MHz_clock(drive->hwif);
- if (drive->addressing == 1) {
+ if (drive->addressing == 1 || PDC202XX_CDROM_UDMA(drive)) {
struct request *rq = HWGROUP(drive)->rq;
ide_hwif_t *hwif = HWIF(drive);
unsigned long high_16 = hwif->dma_master;
@@ -405,7 +411,7 @@
static int pdc202xx_old_ide_dma_end(ide_drive_t *drive)
{
- if (drive->addressing == 1) {
+ if (drive->addressing == 1 || PDC202XX_CDROM_UDMA(drive)) {
ide_hwif_t *hwif = HWIF(drive);
unsigned long high_16 = hwif->dma_master;
unsigned long atapi_reg = high_16 + (hwif->channel ? 0x24 : 0x20);
@@ -519,6 +525,9 @@
hwif->ultra_mask = 0x3f;
hwif->mwdma_mask = 0x07;
hwif->swdma_mask = 0x07;
+#ifdef CONFIG_PDC202XX_ATAPI
+ hwif->atapi_dma = 1;
+#endif
hwif->err_stops_fifo = 1;
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: enable-cdrom-dma-access-with-pdc20265_old.patch
2006-09-23 14:43 enable-cdrom-dma-access-with-pdc20265_old.patch Tobias Oed
@ 2006-09-26 20:05 ` Andrew Morton
2006-09-27 19:36 ` enable-cdrom-dma-access-with-pdc20265_old.patch Tobias Oed
0 siblings, 1 reply; 3+ messages in thread
From: Andrew Morton @ 2006-09-26 20:05 UTC (permalink / raw)
To: Tobias Oed; +Cc: linux-kernel, linux-ide, B.Zolnierkiewicz, alan, sshtylyov
On Sat, 23 Sep 2006 10:43:57 -0400
"Tobias Oed" <tobiasoed@hotmail.com> wrote:
> If it makes things easier my patch labeled
> enable-cdrom-dma-access-with-pdc20265_old.patch in -mm
> could be dropped in favour of what follows (against 2.6.18),
> making the feature an EXPERIMENTAL config option.
eh, we'll just merge it as-is, see what happens, I think.
I'll assume that this new patch contained no other changes (ie: the patch
in -mm is ok-to-merge).
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: enable-cdrom-dma-access-with-pdc20265_old.patch
2006-09-26 20:05 ` enable-cdrom-dma-access-with-pdc20265_old.patch Andrew Morton
@ 2006-09-27 19:36 ` Tobias Oed
0 siblings, 0 replies; 3+ messages in thread
From: Tobias Oed @ 2006-09-27 19:36 UTC (permalink / raw)
To: akpm; +Cc: linux-kernel, linux-ide, B.Zolnierkiewicz, alan, sshtylyov
>
> > If it makes things easier my patch labeled
> > enable-cdrom-dma-access-with-pdc20265_old.patch in -mm
> > could be dropped in favour of what follows (against 2.6.18),
> > making the feature an EXPERIMENTAL config option.
>
>eh, we'll just merge it as-is, see what happens, I think.
>
>I'll assume that this new patch contained no other changes (ie: the patch
>in -mm is ok-to-merge).
Hi Andrew,
except for the config option, the two patches are identical, so
keeping the one that is already in -mm now works with me.
Tobias.
_________________________________________________________________
Be seen and heard with Windows Live Messenger and Microsoft LifeCams
http://clk.atdmt.com/MSN/go/msnnkwme0020000001msn/direct/01/?href=http://www.microsoft.com/hardware/digitalcommunication/default.mspx?locale=en-us&source=hmtagline
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2006-09-27 19:36 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2006-09-23 14:43 enable-cdrom-dma-access-with-pdc20265_old.patch Tobias Oed
2006-09-26 20:05 ` enable-cdrom-dma-access-with-pdc20265_old.patch Andrew Morton
2006-09-27 19:36 ` enable-cdrom-dma-access-with-pdc20265_old.patch Tobias Oed
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®