Commit a8b828f4 authored by Linus Torvalds's avatar Linus Torvalds

Merge bk://gkernel.bkbits.net/libata-2.5

into ppc970.osdl.org:/home/torvalds/v2.5/linux
parents 2d0512a4 3f9d4e0f
...@@ -457,6 +457,14 @@ config SCSI_SATA_VIA ...@@ -457,6 +457,14 @@ config SCSI_SATA_VIA
If unsure, say N. If unsure, say N.
config SCSI_SATA_VITESSE
tristate "VITESSE VSC-7174 SATA support"
depends on SCSI_SATA && PCI && EXPERIMENTAL
help
This option enables support for Vitesse VSC7174 Serial ATA.
If unsure, say N.
config SCSI_BUSLOGIC config SCSI_BUSLOGIC
tristate "BusLogic SCSI support" tristate "BusLogic SCSI support"
depends on (PCI || ISA || MCA) && SCSI depends on (PCI || ISA || MCA) && SCSI
......
...@@ -122,6 +122,7 @@ obj-$(CONFIG_SCSI_ATA_PIIX) += libata.o ata_piix.o ...@@ -122,6 +122,7 @@ obj-$(CONFIG_SCSI_ATA_PIIX) += libata.o ata_piix.o
obj-$(CONFIG_SCSI_SATA_PROMISE) += libata.o sata_promise.o obj-$(CONFIG_SCSI_SATA_PROMISE) += libata.o sata_promise.o
obj-$(CONFIG_SCSI_SATA_SIL) += libata.o sata_sil.o obj-$(CONFIG_SCSI_SATA_SIL) += libata.o sata_sil.o
obj-$(CONFIG_SCSI_SATA_VIA) += libata.o sata_via.o obj-$(CONFIG_SCSI_SATA_VIA) += libata.o sata_via.o
obj-$(CONFIG_SCSI_SATA_VITESSE) += libata.o sata_vsc.o
obj-$(CONFIG_ARM) += arm/ obj-$(CONFIG_ARM) += arm/
......
...@@ -141,7 +141,7 @@ void ata_tf_load_pio(struct ata_port *ap, struct ata_taskfile *tf) ...@@ -141,7 +141,7 @@ void ata_tf_load_pio(struct ata_port *ap, struct ata_taskfile *tf)
} }
if (is_addr && (tf->flags & ATA_TFLAG_LBA48)) { if (is_addr && (tf->flags & ATA_TFLAG_LBA48)) {
outb(tf->hob_feature, ioaddr->error_addr); outb(tf->hob_feature, ioaddr->feature_addr);
outb(tf->hob_nsect, ioaddr->nsect_addr); outb(tf->hob_nsect, ioaddr->nsect_addr);
outb(tf->hob_lbal, ioaddr->lbal_addr); outb(tf->hob_lbal, ioaddr->lbal_addr);
outb(tf->hob_lbam, ioaddr->lbam_addr); outb(tf->hob_lbam, ioaddr->lbam_addr);
...@@ -155,7 +155,7 @@ void ata_tf_load_pio(struct ata_port *ap, struct ata_taskfile *tf) ...@@ -155,7 +155,7 @@ void ata_tf_load_pio(struct ata_port *ap, struct ata_taskfile *tf)
} }
if (is_addr) { if (is_addr) {
outb(tf->feature, ioaddr->error_addr); outb(tf->feature, ioaddr->feature_addr);
outb(tf->nsect, ioaddr->nsect_addr); outb(tf->nsect, ioaddr->nsect_addr);
outb(tf->lbal, ioaddr->lbal_addr); outb(tf->lbal, ioaddr->lbal_addr);
outb(tf->lbam, ioaddr->lbam_addr); outb(tf->lbam, ioaddr->lbam_addr);
...@@ -199,7 +199,7 @@ void ata_tf_load_mmio(struct ata_port *ap, struct ata_taskfile *tf) ...@@ -199,7 +199,7 @@ void ata_tf_load_mmio(struct ata_port *ap, struct ata_taskfile *tf)
} }
if (is_addr && (tf->flags & ATA_TFLAG_LBA48)) { if (is_addr && (tf->flags & ATA_TFLAG_LBA48)) {
writeb(tf->hob_feature, (void *) ioaddr->error_addr); writeb(tf->hob_feature, (void *) ioaddr->feature_addr);
writeb(tf->hob_nsect, (void *) ioaddr->nsect_addr); writeb(tf->hob_nsect, (void *) ioaddr->nsect_addr);
writeb(tf->hob_lbal, (void *) ioaddr->lbal_addr); writeb(tf->hob_lbal, (void *) ioaddr->lbal_addr);
writeb(tf->hob_lbam, (void *) ioaddr->lbam_addr); writeb(tf->hob_lbam, (void *) ioaddr->lbam_addr);
...@@ -213,7 +213,7 @@ void ata_tf_load_mmio(struct ata_port *ap, struct ata_taskfile *tf) ...@@ -213,7 +213,7 @@ void ata_tf_load_mmio(struct ata_port *ap, struct ata_taskfile *tf)
} }
if (is_addr) { if (is_addr) {
writeb(tf->feature, (void *) ioaddr->error_addr); writeb(tf->feature, (void *) ioaddr->feature_addr);
writeb(tf->nsect, (void *) ioaddr->nsect_addr); writeb(tf->nsect, (void *) ioaddr->nsect_addr);
writeb(tf->lbal, (void *) ioaddr->lbal_addr); writeb(tf->lbal, (void *) ioaddr->lbal_addr);
writeb(tf->lbam, (void *) ioaddr->lbam_addr); writeb(tf->lbam, (void *) ioaddr->lbam_addr);
...@@ -250,7 +250,7 @@ void ata_exec_command_pio(struct ata_port *ap, struct ata_taskfile *tf) ...@@ -250,7 +250,7 @@ void ata_exec_command_pio(struct ata_port *ap, struct ata_taskfile *tf)
{ {
DPRINTK("ata%u: cmd 0x%X\n", ap->id, tf->command); DPRINTK("ata%u: cmd 0x%X\n", ap->id, tf->command);
outb(tf->command, ap->ioaddr.cmdstat_addr); outb(tf->command, ap->ioaddr.command_addr);
ata_pause(ap); ata_pause(ap);
} }
...@@ -271,7 +271,7 @@ void ata_exec_command_mmio(struct ata_port *ap, struct ata_taskfile *tf) ...@@ -271,7 +271,7 @@ void ata_exec_command_mmio(struct ata_port *ap, struct ata_taskfile *tf)
{ {
DPRINTK("ata%u: cmd 0x%X\n", ap->id, tf->command); DPRINTK("ata%u: cmd 0x%X\n", ap->id, tf->command);
writeb(tf->command, (void *) ap->ioaddr.cmdstat_addr); writeb(tf->command, (void *) ap->ioaddr.command_addr);
ata_pause(ap); ata_pause(ap);
} }
...@@ -417,7 +417,7 @@ void ata_tf_read_mmio(struct ata_port *ap, struct ata_taskfile *tf) ...@@ -417,7 +417,7 @@ void ata_tf_read_mmio(struct ata_port *ap, struct ata_taskfile *tf)
*/ */
u8 ata_check_status_pio(struct ata_port *ap) u8 ata_check_status_pio(struct ata_port *ap)
{ {
return inb(ap->ioaddr.cmdstat_addr); return inb(ap->ioaddr.status_addr);
} }
/** /**
...@@ -433,7 +433,7 @@ u8 ata_check_status_pio(struct ata_port *ap) ...@@ -433,7 +433,7 @@ u8 ata_check_status_pio(struct ata_port *ap)
*/ */
u8 ata_check_status_mmio(struct ata_port *ap) u8 ata_check_status_mmio(struct ata_port *ap)
{ {
return readb((void *) ap->ioaddr.cmdstat_addr); return readb((void *) ap->ioaddr.status_addr);
} }
static const char * udma_str[] = { static const char * udma_str[] = {
...@@ -1346,12 +1346,6 @@ void ata_bus_reset(struct ata_port *ap) ...@@ -1346,12 +1346,6 @@ void ata_bus_reset(struct ata_port *ap)
DPRINTK("ENTER, host %u, port %u\n", ap->id, ap->port_no); DPRINTK("ENTER, host %u, port %u\n", ap->id, ap->port_no);
/* set up device control */
if (ap->flags & ATA_FLAG_MMIO)
writeb(ap->ctl, ioaddr->ctl_addr);
else
outb(ap->ctl, ioaddr->ctl_addr);
/* determine if device 0/1 are present */ /* determine if device 0/1 are present */
if (ap->flags & ATA_FLAG_SATA_RESET) if (ap->flags & ATA_FLAG_SATA_RESET)
dev0 = 1; dev0 = 1;
...@@ -1372,8 +1366,14 @@ void ata_bus_reset(struct ata_port *ap) ...@@ -1372,8 +1366,14 @@ void ata_bus_reset(struct ata_port *ap)
/* issue bus reset */ /* issue bus reset */
if (ap->flags & ATA_FLAG_SRST) if (ap->flags & ATA_FLAG_SRST)
rc = ata_bus_softreset(ap, devmask); rc = ata_bus_softreset(ap, devmask);
else if ((ap->flags & ATA_FLAG_SATA_RESET) == 0) else if ((ap->flags & ATA_FLAG_SATA_RESET) == 0) {
/* set up device control */
if (ap->flags & ATA_FLAG_MMIO)
writeb(ap->ctl, ioaddr->ctl_addr);
else
outb(ap->ctl, ioaddr->ctl_addr);
rc = ata_bus_edd(ap); rc = ata_bus_edd(ap);
}
if (rc) if (rc)
goto err_out; goto err_out;
...@@ -1399,6 +1399,14 @@ void ata_bus_reset(struct ata_port *ap) ...@@ -1399,6 +1399,14 @@ void ata_bus_reset(struct ata_port *ap)
(ap->device[1].class == ATA_DEV_NONE)) (ap->device[1].class == ATA_DEV_NONE))
goto err_out; goto err_out;
if (ap->flags & (ATA_FLAG_SATA_RESET | ATA_FLAG_SRST)) {
/* set up device control for ATA_FLAG_SATA_RESET */
if (ap->flags & ATA_FLAG_MMIO)
writeb(ap->ctl, ioaddr->ctl_addr);
else
outb(ap->ctl, ioaddr->ctl_addr);
}
DPRINTK("EXIT\n"); DPRINTK("EXIT\n");
return; return;
...@@ -1445,7 +1453,8 @@ static void ata_host_set_pio(struct ata_port *ap) ...@@ -1445,7 +1453,8 @@ static void ata_host_set_pio(struct ata_port *ap)
if (ata_dev_present(&ap->device[i])) { if (ata_dev_present(&ap->device[i])) {
ap->device[i].pio_mode = (pio == 3) ? ap->device[i].pio_mode = (pio == 3) ?
XFER_PIO_3 : XFER_PIO_4; XFER_PIO_3 : XFER_PIO_4;
ap->ops->set_piomode(ap, &ap->device[i], pio); if (ap->ops->set_piomode)
ap->ops->set_piomode(ap, &ap->device[i], pio);
} }
return; return;
...@@ -1509,7 +1518,9 @@ static void ata_host_set_udma(struct ata_port *ap) ...@@ -1509,7 +1518,9 @@ static void ata_host_set_udma(struct ata_port *ap)
for (i = 0; i < ATA_MAX_DEVICES; i++) for (i = 0; i < ATA_MAX_DEVICES; i++)
if (ata_dev_present(&ap->device[i])) { if (ata_dev_present(&ap->device[i])) {
ap->device[i].udma_mode = udma_mode; ap->device[i].udma_mode = udma_mode;
ap->ops->set_udmamode(ap, &ap->device[i], udma_mode); if (ap->ops->set_udmamode)
ap->ops->set_udmamode(ap, &ap->device[i],
udma_mode);
} }
return; return;
...@@ -2369,8 +2380,8 @@ static void ata_dma_complete(struct ata_port *ap, u8 host_stat, ...@@ -2369,8 +2380,8 @@ static void ata_dma_complete(struct ata_port *ap, u8 host_stat,
* One if interrupt was handled, zero if not (shared irq). * One if interrupt was handled, zero if not (shared irq).
*/ */
static inline unsigned int ata_host_intr (struct ata_port *ap, inline unsigned int ata_host_intr (struct ata_port *ap,
struct ata_queued_cmd *qc) struct ata_queued_cmd *qc)
{ {
u8 status, host_stat; u8 status, host_stat;
unsigned int handled = 0; unsigned int handled = 0;
...@@ -2728,7 +2739,7 @@ int ata_port_start (struct ata_port *ap) ...@@ -2728,7 +2739,7 @@ int ata_port_start (struct ata_port *ap)
if (!ap->prd) if (!ap->prd)
return -ENOMEM; return -ENOMEM;
DPRINTK("prd alloc, virt %p, dma %x\n", ap->prd, ap->prd_dma); DPRINTK("prd alloc, virt %p, dma %llx\n", ap->prd, (unsigned long long) ap->prd_dma);
return 0; return 0;
} }
...@@ -3026,12 +3037,14 @@ void ata_std_ports(struct ata_ioports *ioaddr) ...@@ -3026,12 +3037,14 @@ void ata_std_ports(struct ata_ioports *ioaddr)
{ {
ioaddr->data_addr = ioaddr->cmd_addr + ATA_REG_DATA; ioaddr->data_addr = ioaddr->cmd_addr + ATA_REG_DATA;
ioaddr->error_addr = ioaddr->cmd_addr + ATA_REG_ERR; ioaddr->error_addr = ioaddr->cmd_addr + ATA_REG_ERR;
ioaddr->feature_addr = ioaddr->cmd_addr + ATA_REG_FEATURE;
ioaddr->nsect_addr = ioaddr->cmd_addr + ATA_REG_NSECT; ioaddr->nsect_addr = ioaddr->cmd_addr + ATA_REG_NSECT;
ioaddr->lbal_addr = ioaddr->cmd_addr + ATA_REG_LBAL; ioaddr->lbal_addr = ioaddr->cmd_addr + ATA_REG_LBAL;
ioaddr->lbam_addr = ioaddr->cmd_addr + ATA_REG_LBAM; ioaddr->lbam_addr = ioaddr->cmd_addr + ATA_REG_LBAM;
ioaddr->lbah_addr = ioaddr->cmd_addr + ATA_REG_LBAH; ioaddr->lbah_addr = ioaddr->cmd_addr + ATA_REG_LBAH;
ioaddr->device_addr = ioaddr->cmd_addr + ATA_REG_DEVICE; ioaddr->device_addr = ioaddr->cmd_addr + ATA_REG_DEVICE;
ioaddr->cmdstat_addr = ioaddr->cmd_addr + ATA_REG_CMD; ioaddr->status_addr = ioaddr->cmd_addr + ATA_REG_STATUS;
ioaddr->command_addr = ioaddr->cmd_addr + ATA_REG_CMD;
} }
/** /**
...@@ -3153,12 +3166,14 @@ int ata_pci_init_one (struct pci_dev *pdev, struct ata_port_info **port_info, ...@@ -3153,12 +3166,14 @@ int ata_pci_init_one (struct pci_dev *pdev, struct ata_port_info **port_info,
if (legacy_mode) { if (legacy_mode) {
probe_ent->port[0].cmd_addr = 0x1f0; probe_ent->port[0].cmd_addr = 0x1f0;
probe_ent->port[0].altstatus_addr =
probe_ent->port[0].ctl_addr = 0x3f6; probe_ent->port[0].ctl_addr = 0x3f6;
probe_ent->n_ports = 1; probe_ent->n_ports = 1;
probe_ent->irq = 14; probe_ent->irq = 14;
ata_std_ports(&probe_ent->port[0]); ata_std_ports(&probe_ent->port[0]);
probe_ent2->port[0].cmd_addr = 0x170; probe_ent2->port[0].cmd_addr = 0x170;
probe_ent2->port[0].altstatus_addr =
probe_ent2->port[0].ctl_addr = 0x376; probe_ent2->port[0].ctl_addr = 0x376;
probe_ent2->port[0].bmdma_addr = pci_resource_start(pdev, 4)+8; probe_ent2->port[0].bmdma_addr = pci_resource_start(pdev, 4)+8;
probe_ent2->n_ports = 1; probe_ent2->n_ports = 1;
...@@ -3173,11 +3188,13 @@ int ata_pci_init_one (struct pci_dev *pdev, struct ata_port_info **port_info, ...@@ -3173,11 +3188,13 @@ int ata_pci_init_one (struct pci_dev *pdev, struct ata_port_info **port_info,
} else { } else {
probe_ent->port[0].cmd_addr = pci_resource_start(pdev, 0); probe_ent->port[0].cmd_addr = pci_resource_start(pdev, 0);
ata_std_ports(&probe_ent->port[0]); ata_std_ports(&probe_ent->port[0]);
probe_ent->port[0].altstatus_addr =
probe_ent->port[0].ctl_addr = probe_ent->port[0].ctl_addr =
pci_resource_start(pdev, 1) | ATA_PCI_CTL_OFS; pci_resource_start(pdev, 1) | ATA_PCI_CTL_OFS;
probe_ent->port[1].cmd_addr = pci_resource_start(pdev, 2); probe_ent->port[1].cmd_addr = pci_resource_start(pdev, 2);
ata_std_ports(&probe_ent->port[1]); ata_std_ports(&probe_ent->port[1]);
probe_ent->port[1].altstatus_addr =
probe_ent->port[1].ctl_addr = probe_ent->port[1].ctl_addr =
pci_resource_start(pdev, 3) | ATA_PCI_CTL_OFS; pci_resource_start(pdev, 3) | ATA_PCI_CTL_OFS;
probe_ent->port[1].bmdma_addr = pci_resource_start(pdev, 4) + 8; probe_ent->port[1].bmdma_addr = pci_resource_start(pdev, 4) + 8;
...@@ -3367,4 +3384,4 @@ EXPORT_SYMBOL_GPL(ata_scsi_queuecmd); ...@@ -3367,4 +3384,4 @@ EXPORT_SYMBOL_GPL(ata_scsi_queuecmd);
EXPORT_SYMBOL_GPL(ata_scsi_error); EXPORT_SYMBOL_GPL(ata_scsi_error);
EXPORT_SYMBOL_GPL(ata_scsi_slave_config); EXPORT_SYMBOL_GPL(ata_scsi_slave_config);
EXPORT_SYMBOL_GPL(ata_scsi_release); EXPORT_SYMBOL_GPL(ata_scsi_release);
EXPORT_SYMBOL_GPL(ata_host_intr);
...@@ -146,10 +146,6 @@ struct pdc_host_priv { ...@@ -146,10 +146,6 @@ struct pdc_host_priv {
static u32 pdc_sata_scr_read (struct ata_port *ap, unsigned int sc_reg); static u32 pdc_sata_scr_read (struct ata_port *ap, unsigned int sc_reg);
static void pdc_sata_scr_write (struct ata_port *ap, unsigned int sc_reg, u32 val); static void pdc_sata_scr_write (struct ata_port *ap, unsigned int sc_reg, u32 val);
static void pdc_sata_set_piomode (struct ata_port *ap, struct ata_device *adev,
unsigned int pio);
static void pdc_sata_set_udmamode (struct ata_port *ap, struct ata_device *adev,
unsigned int udma);
static int pdc_sata_init_one (struct pci_dev *pdev, const struct pci_device_id *ent); static int pdc_sata_init_one (struct pci_dev *pdev, const struct pci_device_id *ent);
static void pdc_dma_start(struct ata_queued_cmd *qc); static void pdc_dma_start(struct ata_queued_cmd *qc);
static void pdc20621_dma_start(struct ata_queued_cmd *qc); static void pdc20621_dma_start(struct ata_queued_cmd *qc);
...@@ -200,8 +196,6 @@ static Scsi_Host_Template pdc_sata_sht = { ...@@ -200,8 +196,6 @@ static Scsi_Host_Template pdc_sata_sht = {
static struct ata_port_operations pdc_sata_ops = { static struct ata_port_operations pdc_sata_ops = {
.port_disable = ata_port_disable, .port_disable = ata_port_disable,
.set_piomode = pdc_sata_set_piomode,
.set_udmamode = pdc_sata_set_udmamode,
.tf_load = pdc_tf_load_mmio, .tf_load = pdc_tf_load_mmio,
.tf_read = ata_tf_read_mmio, .tf_read = ata_tf_read_mmio,
.check_status = ata_check_status_mmio, .check_status = ata_check_status_mmio,
...@@ -220,8 +214,6 @@ static struct ata_port_operations pdc_sata_ops = { ...@@ -220,8 +214,6 @@ static struct ata_port_operations pdc_sata_ops = {
static struct ata_port_operations pdc_20621_ops = { static struct ata_port_operations pdc_20621_ops = {
.port_disable = ata_port_disable, .port_disable = ata_port_disable,
.set_piomode = pdc_sata_set_piomode,
.set_udmamode = pdc_sata_set_udmamode,
.tf_load = pdc_tf_load_mmio, .tf_load = pdc_tf_load_mmio,
.tf_read = ata_tf_read_mmio, .tf_read = ata_tf_read_mmio,
.check_status = ata_check_status_mmio, .check_status = ata_check_status_mmio,
...@@ -378,19 +370,6 @@ static void pdc_sata_scr_write (struct ata_port *ap, unsigned int sc_reg, ...@@ -378,19 +370,6 @@ static void pdc_sata_scr_write (struct ata_port *ap, unsigned int sc_reg,
writel(val, (void *) ap->ioaddr.scr_addr + (sc_reg * 4)); writel(val, (void *) ap->ioaddr.scr_addr + (sc_reg * 4));
} }
static void pdc_sata_set_piomode (struct ata_port *ap, struct ata_device *adev,
unsigned int pio)
{
/* dummy */
}
static void pdc_sata_set_udmamode (struct ata_port *ap, struct ata_device *adev,
unsigned int udma)
{
/* dummy */
}
enum pdc_packet_bits { enum pdc_packet_bits {
PDC_PKT_READ = (1 << 2), PDC_PKT_READ = (1 << 2),
PDC_PKT_NODATA = (1 << 3), PDC_PKT_NODATA = (1 << 3),
...@@ -1172,13 +1151,16 @@ static void pdc_sata_setup_port(struct ata_ioports *port, unsigned long base) ...@@ -1172,13 +1151,16 @@ static void pdc_sata_setup_port(struct ata_ioports *port, unsigned long base)
{ {
port->cmd_addr = base; port->cmd_addr = base;
port->data_addr = base; port->data_addr = base;
port->feature_addr =
port->error_addr = base + 0x4; port->error_addr = base + 0x4;
port->nsect_addr = base + 0x8; port->nsect_addr = base + 0x8;
port->lbal_addr = base + 0xc; port->lbal_addr = base + 0xc;
port->lbam_addr = base + 0x10; port->lbam_addr = base + 0x10;
port->lbah_addr = base + 0x14; port->lbah_addr = base + 0x14;
port->device_addr = base + 0x18; port->device_addr = base + 0x18;
port->cmdstat_addr = base + 0x1c; port->command_addr =
port->status_addr = base + 0x1c;
port->altstatus_addr =
port->ctl_addr = base + 0x38; port->ctl_addr = base + 0x38;
} }
......
...@@ -75,10 +75,6 @@ enum { ...@@ -75,10 +75,6 @@ enum {
SIL_QUIRK_UDMA5MAX = (1 << 1), SIL_QUIRK_UDMA5MAX = (1 << 1),
}; };
static void sil_set_piomode (struct ata_port *ap, struct ata_device *adev,
unsigned int pio);
static void sil_set_udmamode (struct ata_port *ap, struct ata_device *adev,
unsigned int udma);
static int sil_init_one (struct pci_dev *pdev, const struct pci_device_id *ent); static int sil_init_one (struct pci_dev *pdev, const struct pci_device_id *ent);
static void sil_dev_config(struct ata_port *ap, struct ata_device *dev); static void sil_dev_config(struct ata_port *ap, struct ata_device *dev);
static u32 sil_scr_read (struct ata_port *ap, unsigned int sc_reg); static u32 sil_scr_read (struct ata_port *ap, unsigned int sc_reg);
...@@ -141,8 +137,6 @@ static Scsi_Host_Template sil_sht = { ...@@ -141,8 +137,6 @@ static Scsi_Host_Template sil_sht = {
static struct ata_port_operations sil_ops = { static struct ata_port_operations sil_ops = {
.port_disable = ata_port_disable, .port_disable = ata_port_disable,
.dev_config = sil_dev_config, .dev_config = sil_dev_config,
.set_piomode = sil_set_piomode,
.set_udmamode = sil_set_udmamode,
.tf_load = ata_tf_load_mmio, .tf_load = ata_tf_load_mmio,
.tf_read = ata_tf_read_mmio, .tf_read = ata_tf_read_mmio,
.check_status = ata_check_status_mmio, .check_status = ata_check_status_mmio,
...@@ -287,22 +281,6 @@ static void sil_dev_config(struct ata_port *ap, struct ata_device *dev) ...@@ -287,22 +281,6 @@ static void sil_dev_config(struct ata_port *ap, struct ata_device *dev)
} }
} }
static void sil_set_piomode (struct ata_port *ap, struct ata_device *adev,
unsigned int pio)
{
/* We need empty implementation, the core doesn't test for NULL
* function pointer
*/
}
static void sil_set_udmamode (struct ata_port *ap, struct ata_device *adev,
unsigned int udma)
{
/* We need empty implementation, the core doesn't test for NULL
* function pointer
*/
}
static int sil_init_one (struct pci_dev *pdev, const struct pci_device_id *ent) static int sil_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
{ {
static int printed_version; static int printed_version;
...@@ -360,12 +338,14 @@ static int sil_init_one (struct pci_dev *pdev, const struct pci_device_id *ent) ...@@ -360,12 +338,14 @@ static int sil_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
base = (unsigned long) mmio_base; base = (unsigned long) mmio_base;
probe_ent->port[0].cmd_addr = base + SIL_IDE0_TF; probe_ent->port[0].cmd_addr = base + SIL_IDE0_TF;
probe_ent->port[0].altstatus_addr =
probe_ent->port[0].ctl_addr = base + SIL_IDE0_CTL; probe_ent->port[0].ctl_addr = base + SIL_IDE0_CTL;
probe_ent->port[0].bmdma_addr = base + SIL_IDE0_BMDMA; probe_ent->port[0].bmdma_addr = base + SIL_IDE0_BMDMA;
probe_ent->port[0].scr_addr = base + SIL_IDE0_SCR; probe_ent->port[0].scr_addr = base + SIL_IDE0_SCR;
ata_std_ports(&probe_ent->port[0]); ata_std_ports(&probe_ent->port[0]);
probe_ent->port[1].cmd_addr = base + SIL_IDE1_TF; probe_ent->port[1].cmd_addr = base + SIL_IDE1_TF;
probe_ent->port[1].altstatus_addr =
probe_ent->port[1].ctl_addr = base + SIL_IDE1_CTL; probe_ent->port[1].ctl_addr = base + SIL_IDE1_CTL;
probe_ent->port[1].bmdma_addr = base + SIL_IDE1_BMDMA; probe_ent->port[1].bmdma_addr = base + SIL_IDE1_BMDMA;
probe_ent->port[1].scr_addr = base + SIL_IDE1_SCR; probe_ent->port[1].scr_addr = base + SIL_IDE1_SCR;
...@@ -373,12 +353,14 @@ static int sil_init_one (struct pci_dev *pdev, const struct pci_device_id *ent) ...@@ -373,12 +353,14 @@ static int sil_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
if (ent->driver_data == sil_3114) { if (ent->driver_data == sil_3114) {
probe_ent->port[2].cmd_addr = base + SIL_IDE2_TF; probe_ent->port[2].cmd_addr = base + SIL_IDE2_TF;
probe_ent->port[2].altstatus_addr =
probe_ent->port[2].ctl_addr = base + SIL_IDE2_CTL; probe_ent->port[2].ctl_addr = base + SIL_IDE2_CTL;
probe_ent->port[2].bmdma_addr = base + SIL_IDE2_BMDMA; probe_ent->port[2].bmdma_addr = base + SIL_IDE2_BMDMA;
probe_ent->port[2].scr_addr = base + SIL_IDE2_SCR; probe_ent->port[2].scr_addr = base + SIL_IDE2_SCR;
ata_std_ports(&probe_ent->port[2]); ata_std_ports(&probe_ent->port[2]);
probe_ent->port[3].cmd_addr = base + SIL_IDE3_TF; probe_ent->port[3].cmd_addr = base + SIL_IDE3_TF;
probe_ent->port[3].altstatus_addr =
probe_ent->port[3].ctl_addr = base + SIL_IDE3_CTL; probe_ent->port[3].ctl_addr = base + SIL_IDE3_CTL;
probe_ent->port[3].bmdma_addr = base + SIL_IDE3_BMDMA; probe_ent->port[3].bmdma_addr = base + SIL_IDE3_BMDMA;
probe_ent->port[3].scr_addr = base + SIL_IDE3_SCR; probe_ent->port[3].scr_addr = base + SIL_IDE3_SCR;
......
...@@ -103,13 +103,13 @@ static void k2_sata_tf_load(struct ata_port *ap, struct ata_taskfile *tf) ...@@ -103,13 +103,13 @@ static void k2_sata_tf_load(struct ata_port *ap, struct ata_taskfile *tf)
ata_wait_idle(ap); ata_wait_idle(ap);
} }
if (is_addr && (tf->flags & ATA_TFLAG_LBA48)) { if (is_addr && (tf->flags & ATA_TFLAG_LBA48)) {
writew(tf->feature | (((u16)tf->hob_feature) << 8), ioaddr->error_addr); writew(tf->feature | (((u16)tf->hob_feature) << 8), ioaddr->feature_addr);
writew(tf->nsect | (((u16)tf->hob_nsect) << 8), ioaddr->nsect_addr); writew(tf->nsect | (((u16)tf->hob_nsect) << 8), ioaddr->nsect_addr);
writew(tf->lbal | (((u16)tf->hob_lbal) << 8), ioaddr->lbal_addr); writew(tf->lbal | (((u16)tf->hob_lbal) << 8), ioaddr->lbal_addr);
writew(tf->lbam | (((u16)tf->hob_lbam) << 8), ioaddr->lbam_addr); writew(tf->lbam | (((u16)tf->hob_lbam) << 8), ioaddr->lbam_addr);
writew(tf->lbah | (((u16)tf->hob_lbah) << 8), ioaddr->lbah_addr); writew(tf->lbah | (((u16)tf->hob_lbah) << 8), ioaddr->lbah_addr);
} else if (is_addr) { } else if (is_addr) {
writew(tf->feature, ioaddr->error_addr); writew(tf->feature, ioaddr->feature_addr);
writew(tf->nsect, ioaddr->nsect_addr); writew(tf->nsect, ioaddr->nsect_addr);
writew(tf->lbal, ioaddr->lbal_addr); writew(tf->lbal, ioaddr->lbal_addr);
writew(tf->lbam, ioaddr->lbam_addr); writew(tf->lbam, ioaddr->lbam_addr);
...@@ -146,27 +146,9 @@ static void k2_sata_tf_read(struct ata_port *ap, struct ata_taskfile *tf) ...@@ -146,27 +146,9 @@ static void k2_sata_tf_read(struct ata_port *ap, struct ata_taskfile *tf)
static u8 k2_stat_check_status(struct ata_port *ap) static u8 k2_stat_check_status(struct ata_port *ap)
{ {
return readl((void *) ap->ioaddr.cmdstat_addr); return readl((void *) ap->ioaddr.status_addr);
} }
static void k2_sata_set_piomode (struct ata_port *ap, struct ata_device *adev,
unsigned int pio)
{
/* We need empty implementation, the core doesn't test for NULL
* function pointer
*/
}
static void k2_sata_set_udmamode (struct ata_port *ap, struct ata_device *adev,
unsigned int udma)
{
/* We need empty implementation, the core doesn't test for NULL
* function pointer
*/
}
#ifdef CONFIG_PPC_OF #ifdef CONFIG_PPC_OF
/* /*
* k2_sata_proc_info * k2_sata_proc_info
...@@ -239,8 +221,6 @@ static Scsi_Host_Template k2_sata_sht = { ...@@ -239,8 +221,6 @@ static Scsi_Host_Template k2_sata_sht = {
static struct ata_port_operations k2_sata_ops = { static struct ata_port_operations k2_sata_ops = {
.port_disable = ata_port_disable, .port_disable = ata_port_disable,
.set_piomode = k2_sata_set_piomode,
.set_udmamode = k2_sata_set_udmamode,
.tf_load = k2_sata_tf_load, .tf_load = k2_sata_tf_load,
.tf_read = k2_sata_tf_read, .tf_read = k2_sata_tf_read,
.check_status = k2_stat_check_status, .check_status = k2_stat_check_status,
...@@ -261,13 +241,16 @@ static void k2_sata_setup_port(struct ata_ioports *port, unsigned long base) ...@@ -261,13 +241,16 @@ static void k2_sata_setup_port(struct ata_ioports *port, unsigned long base)
{ {
port->cmd_addr = base + K2_SATA_TF_CMD_OFFSET; port->cmd_addr = base + K2_SATA_TF_CMD_OFFSET;
port->data_addr = base + K2_SATA_TF_DATA_OFFSET; port->data_addr = base + K2_SATA_TF_DATA_OFFSET;
port->feature_addr =
port->error_addr = base + K2_SATA_TF_ERROR_OFFSET; port->error_addr = base + K2_SATA_TF_ERROR_OFFSET;
port->nsect_addr = base + K2_SATA_TF_NSECT_OFFSET; port->nsect_addr = base + K2_SATA_TF_NSECT_OFFSET;
port->lbal_addr = base + K2_SATA_TF_LBAL_OFFSET; port->lbal_addr = base + K2_SATA_TF_LBAL_OFFSET;
port->lbam_addr = base + K2_SATA_TF_LBAM_OFFSET; port->lbam_addr = base + K2_SATA_TF_LBAM_OFFSET;
port->lbah_addr = base + K2_SATA_TF_LBAH_OFFSET; port->lbah_addr = base + K2_SATA_TF_LBAH_OFFSET;
port->device_addr = base + K2_SATA_TF_DEVICE_OFFSET; port->device_addr = base + K2_SATA_TF_DEVICE_OFFSET;
port->cmdstat_addr = base + K2_SATA_TF_CMDSTAT_OFFSET; port->command_addr =
port->status_addr = base + K2_SATA_TF_CMDSTAT_OFFSET;
port->altstatus_addr =
port->ctl_addr = base + K2_SATA_TF_CTL_OFFSET; port->ctl_addr = base + K2_SATA_TF_CTL_OFFSET;
port->bmdma_addr = base + K2_SATA_DMA_CMD_OFFSET; port->bmdma_addr = base + K2_SATA_DMA_CMD_OFFSET;
port->scr_addr = base + K2_SATA_SCR_STATUS_OFFSET; port->scr_addr = base + K2_SATA_SCR_STATUS_OFFSET;
......
...@@ -43,10 +43,6 @@ enum { ...@@ -43,10 +43,6 @@ enum {
static int svia_init_one (struct pci_dev *pdev, const struct pci_device_id *ent); static int svia_init_one (struct pci_dev *pdev, const struct pci_device_id *ent);
static void svia_sata_phy_reset(struct ata_port *ap); static void svia_sata_phy_reset(struct ata_port *ap);
static void svia_port_disable(struct ata_port *ap); static void svia_port_disable(struct ata_port *ap);
static void svia_set_piomode (struct ata_port *ap, struct ata_device *adev,
unsigned int pio);
static void svia_set_udmamode (struct ata_port *ap, struct ata_device *adev,
unsigned int udma);
static unsigned int in_module_init = 1; static unsigned int in_module_init = 1;
...@@ -83,8 +79,6 @@ static Scsi_Host_Template svia_sht = { ...@@ -83,8 +79,6 @@ static Scsi_Host_Template svia_sht = {
static struct ata_port_operations svia_sata_ops = { static struct ata_port_operations svia_sata_ops = {
.port_disable = svia_port_disable, .port_disable = svia_port_disable,
.set_piomode = svia_set_piomode,
.set_udmamode = svia_set_udmamode,
.tf_load = ata_tf_load_pio, .tf_load = ata_tf_load_pio,
.tf_read = ata_tf_read_pio, .tf_read = ata_tf_read_pio,
...@@ -166,38 +160,6 @@ static void svia_port_disable(struct ata_port *ap) ...@@ -166,38 +160,6 @@ static void svia_port_disable(struct ata_port *ap)
/* FIXME */ /* FIXME */
} }
/**
* svia_set_piomode -
* @ap:
* @adev:
* @pio:
*
* LOCKING:
*
*/
static void svia_set_piomode (struct ata_port *ap, struct ata_device *adev,
unsigned int pio)
{
/* FIXME: needed? */
}
/**
* svia_set_udmamode -
* @ap:
* @adev:
* @udma:
*
* LOCKING:
*
*/
static void svia_set_udmamode (struct ata_port *ap, struct ata_device *adev,
unsigned int udma)
{
/* FIXME: needed? */
}
/** /**
* svia_init_one - * svia_init_one -
* @pdev: * @pdev:
......
This diff is collapsed.
...@@ -183,12 +183,15 @@ struct ata_ioports { ...@@ -183,12 +183,15 @@ struct ata_ioports {
unsigned long cmd_addr; unsigned long cmd_addr;
unsigned long data_addr; unsigned long data_addr;
unsigned long error_addr; unsigned long error_addr;
unsigned long feature_addr;
unsigned long nsect_addr; unsigned long nsect_addr;
unsigned long lbal_addr; unsigned long lbal_addr;
unsigned long lbam_addr; unsigned long lbam_addr;
unsigned long lbah_addr; unsigned long lbah_addr;
unsigned long device_addr; unsigned long device_addr;
unsigned long cmdstat_addr; unsigned long status_addr;
unsigned long command_addr;
unsigned long altstatus_addr;
unsigned long ctl_addr; unsigned long ctl_addr;
unsigned long bmdma_addr; unsigned long bmdma_addr;
unsigned long scr_addr; unsigned long scr_addr;
...@@ -408,6 +411,7 @@ extern int ata_scsi_queuecmd(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmn ...@@ -408,6 +411,7 @@ extern int ata_scsi_queuecmd(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmn
extern int ata_scsi_error(struct Scsi_Host *host); extern int ata_scsi_error(struct Scsi_Host *host);
extern int ata_scsi_release(struct Scsi_Host *host); extern int ata_scsi_release(struct Scsi_Host *host);
extern int ata_scsi_slave_config(struct scsi_device *sdev); extern int ata_scsi_slave_config(struct scsi_device *sdev);
extern inline unsigned int ata_host_intr (struct ata_port *ap, struct ata_queued_cmd *qc);
/* /*
* Default driver ops implementations * Default driver ops implementations
*/ */
...@@ -465,8 +469,8 @@ static inline u8 ata_chk_status(struct ata_port *ap) ...@@ -465,8 +469,8 @@ static inline u8 ata_chk_status(struct ata_port *ap)
static inline u8 ata_altstatus(struct ata_port *ap) static inline u8 ata_altstatus(struct ata_port *ap)
{ {
if (ap->flags & ATA_FLAG_MMIO) if (ap->flags & ATA_FLAG_MMIO)
return readb(ap->ioaddr.ctl_addr); return readb(ap->ioaddr.altstatus_addr);
return inb(ap->ioaddr.ctl_addr); return inb(ap->ioaddr.altstatus_addr);
} }
static inline void ata_pause(struct ata_port *ap) static inline void ata_pause(struct ata_port *ap)
...@@ -494,7 +498,7 @@ static inline u8 ata_wait_idle(struct ata_port *ap) ...@@ -494,7 +498,7 @@ static inline u8 ata_wait_idle(struct ata_port *ap)
u8 status = ata_busy_wait(ap, ATA_BUSY | ATA_DRQ, 1000); u8 status = ata_busy_wait(ap, ATA_BUSY | ATA_DRQ, 1000);
if (status & (ATA_BUSY | ATA_DRQ)) { if (status & (ATA_BUSY | ATA_DRQ)) {
unsigned long l = ap->ioaddr.cmdstat_addr; unsigned long l = ap->ioaddr.status_addr;
printk(KERN_WARNING printk(KERN_WARNING
"ATA: abnormal status 0x%X on port 0x%lX\n", "ATA: abnormal status 0x%X on port 0x%lX\n",
status, l); status, l);
......
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