On Fri, 2007-12-28 at 17:57 -0800, Joe Perches wrote:
>
> Perhaps (uncompiled/untested):
>
> Remove unnecessary parenthesis
> Remove GDROM: prefix from sense_texts
> Add function gdrom_data_request
> Check sense_key against sense_text array size
>
> Signed-off-by: Joe Perches <[EMAIL PROTECTED]>
> ---
> drivers/cdrom/gdrom.c | 53 ++++++++++++++++++++++++++----------------------
> 1 files changed, 29 insertions(+), 24 deletions(-)
>
> diff --git a/drivers/cdrom/gdrom.c b/drivers/cdrom/gdrom.c
> index 59d26e0..ab95438 100644
> --- a/drivers/cdrom/gdrom.c
> +++ b/drivers/cdrom/gdrom.c
> @@ -80,16 +80,15 @@ static const struct {
> int sense_key;
> const char * const text;
> } sense_texts[] = {
> - {NO_SENSE, "GDROM: OK"},
> - {RECOVERED_ERROR, "GDROM: Recovered from error"},
> - {NOT_READY, "GDROM: Device not ready"},
> - {MEDIUM_ERROR, "GDROM: Disk not ready"},
> - {HARDWARE_ERROR, "GDROM: Hardware error"},
> - {ILLEGAL_REQUEST, "GDROM: Command has failed"},
> - {UNIT_ATTENTION, "GDROM: Device needs attention - "
> - "disk may have been changed"},
> - {DATA_PROTECT, "GDROM: Data protection error"},
> - {ABORTED_COMMAND, "GDROM: Command aborted"},
> + {NO_SENSE, "OK"},
> + {RECOVERED_ERROR, "Recovered from error"},
> + {NOT_READY, "Device not ready"},
> + {MEDIUM_ERROR, "Disk not ready"},
> + {HARDWARE_ERROR, "Hardware error"},
> + {ILLEGAL_REQUEST, "Command has failed"},
> + {UNIT_ATTENTION, "Device needs attention - disk may have been changed"},
> + {DATA_PROTECT, "Data protection error"},
> + {ABORTED_COMMAND, "Command aborted"},
> };
>
> /* reset the G1 bus */
> @@ -412,11 +416,13 @@ static int gdrom_getsense(short *bufstring)
> return -EIO;
> }
> sense_key = sense[1] & 0x0F;
> - printk(KERN_INFO "%s\n", sense_texts[sense_key].text);
> + if (sense_key < ARRAY_SIZE(sense_texts))
> + printk(KERN_INFO "GDROM: %s\n", sense_texts[sense_key].text);
> + else
> + printk(KERN_ERR "GDROM: Unknown sense key: %d\n", sense_key);
>
> - if (bufstring)
> + if (bufstring) /* return additional sense data */
> memcpy(bufstring, &sense[4], 2);
> - /* return additional sense data */
>
> if (sense_key < 2)
> return 0;
> @@ -550,19 +556,18 @@ static void gdrom_readdisk_dma(struct work_struct *work)
> ctrl_outb(0, GDROM_INTSEC_REG);
> /* In multiple DMA transfers need to wait */
> timeout = jiffies + HZ / 2;
> - while (gdrom_is_busy() && (time_before(jiffies, timeout)))
> + while (gdrom_is_busy() && time_before(jiffies, timeout))
> cpu_relax();
> ctrl_outb(GDROM_COM_PACKET, GDROM_STATUSCOMMAND_REG);
> timeout = jiffies + HZ / 2;
> - while (((ctrl_inb(GDROM_ALTSTATUS_REG) & 0x88) != 8) &&
> - (time_before(jiffies, timeout)))
> - cpu_relax(); /* wait for DRQ to be set to 1 */
> + while (!gdrom_data_request() && time_before(jiffies, timeout))
> + cpu_relax();
> gd.pending = 1;
> gd.transfer = 1;
> outsw(PHYSADDR(GDROM_DATA_REG), &read_command->cmd, 6);
> timeout = jiffies + HZ / 2;
> - while ((ctrl_inb(GDROM_DMA_STATUS_REG)) &&
> - (time_before(jiffies, timeout)))
> + while (ctrl_inb(GDROM_DMA_STATUS_REG) &&
> + time_before(jiffies, timeout))
> cpu_relax();
> ctrl_outb(1, GDROM_DMA_STATUS_REG);
> /* 5 second error margin here seems more reasonable */
>
>
> -
This won't work see include/scsi/scsi.h
/*
* SENSE KEYS
*/
#define NO_SENSE 0x00
#define RECOVERED_ERROR 0x01
#define NOT_READY 0x02
#define MEDIUM_ERROR 0x03
#define HARDWARE_ERROR 0x04
#define ILLEGAL_REQUEST 0x05
#define UNIT_ATTENTION 0x06
#define DATA_PROTECT 0x07
#define BLANK_CHECK 0x08
#define COPY_ABORTED 0x0a
#define ABORTED_COMMAND 0x0b
#define VOLUME_OVERFLOW 0x0d
#define MISCOMPARE 0x0e
(The GD device specs says it supports 0, 1, 2, 3,4, 5, 6, 7 and 0xB)
ie we could get a sense key of 0x0B which would be greater than the
array size. I think you'd have to hard code the limit.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
