Commit 0cb583fd authored by Linus Torvalds's avatar Linus Torvalds

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-next-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-next-2.6:
  ide: fixup for fujitsu disk
  ide: convert to ->proc_fops
  at91_ide: remove headers specific for at91sam9263
  IDE: palm_bk3710: convert clock usage after clkdev conversion
  ide: fix races in handling of user-space SET XFER commands
  ide: allow ide_dev_read_id() to be called from the IRQ context
  ide: ide-taskfile.c fix style problems
  drivers/ide/ide-cd.c: Use DIV_ROUND_CLOSEST
  ide-tape: fix handling of postponed rqs
  ide-tape: convert to ide_debug_log macro
  ide-tape: fix debug call
  ide: Fix annoying warning in ide_pio_bytes().
  IDE: Save a call to PageHighMem()
parents 723e9db7 a2d10568
...@@ -29,9 +29,7 @@ ...@@ -29,9 +29,7 @@
#include <mach/board.h> #include <mach/board.h>
#include <mach/gpio.h> #include <mach/gpio.h>
#include <mach/at91sam9263.h>
#include <mach/at91sam9_smc.h> #include <mach/at91sam9_smc.h>
#include <mach/at91sam9263_matrix.h>
#define DRV_NAME "at91_ide" #define DRV_NAME "at91_ide"
......
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/timer.h> #include <linux/timer.h>
#include <linux/seq_file.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/errno.h> #include <linux/errno.h>
...@@ -1146,8 +1147,8 @@ void ide_cdrom_update_speed(ide_drive_t *drive, u8 *buf) ...@@ -1146,8 +1147,8 @@ void ide_cdrom_update_speed(ide_drive_t *drive, u8 *buf)
ide_debug_log(IDE_DBG_PROBE, "curspeed: %u, maxspeed: %u", ide_debug_log(IDE_DBG_PROBE, "curspeed: %u, maxspeed: %u",
curspeed, maxspeed); curspeed, maxspeed);
cd->current_speed = (curspeed + (176/2)) / 176; cd->current_speed = DIV_ROUND_CLOSEST(curspeed, 176);
cd->max_speed = (maxspeed + (176/2)) / 176; cd->max_speed = DIV_ROUND_CLOSEST(maxspeed, 176);
} }
#define IDE_CD_CAPABILITIES \ #define IDE_CD_CAPABILITIES \
...@@ -1389,19 +1390,30 @@ static sector_t ide_cdrom_capacity(ide_drive_t *drive) ...@@ -1389,19 +1390,30 @@ static sector_t ide_cdrom_capacity(ide_drive_t *drive)
return capacity * sectors_per_frame; return capacity * sectors_per_frame;
} }
static int proc_idecd_read_capacity(char *page, char **start, off_t off, static int idecd_capacity_proc_show(struct seq_file *m, void *v)
int count, int *eof, void *data)
{ {
ide_drive_t *drive = data; ide_drive_t *drive = m->private;
int len;
len = sprintf(page, "%llu\n", (long long)ide_cdrom_capacity(drive)); seq_printf(m, "%llu\n", (long long)ide_cdrom_capacity(drive));
PROC_IDE_READ_RETURN(page, start, off, count, eof, len); return 0;
}
static int idecd_capacity_proc_open(struct inode *inode, struct file *file)
{
return single_open(file, idecd_capacity_proc_show, PDE(inode)->data);
} }
static const struct file_operations idecd_capacity_proc_fops = {
.owner = THIS_MODULE,
.open = idecd_capacity_proc_open,
.read = seq_read,
.llseek = seq_lseek,
.release = single_release,
};
static ide_proc_entry_t idecd_proc[] = { static ide_proc_entry_t idecd_proc[] = {
{ "capacity", S_IFREG|S_IRUGO, proc_idecd_read_capacity, NULL }, { "capacity", S_IFREG|S_IRUGO, &idecd_capacity_proc_fops },
{ NULL, 0, NULL, NULL } {}
}; };
static ide_proc_entry_t *ide_cd_proc_entries(ide_drive_t *drive) static ide_proc_entry_t *ide_cd_proc_entries(ide_drive_t *drive)
......
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/ide.h> #include <linux/ide.h>
#include <linux/seq_file.h>
#include "ide-disk.h" #include "ide-disk.h"
...@@ -37,77 +38,117 @@ static int get_smart_data(ide_drive_t *drive, u8 *buf, u8 sub_cmd) ...@@ -37,77 +38,117 @@ static int get_smart_data(ide_drive_t *drive, u8 *buf, u8 sub_cmd)
return ide_raw_taskfile(drive, &cmd, buf, 1); return ide_raw_taskfile(drive, &cmd, buf, 1);
} }
static int proc_idedisk_read_cache static int idedisk_cache_proc_show(struct seq_file *m, void *v)
(char *page, char **start, off_t off, int count, int *eof, void *data)
{ {
ide_drive_t *drive = (ide_drive_t *) data; ide_drive_t *drive = (ide_drive_t *) m->private;
char *out = page;
int len;
if (drive->dev_flags & IDE_DFLAG_ID_READ) if (drive->dev_flags & IDE_DFLAG_ID_READ)
len = sprintf(out, "%i\n", drive->id[ATA_ID_BUF_SIZE] / 2); seq_printf(m, "%i\n", drive->id[ATA_ID_BUF_SIZE] / 2);
else else
len = sprintf(out, "(none)\n"); seq_printf(m, "(none)\n");
return 0;
}
PROC_IDE_READ_RETURN(page, start, off, count, eof, len); static int idedisk_cache_proc_open(struct inode *inode, struct file *file)
{
return single_open(file, idedisk_cache_proc_show, PDE(inode)->data);
} }
static int proc_idedisk_read_capacity static const struct file_operations idedisk_cache_proc_fops = {
(char *page, char **start, off_t off, int count, int *eof, void *data) .owner = THIS_MODULE,
.open = idedisk_cache_proc_open,
.read = seq_read,
.llseek = seq_lseek,
.release = single_release,
};
static int idedisk_capacity_proc_show(struct seq_file *m, void *v)
{ {
ide_drive_t*drive = (ide_drive_t *)data; ide_drive_t*drive = (ide_drive_t *)m->private;
int len;
len = sprintf(page, "%llu\n", (long long)ide_gd_capacity(drive)); seq_printf(m, "%llu\n", (long long)ide_gd_capacity(drive));
return 0;
}
PROC_IDE_READ_RETURN(page, start, off, count, eof, len); static int idedisk_capacity_proc_open(struct inode *inode, struct file *file)
{
return single_open(file, idedisk_capacity_proc_show, PDE(inode)->data);
} }
static int proc_idedisk_read_smart(char *page, char **start, off_t off, static const struct file_operations idedisk_capacity_proc_fops = {
int count, int *eof, void *data, u8 sub_cmd) .owner = THIS_MODULE,
.open = idedisk_capacity_proc_open,
.read = seq_read,
.llseek = seq_lseek,
.release = single_release,
};
static int __idedisk_proc_show(struct seq_file *m, ide_drive_t *drive, u8 sub_cmd)
{ {
ide_drive_t *drive = (ide_drive_t *)data; u8 *buf;
int len = 0, i = 0;
buf = kmalloc(SECTOR_SIZE, GFP_KERNEL);
if (!buf)
return -ENOMEM;
(void)smart_enable(drive); (void)smart_enable(drive);
if (get_smart_data(drive, page, sub_cmd) == 0) { if (get_smart_data(drive, buf, sub_cmd) == 0) {
unsigned short *val = (unsigned short *) page; __le16 *val = (__le16 *)buf;
char *out = (char *)val + SECTOR_SIZE; int i;
page = out; for (i = 0; i < SECTOR_SIZE / 2; i++) {
do { seq_printf(m, "%04x%c", le16_to_cpu(val[i]),
out += sprintf(out, "%04x%c", le16_to_cpu(*val), (i % 8) == 7 ? '\n' : ' ');
(++i & 7) ? ' ' : '\n'); }
val += 1;
} while (i < SECTOR_SIZE / 2);
len = out - page;
} }
kfree(buf);
return 0;
}
PROC_IDE_READ_RETURN(page, start, off, count, eof, len); static int idedisk_sv_proc_show(struct seq_file *m, void *v)
{
return __idedisk_proc_show(m, m->private, ATA_SMART_READ_VALUES);
} }
static int proc_idedisk_read_sv static int idedisk_sv_proc_open(struct inode *inode, struct file *file)
(char *page, char **start, off_t off, int count, int *eof, void *data)
{ {
return proc_idedisk_read_smart(page, start, off, count, eof, data, return single_open(file, idedisk_sv_proc_show, PDE(inode)->data);
ATA_SMART_READ_VALUES);
} }
static int proc_idedisk_read_st static const struct file_operations idedisk_sv_proc_fops = {
(char *page, char **start, off_t off, int count, int *eof, void *data) .owner = THIS_MODULE,
.open = idedisk_sv_proc_open,
.read = seq_read,
.llseek = seq_lseek,
.release = single_release,
};
static int idedisk_st_proc_show(struct seq_file *m, void *v)
{ {
return proc_idedisk_read_smart(page, start, off, count, eof, data, return __idedisk_proc_show(m, m->private, ATA_SMART_READ_THRESHOLDS);
ATA_SMART_READ_THRESHOLDS);
} }
static int idedisk_st_proc_open(struct inode *inode, struct file *file)
{
return single_open(file, idedisk_st_proc_show, PDE(inode)->data);
}
static const struct file_operations idedisk_st_proc_fops = {
.owner = THIS_MODULE,
.open = idedisk_st_proc_open,
.read = seq_read,
.llseek = seq_lseek,
.release = single_release,
};
ide_proc_entry_t ide_disk_proc[] = { ide_proc_entry_t ide_disk_proc[] = {
{ "cache", S_IFREG|S_IRUGO, proc_idedisk_read_cache, NULL }, { "cache", S_IFREG|S_IRUGO, &idedisk_cache_proc_fops },
{ "capacity", S_IFREG|S_IRUGO, proc_idedisk_read_capacity, NULL }, { "capacity", S_IFREG|S_IRUGO, &idedisk_capacity_proc_fops },
{ "geometry", S_IFREG|S_IRUGO, proc_ide_read_geometry, NULL }, { "geometry", S_IFREG|S_IRUGO, &ide_geometry_proc_fops },
{ "smart_values", S_IFREG|S_IRUSR, proc_idedisk_read_sv, NULL }, { "smart_values", S_IFREG|S_IRUSR, &idedisk_sv_proc_fops },
{ "smart_thresholds", S_IFREG|S_IRUSR, proc_idedisk_read_st, NULL }, { "smart_thresholds", S_IFREG|S_IRUSR, &idedisk_st_proc_fops },
{ NULL, 0, NULL, NULL } {}
}; };
ide_devset_rw_field(bios_cyl, bios_cyl); ide_devset_rw_field(bios_cyl, bios_cyl);
......
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/ide.h> #include <linux/ide.h>
#include <linux/seq_file.h>
#include "ide-floppy.h" #include "ide-floppy.h"
static int proc_idefloppy_read_capacity(char *page, char **start, off_t off, static int idefloppy_capacity_proc_show(struct seq_file *m, void *v)
int count, int *eof, void *data)
{ {
ide_drive_t*drive = (ide_drive_t *)data; ide_drive_t*drive = (ide_drive_t *)m->private;
int len;
len = sprintf(page, "%llu\n", (long long)ide_gd_capacity(drive)); seq_printf(m, "%llu\n", (long long)ide_gd_capacity(drive));
PROC_IDE_READ_RETURN(page, start, off, count, eof, len); return 0;
} }
static int idefloppy_capacity_proc_open(struct inode *inode, struct file *file)
{
return single_open(file, idefloppy_capacity_proc_show, PDE(inode)->data);
}
static const struct file_operations idefloppy_capacity_proc_fops = {
.owner = THIS_MODULE,
.open = idefloppy_capacity_proc_open,
.read = seq_read,
.llseek = seq_lseek,
.release = single_release,
};
ide_proc_entry_t ide_floppy_proc[] = { ide_proc_entry_t ide_floppy_proc[] = {
{ "capacity", S_IFREG|S_IRUGO, proc_idefloppy_read_capacity, NULL }, { "capacity", S_IFREG|S_IRUGO, &idefloppy_capacity_proc_fops },
{ "geometry", S_IFREG|S_IRUGO, proc_ide_read_geometry, NULL }, { "geometry", S_IFREG|S_IRUGO, &ide_geometry_proc_fops },
{ NULL, 0, NULL, NULL } {}
}; };
ide_devset_rw_field(bios_cyl, bios_cyl); ide_devset_rw_field(bios_cyl, bios_cyl);
......
...@@ -167,6 +167,8 @@ static int ide_cmd_ioctl(ide_drive_t *drive, unsigned long arg) ...@@ -167,6 +167,8 @@ static int ide_cmd_ioctl(ide_drive_t *drive, unsigned long arg)
err = -EINVAL; err = -EINVAL;
goto abort; goto abort;
} }
cmd.tf_flags |= IDE_TFLAG_SET_XFER;
} }
err = ide_raw_taskfile(drive, &cmd, buf, args[3]); err = ide_raw_taskfile(drive, &cmd, buf, args[3]);
...@@ -174,12 +176,6 @@ static int ide_cmd_ioctl(ide_drive_t *drive, unsigned long arg) ...@@ -174,12 +176,6 @@ static int ide_cmd_ioctl(ide_drive_t *drive, unsigned long arg)
args[0] = tf->status; args[0] = tf->status;
args[1] = tf->error; args[1] = tf->error;
args[2] = tf->nsect; args[2] = tf->nsect;
if (!err && xfer_rate) {
/* active-retuning-calls future */
ide_set_xfer_rate(drive, xfer_rate);
ide_driveid_update(drive);
}
abort: abort:
if (copy_to_user((void __user *)arg, &args, 4)) if (copy_to_user((void __user *)arg, &args, 4))
err = -EFAULT; err = -EFAULT;
......
...@@ -102,8 +102,8 @@ EXPORT_SYMBOL(ide_fixstring); ...@@ -102,8 +102,8 @@ EXPORT_SYMBOL(ide_fixstring);
* setting a timer to wake up at half second intervals thereafter, * setting a timer to wake up at half second intervals thereafter,
* until timeout is achieved, before timing out. * until timeout is achieved, before timing out.
*/ */
static int __ide_wait_stat(ide_drive_t *drive, u8 good, u8 bad, int __ide_wait_stat(ide_drive_t *drive, u8 good, u8 bad,
unsigned long timeout, u8 *rstat) unsigned long timeout, u8 *rstat)
{ {
ide_hwif_t *hwif = drive->hwif; ide_hwif_t *hwif = drive->hwif;
const struct ide_tp_ops *tp_ops = hwif->tp_ops; const struct ide_tp_ops *tp_ops = hwif->tp_ops;
...@@ -292,6 +292,7 @@ static const char *nien_quirk_list[] = { ...@@ -292,6 +292,7 @@ static const char *nien_quirk_list[] = {
"QUANTUM FIREBALLP KX27.3", "QUANTUM FIREBALLP KX27.3",
"QUANTUM FIREBALLP LM20.4", "QUANTUM FIREBALLP LM20.4",
"QUANTUM FIREBALLP LM20.5", "QUANTUM FIREBALLP LM20.5",
"FUJITSU MHZ2160BH G2",
NULL NULL
}; };
...@@ -316,7 +317,7 @@ int ide_driveid_update(ide_drive_t *drive) ...@@ -316,7 +317,7 @@ int ide_driveid_update(ide_drive_t *drive)
return 0; return 0;
SELECT_MASK(drive, 1); SELECT_MASK(drive, 1);
rc = ide_dev_read_id(drive, ATA_CMD_ID_ATA, id); rc = ide_dev_read_id(drive, ATA_CMD_ID_ATA, id, 1);
SELECT_MASK(drive, 0); SELECT_MASK(drive, 0);
if (rc) if (rc)
...@@ -363,14 +364,6 @@ int ide_config_drive_speed(ide_drive_t *drive, u8 speed) ...@@ -363,14 +364,6 @@ int ide_config_drive_speed(ide_drive_t *drive, u8 speed)
* this point (lost interrupt). * this point (lost interrupt).
*/ */
/*
* FIXME: we race against the running IRQ here if
* this is called from non IRQ context. If we use
* disable_irq() we hang on the error path. Work
* is needed.
*/
disable_irq_nosync(hwif->irq);
udelay(1); udelay(1);
tp_ops->dev_select(drive); tp_ops->dev_select(drive);
SELECT_MASK(drive, 1); SELECT_MASK(drive, 1);
...@@ -394,8 +387,6 @@ int ide_config_drive_speed(ide_drive_t *drive, u8 speed) ...@@ -394,8 +387,6 @@ int ide_config_drive_speed(ide_drive_t *drive, u8 speed)
SELECT_MASK(drive, 0); SELECT_MASK(drive, 0);
enable_irq(hwif->irq);
if (error) { if (error) {
(void) ide_dump_status(drive, "set_drive_speed_status", stat); (void) ide_dump_status(drive, "set_drive_speed_status", stat);
return error; return error;
......
...@@ -238,6 +238,7 @@ static void do_identify(ide_drive_t *drive, u8 cmd, u16 *id) ...@@ -238,6 +238,7 @@ static void do_identify(ide_drive_t *drive, u8 cmd, u16 *id)
* @drive: drive to identify * @drive: drive to identify
* @cmd: command to use * @cmd: command to use
* @id: buffer for IDENTIFY data * @id: buffer for IDENTIFY data
* @irq_ctx: flag set when called from the IRQ context
* *
* Sends an ATA(PI) IDENTIFY request to a drive and waits for a response. * Sends an ATA(PI) IDENTIFY request to a drive and waits for a response.
* *
...@@ -246,7 +247,7 @@ static void do_identify(ide_drive_t *drive, u8 cmd, u16 *id) ...@@ -246,7 +247,7 @@ static void do_identify(ide_drive_t *drive, u8 cmd, u16 *id)
* 2 device aborted the command (refused to identify itself) * 2 device aborted the command (refused to identify itself)
*/ */
int ide_dev_read_id(ide_drive_t *drive, u8 cmd, u16 *id) int ide_dev_read_id(ide_drive_t *drive, u8 cmd, u16 *id, int irq_ctx)
{ {
ide_hwif_t *hwif = drive->hwif; ide_hwif_t *hwif = drive->hwif;
struct ide_io_ports *io_ports = &hwif->io_ports; struct ide_io_ports *io_ports = &hwif->io_ports;
...@@ -263,7 +264,10 @@ int ide_dev_read_id(ide_drive_t *drive, u8 cmd, u16 *id) ...@@ -263,7 +264,10 @@ int ide_dev_read_id(ide_drive_t *drive, u8 cmd, u16 *id)
tp_ops->write_devctl(hwif, ATA_NIEN | ATA_DEVCTL_OBS); tp_ops->write_devctl(hwif, ATA_NIEN | ATA_DEVCTL_OBS);
/* take a deep breath */ /* take a deep breath */
msleep(50); if (irq_ctx)
mdelay(50);
else
msleep(50);
if (io_ports->ctl_addr && if (io_ports->ctl_addr &&
(hwif->host_flags & IDE_HFLAG_BROKEN_ALTSTATUS) == 0) { (hwif->host_flags & IDE_HFLAG_BROKEN_ALTSTATUS) == 0) {
...@@ -295,12 +299,19 @@ int ide_dev_read_id(ide_drive_t *drive, u8 cmd, u16 *id) ...@@ -295,12 +299,19 @@ int ide_dev_read_id(ide_drive_t *drive, u8 cmd, u16 *id)
timeout = ((cmd == ATA_CMD_ID_ATA) ? WAIT_WORSTCASE : WAIT_PIDENTIFY) / 2; timeout = ((cmd == ATA_CMD_ID_ATA) ? WAIT_WORSTCASE : WAIT_PIDENTIFY) / 2;
if (ide_busy_sleep(drive, timeout, use_altstatus))
return 1;
/* wait for IRQ and ATA_DRQ */ /* wait for IRQ and ATA_DRQ */
msleep(50); if (irq_ctx) {
s = tp_ops->read_status(hwif); rc = __ide_wait_stat(drive, ATA_DRQ, BAD_R_STAT, timeout, &s);
if (rc)
return 1;
} else {
rc = ide_busy_sleep(drive, timeout, use_altstatus);
if (rc)
return 1;
msleep(50);
s = tp_ops->read_status(hwif);
}
if (OK_STAT(s, ATA_DRQ, BAD_R_STAT)) { if (OK_STAT(s, ATA_DRQ, BAD_R_STAT)) {
/* drive returned ID */ /* drive returned ID */
...@@ -406,10 +417,10 @@ static int do_probe (ide_drive_t *drive, u8 cmd) ...@@ -406,10 +417,10 @@ static int do_probe (ide_drive_t *drive, u8 cmd)
if (OK_STAT(stat, ATA_DRDY, ATA_BUSY) || if (OK_STAT(stat, ATA_DRDY, ATA_BUSY) ||
present || cmd == ATA_CMD_ID_ATAPI) { present || cmd == ATA_CMD_ID_ATAPI) {
rc = ide_dev_read_id(drive, cmd, id); rc = ide_dev_read_id(drive, cmd, id, 0);
if (rc) if (rc)
/* failed: try again */ /* failed: try again */
rc = ide_dev_read_id(drive, cmd, id); rc = ide_dev_read_id(drive, cmd, id, 0);
stat = tp_ops->read_status(hwif); stat = tp_ops->read_status(hwif);
...@@ -424,7 +435,7 @@ static int do_probe (ide_drive_t *drive, u8 cmd) ...@@ -424,7 +435,7 @@ static int do_probe (ide_drive_t *drive, u8 cmd)
msleep(50); msleep(50);
tp_ops->exec_command(hwif, ATA_CMD_DEV_RESET); tp_ops->exec_command(hwif, ATA_CMD_DEV_RESET);
(void)ide_busy_sleep(drive, WAIT_WORSTCASE, 0); (void)ide_busy_sleep(drive, WAIT_WORSTCASE, 0);
rc = ide_dev_read_id(drive, cmd, id); rc = ide_dev_read_id(drive, cmd, id, 0);
} }
/* ensure drive IRQ is clear */ /* ensure drive IRQ is clear */
......
This diff is collapsed.
This diff is collapsed.
...@@ -19,8 +19,8 @@ ...@@ -19,8 +19,8 @@
#include <linux/hdreg.h> #include <linux/hdreg.h>
#include <linux/ide.h> #include <linux/ide.h>
#include <linux/scatterlist.h> #include <linux/scatterlist.h>
#include <linux/uaccess.h>
#include <asm/uaccess.h>
#include <asm/io.h> #include <asm/io.h>
void ide_tf_readback(ide_drive_t *drive, struct ide_cmd *cmd) void ide_tf_readback(ide_drive_t *drive, struct ide_cmd *cmd)
...@@ -53,7 +53,7 @@ void ide_tf_dump(const char *s, struct ide_cmd *cmd) ...@@ -53,7 +53,7 @@ void ide_tf_dump(const char *s, struct ide_cmd *cmd)
#endif #endif
} }
int taskfile_lib_get_identify (ide_drive_t *drive, u8 *buf) int taskfile_lib_get_identify(ide_drive_t *drive, u8 *buf)
{ {
struct ide_cmd cmd; struct ide_cmd cmd;
...@@ -86,7 +86,7 @@ ide_startstop_t do_rw_taskfile(ide_drive_t *drive, struct ide_cmd *orig_cmd) ...@@ -86,7 +86,7 @@ ide_startstop_t do_rw_taskfile(ide_drive_t *drive, struct ide_cmd *orig_cmd)
if (orig_cmd->protocol == ATA_PROT_PIO && if (orig_cmd->protocol == ATA_PROT_PIO &&
(orig_cmd->tf_flags & IDE_TFLAG_MULTI_PIO) && (orig_cmd->tf_flags & IDE_TFLAG_MULTI_PIO) &&
drive->mult_count == 0) { drive->mult_count == 0) {
printk(KERN_ERR "%s: multimode not set!\n", drive->name); pr_err("%s: multimode not set!\n", drive->name);
return ide_stopped; return ide_stopped;
} }
...@@ -214,7 +214,7 @@ static u8 wait_drive_not_busy(ide_drive_t *drive) ...@@ -214,7 +214,7 @@ static u8 wait_drive_not_busy(ide_drive_t *drive)
} }
if (stat & ATA_BUSY) if (stat & ATA_BUSY)
printk(KERN_ERR "%s: drive still BUSY!\n", drive->name); pr_err("%s: drive still BUSY!\n", drive->name);
return stat; return stat;
} }
...@@ -225,8 +225,8 @@ void ide_pio_bytes(ide_drive_t *drive, struct ide_cmd *cmd, ...@@ -225,8 +225,8 @@ void ide_pio_bytes(ide_drive_t *drive, struct ide_cmd *cmd,
ide_hwif_t *hwif = drive->hwif; ide_hwif_t *hwif = drive->hwif;
struct scatterlist *sg = hwif->sg_table; struct scatterlist *sg = hwif->sg_table;
struct scatterlist *cursg = cmd->cursg; struct scatterlist *cursg = cmd->cursg;
unsigned long uninitialized_var(flags);
struct page *page; struct page *page;
unsigned long flags;
unsigned int offset; unsigned int offset;
u8 *buf; u8 *buf;
...@@ -236,6 +236,7 @@ void ide_pio_bytes(ide_drive_t *drive, struct ide_cmd *cmd, ...@@ -236,6 +236,7 @@ void ide_pio_bytes(ide_drive_t *drive, struct ide_cmd *cmd,
while (len) { while (len) {
unsigned nr_bytes = min(len, cursg->length - cmd->cursg_ofs); unsigned nr_bytes = min(len, cursg->length - cmd->cursg_ofs);
int page_is_high;
if (nr_bytes > PAGE_SIZE) if (nr_bytes > PAGE_SIZE)
nr_bytes = PAGE_SIZE; nr_bytes = PAGE_SIZE;
...@@ -247,7 +248,8 @@ void ide_pio_bytes(ide_drive_t *drive, struct ide_cmd *cmd, ...@@ -247,7 +248,8 @@ void ide_pio_bytes(ide_drive_t *drive, struct ide_cmd *cmd,
page = nth_page(page, (offset >> PAGE_SHIFT)); page = nth_page(page, (offset >> PAGE_SHIFT));
offset %= PAGE_SIZE; offset %= PAGE_SIZE;
if (PageHighMem(page)) page_is_high = PageHighMem(page);
if (page_is_high)
local_irq_save(flags); local_irq_save(flags);
buf = kmap_atomic(page, KM_BIO_SRC_IRQ) + offset; buf = kmap_atomic(page, KM_BIO_SRC_IRQ) + offset;
...@@ -268,7 +270,7 @@ void ide_pio_bytes(ide_drive_t *drive, struct ide_cmd *cmd, ...@@ -268,7 +270,7 @@ void ide_pio_bytes(ide_drive_t *drive, struct ide_cmd *cmd,
kunmap_atomic(buf, KM_BIO_SRC_IRQ); kunmap_atomic(buf, KM_BIO_SRC_IRQ);
if (PageHighMem(page)) if (page_is_high)
local_irq_restore(flags); local_irq_restore(flags);
len -= nr_bytes; len -= nr_bytes;
...@@ -322,10 +324,17 @@ static void ide_error_cmd(ide_drive_t *drive, struct ide_cmd *cmd) ...@@ -322,10 +324,17 @@ static void ide_error_cmd(ide_drive_t *drive, struct ide_cmd *cmd)
void ide_finish_cmd(ide_drive_t *drive, struct ide_cmd *cmd, u8 stat) void ide_finish_cmd(ide_drive_t *drive, struct ide_cmd *cmd, u8 stat)
{ {
struct request *rq = drive->hwif->rq; struct request *rq = drive->hwif->rq;
u8 err = ide_read_error(drive); u8 err = ide_read_error(drive), nsect = cmd->tf.nsect;
u8 set_xfer = !!(cmd->tf_flags & IDE_TFLAG_SET_XFER);
ide_complete_cmd(drive, cmd, stat, err); ide_complete_cmd(drive, cmd, stat, err);
rq->errors = err; rq->errors = err;
if (err == 0 && set_xfer) {
ide_set_xfer_rate(drive, nsect);
ide_driveid_update(drive);
}
ide_complete_rq(drive, err ? -EIO : 0, blk_rq_bytes(rq)); ide_complete_rq(drive, err ? -EIO : 0, blk_rq_bytes(rq));
} }
...@@ -398,8 +407,7 @@ static ide_startstop_t pre_task_out_intr(ide_drive_t *drive, ...@@ -398,8 +407,7 @@ static ide_startstop_t pre_task_out_intr(ide_drive_t *drive,
if (ide_wait_stat(&startstop, drive, ATA_DRQ, if (ide_wait_stat(&startstop, drive, ATA_DRQ,
drive->bad_wstat, WAIT_DRQ)) { drive->bad_wstat, WAIT_DRQ)) {
printk(KERN_ERR "%s: no DRQ after issuing %sWRITE%s\n", pr_err("%s: no DRQ after issuing %sWRITE%s\n", drive->name,
drive->name,
(cmd->tf_flags & IDE_TFLAG_MULTI_PIO) ? "MULT" : "", (cmd->tf_flags & IDE_TFLAG_MULTI_PIO) ? "MULT" : "",
(drive->dev_flags & IDE_DFLAG_LBA48) ? "_EXT" : ""); (drive->dev_flags & IDE_DFLAG_LBA48) ? "_EXT" : "");
return startstop; return startstop;
...@@ -449,7 +457,6 @@ int ide_raw_taskfile(ide_drive_t *drive, struct ide_cmd *cmd, u8 *buf, ...@@ -449,7 +457,6 @@ int ide_raw_taskfile(ide_drive_t *drive, struct ide_cmd *cmd, u8 *buf,
blk_put_request(rq); blk_put_request(rq);
return error; return error;
} }
EXPORT_SYMBOL(ide_raw_taskfile); EXPORT_SYMBOL(ide_raw_taskfile);
int ide_no_data_taskfile(ide_drive_t *drive, struct ide_cmd *cmd) int ide_no_data_taskfile(ide_drive_t *drive, struct ide_cmd *cmd)
...@@ -475,10 +482,9 @@ int ide_taskfile_ioctl(ide_drive_t *drive, unsigned long arg) ...@@ -475,10 +482,9 @@ int ide_taskfile_ioctl(ide_drive_t *drive, unsigned long arg)
u16 nsect = 0; u16 nsect = 0;
char __user *buf = (char __user *)arg; char __user *buf = (char __user *)arg;
// printk("IDE Taskfile ...\n");
req_task = kzalloc(tasksize, GFP_KERNEL); req_task = kzalloc(tasksize, GFP_KERNEL);
if (req_task == NULL) return -ENOMEM; if (req_task == NULL)
return -ENOMEM;
if (copy_from_user(req_task, buf, tasksize)) { if (copy_from_user(req_task, buf, tasksize)) {
kfree(req_task); kfree(req_task);
return -EFAULT; return -EFAULT;
...@@ -486,7 +492,7 @@ int ide_taskfile_ioctl(ide_drive_t *drive, unsigned long arg) ...@@ -486,7 +492,7 @@ int ide_taskfile_ioctl(ide_drive_t *drive, unsigned long arg)
taskout = req_task->out_size; taskout = req_task->out_size;
taskin = req_task->in_size; taskin = req_task->in_size;
if (taskin > 65536 || taskout > 65536) { if (taskin > 65536 || taskout > 65536) {
err = -EINVAL; err = -EINVAL;
goto abort; goto abort;
...@@ -576,51 +582,49 @@ int ide_taskfile_ioctl(ide_drive_t *drive, unsigned long arg) ...@@ -576,51 +582,49 @@ int ide_taskfile_ioctl(ide_drive_t *drive, unsigned long arg)
cmd.protocol = ATA_PROT_DMA; cmd.protocol = ATA_PROT_DMA;
switch (req_task->data_phase) { switch (req_task->data_phase) {
case TASKFILE_MULTI_OUT: case TASKFILE_MULTI_OUT:
if (!drive->mult_count) { if (!drive->mult_count) {
/* (hs): give up if multcount is not set */ /* (hs): give up if multcount is not set */
printk(KERN_ERR "%s: %s Multimode Write " \ pr_err("%s: %s Multimode Write multcount is not set\n",
"multcount is not set\n", drive->name, __func__);
drive->name, __func__); err = -EPERM;
err = -EPERM; goto abort;
goto abort; }
} cmd.tf_flags |= IDE_TFLAG_MULTI_PIO;
cmd.tf_flags |= IDE_TFLAG_MULTI_PIO; /* fall through */
/* fall through */ case TASKFILE_OUT:
case TASKFILE_OUT: cmd.protocol = ATA_PROT_PIO;
cmd.protocol = ATA_PROT_PIO; /* fall through */
/* fall through */ case TASKFILE_OUT_DMAQ:
case TASKFILE_OUT_DMAQ: case TASKFILE_OUT_DMA:
case TASKFILE_OUT_DMA: cmd.tf_flags |= IDE_TFLAG_WRITE;
cmd.tf_flags |= IDE_TFLAG_WRITE; nsect = taskout / SECTOR_SIZE;
nsect = taskout / SECTOR_SIZE; data_buf = outbuf;
data_buf = outbuf; break;
break; case TASKFILE_MULTI_IN:
case TASKFILE_MULTI_IN: if (!drive->mult_count) {
if (!drive->mult_count) { /* (hs): give up if multcount is not set */
/* (hs): give up if multcount is not set */ pr_err("%s: %s Multimode Read multcount is not set\n",
printk(KERN_ERR "%s: %s Multimode Read failure " \ drive->name, __func__);
"multcount is not set\n", err = -EPERM;
drive->name, __func__);
err = -EPERM;
goto abort;
}
cmd.tf_flags |= IDE_TFLAG_MULTI_PIO;
/* fall through */
case TASKFILE_IN:
cmd.protocol = ATA_PROT_PIO;
/* fall through */
case TASKFILE_IN_DMAQ:
case TASKFILE_IN_DMA:
nsect = taskin / SECTOR_SIZE;
data_buf = inbuf;
break;
case TASKFILE_NO_DATA:
cmd.protocol = ATA_PROT_NODATA;
break;
default:
err = -EFAULT;
goto abort; goto abort;
}
cmd.tf_flags |= IDE_TFLAG_MULTI_PIO;
/* fall through */
case TASKFILE_IN:
cmd.protocol = ATA_PROT_PIO;
/* fall through */
case TASKFILE_IN_DMAQ:
case TASKFILE_IN_DMA:
nsect = taskin / SECTOR_SIZE;
data_buf = inbuf;
break;
case TASKFILE_NO_DATA:
cmd.protocol = ATA_PROT_NODATA;
break;
default:
err = -EFAULT;
goto abort;
} }
if (req_task->req_cmd == IDE_DRIVE_TASK_NO_DATA) if (req_task->req_cmd == IDE_DRIVE_TASK_NO_DATA)
...@@ -629,7 +633,7 @@ int ide_taskfile_ioctl(ide_drive_t *drive, unsigned long arg) ...@@ -629,7 +633,7 @@ int ide_taskfile_ioctl(ide_drive_t *drive, unsigned long arg)
nsect = (cmd.hob.nsect << 8) | cmd.tf.nsect; nsect = (cmd.hob.nsect << 8) | cmd.tf.nsect;
if (!nsect) { if (!nsect) {
printk(KERN_ERR "%s: in/out command without data\n", pr_err("%s: in/out command without data\n",
drive->name); drive->name);
err = -EFAULT; err = -EFAULT;
goto abort; goto abort;
...@@ -671,8 +675,6 @@ int ide_taskfile_ioctl(ide_drive_t *drive, unsigned long arg) ...@@ -671,8 +675,6 @@ int ide_taskfile_ioctl(ide_drive_t *drive, unsigned long arg)
kfree(outbuf); kfree(outbuf);
kfree(inbuf); kfree(inbuf);
// printk("IDE Taskfile ioctl ended. rc = %i\n", err);
return err; return err;
} }
#endif #endif
...@@ -318,7 +318,7 @@ static int __init palm_bk3710_probe(struct platform_device *pdev) ...@@ -318,7 +318,7 @@ static int __init palm_bk3710_probe(struct platform_device *pdev)
int i, rc; int i, rc;
struct ide_hw hw, *hws[] = { &hw }; struct ide_hw hw, *hws[] = { &hw };
clk = clk_get(&pdev->dev, "IDECLK"); clk = clk_get(&pdev->dev, NULL);
if (IS_ERR(clk)) if (IS_ERR(clk))
return -ENODEV; return -ENODEV;
......
...@@ -258,6 +258,7 @@ enum { ...@@ -258,6 +258,7 @@ enum {
IDE_TFLAG_DYN = (1 << 5), IDE_TFLAG_DYN = (1 << 5),
IDE_TFLAG_FS = (1 << 6), IDE_TFLAG_FS = (1 << 6),
IDE_TFLAG_MULTI_PIO = (1 << 7), IDE_TFLAG_MULTI_PIO = (1 << 7),
IDE_TFLAG_SET_XFER = (1 << 8),
}; };
enum { enum {
...@@ -294,7 +295,7 @@ struct ide_cmd { ...@@ -294,7 +295,7 @@ struct ide_cmd {
} out, in; } out, in;
} valid; } valid;
u8 tf_flags; u16 tf_flags;
u8 ftf_flags; /* for TASKFILE ioctl */ u8 ftf_flags; /* for TASKFILE ioctl */
int protocol; int protocol;
...@@ -918,8 +919,7 @@ __IDE_PROC_DEVSET(_name, _min, _max, NULL, NULL) ...@@ -918,8 +919,7 @@ __IDE_PROC_DEVSET(_name, _min, _max, NULL, NULL)
typedef struct { typedef struct {
const char *name; const char *name;
mode_t mode; mode_t mode;
read_proc_t *read_proc; const struct file_operations *proc_fops;
write_proc_t *write_proc;
} ide_proc_entry_t; } ide_proc_entry_t;
void proc_ide_create(void); void proc_ide_create(void);
...@@ -931,24 +931,8 @@ void ide_proc_unregister_port(ide_hwif_t *); ...@@ -931,24 +931,8 @@ void ide_proc_unregister_port(ide_hwif_t *);
void ide_proc_register_driver(ide_drive_t *, struct ide_driver *); void ide_proc_register_driver(ide_drive_t *, struct ide_driver *);
void ide_proc_unregister_driver(ide_drive_t *, struct ide_driver *); void ide_proc_unregister_driver(ide_drive_t *, struct ide_driver *);
read_proc_t proc_ide_read_capacity; extern const struct file_operations ide_capacity_proc_fops;
read_proc_t proc_ide_read_geometry; extern const struct file_operations ide_geometry_proc_fops;
/*
* Standard exit stuff:
*/
#define PROC_IDE_READ_RETURN(page,start,off,count,eof,len) \
{ \
len -= off; \
if (len < count) { \
*eof = 1; \
if (len <= 0) \
return 0; \
} else \
len = count; \
*start = page + off; \
return len; \
}
#else #else
static inline void proc_ide_create(void) { ; } static inline void proc_ide_create(void) { ; }
static inline void proc_ide_destroy(void) { ; } static inline void proc_ide_destroy(void) { ; }
...@@ -960,7 +944,6 @@ static inline void ide_proc_register_driver(ide_drive_t *drive, ...@@ -960,7 +944,6 @@ static inline void ide_proc_register_driver(ide_drive_t *drive,
struct ide_driver *driver) { ; } struct ide_driver *driver) { ; }
static inline void ide_proc_unregister_driver(ide_drive_t *drive, static inline void ide_proc_unregister_driver(ide_drive_t *drive,
struct ide_driver *driver) { ; } struct ide_driver *driver) { ; }
#define PROC_IDE_READ_RETURN(page,start,off,count,eof,len) return 0;
#endif #endif
enum { enum {
...@@ -1081,6 +1064,7 @@ extern void ide_fixstring(u8 *, const int, const int); ...@@ -1081,6 +1064,7 @@ extern void ide_fixstring(u8 *, const int, const int);
int ide_busy_sleep(ide_drive_t *, unsigned long, int); int ide_busy_sleep(ide_drive_t *, unsigned long, int);
int __ide_wait_stat(ide_drive_t *, u8, u8, unsigned long, u8 *);
int ide_wait_stat(ide_startstop_t *, ide_drive_t *, u8, u8, unsigned long); int ide_wait_stat(ide_startstop_t *, ide_drive_t *, u8, u8, unsigned long);
ide_startstop_t ide_do_park_unpark(ide_drive_t *, struct request *); ide_startstop_t ide_do_park_unpark(ide_drive_t *, struct request *);
...@@ -1169,7 +1153,7 @@ int ide_no_data_taskfile(ide_drive_t *, struct ide_cmd *); ...@@ -1169,7 +1153,7 @@ int ide_no_data_taskfile(ide_drive_t *, struct ide_cmd *);
int ide_taskfile_ioctl(ide_drive_t *, unsigned long); int ide_taskfile_ioctl(ide_drive_t *, unsigned long);
int ide_dev_read_id(ide_drive_t *, u8, u16 *); int ide_dev_read_id(ide_drive_t *, u8, u16 *, int);
extern int ide_driveid_update(ide_drive_t *); extern int ide_driveid_update(ide_drive_t *);
extern int ide_config_drive_speed(ide_drive_t *, u8); extern int ide_config_drive_speed(ide_drive_t *, u8);
......
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