On Tuesday 02 October 2007, Jeff Garzik wrote: > Sergei Shtylyov wrote: > > Bartlomiej Zolnierkiewicz wrote: > > > >> Stop abusing ide_lock lock (switch to a private locking). > > > >> Fixes same issue as fixed by Alan Cox in atiixp host driver with > >> commit 6c5f8cc33eb2e10b6ab788bbe259fc142a068627. > > > >> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@xxxxxxxxx> > > > >> Index: b/drivers/ide/legacy/qd65xx.c > >> =================================================================== > >> --- a/drivers/ide/legacy/qd65xx.c > >> +++ b/drivers/ide/legacy/qd65xx.c > >> @@ -89,13 +89,15 @@ > >> > >> static int timings[4]={-1,-1,-1,-1}; /* stores current timing for > >> each timer */ > >> > >> +static DEFINE_SPINLOCK(qd65xx_lock); > >> + > >> static void qd_write_reg (u8 content, unsigned long reg) > >> { > >> unsigned long flags; > >> > >> - spin_lock_irqsave(&ide_lock, flags); > >> + spin_lock_irqsave(&qd65xx_lock, flags); > >> outb(content,reg); > >> - spin_unlock_irqrestore(&ide_lock, flags); > >> + spin_unlock_irqrestore(&qd65xx_lock, flags); > >> } > >> > >> static u8 __init qd_read_reg (unsigned long reg) > >> @@ -103,9 +105,9 @@ static u8 __init qd_read_reg (unsigned l > >> unsigned long flags; > >> u8 read; > >> > >> - spin_lock_irqsave(&ide_lock, flags); > >> + spin_lock_irqsave(&qd65xx_lock, flags); > >> read = inb(reg); > >> - spin_unlock_irqrestore(&ide_lock, flags); > >> + spin_unlock_irqrestore(&qd65xx_lock, flags); > >> return read; > >> } > > > > I don't see why all the locking above is needed at all -- isn't these > > atomic functions? :-/ > > Agreed. Indeed, incremental patch follows. [PATCH] qd65xx: remove pointless qd_{read,write}_reg() These functions are atomic so locking is pointless (noticed by Sergei). Cc: Sergei Shtylyov <sshtylyov@xxxxxxxxxxxxx> Cc: Jeff Garzik <jeff@xxxxxxxxxx> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@xxxxxxxxx> --- drivers/ide/legacy/qd65xx.c | 43 +++++++++++-------------------------------- 1 file changed, 11 insertions(+), 32 deletions(-) Index: b/drivers/ide/legacy/qd65xx.c =================================================================== --- a/drivers/ide/legacy/qd65xx.c +++ b/drivers/ide/legacy/qd65xx.c @@ -89,28 +89,6 @@ static int timings[4]={-1,-1,-1,-1}; /* stores current timing for each timer */ -static DEFINE_SPINLOCK(qd65xx_lock); - -static void qd_write_reg (u8 content, unsigned long reg) -{ - unsigned long flags; - - spin_lock_irqsave(&qd65xx_lock, flags); - outb(content,reg); - spin_unlock_irqrestore(&qd65xx_lock, flags); -} - -static u8 __init qd_read_reg (unsigned long reg) -{ - unsigned long flags; - u8 read; - - spin_lock_irqsave(&qd65xx_lock, flags); - read = inb(reg); - spin_unlock_irqrestore(&qd65xx_lock, flags); - return read; -} - /* * qd_select: * @@ -123,7 +101,7 @@ static void qd_select (ide_drive_t *driv (QD_TIMREG(drive) & 0x02); if (timings[index] != QD_TIMING(drive)) - qd_write_reg(timings[index] = QD_TIMING(drive), QD_TIMREG(drive)); + outb(timings[index] = QD_TIMING(drive), QD_TIMREG(drive)); } /* @@ -286,7 +264,7 @@ static void qd6580_set_pio_mode(ide_driv } if (!HWIF(drive)->channel && drive->media != ide_disk) { - qd_write_reg(0x5f, QD_CONTROL_PORT); + outb(0x5f, QD_CONTROL_PORT); printk(KERN_WARNING "%s: ATAPI: disabled read-ahead FIFO " "and post-write buffer on %s.\n", drive->name, HWIF(drive)->name); @@ -303,6 +281,7 @@ static void qd6580_set_pio_mode(ide_driv static int __init qd_testreg(int port) { + static DEFINE_SPINLOCK(qd65xx_lock); unsigned long flags; u8 savereg, readreg; @@ -365,13 +344,13 @@ static void __exit qd_unsetup(ide_hwif_t if (set_pio_mode == (void *)qd6500_set_pio_mode) { // will do it for both - qd_write_reg(QD6500_DEF_DATA, QD_TIMREG(&hwif->drives[0])); + outb(QD6500_DEF_DATA, QD_TIMREG(&hwif->drives[0])); } else if (set_pio_mode == (void *)qd6580_set_pio_mode) { if (QD_CONTROL(hwif) & QD_CONTR_SEC_DISABLED) { - qd_write_reg(QD6580_DEF_DATA, QD_TIMREG(&hwif->drives[0])); - qd_write_reg(QD6580_DEF_DATA2, QD_TIMREG(&hwif->drives[1])); + outb(QD6580_DEF_DATA, QD_TIMREG(&hwif->drives[0])); + outb(QD6580_DEF_DATA2, QD_TIMREG(&hwif->drives[1])); } else { - qd_write_reg(hwif->channel ? QD6580_DEF_DATA2 : QD6580_DEF_DATA, QD_TIMREG(&hwif->drives[0])); + outb(hwif->channel ? QD6580_DEF_DATA2 : QD6580_DEF_DATA, QD_TIMREG(&hwif->drives[0])); } } else { printk(KERN_WARNING "Unknown qd65xx tuning fonction !\n"); @@ -394,7 +373,7 @@ static int __init qd_probe(int base) u8 config; u8 unit; - config = qd_read_reg(QD_CONFIG_PORT); + config = inb(QD_CONFIG_PORT); if (! ((config & QD_CONFIG_BASEPORT) >> 1 == (base == 0xb0)) ) return 1; @@ -438,7 +417,7 @@ static int __init qd_probe(int base) /* qd6580 found */ - control = qd_read_reg(QD_CONTROL_PORT); + control = inb(QD_CONTROL_PORT); printk(KERN_NOTICE "qd6580 at %#x\n", base); printk(KERN_DEBUG "qd6580: config=%#x, control=%#x, ID3=%u\n", @@ -459,7 +438,7 @@ static int __init qd_probe(int base) ide_device_add(idx); - qd_write_reg(QD_DEF_CONTR, QD_CONTROL_PORT); + outb(QD_DEF_CONTR, QD_CONTROL_PORT); return 1; } else { @@ -486,7 +465,7 @@ static int __init qd_probe(int base) ide_device_add(idx); - qd_write_reg(QD_DEF_CONTR, QD_CONTROL_PORT); + outb(QD_DEF_CONTR, QD_CONTROL_PORT); return 0; /* no other qd65xx possible */ } - To unsubscribe from this list: send the line "unsubscribe linux-ide" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html