ide: do complete DMA setup in ->init_dma method (take 2)

* Make ide_hwif_setup_dma() return an error value.

* Pass 'const struct ide_port_info *d' instead of 'unsigned long dmabase'
  to ->init_dma method and make it return an error value.

* Rename ide_get_or_set_dma_base() to ide_pci_dma_base(),
  change ordering of its arguments and then export it.

* Export ide_pci_set_master().

* Do complete DMA setup inside ->init_dma method and update ->init_dma
  users accordingly.

* Sanitize code for DMA setup in ide_init_port().

v2:
* Fix for CONFIG_BLK_DEV_IDEDMA_PCI=n configs
  (from Jiri Slaby <jirislaby@gmail.com>):

  Fix following compiler warning by returning EINVAL:

  In file included from ANYTHING-INCLUDING-IDE.H:45:
  include/linux/ide.h: In function ‘ide_hwif_setup_dma’:
  include/linux/ide.h:1022: warning: no return statement in function returning non-void

Cc: Jiri Slaby <jirislaby@gmail.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Acked-by: default avatarSergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent f629b38b
...@@ -1356,9 +1356,6 @@ static void ide_init_port(ide_hwif_t *hwif, unsigned int port, ...@@ -1356,9 +1356,6 @@ static void ide_init_port(ide_hwif_t *hwif, unsigned int port,
if (d->init_iops) if (d->init_iops)
d->init_iops(hwif); d->init_iops(hwif);
if ((d->host_flags & IDE_HFLAG_NO_DMA) == 0)
ide_hwif_setup_dma(hwif, d);
if ((!hwif->irq && (d->host_flags & IDE_HFLAG_LEGACY_IRQS)) || if ((!hwif->irq && (d->host_flags & IDE_HFLAG_LEGACY_IRQS)) ||
(d->host_flags & IDE_HFLAG_FORCE_LEGACY_IRQS)) (d->host_flags & IDE_HFLAG_FORCE_LEGACY_IRQS))
hwif->irq = port ? 15 : 14; hwif->irq = port ? 15 : 14;
...@@ -1377,9 +1374,21 @@ static void ide_init_port(ide_hwif_t *hwif, unsigned int port, ...@@ -1377,9 +1374,21 @@ static void ide_init_port(ide_hwif_t *hwif, unsigned int port,
hwif->mwdma_mask = d->mwdma_mask; hwif->mwdma_mask = d->mwdma_mask;
hwif->ultra_mask = d->udma_mask; hwif->ultra_mask = d->udma_mask;
/* reset DMA masks only for SFF-style DMA controllers */ if ((d->host_flags & IDE_HFLAG_NO_DMA) == 0) {
if ((d->host_flags & IDE_HFLAG_NO_DMA) == 0 && hwif->dma_base == 0) int rc;
hwif->swdma_mask = hwif->mwdma_mask = hwif->ultra_mask = 0;
if (d->init_dma)
rc = d->init_dma(hwif, d);
else
rc = ide_hwif_setup_dma(hwif, d);
if (rc < 0) {
printk(KERN_INFO "%s: DMA disabled\n", hwif->name);
hwif->swdma_mask = 0;
hwif->mwdma_mask = 0;
hwif->ultra_mask = 0;
}
}
if (d->host_flags & IDE_HFLAG_RQSIZE_256) if (d->host_flags & IDE_HFLAG_RQSIZE_256)
hwif->rqsize = 256; hwif->rqsize = 256;
......
...@@ -723,17 +723,32 @@ static void __devinit init_hwif_ali15x3 (ide_hwif_t *hwif) ...@@ -723,17 +723,32 @@ static void __devinit init_hwif_ali15x3 (ide_hwif_t *hwif)
/** /**
* init_dma_ali15x3 - set up DMA on ALi15x3 * init_dma_ali15x3 - set up DMA on ALi15x3
* @hwif: IDE interface * @hwif: IDE interface
* @dmabase: DMA interface base PCI address * @d: IDE port info
* *
* Set up the DMA functionality on the ALi 15x3. For the ALi * Set up the DMA functionality on the ALi 15x3.
* controllers this is generic so we can let the generic code do
* the actual work.
*/ */
static void __devinit init_dma_ali15x3 (ide_hwif_t *hwif, unsigned long dmabase) static int __devinit init_dma_ali15x3(ide_hwif_t *hwif,
const struct ide_port_info *d)
{ {
struct pci_dev *dev = to_pci_dev(hwif->dev);
unsigned long base = ide_pci_dma_base(hwif, d);
if (base == 0 || ide_pci_set_master(dev, d->name) < 0)
return -1;
if (!hwif->channel) if (!hwif->channel)
outb(inb(dmabase + 2) & 0x60, dmabase + 2); outb(inb(base + 2) & 0x60, base + 2);
printk(KERN_INFO " %s: BM-DMA at 0x%04lx-0x%04lx\n",
hwif->name, base, base + 7);
if (ide_allocate_dma_engine(hwif))
return -1;
ide_setup_dma(hwif, base);
return 0;
} }
static const struct ide_port_ops ali_port_ops = { static const struct ide_port_ops ali_port_ops = {
......
...@@ -1327,14 +1327,17 @@ static void __devinit init_hwif_hpt366(ide_hwif_t *hwif) ...@@ -1327,14 +1327,17 @@ static void __devinit init_hwif_hpt366(ide_hwif_t *hwif)
hwif->dma_lost_irq = &hpt366_dma_lost_irq; hwif->dma_lost_irq = &hpt366_dma_lost_irq;
} }
static void __devinit init_dma_hpt366(ide_hwif_t *hwif, unsigned long dmabase) static int __devinit init_dma_hpt366(ide_hwif_t *hwif,
const struct ide_port_info *d)
{ {
struct pci_dev *dev = to_pci_dev(hwif->dev); struct pci_dev *dev = to_pci_dev(hwif->dev);
u8 masterdma = 0, slavedma = 0; unsigned long flags, base = ide_pci_dma_base(hwif, d);
u8 dma_new = 0, dma_old = 0; u8 dma_old, dma_new, masterdma = 0, slavedma = 0;
unsigned long flags;
dma_old = inb(dmabase + 2); if (base == 0 || ide_pci_set_master(dev, d->name) < 0)
return -1;
dma_old = inb(base + 2);
local_irq_save(flags); local_irq_save(flags);
...@@ -1345,9 +1348,21 @@ static void __devinit init_dma_hpt366(ide_hwif_t *hwif, unsigned long dmabase) ...@@ -1345,9 +1348,21 @@ static void __devinit init_dma_hpt366(ide_hwif_t *hwif, unsigned long dmabase)
if (masterdma & 0x30) dma_new |= 0x20; if (masterdma & 0x30) dma_new |= 0x20;
if ( slavedma & 0x30) dma_new |= 0x40; if ( slavedma & 0x30) dma_new |= 0x40;
if (dma_new != dma_old) if (dma_new != dma_old)
outb(dma_new, dmabase + 2); outb(dma_new, base + 2);
local_irq_restore(flags); local_irq_restore(flags);
printk(KERN_INFO " %s: BM-DMA at 0x%04lx-0x%04lx\n",
hwif->name, base, base + 7);
hwif->extra_base = base + (hwif->channel ? 8 : 16);
if (ide_allocate_dma_engine(hwif))
return -1;
ide_setup_dma(hwif, base);
return 0;
} }
static void __devinit hpt374_init(struct pci_dev *dev, struct pci_dev *dev2) static void __devinit hpt374_init(struct pci_dev *dev, struct pci_dev *dev2)
......
...@@ -72,16 +72,16 @@ static void ide_pci_clear_simplex(unsigned long dma_base, const char *name) ...@@ -72,16 +72,16 @@ static void ide_pci_clear_simplex(unsigned long dma_base, const char *name)
} }
/** /**
* ide_get_or_set_dma_base - setup BMIBA * ide_pci_dma_base - setup BMIBA
* @d: IDE port info
* @hwif: IDE interface * @hwif: IDE interface
* @d: IDE port info
* *
* Fetch the DMA Bus-Master-I/O-Base-Address (BMIBA) from PCI space. * Fetch the DMA Bus-Master-I/O-Base-Address (BMIBA) from PCI space.
* Where a device has a partner that is already in DMA mode we check * Where a device has a partner that is already in DMA mode we check
* and enforce IDE simplex rules. * and enforce IDE simplex rules.
*/ */
static unsigned long ide_get_or_set_dma_base(const struct ide_port_info *d, ide_hwif_t *hwif) unsigned long ide_pci_dma_base(ide_hwif_t *hwif, const struct ide_port_info *d)
{ {
struct pci_dev *dev = to_pci_dev(hwif->dev); struct pci_dev *dev = to_pci_dev(hwif->dev);
unsigned long dma_base = 0; unsigned long dma_base = 0;
...@@ -132,11 +132,12 @@ static unsigned long ide_get_or_set_dma_base(const struct ide_port_info *d, ide_ ...@@ -132,11 +132,12 @@ static unsigned long ide_get_or_set_dma_base(const struct ide_port_info *d, ide_
out: out:
return dma_base; return dma_base;
} }
EXPORT_SYMBOL_GPL(ide_pci_dma_base);
/* /*
* Set up BM-DMA capability (PnP BIOS should have done this) * Set up BM-DMA capability (PnP BIOS should have done this)
*/ */
static int ide_pci_set_master(struct pci_dev *dev, const char *name) int ide_pci_set_master(struct pci_dev *dev, const char *name)
{ {
u16 pcicmd; u16 pcicmd;
...@@ -155,6 +156,7 @@ static int ide_pci_set_master(struct pci_dev *dev, const char *name) ...@@ -155,6 +156,7 @@ static int ide_pci_set_master(struct pci_dev *dev, const char *name)
return 0; return 0;
} }
EXPORT_SYMBOL_GPL(ide_pci_set_master);
#endif /* CONFIG_BLK_DEV_IDEDMA_PCI */ #endif /* CONFIG_BLK_DEV_IDEDMA_PCI */
void ide_setup_pci_noise(struct pci_dev *dev, const struct ide_port_info *d) void ide_setup_pci_noise(struct pci_dev *dev, const struct ide_port_info *d)
...@@ -360,20 +362,17 @@ static ide_hwif_t *ide_hwif_configure(struct pci_dev *dev, ...@@ -360,20 +362,17 @@ static ide_hwif_t *ide_hwif_configure(struct pci_dev *dev,
* state * state
*/ */
void ide_hwif_setup_dma(ide_hwif_t *hwif, const struct ide_port_info *d) int ide_hwif_setup_dma(ide_hwif_t *hwif, const struct ide_port_info *d)
{ {
struct pci_dev *dev = to_pci_dev(hwif->dev); struct pci_dev *dev = to_pci_dev(hwif->dev);
if ((d->host_flags & IDE_HFLAG_NO_AUTODMA) == 0 || if ((d->host_flags & IDE_HFLAG_NO_AUTODMA) == 0 ||
((dev->class >> 8) == PCI_CLASS_STORAGE_IDE && ((dev->class >> 8) == PCI_CLASS_STORAGE_IDE &&
(dev->class & 0x80))) { (dev->class & 0x80))) {
unsigned long base = ide_get_or_set_dma_base(d, hwif); unsigned long base = ide_pci_dma_base(hwif, d);
if (base == 0 || ide_pci_set_master(dev, d->name) < 0) if (base == 0 || ide_pci_set_master(dev, d->name) < 0)
goto out_disabled; return -1;
if (d->init_dma)
d->init_dma(hwif, base);
if (hwif->mmio) if (hwif->mmio)
printk(KERN_INFO " %s: MMIO-DMA\n", hwif->name); printk(KERN_INFO " %s: MMIO-DMA\n", hwif->name);
...@@ -383,15 +382,13 @@ void ide_hwif_setup_dma(ide_hwif_t *hwif, const struct ide_port_info *d) ...@@ -383,15 +382,13 @@ void ide_hwif_setup_dma(ide_hwif_t *hwif, const struct ide_port_info *d)
hwif->extra_base = base + (hwif->channel ? 8 : 16); hwif->extra_base = base + (hwif->channel ? 8 : 16);
if (ide_allocate_dma_engine(hwif) == 0) if (ide_allocate_dma_engine(hwif))
ide_setup_dma(hwif, base); return -1;
}
return; ide_setup_dma(hwif, base);
}
out_disabled: return 0;
printk(KERN_INFO "%s: Bus-Master DMA disabled (BIOS) on %s\n",
d->name, pci_name(dev));
} }
#endif /* CONFIG_BLK_DEV_IDEDMA_PCI */ #endif /* CONFIG_BLK_DEV_IDEDMA_PCI */
......
...@@ -1007,10 +1007,15 @@ void ide_pci_setup_ports(struct pci_dev *, const struct ide_port_info *, int, u8 ...@@ -1007,10 +1007,15 @@ void ide_pci_setup_ports(struct pci_dev *, const struct ide_port_info *, int, u8
void ide_setup_pci_noise(struct pci_dev *, const struct ide_port_info *); void ide_setup_pci_noise(struct pci_dev *, const struct ide_port_info *);
#ifdef CONFIG_BLK_DEV_IDEDMA_PCI #ifdef CONFIG_BLK_DEV_IDEDMA_PCI
void ide_hwif_setup_dma(ide_hwif_t *, const struct ide_port_info *); int ide_pci_set_master(struct pci_dev *, const char *);
unsigned long ide_pci_dma_base(ide_hwif_t *, const struct ide_port_info *);
int ide_hwif_setup_dma(ide_hwif_t *, const struct ide_port_info *);
#else #else
static inline void ide_hwif_setup_dma(ide_hwif_t *hwif, static inline int ide_hwif_setup_dma(ide_hwif_t *hwif,
const struct ide_port_info *d) { } const struct ide_port_info *d)
{
return -EINVAL;
}
#endif #endif
extern void default_hwif_iops(ide_hwif_t *); extern void default_hwif_iops(ide_hwif_t *);
...@@ -1103,7 +1108,8 @@ struct ide_port_info { ...@@ -1103,7 +1108,8 @@ struct ide_port_info {
unsigned int (*init_chipset)(struct pci_dev *, const char *); unsigned int (*init_chipset)(struct pci_dev *, const char *);
void (*init_iops)(ide_hwif_t *); void (*init_iops)(ide_hwif_t *);
void (*init_hwif)(ide_hwif_t *); void (*init_hwif)(ide_hwif_t *);
void (*init_dma)(ide_hwif_t *, unsigned long); int (*init_dma)(ide_hwif_t *,
const struct ide_port_info *);
const struct ide_port_ops *port_ops; const struct ide_port_ops *port_ops;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment