* [PATCH 1/13] serverworks: cleanup ->set_dma_mode method
@ 2007-11-12 23:01 Bartlomiej Zolnierkiewicz
2007-11-13 11:32 ` Sergei Shtylyov
0 siblings, 1 reply; 3+ messages in thread
From: Bartlomiej Zolnierkiewicz @ 2007-11-12 23:01 UTC (permalink / raw)
To: linux-ide
IDE core guarantees that ->set_dma_mode will be called only
for DMA modes set in SWDMA/MWDMA/UDMA masks.
There should be no functionality changes caused by this patch.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
---
drivers/ide/pci/serverworks.c | 25 ++++++-------------------
1 file changed, 6 insertions(+), 19 deletions(-)
Index: b/drivers/ide/pci/serverworks.c
===================================================================
--- a/drivers/ide/pci/serverworks.c
+++ b/drivers/ide/pci/serverworks.c
@@ -164,25 +164,12 @@ static void svwks_set_dma_mode(ide_drive
ultra_timing &= ~(0x0F << (4*unit));
ultra_enable &= ~(0x01 << drive->dn);
- switch(speed) {
- case XFER_MW_DMA_2:
- case XFER_MW_DMA_1:
- case XFER_MW_DMA_0:
- dma_timing |= dma_modes[speed - XFER_MW_DMA_0];
- break;
-
- case XFER_UDMA_5:
- case XFER_UDMA_4:
- case XFER_UDMA_3:
- case XFER_UDMA_2:
- case XFER_UDMA_1:
- case XFER_UDMA_0:
- dma_timing |= dma_modes[2];
- ultra_timing |= ((udma_modes[speed - XFER_UDMA_0]) << (4*unit));
- ultra_enable |= (0x01 << drive->dn);
- default:
- break;
- }
+ if (speed >= XFER_UDMA_0) {
+ dma_timing |= dma_modes[2];
+ ultra_timing |= (udma_modes[speed - XFER_UDMA_0] << (4 * unit));
+ ultra_enable |= (0x01 << drive->dn);
+ } else if (speed >= XFER_MW_DMA_0)
+ dma_timing |= dma_modes[speed - XFER_MW_DMA_0];
pci_write_config_byte(dev, drive_pci2[drive->dn], dma_timing);
pci_write_config_byte(dev, (0x56|hwif->channel), ultra_timing);
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH 1/13] serverworks: cleanup ->set_dma_mode method
2007-11-12 23:01 [PATCH 1/13] serverworks: cleanup ->set_dma_mode method Bartlomiej Zolnierkiewicz
@ 2007-11-13 11:32 ` Sergei Shtylyov
2007-11-13 21:26 ` Bartlomiej Zolnierkiewicz
0 siblings, 1 reply; 3+ messages in thread
From: Sergei Shtylyov @ 2007-11-13 11:32 UTC (permalink / raw)
To: Bartlomiej Zolnierkiewicz; +Cc: linux-ide
Bartlomiej Zolnierkiewicz wrote:
> IDE core guarantees that ->set_dma_mode will be called only
> for DMA modes set in SWDMA/MWDMA/UDMA masks.
> There should be no functionality changes caused by this patch.
> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
> Index: b/drivers/ide/pci/serverworks.c
> ===================================================================
> --- a/drivers/ide/pci/serverworks.c
> +++ b/drivers/ide/pci/serverworks.c
> @@ -164,25 +164,12 @@ static void svwks_set_dma_mode(ide_drive
> ultra_timing &= ~(0x0F << (4*unit));
> ultra_enable &= ~(0x01 << drive->dn);
>
> - switch(speed) {
> - case XFER_MW_DMA_2:
> - case XFER_MW_DMA_1:
> - case XFER_MW_DMA_0:
> - dma_timing |= dma_modes[speed - XFER_MW_DMA_0];
> - break;
> -
> - case XFER_UDMA_5:
> - case XFER_UDMA_4:
> - case XFER_UDMA_3:
> - case XFER_UDMA_2:
> - case XFER_UDMA_1:
> - case XFER_UDMA_0:
> - dma_timing |= dma_modes[2];
Why it needs to change in the first place?
> - ultra_timing |= ((udma_modes[speed - XFER_UDMA_0]) << (4*unit));
> - ultra_enable |= (0x01 << drive->dn);
> - default:
> - break;
> - }
> + if (speed >= XFER_UDMA_0) {
> + dma_timing |= dma_modes[2];
> + ultra_timing |= (udma_modes[speed - XFER_UDMA_0] << (4 * unit));
> + ultra_enable |= (0x01 << drive->dn);
> + } else if (speed >= XFER_MW_DMA_0)
> + dma_timing |= dma_modes[speed - XFER_MW_DMA_0];
>
> pci_write_config_byte(dev, drive_pci2[drive->dn], dma_timing);
> pci_write_config_byte(dev, (0x56|hwif->channel), ultra_timing);
Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
MBR, Sergei
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH 1/13] serverworks: cleanup ->set_dma_mode method
2007-11-13 11:32 ` Sergei Shtylyov
@ 2007-11-13 21:26 ` Bartlomiej Zolnierkiewicz
0 siblings, 0 replies; 3+ messages in thread
From: Bartlomiej Zolnierkiewicz @ 2007-11-13 21:26 UTC (permalink / raw)
To: Sergei Shtylyov; +Cc: linux-ide
On Tuesday 13 November 2007, Sergei Shtylyov wrote:
[...]
> > Index: b/drivers/ide/pci/serverworks.c
> > ===================================================================
> > --- a/drivers/ide/pci/serverworks.c
> > +++ b/drivers/ide/pci/serverworks.c
> > @@ -164,25 +164,12 @@ static void svwks_set_dma_mode(ide_drive
> > ultra_timing &= ~(0x0F << (4*unit));
> > ultra_enable &= ~(0x01 << drive->dn);
> >
> > - switch(speed) {
> > - case XFER_MW_DMA_2:
> > - case XFER_MW_DMA_1:
> > - case XFER_MW_DMA_0:
> > - dma_timing |= dma_modes[speed - XFER_MW_DMA_0];
> > - break;
> > -
> > - case XFER_UDMA_5:
> > - case XFER_UDMA_4:
> > - case XFER_UDMA_3:
> > - case XFER_UDMA_2:
> > - case XFER_UDMA_1:
> > - case XFER_UDMA_0:
> > - dma_timing |= dma_modes[2];
>
> Why it needs to change in the first place?
Indeed, there is a needless coupling of MWDMA/UDMA timings in serverworks.
Care to fix it?
Bart
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2007-11-13 21:20 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-11-12 23:01 [PATCH 1/13] serverworks: cleanup ->set_dma_mode method Bartlomiej Zolnierkiewicz
2007-11-13 11:32 ` Sergei Shtylyov
2007-11-13 21:26 ` Bartlomiej Zolnierkiewicz
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).