* [RESEND PATCH 0/10] ide-floppy redux p1 @ 2008-01-03 13:19 Borislav Petkov 2008-01-03 13:20 ` [RESEND PATCH 01/10] move ide-floppy historical changelog to Documentation/ide/ChangeLog.ide-floppy.1996-2002; Borislav Petkov 2008-01-04 0:14 ` [RESEND PATCH 0/10] ide-floppy redux p1 Bartlomiej Zolnierkiewicz 0 siblings, 2 replies; 26+ messages in thread From: Borislav Petkov @ 2008-01-03 13:19 UTC (permalink / raw) To: linux-ide, linux-kernel; +Cc: bzolnier Hi Bart, here's the unfinished redux of ide-floppy which i'm REsending now so that we could sinchronize trees. The original send got busted in vger's filters due to syntax error in the Message-ID tag. Documentation/ide/ChangeLog.ide-floppy.1996-2002 | 64 ++ drivers/ide/ide-floppy.c | 1248 +++++++--------------- drivers/ide/ide-floppy.h | 351 ++++++ include/linux/cdrom.h | 1 + 4 files changed, 819 insertions(+), 845 deletions(-) ^ permalink raw reply [flat|nested] 26+ messages in thread
* [RESEND PATCH 01/10] move ide-floppy historical changelog to Documentation/ide/ChangeLog.ide-floppy.1996-2002; 2008-01-03 13:19 [RESEND PATCH 0/10] ide-floppy redux p1 Borislav Petkov @ 2008-01-03 13:20 ` Borislav Petkov 2008-01-03 13:20 ` [RESEND PATCH 02/10] ide-floppy: move ide-floppy struct and macro defs into its own header. While at it Borislav Petkov 2008-01-04 0:36 ` [RESEND PATCH 01/10] move ide-floppy historical changelog to Documentation/ide/ChangeLog.ide-floppy.1996-2002; Bartlomiej Zolnierkiewicz 2008-01-04 0:14 ` [RESEND PATCH 0/10] ide-floppy redux p1 Bartlomiej Zolnierkiewicz 1 sibling, 2 replies; 26+ messages in thread From: Borislav Petkov @ 2008-01-03 13:20 UTC (permalink / raw) To: linux-ide, linux-kernel; +Cc: bzolnier, Borislav Petkov Signed-off-by: Borislav Petkov <bbpetkov@yahoo.de> --- Documentation/ide/ChangeLog.ide-floppy.1996-2002 | 64 ++++++++++++++++++++ drivers/ide/ide-floppy.c | 69 +--------------------- 2 files changed, 67 insertions(+), 66 deletions(-) diff --git a/Documentation/ide/ChangeLog.ide-floppy.1996-2002 b/Documentation/ide/ChangeLog.ide-floppy.1996-2002 new file mode 100644 index 0000000..70166f3 --- /dev/null +++ b/Documentation/ide/ChangeLog.ide-floppy.1996-2002 @@ -0,0 +1,64 @@ +/* + * Many thanks to Lode Leroy <Lode.Leroy@www.ibase.be>, who tested so many + * ALPHA patches to this driver on an EASYSTOR LS-120 ATAPI floppy drive. + * + * Ver 0.1 Oct 17 96 Initial test version, mostly based on ide-tape.c. + * Ver 0.2 Oct 31 96 Minor changes. + * Ver 0.3 Dec 2 96 Fixed error recovery bug. + * Ver 0.4 Jan 26 97 Add support for the HDIO_GETGEO ioctl. + * Ver 0.5 Feb 21 97 Add partitions support. + * Use the minimum of the LBA and CHS capacities. + * Avoid hwgroup->rq == NULL on the last irq. + * Fix potential null dereferencing with DEBUG_LOG. + * Ver 0.8 Dec 7 97 Increase irq timeout from 10 to 50 seconds. + * Add media write-protect detection. + * Issue START command only if TEST UNIT READY fails. + * Add work-around for IOMEGA ZIP revision 21.D. + * Remove idefloppy_get_capabilities(). + * Ver 0.9 Jul 4 99 Fix a bug which might have caused the number of + * bytes requested on each interrupt to be zero. + * Thanks to <shanos@es.co.nz> for pointing this out. + * Ver 0.9.sv Jan 6 01 Sam Varshavchik <mrsam@courier-mta.com> + * Implement low level formatting. Reimplemented + * IDEFLOPPY_CAPABILITIES_PAGE, since we need the srfp + * bit. My LS-120 drive barfs on + * IDEFLOPPY_CAPABILITIES_PAGE, but maybe it's just me. + * Compromise by not reporting a failure to get this + * mode page. Implemented four IOCTLs in order to + * implement formatting. IOCTls begin with 0x4600, + * 0x46 is 'F' as in Format. + * Jan 9 01 Userland option to select format verify. + * Added PC_SUPPRESS_ERROR flag - some idefloppy drives + * do not implement IDEFLOPPY_CAPABILITIES_PAGE, and + * return a sense error. Suppress error reporting in + * this particular case in order to avoid spurious + * errors in syslog. The culprit is + * idefloppy_get_capability_page(), so move it to + * idefloppy_begin_format() so that it's not used + * unless absolutely necessary. + * If drive does not support format progress indication + * monitor the dsc bit in the status register. + * Also, O_NDELAY on open will allow the device to be + * opened without a disk available. This can be used to + * open an unformatted disk, or get the device capacity. + * Ver 0.91 Dec 11 99 Added IOMEGA Clik! drive support by + * <paul@paulbristow.net> + * Ver 0.92 Oct 22 00 Paul Bristow became official maintainer for this + * driver. Included Powerbook internal zip kludge. + * Ver 0.93 Oct 24 00 Fixed bugs for Clik! drive + * no disk on insert and disk change now works + * Ver 0.94 Oct 27 00 Tidied up to remove strstr(Clik) everywhere + * Ver 0.95 Nov 7 00 Brought across to kernel 2.4 + * Ver 0.96 Jan 7 01 Actually in line with release version of 2.4.0 + * including set_bit patch from Rusty Russell + * Ver 0.97 Jul 22 01 Merge 0.91-0.96 onto 0.9.sv for ac series + * Ver 0.97.sv Aug 3 01 Backported from 2.4.7-ac3 + * Ver 0.98 Oct 26 01 Split idefloppy_transfer_pc into two pieces to + * fix a lost interrupt problem. It appears the busy + * bit was being deasserted by my IOMEGA ATAPI ZIP 100 + * drive before the drive was actually ready. + * Ver 0.98a Oct 29 01 Expose delay value so we can play. + * Ver 0.99 Feb 24 02 Remove duplicate code, modify clik! detection code + * to support new PocketZip drives + */ + diff --git a/drivers/ide/ide-floppy.c b/drivers/ide/ide-floppy.c index 04a3578..785fbde 100644 --- a/drivers/ide/ide-floppy.c +++ b/drivers/ide/ide-floppy.c @@ -1,12 +1,8 @@ /* - * linux/drivers/ide/ide-floppy.c Version 0.99 Feb 24 2002 + * IDE ATAPI floppy driver. * * Copyright (C) 1996 - 1999 Gadi Oxman <gadio@netvision.net.il> * Copyright (C) 2000 - 2002 Paul Bristow <paul@paulbristow.net> - */ - -/* - * IDE ATAPI floppy driver. * * The driver currently doesn't have any fancy features, just the bare * minimum read/write support. @@ -17,67 +13,8 @@ * Iomega Zip 100/250 * Iomega PC Card Clik!/PocketZip * - * Many thanks to Lode Leroy <Lode.Leroy@www.ibase.be>, who tested so many - * ALPHA patches to this driver on an EASYSTOR LS-120 ATAPI floppy drive. - * - * Ver 0.1 Oct 17 96 Initial test version, mostly based on ide-tape.c. - * Ver 0.2 Oct 31 96 Minor changes. - * Ver 0.3 Dec 2 96 Fixed error recovery bug. - * Ver 0.4 Jan 26 97 Add support for the HDIO_GETGEO ioctl. - * Ver 0.5 Feb 21 97 Add partitions support. - * Use the minimum of the LBA and CHS capacities. - * Avoid hwgroup->rq == NULL on the last irq. - * Fix potential null dereferencing with DEBUG_LOG. - * Ver 0.8 Dec 7 97 Increase irq timeout from 10 to 50 seconds. - * Add media write-protect detection. - * Issue START command only if TEST UNIT READY fails. - * Add work-around for IOMEGA ZIP revision 21.D. - * Remove idefloppy_get_capabilities(). - * Ver 0.9 Jul 4 99 Fix a bug which might have caused the number of - * bytes requested on each interrupt to be zero. - * Thanks to <shanos@es.co.nz> for pointing this out. - * Ver 0.9.sv Jan 6 01 Sam Varshavchik <mrsam@courier-mta.com> - * Implement low level formatting. Reimplemented - * IDEFLOPPY_CAPABILITIES_PAGE, since we need the srfp - * bit. My LS-120 drive barfs on - * IDEFLOPPY_CAPABILITIES_PAGE, but maybe it's just me. - * Compromise by not reporting a failure to get this - * mode page. Implemented four IOCTLs in order to - * implement formatting. IOCTls begin with 0x4600, - * 0x46 is 'F' as in Format. - * Jan 9 01 Userland option to select format verify. - * Added PC_SUPPRESS_ERROR flag - some idefloppy drives - * do not implement IDEFLOPPY_CAPABILITIES_PAGE, and - * return a sense error. Suppress error reporting in - * this particular case in order to avoid spurious - * errors in syslog. The culprit is - * idefloppy_get_capability_page(), so move it to - * idefloppy_begin_format() so that it's not used - * unless absolutely necessary. - * If drive does not support format progress indication - * monitor the dsc bit in the status register. - * Also, O_NDELAY on open will allow the device to be - * opened without a disk available. This can be used to - * open an unformatted disk, or get the device capacity. - * Ver 0.91 Dec 11 99 Added IOMEGA Clik! drive support by - * <paul@paulbristow.net> - * Ver 0.92 Oct 22 00 Paul Bristow became official maintainer for this - * driver. Included Powerbook internal zip kludge. - * Ver 0.93 Oct 24 00 Fixed bugs for Clik! drive - * no disk on insert and disk change now works - * Ver 0.94 Oct 27 00 Tidied up to remove strstr(Clik) everywhere - * Ver 0.95 Nov 7 00 Brought across to kernel 2.4 - * Ver 0.96 Jan 7 01 Actually in line with release version of 2.4.0 - * including set_bit patch from Rusty Russell - * Ver 0.97 Jul 22 01 Merge 0.91-0.96 onto 0.9.sv for ac series - * Ver 0.97.sv Aug 3 01 Backported from 2.4.7-ac3 - * Ver 0.98 Oct 26 01 Split idefloppy_transfer_pc into two pieces to - * fix a lost interrupt problem. It appears the busy - * bit was being deasserted by my IOMEGA ATAPI ZIP 100 - * drive before the drive was actually ready. - * Ver 0.98a Oct 29 01 Expose delay value so we can play. - * Ver 0.99 Feb 24 02 Remove duplicate code, modify clik! detection code - * to support new PocketZip drives + * For a historical changelog see + * Documentation/ide/ChangeLog.ide-floppy.1996-2002 */ #define IDEFLOPPY_VERSION "0.99.newide" -- 1.5.3.7 ^ permalink raw reply related [flat|nested] 26+ messages in thread
* [RESEND PATCH 02/10] ide-floppy: move ide-floppy struct and macro defs into its own header. While at it 2008-01-03 13:20 ` [RESEND PATCH 01/10] move ide-floppy historical changelog to Documentation/ide/ChangeLog.ide-floppy.1996-2002; Borislav Petkov @ 2008-01-03 13:20 ` Borislav Petkov 2008-01-03 13:20 ` [RESEND PATCH 03/10] ide-floppy: convert to generic packet commands Borislav Petkov 2008-01-04 22:49 ` [RESEND PATCH 02/10] ide-floppy: move ide-floppy struct and macro defs into its own header. While at it Bartlomiej Zolnierkiewicz 2008-01-04 0:36 ` [RESEND PATCH 01/10] move ide-floppy historical changelog to Documentation/ide/ChangeLog.ide-floppy.1996-2002; Bartlomiej Zolnierkiewicz 1 sibling, 2 replies; 26+ messages in thread From: Borislav Petkov @ 2008-01-03 13:20 UTC (permalink / raw) To: linux-ide, linux-kernel; +Cc: bzolnier, Borislav Petkov - do a white-space cleanup - remove old crufty code untouched since at least 2005 - shorten lines longer than 80ish columns - shorten some LAAARGE typenames. There should be no functional changes resulting from this patch. Signed-off-by: Borislav Petkov <bbpetkov@yahoo.de> --- drivers/ide/ide-floppy.c | 763 ++++++++++++---------------------------------- drivers/ide/ide-floppy.h | 382 +++++++++++++++++++++++ 2 files changed, 581 insertions(+), 564 deletions(-) diff --git a/drivers/ide/ide-floppy.c b/drivers/ide/ide-floppy.c index 785fbde..52d09c1 100644 --- a/drivers/ide/ide-floppy.c +++ b/drivers/ide/ide-floppy.c @@ -44,418 +44,7 @@ #include <asm/io.h> #include <asm/unaligned.h> -/* - * The following are used to debug the driver. - */ -#define IDEFLOPPY_DEBUG_LOG 0 -#define IDEFLOPPY_DEBUG_INFO 0 -#define IDEFLOPPY_DEBUG_BUGS 1 - -/* #define IDEFLOPPY_DEBUG(fmt, args...) printk(KERN_INFO fmt, ## args) */ -#define IDEFLOPPY_DEBUG( fmt, args... ) - -#if IDEFLOPPY_DEBUG_LOG -#define debug_log printk -#else -#define debug_log(fmt, args... ) do {} while(0) -#endif - - -/* - * Some drives require a longer irq timeout. - */ -#define IDEFLOPPY_WAIT_CMD (5 * WAIT_CMD) - -/* - * After each failed packet command we issue a request sense command - * and retry the packet command IDEFLOPPY_MAX_PC_RETRIES times. - */ -#define IDEFLOPPY_MAX_PC_RETRIES 3 - -/* - * With each packet command, we allocate a buffer of - * IDEFLOPPY_PC_BUFFER_SIZE bytes. - */ -#define IDEFLOPPY_PC_BUFFER_SIZE 256 - -/* - * In various places in the driver, we need to allocate storage - * for packet commands and requests, which will remain valid while - * we leave the driver to wait for an interrupt or a timeout event. - */ -#define IDEFLOPPY_PC_STACK (10 + IDEFLOPPY_MAX_PC_RETRIES) - -/* - * Our view of a packet command. - */ -typedef struct idefloppy_packet_command_s { - u8 c[12]; /* Actual packet bytes */ - int retries; /* On each retry, we increment retries */ - int error; /* Error code */ - int request_transfer; /* Bytes to transfer */ - int actually_transferred; /* Bytes actually transferred */ - int buffer_size; /* Size of our data buffer */ - int b_count; /* Missing/Available data on the current buffer */ - struct request *rq; /* The corresponding request */ - u8 *buffer; /* Data buffer */ - u8 *current_position; /* Pointer into the above buffer */ - void (*callback) (ide_drive_t *); /* Called when this packet command is completed */ - u8 pc_buffer[IDEFLOPPY_PC_BUFFER_SIZE]; /* Temporary buffer */ - unsigned long flags; /* Status/Action bit flags: long for set_bit */ -} idefloppy_pc_t; - -/* - * Packet command flag bits. - */ -#define PC_ABORT 0 /* Set when an error is considered normal - We won't retry */ -#define PC_DMA_RECOMMENDED 2 /* 1 when we prefer to use DMA if possible */ -#define PC_DMA_IN_PROGRESS 3 /* 1 while DMA in progress */ -#define PC_DMA_ERROR 4 /* 1 when encountered problem during DMA */ -#define PC_WRITING 5 /* Data direction */ - -#define PC_SUPPRESS_ERROR 6 /* Suppress error reporting */ - -/* - * Removable Block Access Capabilities Page - */ -typedef struct { -#if defined(__LITTLE_ENDIAN_BITFIELD) - unsigned page_code :6; /* Page code - Should be 0x1b */ - unsigned reserved1_6 :1; /* Reserved */ - unsigned ps :1; /* Should be 0 */ -#elif defined(__BIG_ENDIAN_BITFIELD) - unsigned ps :1; /* Should be 0 */ - unsigned reserved1_6 :1; /* Reserved */ - unsigned page_code :6; /* Page code - Should be 0x1b */ -#else -#error "Bitfield endianness not defined! Check your byteorder.h" -#endif - u8 page_length; /* Page Length - Should be 0xa */ -#if defined(__LITTLE_ENDIAN_BITFIELD) - unsigned reserved2 :6; - unsigned srfp :1; /* Supports reporting progress of format */ - unsigned sflp :1; /* System floppy type device */ - unsigned tlun :3; /* Total logical units supported by the device */ - unsigned reserved3 :3; - unsigned sml :1; /* Single / Multiple lun supported */ - unsigned ncd :1; /* Non cd optical device */ -#elif defined(__BIG_ENDIAN_BITFIELD) - unsigned sflp :1; /* System floppy type device */ - unsigned srfp :1; /* Supports reporting progress of format */ - unsigned reserved2 :6; - unsigned ncd :1; /* Non cd optical device */ - unsigned sml :1; /* Single / Multiple lun supported */ - unsigned reserved3 :3; - unsigned tlun :3; /* Total logical units supported by the device */ -#else -#error "Bitfield endianness not defined! Check your byteorder.h" -#endif - u8 reserved[8]; -} idefloppy_capabilities_page_t; - -/* - * Flexible disk page. - */ -typedef struct { -#if defined(__LITTLE_ENDIAN_BITFIELD) - unsigned page_code :6; /* Page code - Should be 0x5 */ - unsigned reserved1_6 :1; /* Reserved */ - unsigned ps :1; /* The device is capable of saving the page */ -#elif defined(__BIG_ENDIAN_BITFIELD) - unsigned ps :1; /* The device is capable of saving the page */ - unsigned reserved1_6 :1; /* Reserved */ - unsigned page_code :6; /* Page code - Should be 0x5 */ -#else -#error "Bitfield endianness not defined! Check your byteorder.h" -#endif - u8 page_length; /* Page Length - Should be 0x1e */ - u16 transfer_rate; /* In kilobits per second */ - u8 heads, sectors; /* Number of heads, Number of sectors per track */ - u16 sector_size; /* Byes per sector */ - u16 cyls; /* Number of cylinders */ - u8 reserved10[10]; - u8 motor_delay; /* Motor off delay */ - u8 reserved21[7]; - u16 rpm; /* Rotations per minute */ - u8 reserved30[2]; -} idefloppy_flexible_disk_page_t; - -/* - * Format capacity - */ -typedef struct { - u8 reserved[3]; - u8 length; /* Length of the following descriptors in bytes */ -} idefloppy_capacity_header_t; - -typedef struct { - u32 blocks; /* Number of blocks */ -#if defined(__LITTLE_ENDIAN_BITFIELD) - unsigned dc :2; /* Descriptor Code */ - unsigned reserved :6; -#elif defined(__BIG_ENDIAN_BITFIELD) - unsigned reserved :6; - unsigned dc :2; /* Descriptor Code */ -#else -#error "Bitfield endianness not defined! Check your byteorder.h" -#endif - u8 length_msb; /* Block Length (MSB)*/ - u16 length; /* Block Length */ -} idefloppy_capacity_descriptor_t; - -#define CAPACITY_INVALID 0x00 -#define CAPACITY_UNFORMATTED 0x01 -#define CAPACITY_CURRENT 0x02 -#define CAPACITY_NO_CARTRIDGE 0x03 - -/* - * Most of our global data which we need to save even as we leave the - * driver due to an interrupt or a timer event is stored in a variable - * of type idefloppy_floppy_t, defined below. - */ -typedef struct ide_floppy_obj { - ide_drive_t *drive; - ide_driver_t *driver; - struct gendisk *disk; - struct kref kref; - unsigned int openers; /* protected by BKL for now */ - - /* Current packet command */ - idefloppy_pc_t *pc; - /* Last failed packet command */ - idefloppy_pc_t *failed_pc; - /* Packet command stack */ - idefloppy_pc_t pc_stack[IDEFLOPPY_PC_STACK]; - /* Next free packet command storage space */ - int pc_stack_index; - struct request rq_stack[IDEFLOPPY_PC_STACK]; - /* We implement a circular array */ - int rq_stack_index; - - /* - * Last error information - */ - u8 sense_key, asc, ascq; - /* delay this long before sending packet command */ - u8 ticks; - int progress_indication; - - /* - * Device information - */ - /* Current format */ - int blocks, block_size, bs_factor; - /* Last format capacity */ - idefloppy_capacity_descriptor_t capacity; - /* Copy of the flexible disk page */ - idefloppy_flexible_disk_page_t flexible_disk_page; - /* Write protect */ - int wp; - /* Supports format progress report */ - int srfp; - /* Status/Action flags */ - unsigned long flags; -} idefloppy_floppy_t; - -#define IDEFLOPPY_TICKS_DELAY HZ/20 /* default delay for ZIP 100 (50ms) */ - -/* - * Floppy flag bits values. - */ -#define IDEFLOPPY_DRQ_INTERRUPT 0 /* DRQ interrupt device */ -#define IDEFLOPPY_MEDIA_CHANGED 1 /* Media may have changed */ -#define IDEFLOPPY_USE_READ12 2 /* Use READ12/WRITE12 or READ10/WRITE10 */ -#define IDEFLOPPY_FORMAT_IN_PROGRESS 3 /* Format in progress */ -#define IDEFLOPPY_CLIK_DRIVE 4 /* Avoid commands not supported in Clik drive */ -#define IDEFLOPPY_ZIP_DRIVE 5 /* Requires BH algorithm for packets */ - -/* - * ATAPI floppy drive packet commands - */ -#define IDEFLOPPY_FORMAT_UNIT_CMD 0x04 -#define IDEFLOPPY_INQUIRY_CMD 0x12 -#define IDEFLOPPY_MODE_SELECT_CMD 0x55 -#define IDEFLOPPY_MODE_SENSE_CMD 0x5a -#define IDEFLOPPY_READ10_CMD 0x28 -#define IDEFLOPPY_READ12_CMD 0xa8 -#define IDEFLOPPY_READ_CAPACITY_CMD 0x23 -#define IDEFLOPPY_REQUEST_SENSE_CMD 0x03 -#define IDEFLOPPY_PREVENT_REMOVAL_CMD 0x1e -#define IDEFLOPPY_SEEK_CMD 0x2b -#define IDEFLOPPY_START_STOP_CMD 0x1b -#define IDEFLOPPY_TEST_UNIT_READY_CMD 0x00 -#define IDEFLOPPY_VERIFY_CMD 0x2f -#define IDEFLOPPY_WRITE10_CMD 0x2a -#define IDEFLOPPY_WRITE12_CMD 0xaa -#define IDEFLOPPY_WRITE_VERIFY_CMD 0x2e - -/* - * Defines for the mode sense command - */ -#define MODE_SENSE_CURRENT 0x00 -#define MODE_SENSE_CHANGEABLE 0x01 -#define MODE_SENSE_DEFAULT 0x02 -#define MODE_SENSE_SAVED 0x03 - -/* - * IOCTLs used in low-level formatting. - */ - -#define IDEFLOPPY_IOCTL_FORMAT_SUPPORTED 0x4600 -#define IDEFLOPPY_IOCTL_FORMAT_GET_CAPACITY 0x4601 -#define IDEFLOPPY_IOCTL_FORMAT_START 0x4602 -#define IDEFLOPPY_IOCTL_FORMAT_GET_PROGRESS 0x4603 - -#if 0 -/* - * Special requests for our block device strategy routine. - */ -#define IDEFLOPPY_FIRST_RQ 90 - -/* - * IDEFLOPPY_PC_RQ is used to queue a packet command in the request queue. - */ -#define IDEFLOPPY_PC_RQ 90 - -#define IDEFLOPPY_LAST_RQ 90 - -/* - * A macro which can be used to check if a given request command - * originated in the driver or in the buffer cache layer. - */ -#define IDEFLOPPY_RQ_CMD(cmd) ((cmd >= IDEFLOPPY_FIRST_RQ) && (cmd <= IDEFLOPPY_LAST_RQ)) - -#endif - -/* - * Error codes which are returned in rq->errors to the higher part - * of the driver. - */ -#define IDEFLOPPY_ERROR_GENERAL 101 - -/* - * The following is used to format the general configuration word of - * the ATAPI IDENTIFY DEVICE command. - */ -struct idefloppy_id_gcw { -#if defined(__LITTLE_ENDIAN_BITFIELD) - unsigned packet_size :2; /* Packet Size */ - unsigned reserved234 :3; /* Reserved */ - unsigned drq_type :2; /* Command packet DRQ type */ - unsigned removable :1; /* Removable media */ - unsigned device_type :5; /* Device type */ - unsigned reserved13 :1; /* Reserved */ - unsigned protocol :2; /* Protocol type */ -#elif defined(__BIG_ENDIAN_BITFIELD) - unsigned protocol :2; /* Protocol type */ - unsigned reserved13 :1; /* Reserved */ - unsigned device_type :5; /* Device type */ - unsigned removable :1; /* Removable media */ - unsigned drq_type :2; /* Command packet DRQ type */ - unsigned reserved234 :3; /* Reserved */ - unsigned packet_size :2; /* Packet Size */ -#else -#error "Bitfield endianness not defined! Check your byteorder.h" -#endif -}; - -/* - * INQUIRY packet command - Data Format - */ -typedef struct { -#if defined(__LITTLE_ENDIAN_BITFIELD) - unsigned device_type :5; /* Peripheral Device Type */ - unsigned reserved0_765 :3; /* Peripheral Qualifier - Reserved */ - unsigned reserved1_6t0 :7; /* Reserved */ - unsigned rmb :1; /* Removable Medium Bit */ - unsigned ansi_version :3; /* ANSI Version */ - unsigned ecma_version :3; /* ECMA Version */ - unsigned iso_version :2; /* ISO Version */ - unsigned response_format :4; /* Response Data Format */ - unsigned reserved3_45 :2; /* Reserved */ - unsigned reserved3_6 :1; /* TrmIOP - Reserved */ - unsigned reserved3_7 :1; /* AENC - Reserved */ -#elif defined(__BIG_ENDIAN_BITFIELD) - unsigned reserved0_765 :3; /* Peripheral Qualifier - Reserved */ - unsigned device_type :5; /* Peripheral Device Type */ - unsigned rmb :1; /* Removable Medium Bit */ - unsigned reserved1_6t0 :7; /* Reserved */ - unsigned iso_version :2; /* ISO Version */ - unsigned ecma_version :3; /* ECMA Version */ - unsigned ansi_version :3; /* ANSI Version */ - unsigned reserved3_7 :1; /* AENC - Reserved */ - unsigned reserved3_6 :1; /* TrmIOP - Reserved */ - unsigned reserved3_45 :2; /* Reserved */ - unsigned response_format :4; /* Response Data Format */ -#else -#error "Bitfield endianness not defined! Check your byteorder.h" -#endif - u8 additional_length; /* Additional Length (total_length-4) */ - u8 rsv5, rsv6, rsv7; /* Reserved */ - u8 vendor_id[8]; /* Vendor Identification */ - u8 product_id[16]; /* Product Identification */ - u8 revision_level[4]; /* Revision Level */ - u8 vendor_specific[20]; /* Vendor Specific - Optional */ - u8 reserved56t95[40]; /* Reserved - Optional */ - /* Additional information may be returned */ -} idefloppy_inquiry_result_t; - -/* - * REQUEST SENSE packet command result - Data Format. - */ -typedef struct { -#if defined(__LITTLE_ENDIAN_BITFIELD) - unsigned error_code :7; /* Current error (0x70) */ - unsigned valid :1; /* The information field conforms to SFF-8070i */ - u8 reserved1 :8; /* Reserved */ - unsigned sense_key :4; /* Sense Key */ - unsigned reserved2_4 :1; /* Reserved */ - unsigned ili :1; /* Incorrect Length Indicator */ - unsigned reserved2_67 :2; -#elif defined(__BIG_ENDIAN_BITFIELD) - unsigned valid :1; /* The information field conforms to SFF-8070i */ - unsigned error_code :7; /* Current error (0x70) */ - u8 reserved1 :8; /* Reserved */ - unsigned reserved2_67 :2; - unsigned ili :1; /* Incorrect Length Indicator */ - unsigned reserved2_4 :1; /* Reserved */ - unsigned sense_key :4; /* Sense Key */ -#else -#error "Bitfield endianness not defined! Check your byteorder.h" -#endif - u32 information __attribute__ ((packed)); - u8 asl; /* Additional sense length (n-7) */ - u32 command_specific; /* Additional command specific information */ - u8 asc; /* Additional Sense Code */ - u8 ascq; /* Additional Sense Code Qualifier */ - u8 replaceable_unit_code; /* Field Replaceable Unit Code */ - u8 sksv[3]; - u8 pad[2]; /* Padding to 20 bytes */ -} idefloppy_request_sense_result_t; - -/* - * Pages of the SELECT SENSE / MODE SENSE packet commands. - */ -#define IDEFLOPPY_CAPABILITIES_PAGE 0x1b -#define IDEFLOPPY_FLEXIBLE_DISK_PAGE 0x05 - -/* - * Mode Parameter Header for the MODE SENSE packet command - */ -typedef struct { - u16 mode_data_length; /* Length of the following data transfer */ - u8 medium_type; /* Medium Type */ -#if defined(__LITTLE_ENDIAN_BITFIELD) - unsigned reserved3 :7; - unsigned wp :1; /* Write protect */ -#elif defined(__BIG_ENDIAN_BITFIELD) - unsigned wp :1; /* Write protect */ - unsigned reserved3 :7; -#else -#error "Bitfield endianness not defined! Check your byteorder.h" -#endif - u8 reserved[4]; -} idefloppy_mode_parameter_header_t; +#include "ide-floppy.h" static DEFINE_MUTEX(idefloppy_ref_mutex); @@ -512,7 +101,7 @@ static void idefloppy_write_zeros (ide_drive_t *drive, unsigned int bcount) */ static int idefloppy_do_end_request(ide_drive_t *drive, int uptodate, int nsecs) { - idefloppy_floppy_t *floppy = drive->driver_data; + idefloppy_t *floppy = drive->driver_data; struct request *rq = HWGROUP(drive)->rq; int error; @@ -539,7 +128,8 @@ static int idefloppy_do_end_request(ide_drive_t *drive, int uptodate, int nsecs) return 0; } -static void idefloppy_input_buffers (ide_drive_t *drive, idefloppy_pc_t *pc, unsigned int bcount) +static void idefloppy_input_buffers (ide_drive_t *drive, idefloppy_pc_t *pc, + unsigned int bcount) { struct request *rq = pc->rq; struct bio_vec *bvec; @@ -566,12 +156,14 @@ static void idefloppy_input_buffers (ide_drive_t *drive, idefloppy_pc_t *pc, uns idefloppy_do_end_request(drive, 1, done >> 9); if (bcount) { - printk(KERN_ERR "%s: leftover data in idefloppy_input_buffers, bcount == %d\n", drive->name, bcount); + printk(KERN_ERR "%s: leftover data in idefloppy_input_buffers," + " bcount == %d\n", drive->name, bcount); idefloppy_discard_data(drive, bcount); } } -static void idefloppy_output_buffers (ide_drive_t *drive, idefloppy_pc_t *pc, unsigned int bcount) +static void idefloppy_output_buffers (ide_drive_t *drive, idefloppy_pc_t *pc, + unsigned int bcount) { struct request *rq = pc->rq; struct req_iterator iter; @@ -599,7 +191,8 @@ static void idefloppy_output_buffers (ide_drive_t *drive, idefloppy_pc_t *pc, un #if IDEFLOPPY_DEBUG_BUGS if (bcount) { - printk(KERN_ERR "%s: leftover data in idefloppy_output_buffers, bcount == %d\n", drive->name, bcount); + printk(KERN_ERR "%s: leftover data in idefloppy_output_buffers," + " bcount == %d\n", drive->name, bcount); idefloppy_write_zeros(drive, bcount); } #endif @@ -619,7 +212,8 @@ static void idefloppy_update_buffers (ide_drive_t *drive, idefloppy_pc_t *pc) * of the request queue, before the current request, so that it will be * processed immediately, on the next pass through the driver. */ -static void idefloppy_queue_pc_head (ide_drive_t *drive,idefloppy_pc_t *pc,struct request *rq) +static void idefloppy_queue_pc_head (ide_drive_t *drive,idefloppy_pc_t *pc, + struct request *rq) { struct ide_floppy_obj *floppy = drive->driver_data; @@ -632,7 +226,7 @@ static void idefloppy_queue_pc_head (ide_drive_t *drive,idefloppy_pc_t *pc,struc static idefloppy_pc_t *idefloppy_next_pc_storage (ide_drive_t *drive) { - idefloppy_floppy_t *floppy = drive->driver_data; + idefloppy_t *floppy = drive->driver_data; if (floppy->pc_stack_index == IDEFLOPPY_PC_STACK) floppy->pc_stack_index=0; @@ -641,7 +235,7 @@ static idefloppy_pc_t *idefloppy_next_pc_storage (ide_drive_t *drive) static struct request *idefloppy_next_rq_storage (ide_drive_t *drive) { - idefloppy_floppy_t *floppy = drive->driver_data; + idefloppy_t *floppy = drive->driver_data; if (floppy->rq_stack_index == IDEFLOPPY_PC_STACK) floppy->rq_stack_index = 0; @@ -652,9 +246,10 @@ static struct request *idefloppy_next_rq_storage (ide_drive_t *drive) * idefloppy_analyze_error is called on each failed packet command retry * to analyze the request sense. */ -static void idefloppy_analyze_error (ide_drive_t *drive,idefloppy_request_sense_result_t *result) +static void idefloppy_analyze_error (ide_drive_t *drive, + rq_sense_res_t *result) { - idefloppy_floppy_t *floppy = drive->driver_data; + idefloppy_t *floppy = drive->driver_data; floppy->sense_key = result->sense_key; floppy->asc = result->asc; @@ -673,15 +268,18 @@ static void idefloppy_analyze_error (ide_drive_t *drive,idefloppy_request_sense_ static void idefloppy_request_sense_callback (ide_drive_t *drive) { - idefloppy_floppy_t *floppy = drive->driver_data; + idefloppy_t *floppy = drive->driver_data; + u8 *buf = floppy->pc->buffer; debug_log(KERN_INFO "ide-floppy: Reached %s\n", __FUNCTION__); - + if (!floppy->pc->error) { - idefloppy_analyze_error(drive,(idefloppy_request_sense_result_t *) floppy->pc->buffer); + idefloppy_analyze_error(drive, (rq_sense_res_t *) buf); idefloppy_do_end_request(drive, 1, 0); } else { - printk(KERN_ERR "Error in REQUEST SENSE itself - Aborting request!\n"); + printk(KERN_ERR "Error in REQUEST SENSE itself - " + "Aborting request!\n"); + idefloppy_do_end_request(drive, 0, 0); } } @@ -691,8 +289,8 @@ static void idefloppy_request_sense_callback (ide_drive_t *drive) */ static void idefloppy_pc_callback (ide_drive_t *drive) { - idefloppy_floppy_t *floppy = drive->driver_data; - + idefloppy_t *floppy = drive->driver_data; + debug_log(KERN_INFO "ide-floppy: Reached %s\n", __FUNCTION__); idefloppy_do_end_request(drive, floppy->pc->error ? 0 : 1, 0); @@ -714,7 +312,7 @@ static void idefloppy_init_pc (idefloppy_pc_t *pc) static void idefloppy_create_request_sense_cmd (idefloppy_pc_t *pc) { - idefloppy_init_pc(pc); + idefloppy_init_pc(pc); pc->c[0] = IDEFLOPPY_REQUEST_SENSE_CMD; pc->c[4] = 255; pc->request_transfer = 18; @@ -745,7 +343,7 @@ static void idefloppy_retry_pc (ide_drive_t *drive) */ static ide_startstop_t idefloppy_pc_intr (ide_drive_t *drive) { - idefloppy_floppy_t *floppy = drive->driver_data; + idefloppy_t *floppy = drive->driver_data; atapi_status_t status; atapi_bcount_t bcount; atapi_ireason_t ireason; @@ -867,7 +465,9 @@ static ide_startstop_t idefloppy_pc_intr (ide_drive_t *drive) pc->current_position += bcount.all; BUG_ON(HWGROUP(drive)->handler != NULL); - ide_set_handler(drive, &idefloppy_pc_intr, IDEFLOPPY_WAIT_CMD, NULL); /* And set the interrupt handler again */ + + /* And set the interrupt handler again */ + ide_set_handler(drive, &idefloppy_pc_intr, IDEFLOPPY_WAIT_CMD, NULL); return ide_started; } @@ -879,7 +479,7 @@ static ide_startstop_t idefloppy_pc_intr (ide_drive_t *drive) static ide_startstop_t idefloppy_transfer_pc (ide_drive_t *drive) { ide_startstop_t startstop; - idefloppy_floppy_t *floppy = drive->driver_data; + idefloppy_t *floppy = drive->driver_data; atapi_ireason_t ireason; if (ide_wait_stat(&startstop, drive, DRQ_STAT, BUSY_STAT, WAIT_READY)) { @@ -910,13 +510,13 @@ static ide_startstop_t idefloppy_transfer_pc (ide_drive_t *drive) * gets in trouble. * * So, follow carefully. transfer_pc1 is called as an interrupt (or - * directly). In either case, when the device says it's ready for a + * directly). In either case, when the device says it's ready for a * packet, we schedule the packet transfer to occur about 2-3 ticks * later in transfer_pc2. */ static int idefloppy_transfer_pc2 (ide_drive_t *drive) { - idefloppy_floppy_t *floppy = drive->driver_data; + idefloppy_t *floppy = drive->driver_data; /* Send the actual packet */ HWIF(drive)->atapi_output_bytes(drive, floppy->pc->c, 12); @@ -926,7 +526,7 @@ static int idefloppy_transfer_pc2 (ide_drive_t *drive) static ide_startstop_t idefloppy_transfer_pc1 (ide_drive_t *drive) { - idefloppy_floppy_t *floppy = drive->driver_data; + idefloppy_t *floppy = drive->driver_data; ide_startstop_t startstop; atapi_ireason_t ireason; @@ -941,7 +541,7 @@ static ide_startstop_t idefloppy_transfer_pc1 (ide_drive_t *drive) "while issuing a packet command\n"); return ide_do_reset(drive); } - /* + /* * The following delay solves a problem with ATAPI Zip 100 drives * where the Busy flag was apparently being deasserted before the * unit was ready to receive data. This was happening on a @@ -950,8 +550,8 @@ static ide_startstop_t idefloppy_transfer_pc1 (ide_drive_t *drive) * used until after the packet is moved in about 50 msec. */ BUG_ON(HWGROUP(drive)->handler != NULL); - ide_set_handler(drive, - &idefloppy_pc_intr, /* service routine for packet command */ + ide_set_handler(drive, + &idefloppy_pc_intr, /* service routine for packet command */ floppy->ticks, /* wait this long before "failing" */ &idefloppy_transfer_pc2); /* fail == transfer_pc2 */ return ide_started; @@ -962,7 +562,7 @@ static ide_startstop_t idefloppy_transfer_pc1 (ide_drive_t *drive) * * Supresses error messages resulting from Medium not present */ -static inline int idefloppy_should_report_error(idefloppy_floppy_t *floppy) +static inline int idefloppy_should_report_error(idefloppy_t *floppy) { if (floppy->sense_key == 0x02 && floppy->asc == 0x3a && @@ -976,7 +576,7 @@ static inline int idefloppy_should_report_error(idefloppy_floppy_t *floppy) */ static ide_startstop_t idefloppy_issue_pc (ide_drive_t *drive, idefloppy_pc_t *pc) { - idefloppy_floppy_t *floppy = drive->driver_data; + idefloppy_t *floppy = drive->driver_data; ide_hwif_t *hwif = drive->hwif; atapi_feature_t feature; atapi_bcount_t bcount; @@ -1061,7 +661,7 @@ static ide_startstop_t idefloppy_issue_pc (ide_drive_t *drive, idefloppy_pc_t *p /* immediate */ pkt_xfer_routine = &idefloppy_transfer_pc; } - + if (test_bit (IDEFLOPPY_DRQ_INTERRUPT, &floppy->flags)) { /* Issue the packet command */ ide_execute_command(drive, WIN_PACKETCMD, @@ -1127,10 +727,11 @@ static void idefloppy_create_format_unit_cmd (idefloppy_pc_t *pc, int b, int l, /* * A mode sense command is used to "sense" floppy parameters. */ -static void idefloppy_create_mode_sense_cmd (idefloppy_pc_t *pc, u8 page_code, u8 type) +static void idefloppy_create_mode_sense_cmd (idefloppy_pc_t *pc, u8 page_code, + u8 type) { - u16 length = sizeof(idefloppy_mode_parameter_header_t); - + u16 length = sizeof(idefloppy_mode_par_hdr_t); + idefloppy_init_pc(pc); pc->c[0] = IDEFLOPPY_MODE_SENSE_CMD; pc->c[1] = 0; @@ -1164,7 +765,8 @@ static void idefloppy_create_test_unit_ready_cmd(idefloppy_pc_t *pc) pc->c[0] = IDEFLOPPY_TEST_UNIT_READY_CMD; } -static void idefloppy_create_rw_cmd (idefloppy_floppy_t *floppy, idefloppy_pc_t *pc, struct request *rq, unsigned long sector) +static void idefloppy_create_rw_cmd (idefloppy_t *floppy, idefloppy_pc_t *pc, + struct request *rq, unsigned long sector) { int block = sector / floppy->bs_factor; int blocks = rq->nr_sectors / floppy->bs_factor; @@ -1194,7 +796,7 @@ static void idefloppy_create_rw_cmd (idefloppy_floppy_t *floppy, idefloppy_pc_t } static void -idefloppy_blockpc_cmd(idefloppy_floppy_t *floppy, idefloppy_pc_t *pc, struct request *rq) +idefloppy_blockpc_cmd(idefloppy_t *floppy, idefloppy_pc_t *pc, struct request *rq) { idefloppy_init_pc(pc); pc->callback = &idefloppy_rw_callback; @@ -1206,7 +808,7 @@ idefloppy_blockpc_cmd(idefloppy_floppy_t *floppy, idefloppy_pc_t *pc, struct req pc->buffer = rq->data; if (rq->bio) set_bit(PC_DMA_RECOMMENDED, &pc->flags); - + /* * possibly problematic, doesn't look like ide-floppy correctly * handled scattered requests if dma fails... @@ -1215,11 +817,12 @@ idefloppy_blockpc_cmd(idefloppy_floppy_t *floppy, idefloppy_pc_t *pc, struct req } /* - * idefloppy_do_request is our request handling function. + * idefloppy_do_request is our request handling function. */ -static ide_startstop_t idefloppy_do_request (ide_drive_t *drive, struct request *rq, sector_t block_s) +static ide_startstop_t idefloppy_do_request (ide_drive_t *drive, + struct request *rq, sector_t block_s) { - idefloppy_floppy_t *floppy = drive->driver_data; + idefloppy_t *floppy = drive->driver_data; idefloppy_pc_t *pc; unsigned long block = (unsigned long)block_s; @@ -1233,10 +836,14 @@ static ide_startstop_t idefloppy_do_request (ide_drive_t *drive, struct request if (rq->errors >= ERROR_MAX) { if (floppy->failed_pc != NULL) { if (idefloppy_should_report_error(floppy)) - printk(KERN_ERR "ide-floppy: %s: I/O error, pc = %2x," - " key = %2x, asc = %2x, ascq = %2x\n", - drive->name, floppy->failed_pc->c[0], - floppy->sense_key, floppy->asc, floppy->ascq); + printk(KERN_ERR "ide-floppy: %s: I/O error," + " pc = %2x, key = %2x, asc = %2x," + " ascq = %2x\n", + drive->name, + floppy->failed_pc->c[0], + floppy->sense_key, + floppy->asc, + floppy->ascq); } else printk(KERN_ERR "ide-floppy: %s: I/O error\n", @@ -1293,55 +900,62 @@ static int idefloppy_queue_pc_tail (ide_drive_t *drive,idefloppy_pc_t *pc) */ static int idefloppy_get_flexible_disk_page (ide_drive_t *drive) { - idefloppy_floppy_t *floppy = drive->driver_data; + idefloppy_t *floppy = drive->driver_data; idefloppy_pc_t pc; - idefloppy_mode_parameter_header_t *header; - idefloppy_flexible_disk_page_t *page; + idefloppy_mode_par_hdr_t *header; + idefloppy_flex_disk_page_t *page; int capacity, lba_capacity; - idefloppy_create_mode_sense_cmd(&pc, IDEFLOPPY_FLEXIBLE_DISK_PAGE, MODE_SENSE_CURRENT); + idefloppy_create_mode_sense_cmd(&pc, IDEFLOPPY_FLEXIBLE_DISK_PAGE, + MODE_SENSE_CURRENT); if (idefloppy_queue_pc_tail(drive,&pc)) { printk(KERN_ERR "ide-floppy: Can't get flexible disk " "page parameters\n"); return 1; } - header = (idefloppy_mode_parameter_header_t *) pc.buffer; + header = (idefloppy_mode_par_hdr_t *) pc.buffer; floppy->wp = header->wp; set_disk_ro(floppy->disk, floppy->wp); - page = (idefloppy_flexible_disk_page_t *) (header + 1); + page = (idefloppy_flex_disk_page_t *) (header + 1); page->transfer_rate = ntohs(page->transfer_rate); page->sector_size = ntohs(page->sector_size); page->cyls = ntohs(page->cyls); page->rpm = ntohs(page->rpm); capacity = page->cyls * page->heads * page->sectors * page->sector_size; - if (memcmp (page, &floppy->flexible_disk_page, sizeof (idefloppy_flexible_disk_page_t))) + + if (memcmp (page, &floppy->flex_disk_page, + sizeof (idefloppy_flex_disk_page_t))) + printk(KERN_INFO "%s: %dkB, %d/%d/%d CHS, %d kBps, " "%d sector size, %d rpm\n", drive->name, capacity / 1024, page->cyls, page->heads, page->sectors, page->transfer_rate / 8, page->sector_size, page->rpm); - floppy->flexible_disk_page = *page; + floppy->flex_disk_page = *page; drive->bios_cyl = page->cyls; drive->bios_head = page->heads; drive->bios_sect = page->sectors; lba_capacity = floppy->blocks * floppy->block_size; + if (capacity < lba_capacity) { printk(KERN_NOTICE "%s: The disk reports a capacity of %d " "bytes, but the drive only handles %d\n", drive->name, lba_capacity, capacity); - floppy->blocks = floppy->block_size ? capacity / floppy->block_size : 0; + floppy->blocks = floppy->block_size ? + capacity / floppy->block_size : 0; } + return 0; } static int idefloppy_get_capability_page(ide_drive_t *drive) { - idefloppy_floppy_t *floppy = drive->driver_data; + idefloppy_t *floppy = drive->driver_data; idefloppy_pc_t pc; - idefloppy_mode_parameter_header_t *header; - idefloppy_capabilities_page_t *page; + idefloppy_mode_par_hdr_t *header; + idefloppy_cap_page_t *page; floppy->srfp = 0; idefloppy_create_mode_sense_cmd(&pc, IDEFLOPPY_CAPABILITIES_PAGE, @@ -1352,8 +966,8 @@ static int idefloppy_get_capability_page(ide_drive_t *drive) return 1; } - header = (idefloppy_mode_parameter_header_t *) pc.buffer; - page= (idefloppy_capabilities_page_t *)(header+1); + header = (idefloppy_mode_par_hdr_t *) pc.buffer; + page= (idefloppy_cap_page_t *)(header+1); floppy->srfp = page->srfp; return (0); } @@ -1364,12 +978,12 @@ static int idefloppy_get_capability_page(ide_drive_t *drive) */ static int idefloppy_get_capacity (ide_drive_t *drive) { - idefloppy_floppy_t *floppy = drive->driver_data; + idefloppy_t *floppy = drive->driver_data; idefloppy_pc_t pc; idefloppy_capacity_header_t *header; - idefloppy_capacity_descriptor_t *descriptor; + idefloppy_cap_desc_t *descriptor; int i, descriptors, rc = 1, blocks, length; - + drive->bios_cyl = 0; drive->bios_head = drive->bios_sect = 0; floppy->blocks = 0; @@ -1382,14 +996,14 @@ static int idefloppy_get_capacity (ide_drive_t *drive) return 1; } header = (idefloppy_capacity_header_t *) pc.buffer; - descriptors = header->length / sizeof(idefloppy_capacity_descriptor_t); - descriptor = (idefloppy_capacity_descriptor_t *) (header + 1); + descriptors = header->length / sizeof(idefloppy_cap_desc_t); + descriptor = (idefloppy_cap_desc_t *) (header + 1); for (i = 0; i < descriptors; i++, descriptor++) { blocks = descriptor->blocks = ntohl(descriptor->blocks); length = descriptor->length = ntohs(descriptor->length); - if (!i) + if (!i) { switch (descriptor->dc) { /* Clik! drive returns this instead of CAPACITY_CURRENT */ @@ -1402,7 +1016,8 @@ static int idefloppy_get_capacity (ide_drive_t *drive) break; case CAPACITY_CURRENT: /* Normal Zip/LS-120 disks */ - if (memcmp(descriptor, &floppy->capacity, sizeof (idefloppy_capacity_descriptor_t))) + if (memcmp(descriptor, &floppy->capacity, + sizeof (idefloppy_cap_desc_t))) printk(KERN_INFO "%s: %dkB, %d blocks, %d " "sector size\n", drive->name, blocks * length / 1024, blocks, length); @@ -1453,31 +1068,31 @@ static int idefloppy_get_capacity (ide_drive_t *drive) } /* -** Obtain the list of formattable capacities. -** Very similar to idefloppy_get_capacity, except that we push the capacity -** descriptors to userland, instead of our own structures. -** -** Userland gives us the following structure: -** -** struct idefloppy_format_capacities { -** int nformats; -** struct { -** int nblocks; -** int blocksize; -** } formats[]; -** } ; -** -** userland initializes nformats to the number of allocated formats[] -** records. On exit we set nformats to the number of records we've -** actually initialized. -** -*/ + * Obtain the list of formattable capacities. + * Very similar to idefloppy_get_capacity, except that we push the capacity + * descriptors to userland, instead of our own structures. + * + * Userland gives us the following structure: + * + * struct idefloppy_format_capacities { + * int nformats; + * struct { + * int nblocks; + * int blocksize; + * } formats[]; + * } ; + * + * userland initializes nformats to the number of allocated formats[] + * records. On exit we set nformats to the number of records we've + * actually initialized. + * + */ static int idefloppy_get_format_capacities(ide_drive_t *drive, int __user *arg) { idefloppy_pc_t pc; idefloppy_capacity_header_t *header; - idefloppy_capacity_descriptor_t *descriptor; + idefloppy_cap_desc_t *descriptor; int i, descriptors, blocks, length; int u_array_size; int u_index; @@ -1496,17 +1111,17 @@ static int idefloppy_get_format_capacities(ide_drive_t *drive, int __user *arg) } header = (idefloppy_capacity_header_t *) pc.buffer; descriptors = header->length / - sizeof(idefloppy_capacity_descriptor_t); - descriptor = (idefloppy_capacity_descriptor_t *) (header + 1); + sizeof(idefloppy_cap_desc_t); + descriptor = (idefloppy_cap_desc_t *) (header + 1); u_index = 0; argp = arg + 1; /* - ** We always skip the first capacity descriptor. That's the - ** current capacity. We are interested in the remaining descriptors, - ** the formattable capacities. - */ + * We always skip the first capacity descriptor. That's the + * current capacity. We are interested in the remaining descriptors, + * the formattable capacities. + */ for (i=0; i<descriptors; i++, descriptor++) { if (u_index >= u_array_size) @@ -1534,20 +1149,20 @@ static int idefloppy_get_format_capacities(ide_drive_t *drive, int __user *arg) } /* -** Send ATAPI_FORMAT_UNIT to the drive. -** -** Userland gives us the following structure: -** -** struct idefloppy_format_command { -** int nblocks; -** int blocksize; -** int flags; -** } ; -** -** flags is a bitmask, currently, the only defined flag is: -** -** 0x01 - verify media after format. -*/ + * Send ATAPI_FORMAT_UNIT to the drive. + * + * Userland gives us the following structure: + * + * struct idefloppy_format_command { + * int nblocks; + * int blocksize; + * int flags; + * } ; + * + * flags is a bitmask, currently, the only defined flag is: + * + * 0x01 - verify media after format. + */ static int idefloppy_begin_format(ide_drive_t *drive, int __user *arg) { @@ -1573,18 +1188,18 @@ static int idefloppy_begin_format(ide_drive_t *drive, int __user *arg) } /* -** Get ATAPI_FORMAT_UNIT progress indication. -** -** Userland gives a pointer to an int. The int is set to a progress -** indicator 0-65536, with 65536=100%. -** -** If the drive does not support format progress indication, we just check -** the dsc bit, and return either 0 or 65536. -*/ + * Get ATAPI_FORMAT_UNIT progress indication. + * + * Userland gives a pointer to an int. The int is set to a progress + * indicator 0-65536, with 65536=100%. + * + * If the drive does not support format progress indication, we just check + * the dsc bit, and return either 0 or 65536. + */ static int idefloppy_get_format_progress(ide_drive_t *drive, int __user *arg) { - idefloppy_floppy_t *floppy = drive->driver_data; + idefloppy_t *floppy = drive->driver_data; idefloppy_pc_t pc; int progress_indication = 0x10000; @@ -1622,7 +1237,7 @@ static int idefloppy_get_format_progress(ide_drive_t *drive, int __user *arg) */ static sector_t idefloppy_capacity (ide_drive_t *drive) { - idefloppy_floppy_t *floppy = drive->driver_data; + idefloppy_t *floppy = drive->driver_data; unsigned long capacity = floppy->blocks * floppy->bs_factor; return capacity; @@ -1647,7 +1262,7 @@ static int idefloppy_identify_device (ide_drive_t *drive,struct hd_driveid *id) if ((gcw.device_type == 5) && !strstr(id->model, "CD-ROM") && strstr(id->model, "ZIP")) - gcw.device_type = 0; + gcw.device_type = 0; #endif #if IDEFLOPPY_DEBUG_INFO @@ -1669,7 +1284,7 @@ static int idefloppy_identify_device (ide_drive_t *drive,struct hd_driveid *id) default: sprintf(buffer, "Reserved"); } printk(KERN_INFO "Device Type: %x - %s\n", gcw.device_type, buffer); - printk(KERN_INFO "Removable: %s\n",gcw.removable ? "Yes":"No"); + printk(KERN_INFO "Removable: %s\n",gcw.removable ? "Yes":"No"); switch (gcw.drq_type) { case 0: sprintf(buffer, "Microprocessor DRQ");break; case 1: sprintf(buffer, "Interrupt DRQ");break; @@ -1689,9 +1304,12 @@ static int idefloppy_identify_device (ide_drive_t *drive,struct hd_driveid *id) printk(KERN_INFO "Write buffer size(?): %d bytes\n",id->buf_size*512); printk(KERN_INFO "DMA: %s",id->capability & 0x01 ? "Yes\n":"No\n"); printk(KERN_INFO "LBA: %s",id->capability & 0x02 ? "Yes\n":"No\n"); - printk(KERN_INFO "IORDY can be disabled: %s",id->capability & 0x04 ? "Yes\n":"No\n"); - printk(KERN_INFO "IORDY supported: %s",id->capability & 0x08 ? "Yes\n":"Unknown\n"); - printk(KERN_INFO "ATAPI overlap supported: %s",id->capability & 0x20 ? "Yes\n":"No\n"); + printk(KERN_INFO "IORDY can be disabled: %s", + id->capability & 0x04 ? "Yes\n":"No\n"); + printk(KERN_INFO "IORDY supported: %s", + id->capability & 0x08 ? "Yes\n":"Unknown\n"); + printk(KERN_INFO "ATAPI overlap supported: %s", + id->capability & 0x20 ? "Yes\n":"No\n"); printk(KERN_INFO "PIO Cycle Timing Category: %d\n",id->tPIO); printk(KERN_INFO "DMA Cycle Timing Category: %d\n",id->tDMA); printk(KERN_INFO "Single Word DMA supported modes:\n"); @@ -1713,12 +1331,16 @@ static int idefloppy_identify_device (ide_drive_t *drive,struct hd_driveid *id) sprintf(buffer, "Not supported"); else sprintf(buffer, "%d ns",id->eide_dma_min); - printk(KERN_INFO "Minimum Multi-word DMA cycle per word: %s\n", buffer); + printk(KERN_INFO "Minimum Multi-word DMA cycle per word: %s\n", + buffer); + if (id->eide_dma_time == 0) sprintf(buffer, "Not supported"); else sprintf(buffer, "%d ns",id->eide_dma_time); - printk(KERN_INFO "Manufacturer\'s Recommended Multi-word cycle: %s\n", buffer); + printk(KERN_INFO "Manufacturer\'s Recommended Multi-word" + " cycle: %s\n", buffer); + if (id->eide_pio == 0) sprintf(buffer, "Not supported"); else @@ -1731,7 +1353,8 @@ static int idefloppy_identify_device (ide_drive_t *drive,struct hd_driveid *id) sprintf(buffer, "%d ns",id->eide_pio_iordy); printk(KERN_INFO "Minimum PIO cycle with IORDY: %s\n", buffer); } else - printk(KERN_INFO "According to the device, fields 64-70 are not valid.\n"); + printk(KERN_INFO "According to the device, fields 64-70 are not" + " valid.\n"); #endif /* IDEFLOPPY_DEBUG_INFO */ if (gcw.protocol != 2) @@ -1741,7 +1364,8 @@ static int idefloppy_identify_device (ide_drive_t *drive,struct hd_driveid *id) else if (!gcw.removable) printk(KERN_ERR "ide-floppy: The removable flag is not set\n"); else if (gcw.drq_type == 3) { - printk(KERN_ERR "ide-floppy: Sorry, DRQ type %d not supported\n", gcw.drq_type); + printk(KERN_ERR "ide-floppy: Sorry, DRQ type %d not supported\n", + gcw.drq_type); } else if (gcw.packet_size != 0) { printk(KERN_ERR "ide-floppy: Packet size is not 12 bytes long\n"); } else @@ -1752,15 +1376,23 @@ static int idefloppy_identify_device (ide_drive_t *drive,struct hd_driveid *id) #ifdef CONFIG_IDE_PROC_FS static void idefloppy_add_settings(ide_drive_t *drive) { - idefloppy_floppy_t *floppy = drive->driver_data; + idefloppy_t *floppy = drive->driver_data; -/* - * drive setting name read/write data type min max mul_factor div_factor data pointer set function - */ - ide_add_setting(drive, "bios_cyl", SETTING_RW, TYPE_INT, 0, 1023, 1, 1, &drive->bios_cyl, NULL); - ide_add_setting(drive, "bios_head", SETTING_RW, TYPE_BYTE, 0, 255, 1, 1, &drive->bios_head, NULL); - ide_add_setting(drive, "bios_sect", SETTING_RW, TYPE_BYTE, 0, 63, 1, 1, &drive->bios_sect, NULL); - ide_add_setting(drive, "ticks", SETTING_RW, TYPE_BYTE, 0, 255, 1, 1, &floppy->ticks, NULL); + /* + * drive setting name read/write data_type min max mul_factor div_factor + * data_pointer set_function + */ + ide_add_setting(drive, "bios_cyl", SETTING_RW, TYPE_INT, 0, 1023, 1, 1, + &drive->bios_cyl, NULL); + + ide_add_setting(drive, "bios_head", SETTING_RW, TYPE_BYTE,0, 255, 1, 1, + &drive->bios_head,NULL); + + ide_add_setting(drive, "bios_sect", SETTING_RW, TYPE_BYTE,0, 63, 1, 1, + &drive->bios_sect,NULL); + + ide_add_setting(drive, "ticks", SETTING_RW, TYPE_BYTE,0, 255, 1, 1, + &floppy->ticks, NULL); } #else static inline void idefloppy_add_settings(ide_drive_t *drive) { ; } @@ -1769,7 +1401,7 @@ static inline void idefloppy_add_settings(ide_drive_t *drive) { ; } /* * Driver initialization. */ -static void idefloppy_setup (ide_drive_t *drive, idefloppy_floppy_t *floppy) +static void idefloppy_setup (ide_drive_t *drive, idefloppy_t *floppy) { struct idefloppy_id_gcw gcw; @@ -1805,14 +1437,13 @@ static void idefloppy_setup (ide_drive_t *drive, idefloppy_floppy_t *floppy) set_bit(IDEFLOPPY_CLIK_DRIVE, &floppy->flags); } - (void) idefloppy_get_capacity(drive); idefloppy_add_settings(drive); } static void ide_floppy_remove(ide_drive_t *drive) { - idefloppy_floppy_t *floppy = drive->driver_data; + idefloppy_t *floppy = drive->driver_data; struct gendisk *g = floppy->disk; ide_proc_unregister_driver(drive, floppy->driver); @@ -1846,8 +1477,8 @@ static int proc_idefloppy_read_capacity } static ide_proc_entry_t idefloppy_proc[] = { - { "capacity", S_IFREG|S_IRUGO, proc_idefloppy_read_capacity, NULL }, - { "geometry", S_IFREG|S_IRUGO, proc_ide_read_geometry, NULL }, + { "capacity", S_IFREG|S_IRUGO, proc_idefloppy_read_capacity, NULL }, + { "geometry", S_IFREG|S_IRUGO, proc_ide_read_geometry, NULL }, { NULL, 0, NULL, NULL } }; #endif /* CONFIG_IDE_PROC_FS */ @@ -1904,10 +1535,10 @@ static int idefloppy_open(struct inode *inode, struct file *filp) if (idefloppy_get_capacity (drive) && (filp->f_flags & O_NDELAY) == 0 /* - ** Allow O_NDELAY to open a drive without a disk, or with - ** an unreadable disk, so that we can get the format - ** capacity of the drive or begin the format - Sam - */ + * Allow O_NDELAY to open a drive without a disk, or with + * an unreadable disk, so that we can get the format + * capacity of the drive or begin the format - Sam + */ ) { ret = -EIO; goto out_put_floppy; @@ -1942,7 +1573,7 @@ static int idefloppy_release(struct inode *inode, struct file *filp) struct ide_floppy_obj *floppy = ide_floppy_g(disk); ide_drive_t *drive = floppy->drive; idefloppy_pc_t pc; - + debug_log(KERN_INFO "Reached idefloppy_release\n"); if (floppy->openers == 1) { @@ -1992,7 +1623,8 @@ static int idefloppy_ioctl(struct inode *inode, struct file *file, if (floppy->openers > 1) return -EBUSY; - /* The IOMEGA Clik! Drive doesn't support this command - no room for an eject mechanism */ + /* The IOMEGA Clik! Drive doesn't support this command - + * no room for an eject mechanism */ if (!test_bit(IDEFLOPPY_CLIK_DRIVE, &floppy->flags)) { idefloppy_create_prevent_cmd(&pc, prevent); (void) idefloppy_queue_pc_tail(drive, &pc); @@ -2012,8 +1644,8 @@ static int idefloppy_ioctl(struct inode *inode, struct file *file, return -EPERM; if (floppy->openers > 1) { - /* Don't format if someone is using the disk */ + /* Don't format if someone is using the disk */ clear_bit(IDEFLOPPY_FORMAT_IN_PROGRESS, &floppy->flags); return -EBUSY; @@ -2026,11 +1658,11 @@ static int idefloppy_ioctl(struct inode *inode, struct file *file, clear_bit(IDEFLOPPY_FORMAT_IN_PROGRESS, &floppy->flags); return err; /* - ** Note, the bit will be cleared when the device is - ** closed. This is the cleanest way to handle the - ** situation where the drive does not support - ** format progress reporting. - */ + * Note, the bit will be cleared when the device is + * closed. This is the cleanest way to handle the + * situation where the drive does not support + * format progress reporting. + */ case IDEFLOPPY_IOCTL_FORMAT_GET_PROGRESS: return idefloppy_get_format_progress(drive, argp); } @@ -2083,7 +1715,7 @@ static struct block_device_operations idefloppy_ops = { static int ide_floppy_probe(ide_drive_t *drive) { - idefloppy_floppy_t *floppy; + idefloppy_t *floppy; struct gendisk *g; if (!strstr("ide-floppy", drive->driver_req)) @@ -2093,15 +1725,18 @@ static int ide_floppy_probe(ide_drive_t *drive) if (drive->media != ide_floppy) goto failed; if (!idefloppy_identify_device (drive, drive->id)) { - printk (KERN_ERR "ide-floppy: %s: not supported by this version of ide-floppy\n", drive->name); + printk (KERN_ERR "ide-floppy: %s: not supported by this version" + " of ide-floppy\n", drive->name); goto failed; } if (drive->scsi) { - printk("ide-floppy: passing drive %s to ide-scsi emulation.\n", drive->name); + printk("ide-floppy: passing drive %s to ide-scsi emulation.\n", + drive->name); goto failed; } - if ((floppy = kzalloc(sizeof (idefloppy_floppy_t), GFP_KERNEL)) == NULL) { - printk (KERN_ERR "ide-floppy: %s: Can't allocate a floppy structure\n", drive->name); + if ((floppy = kzalloc(sizeof (idefloppy_t), GFP_KERNEL)) == NULL) { + printk (KERN_ERR "ide-floppy: %s: Can't allocate a floppy" + " structure\n", drive->name); goto failed; } diff --git a/drivers/ide/ide-floppy.h b/drivers/ide/ide-floppy.h new file mode 100644 index 0000000..ecfafa6 --- /dev/null +++ b/drivers/ide/ide-floppy.h @@ -0,0 +1,382 @@ +#ifndef _IDE_FLOPPY_H +#define _IDE_FLOPPY_H + +/* + * The following are used to debug the driver. + */ +#define IDEFLOPPY_DEBUG_LOG 0 +#define IDEFLOPPY_DEBUG_INFO 0 +#define IDEFLOPPY_DEBUG_BUGS 1 + +/* #define IDEFLOPPY_DEBUG(fmt, args...) printk(KERN_INFO fmt, ## args) */ +#define IDEFLOPPY_DEBUG( fmt, args... ) + +#if IDEFLOPPY_DEBUG_LOG +#define debug_log printk +#else +#define debug_log(fmt, args... ) do {} while(0) +#endif + +/* + * Some drives require a longer irq timeout. + */ +#define IDEFLOPPY_WAIT_CMD (5 * WAIT_CMD) + +/* + * After each failed packet command we issue a request sense command + * and retry the packet command IDEFLOPPY_MAX_PC_RETRIES times. + */ +#define IDEFLOPPY_MAX_PC_RETRIES 3 + +/* + * With each packet command, we allocate a buffer of + * IDEFLOPPY_PC_BUFFER_SIZE bytes. + */ +#define IDEFLOPPY_PC_BUFFER_SIZE 256 + +/* + * In various places in the driver, we need to allocate storage + * for packet commands and requests, which will remain valid while + * we leave the driver to wait for an interrupt or a timeout event. + */ +#define IDEFLOPPY_PC_STACK (10 + IDEFLOPPY_MAX_PC_RETRIES) + +/* + * Our view of a packet command. + */ +typedef struct idefloppy_packet_command_s { + u8 c[12]; /* Actual packet bytes */ + int retries; /* On each retry, we increment + retries */ + int error; /* Error code */ + int request_transfer; /* Bytes to transfer */ + int actually_transferred; /* Bytes actually transferred */ + int buffer_size; /* Size of our data buffer */ + int b_count; /* Missing/Available data on the + current buffer */ + struct request *rq; /* The corresponding request */ + u8 *buffer; /* Data buffer */ + u8 *current_position; /* Pointer into the above buffer */ + void (*callback) (ide_drive_t *); /* Called when this packet + command is completed */ + u8 pc_buffer[IDEFLOPPY_PC_BUFFER_SIZE]; /* Temporary buffer */ + unsigned long flags; /* Status/Action bit flags: long + for set_bit */ +} idefloppy_pc_t; + +/* + * Packet command flag bits. + */ +#define PC_ABORT 0 /* Set when an error is considered \ + normal - We won't retry */ + +#define PC_DMA_RECOMMENDED 2 /* 1 when we prefer to use DMA \ + if possible */ + +#define PC_DMA_IN_PROGRESS 3 /* 1 while DMA in progress */ + +#define PC_DMA_ERROR 4 /* 1 when encountered problem \ + during DMA */ + +#define PC_WRITING 5 /* Data direction */ + +#define PC_SUPPRESS_ERROR 6 /* Suppress error reporting */ + +/* + * Removable Block Access Capabilities Page + */ +typedef struct { +#if defined(__LITTLE_ENDIAN_BITFIELD) + unsigned page_code :6; /* Page code - Should be 0x1b */ + unsigned reserved1_6 :1; /* Reserved */ + unsigned ps :1; /* Should be 0 */ +#elif defined(__BIG_ENDIAN_BITFIELD) + unsigned ps :1; /* Should be 0 */ + unsigned reserved1_6 :1; /* Reserved */ + unsigned page_code :6; /* Page code - Should be 0x1b */ +#else +#error "Bitfield endianness not defined! Check your byteorder.h" +#endif + u8 page_length; /* Page Length - Should be 0xa */ +#if defined(__LITTLE_ENDIAN_BITFIELD) + unsigned reserved2 :6; + unsigned srfp :1; /* Supports reporting progress + of format */ + unsigned sflp :1; /* System floppy type device */ + unsigned tlun :3; /* Total logical units supported + by the device */ + unsigned reserved3 :3; + unsigned sml :1; /* Single / Multiple lun supported */ + unsigned ncd :1; /* Non cd optical device */ +#elif defined(__BIG_ENDIAN_BITFIELD) + unsigned sflp :1; /* System floppy type device */ + unsigned srfp :1; /* Supports reporting progress + of format */ + unsigned reserved2 :6; + unsigned ncd :1; /* Non cd optical device */ + unsigned sml :1; /* Single / Multiple lun supported */ + unsigned reserved3 :3; + unsigned tlun :3; /* Total logical units supported + by the device */ +#else +#error "Bitfield endianness not defined! Check your byteorder.h" +#endif + u8 reserved[8]; +} idefloppy_cap_page_t; + +/* + * Flexible disk page. + */ +typedef struct { +#if defined(__LITTLE_ENDIAN_BITFIELD) + unsigned page_code :6; /* Page code - Should be 0x5 */ + unsigned reserved1_6 :1; /* Reserved */ + unsigned ps :1; /* The device is capable of + saving the page */ +#elif defined(__BIG_ENDIAN_BITFIELD) + unsigned ps :1; /* The device is capable of + saving the page */ + unsigned reserved1_6 :1; /* Reserved */ + unsigned page_code :6; /* Page code - Should be 0x5 */ +#else +#error "Bitfield endianness not defined! Check your byteorder.h" +#endif + u8 page_length; /* Page Length - Should be 0x1e */ + u16 transfer_rate; /* In kilobits per second */ + u8 heads, sectors; /* Number of heads, Number of + sectors per track */ + u16 sector_size; /* Byes per sector */ + u16 cyls; /* Number of cylinders */ + u8 reserved10[10]; + u8 motor_delay; /* Motor off delay */ + u8 reserved21[7]; + u16 rpm; /* Rotations per minute */ + u8 reserved30[2]; +} idefloppy_flex_disk_page_t; + +/* + * Format capacity + */ +typedef struct { + u8 reserved[3]; + u8 length; /* Length of the following + descriptors in bytes */ +} idefloppy_capacity_header_t; + +typedef struct { + u32 blocks; /* Number of blocks */ +#if defined(__LITTLE_ENDIAN_BITFIELD) + unsigned dc :2; /* Descriptor Code */ + unsigned reserved :6; +#elif defined(__BIG_ENDIAN_BITFIELD) + unsigned reserved :6; + unsigned dc :2; /* Descriptor Code */ +#else +#error "Bitfield endianness not defined! Check your byteorder.h" +#endif + u8 length_msb; /* Block Length (MSB)*/ + u16 length; /* Block Length */ +} idefloppy_cap_desc_t; + +#define CAPACITY_INVALID 0x00 +#define CAPACITY_UNFORMATTED 0x01 +#define CAPACITY_CURRENT 0x02 +#define CAPACITY_NO_CARTRIDGE 0x03 + +/* + * Most of our global data which we need to save even as we leave the + * driver due to an interrupt or a timer event is stored in a variable + * of type idefloppy_t, defined below. + */ +typedef struct ide_floppy_obj { + ide_drive_t *drive; + ide_driver_t *driver; + struct gendisk *disk; + struct kref kref; + unsigned int openers; /* protected by BKL for now */ + + /* Current packet command */ + idefloppy_pc_t *pc; + /* Last failed packet command */ + idefloppy_pc_t *failed_pc; + /* Packet command stack */ + idefloppy_pc_t pc_stack[IDEFLOPPY_PC_STACK]; + /* Next free packet command storage space */ + int pc_stack_index; + struct request rq_stack[IDEFLOPPY_PC_STACK]; + /* We implement a circular array */ + int rq_stack_index; + + /* + * Last error information + */ + u8 sense_key, asc, ascq; + /* delay this long before sending packet command */ + u8 ticks; + int progress_indication; + + /* + * Device information + */ + /* Current format */ + int blocks, block_size, bs_factor; + /* Last format capacity */ + idefloppy_cap_desc_t capacity; + /* Copy of the flexible disk page */ + idefloppy_flex_disk_page_t flex_disk_page; + /* Write protect */ + int wp; + /* Supports format progress report */ + int srfp; + /* Status/Action flags */ + unsigned long flags; +} idefloppy_t; + +#define IDEFLOPPY_TICKS_DELAY HZ/20 /* default delay for ZIP 100 (50ms) */ + +/* + * Floppy flag bits values. + */ +#define IDEFLOPPY_DRQ_INTERRUPT 0 /* DRQ interrupt device */ +#define IDEFLOPPY_MEDIA_CHANGED 1 /* Media may have changed */ +#define IDEFLOPPY_USE_READ12 2 /* Use READ12/WRITE12 or \ + READ10/WRITE10 */ + +#define IDEFLOPPY_FORMAT_IN_PROGRESS 3 /* Format in progress */ +#define IDEFLOPPY_CLIK_DRIVE 4 /* Avoid commands not supported \ + in Clik drive */ + +#define IDEFLOPPY_ZIP_DRIVE 5 /* Requires BH algorithm for \ + packets */ + +/* + * ATAPI floppy drive packet commands + */ +#define IDEFLOPPY_FORMAT_UNIT_CMD 0x04 +#define IDEFLOPPY_INQUIRY_CMD 0x12 +#define IDEFLOPPY_MODE_SELECT_CMD 0x55 +#define IDEFLOPPY_MODE_SENSE_CMD 0x5a +#define IDEFLOPPY_READ10_CMD 0x28 +#define IDEFLOPPY_READ12_CMD 0xa8 +#define IDEFLOPPY_READ_CAPACITY_CMD 0x23 +#define IDEFLOPPY_REQUEST_SENSE_CMD 0x03 +#define IDEFLOPPY_PREVENT_REMOVAL_CMD 0x1e +#define IDEFLOPPY_SEEK_CMD 0x2b +#define IDEFLOPPY_START_STOP_CMD 0x1b +#define IDEFLOPPY_TEST_UNIT_READY_CMD 0x00 +#define IDEFLOPPY_VERIFY_CMD 0x2f +#define IDEFLOPPY_WRITE10_CMD 0x2a +#define IDEFLOPPY_WRITE12_CMD 0xaa +#define IDEFLOPPY_WRITE_VERIFY_CMD 0x2e + +/* + * Defines for the mode sense command + */ +#define MODE_SENSE_CURRENT 0x00 +#define MODE_SENSE_CHANGEABLE 0x01 +#define MODE_SENSE_DEFAULT 0x02 +#define MODE_SENSE_SAVED 0x03 + +/* + * IOCTLs used in low-level formatting. + */ + +#define IDEFLOPPY_IOCTL_FORMAT_SUPPORTED 0x4600 +#define IDEFLOPPY_IOCTL_FORMAT_GET_CAPACITY 0x4601 +#define IDEFLOPPY_IOCTL_FORMAT_START 0x4602 +#define IDEFLOPPY_IOCTL_FORMAT_GET_PROGRESS 0x4603 + +/* + * Error codes which are returned in rq->errors to the higher part + * of the driver. + */ +#define IDEFLOPPY_ERROR_GENERAL 101 + +/* + * The following is used to format the general configuration word of + * the ATAPI IDENTIFY DEVICE command. + */ +struct idefloppy_id_gcw { +#if defined(__LITTLE_ENDIAN_BITFIELD) + unsigned packet_size :2; /* Packet Size */ + unsigned reserved234 :3; /* Reserved */ + unsigned drq_type :2; /* Command packet DRQ type */ + unsigned removable :1; /* Removable media */ + unsigned device_type :5; /* Device type */ + unsigned reserved13 :1; /* Reserved */ + unsigned protocol :2; /* Protocol type */ +#elif defined(__BIG_ENDIAN_BITFIELD) + unsigned protocol :2; /* Protocol type */ + unsigned reserved13 :1; /* Reserved */ + unsigned device_type :5; /* Device type */ + unsigned removable :1; /* Removable media */ + unsigned drq_type :2; /* Command packet DRQ type */ + unsigned reserved234 :3; /* Reserved */ + unsigned packet_size :2; /* Packet Size */ +#else +#error "Bitfield endianness not defined! Check your byteorder.h" +#endif +}; + +/* + * REQUEST SENSE packet command result - Data Format. + */ +typedef struct { +#if defined(__LITTLE_ENDIAN_BITFIELD) + unsigned error_code :7; /* Current error (0x70) */ + unsigned valid :1; /* The information field conforms + to SFF-8070i */ + u8 reserved1 :8; /* Reserved */ + unsigned sense_key :4; /* Sense Key */ + unsigned reserved2_4 :1; /* Reserved */ + unsigned ili :1; /* Incorrect Length Indicator */ + unsigned reserved2_67 :2; +#elif defined(__BIG_ENDIAN_BITFIELD) + unsigned valid :1; /* The information field conforms + to SFF-8070i */ + unsigned error_code :7; /* Current error (0x70) */ + u8 reserved1 :8; /* Reserved */ + unsigned reserved2_67 :2; + unsigned ili :1; /* Incorrect Length Indicator */ + unsigned reserved2_4 :1; /* Reserved */ + unsigned sense_key :4; /* Sense Key */ +#else +#error "Bitfield endianness not defined! Check your byteorder.h" +#endif + u32 information __attribute__ ((packed)); + u8 asl; /* Additional sense length (n-7) */ + u32 command_specific; /* Additional command specific + information */ + u8 asc; /* Additional Sense Code */ + u8 ascq; /* Additional Sense Code Qualifier */ + u8 replaceable_unit_code; /* Field Replaceable Unit Code */ + u8 sksv[3]; + u8 pad[2]; /* Padding to 20 bytes */ +} rq_sense_res_t; + +/* + * Pages of the SELECT SENSE / MODE SENSE packet commands. + */ +#define IDEFLOPPY_CAPABILITIES_PAGE 0x1b +#define IDEFLOPPY_FLEXIBLE_DISK_PAGE 0x05 + +/* + * Mode Parameter Header for the MODE SENSE packet command + */ +typedef struct { + u16 mode_data_length; /* Length of the following data + transfer */ + u8 medium_type; /* Medium Type */ +#if defined(__LITTLE_ENDIAN_BITFIELD) + unsigned reserved3 :7; + unsigned wp :1; /* Write protect */ +#elif defined(__BIG_ENDIAN_BITFIELD) + unsigned wp :1; /* Write protect */ + unsigned reserved3 :7; +#else +#error "Bitfield endianness not defined! Check your byteorder.h" +#endif + u8 reserved[4]; +} idefloppy_mode_par_hdr_t; + +#endif /* _IDE_FLOPPY_H */ -- 1.5.3.7 ^ permalink raw reply related [flat|nested] 26+ messages in thread
* [RESEND PATCH 03/10] ide-floppy: convert to generic packet commands 2008-01-03 13:20 ` [RESEND PATCH 02/10] ide-floppy: move ide-floppy struct and macro defs into its own header. While at it Borislav Petkov @ 2008-01-03 13:20 ` Borislav Petkov 2008-01-03 13:20 ` [RESEND PATCH 04/10] ide-floppy: cleanup debugging macros Borislav Petkov 2008-01-04 1:04 ` [RESEND PATCH 03/10] ide-floppy: convert to generic packet commands Bartlomiej Zolnierkiewicz 2008-01-04 22:49 ` [RESEND PATCH 02/10] ide-floppy: move ide-floppy struct and macro defs into its own header. While at it Bartlomiej Zolnierkiewicz 1 sibling, 2 replies; 26+ messages in thread From: Borislav Petkov @ 2008-01-03 13:20 UTC (permalink / raw) To: linux-ide, linux-kernel; +Cc: bzolnier, Borislav Petkov, Jens Axboe Replace the ide-floppy packet commands opcode defines with the generic ones. Add a missing GPCMD_WRITE_12 (opcode 0xaa) to the generic ones in cdrom.h. The last one can be found in the current version of INF-8090, p.905. CC: Jens Axboe <axboe@kernel.dk> Signed-off-by: Borislav Petkov <bbpetkov@yahoo.de> --- drivers/ide/ide-floppy.c | 26 +++++++++++++------------- drivers/ide/ide-floppy.h | 21 --------------------- include/linux/cdrom.h | 1 + 3 files changed, 14 insertions(+), 34 deletions(-) diff --git a/drivers/ide/ide-floppy.c b/drivers/ide/ide-floppy.c index 52d09c1..4fb6128 100644 --- a/drivers/ide/ide-floppy.c +++ b/drivers/ide/ide-floppy.c @@ -313,7 +313,7 @@ static void idefloppy_init_pc (idefloppy_pc_t *pc) static void idefloppy_create_request_sense_cmd (idefloppy_pc_t *pc) { idefloppy_init_pc(pc); - pc->c[0] = IDEFLOPPY_REQUEST_SENSE_CMD; + pc->c[0] = GPCMD_REQUEST_SENSE; pc->c[4] = 255; pc->request_transfer = 18; pc->callback = &idefloppy_request_sense_callback; @@ -379,7 +379,7 @@ static ide_startstop_t idefloppy_pc_intr (ide_drive_t *drive) debug_log(KERN_INFO "ide-floppy: %s: I/O error\n", drive->name); rq->errors++; - if (pc->c[0] == IDEFLOPPY_REQUEST_SENSE_CMD) { + if (pc->c[0] == GPCMD_REQUEST_SENSE) { printk(KERN_ERR "ide-floppy: I/O error in " "request sense command\n"); return ide_do_reset(drive); @@ -586,8 +586,8 @@ static ide_startstop_t idefloppy_issue_pc (ide_drive_t *drive, idefloppy_pc_t *p and have lived on another thread's stack; that stack may have become unmapped meanwhile (CONFIG_DEBUG_PAGEALLOC). */ #if IDEFLOPPY_DEBUG_BUGS - if (floppy->pc->c[0] == IDEFLOPPY_REQUEST_SENSE_CMD && - pc->c[0] == IDEFLOPPY_REQUEST_SENSE_CMD) { + if (floppy->pc->c[0] == GPCMD_REQUEST_SENSE && + pc->c[0] == GPCMD_REQUEST_SENSE) { printk(KERN_ERR "ide-floppy: possible ide-floppy.c bug - " "Two request sense in serial were issued\n"); } @@ -595,7 +595,7 @@ static ide_startstop_t idefloppy_issue_pc (ide_drive_t *drive, idefloppy_pc_t *p #endif if (floppy->failed_pc == NULL && - pc->c[0] != IDEFLOPPY_REQUEST_SENSE_CMD) + pc->c[0] != GPCMD_REQUEST_SENSE) floppy->failed_pc = pc; /* Set the current packet command */ floppy->pc = pc; @@ -690,14 +690,14 @@ static void idefloppy_create_prevent_cmd (idefloppy_pc_t *pc, int prevent) "prevent = %d\n", prevent); idefloppy_init_pc(pc); - pc->c[0] = IDEFLOPPY_PREVENT_REMOVAL_CMD; + pc->c[0] = GPCMD_PREVENT_ALLOW_MEDIUM_REMOVAL; pc->c[4] = prevent; } static void idefloppy_create_read_capacity_cmd (idefloppy_pc_t *pc) { idefloppy_init_pc(pc); - pc->c[0] = IDEFLOPPY_READ_CAPACITY_CMD; + pc->c[0] = GPCMD_READ_FORMAT_CAPACITIES; pc->c[7] = 255; pc->c[8] = 255; pc->request_transfer = 255; @@ -707,7 +707,7 @@ static void idefloppy_create_format_unit_cmd (idefloppy_pc_t *pc, int b, int l, int flags) { idefloppy_init_pc(pc); - pc->c[0] = IDEFLOPPY_FORMAT_UNIT_CMD; + pc->c[0] = GPCMD_FORMAT_UNIT; pc->c[1] = 0x17; memset(pc->buffer, 0, 12); @@ -733,7 +733,7 @@ static void idefloppy_create_mode_sense_cmd (idefloppy_pc_t *pc, u8 page_code, u16 length = sizeof(idefloppy_mode_par_hdr_t); idefloppy_init_pc(pc); - pc->c[0] = IDEFLOPPY_MODE_SENSE_CMD; + pc->c[0] = GPCMD_MODE_SENSE_10; pc->c[1] = 0; pc->c[2] = page_code + (type << 6); @@ -755,14 +755,14 @@ static void idefloppy_create_mode_sense_cmd (idefloppy_pc_t *pc, u8 page_code, static void idefloppy_create_start_stop_cmd (idefloppy_pc_t *pc, int start) { idefloppy_init_pc(pc); - pc->c[0] = IDEFLOPPY_START_STOP_CMD; + pc->c[0] = GPCMD_START_STOP_UNIT; pc->c[4] = start; } static void idefloppy_create_test_unit_ready_cmd(idefloppy_pc_t *pc) { idefloppy_init_pc(pc); - pc->c[0] = IDEFLOPPY_TEST_UNIT_READY_CMD; + pc->c[0] = GPCMD_TEST_UNIT_READY; } static void idefloppy_create_rw_cmd (idefloppy_t *floppy, idefloppy_pc_t *pc, @@ -778,10 +778,10 @@ static void idefloppy_create_rw_cmd (idefloppy_t *floppy, idefloppy_pc_t *pc, idefloppy_init_pc(pc); if (test_bit(IDEFLOPPY_USE_READ12, &floppy->flags)) { - pc->c[0] = cmd == READ ? IDEFLOPPY_READ12_CMD : IDEFLOPPY_WRITE12_CMD; + pc->c[0] = cmd == READ ? GPCMD_READ_12 : GPCMD_WRITE_12; put_unaligned(htonl(blocks), (unsigned int *) &pc->c[6]); } else { - pc->c[0] = cmd == READ ? IDEFLOPPY_READ10_CMD : IDEFLOPPY_WRITE10_CMD; + pc->c[0] = cmd == READ ? GPCMD_READ_10 : GPCMD_WRITE_10; put_unaligned(htons(blocks), (unsigned short *) &pc->c[7]); } put_unaligned(htonl(block), (unsigned int *) &pc->c[2]); diff --git a/drivers/ide/ide-floppy.h b/drivers/ide/ide-floppy.h index ecfafa6..4e12038 100644 --- a/drivers/ide/ide-floppy.h +++ b/drivers/ide/ide-floppy.h @@ -248,27 +248,6 @@ typedef struct ide_floppy_obj { #define IDEFLOPPY_ZIP_DRIVE 5 /* Requires BH algorithm for \ packets */ - -/* - * ATAPI floppy drive packet commands - */ -#define IDEFLOPPY_FORMAT_UNIT_CMD 0x04 -#define IDEFLOPPY_INQUIRY_CMD 0x12 -#define IDEFLOPPY_MODE_SELECT_CMD 0x55 -#define IDEFLOPPY_MODE_SENSE_CMD 0x5a -#define IDEFLOPPY_READ10_CMD 0x28 -#define IDEFLOPPY_READ12_CMD 0xa8 -#define IDEFLOPPY_READ_CAPACITY_CMD 0x23 -#define IDEFLOPPY_REQUEST_SENSE_CMD 0x03 -#define IDEFLOPPY_PREVENT_REMOVAL_CMD 0x1e -#define IDEFLOPPY_SEEK_CMD 0x2b -#define IDEFLOPPY_START_STOP_CMD 0x1b -#define IDEFLOPPY_TEST_UNIT_READY_CMD 0x00 -#define IDEFLOPPY_VERIFY_CMD 0x2f -#define IDEFLOPPY_WRITE10_CMD 0x2a -#define IDEFLOPPY_WRITE12_CMD 0xaa -#define IDEFLOPPY_WRITE_VERIFY_CMD 0x2e - /* * Defines for the mode sense command */ diff --git a/include/linux/cdrom.h b/include/linux/cdrom.h index ba32479..a729b02 100644 --- a/include/linux/cdrom.h +++ b/include/linux/cdrom.h @@ -480,6 +480,7 @@ struct cdrom_generic_command #define GPCMD_TEST_UNIT_READY 0x00 #define GPCMD_VERIFY_10 0x2f #define GPCMD_WRITE_10 0x2a +#define GPCMD_WRITE_12 0xaa /* ide floppy */ #define GPCMD_WRITE_AND_VERIFY_10 0x2e /* This is listed as optional in ATAPI 2.6, but is (curiously) * missing from Mt. Fuji, Table 57. It _is_ mentioned in Mt. Fuji -- 1.5.3.7 ^ permalink raw reply related [flat|nested] 26+ messages in thread
* [RESEND PATCH 04/10] ide-floppy: cleanup debugging macros 2008-01-03 13:20 ` [RESEND PATCH 03/10] ide-floppy: convert to generic packet commands Borislav Petkov @ 2008-01-03 13:20 ` Borislav Petkov 2008-01-03 13:20 ` [RESEND PATCH 05/10] ide-floppy: factor out ioctl handlers from idefloppy_ioctl() Borislav Petkov 2008-01-04 1:19 ` [RESEND PATCH 04/10] ide-floppy: cleanup debugging macros Bartlomiej Zolnierkiewicz 2008-01-04 1:04 ` [RESEND PATCH 03/10] ide-floppy: convert to generic packet commands Bartlomiej Zolnierkiewicz 1 sibling, 2 replies; 26+ messages in thread From: Borislav Petkov @ 2008-01-03 13:20 UTC (permalink / raw) To: linux-ide, linux-kernel; +Cc: bzolnier, Borislav Petkov There should be no functional change resulting from this patch. Signed-off-by: Borislav Petkov <bbpetkov@yahoo.de> --- drivers/ide/ide-floppy.c | 58 +++++++++++++++++++++------------------------ drivers/ide/ide-floppy.h | 3 +- 2 files changed, 29 insertions(+), 32 deletions(-) diff --git a/drivers/ide/ide-floppy.c b/drivers/ide/ide-floppy.c index 4fb6128..196a697 100644 --- a/drivers/ide/ide-floppy.c +++ b/drivers/ide/ide-floppy.c @@ -105,7 +105,7 @@ static int idefloppy_do_end_request(ide_drive_t *drive, int uptodate, int nsecs) struct request *rq = HWGROUP(drive)->rq; int error; - debug_log(KERN_INFO "Reached idefloppy_end_request\n"); + debug_log("Reached %s\n", __FUNCTION__); switch (uptodate) { case 0: error = IDEFLOPPY_ERROR_GENERAL; break; @@ -257,13 +257,12 @@ static void idefloppy_analyze_error (ide_drive_t *drive, floppy->progress_indication = result->sksv[0] & 0x80 ? (u16)get_unaligned((u16 *)(result->sksv+1)):0x10000; if (floppy->failed_pc) - debug_log(KERN_INFO "ide-floppy: pc = %x, sense key = %x, " - "asc = %x, ascq = %x\n", floppy->failed_pc->c[0], - result->sense_key, result->asc, result->ascq); + debug_log("pc = %x, sense key = %x, asc = %x, ascq = %x\n", + floppy->failed_pc->c[0], result->sense_key, + result->asc, result->ascq); else - debug_log(KERN_INFO "ide-floppy: sense key = %x, asc = %x, " - "ascq = %x\n", result->sense_key, - result->asc, result->ascq); + debug_log("sense key = %x, asc = %x, ascq = %x\n", + result->sense_key, result->asc, result->ascq); } static void idefloppy_request_sense_callback (ide_drive_t *drive) @@ -271,7 +270,7 @@ static void idefloppy_request_sense_callback (ide_drive_t *drive) idefloppy_t *floppy = drive->driver_data; u8 *buf = floppy->pc->buffer; - debug_log(KERN_INFO "ide-floppy: Reached %s\n", __FUNCTION__); + debug_log("Reached %s\n", __FUNCTION__); if (!floppy->pc->error) { idefloppy_analyze_error(drive, (rq_sense_res_t *) buf); @@ -291,7 +290,7 @@ static void idefloppy_pc_callback (ide_drive_t *drive) { idefloppy_t *floppy = drive->driver_data; - debug_log(KERN_INFO "ide-floppy: Reached %s\n", __FUNCTION__); + debug_log("Reached %s\n", __FUNCTION__); idefloppy_do_end_request(drive, floppy->pc->error ? 0 : 1, 0); } @@ -351,8 +350,7 @@ static ide_startstop_t idefloppy_pc_intr (ide_drive_t *drive) struct request *rq = pc->rq; unsigned int temp; - debug_log(KERN_INFO "ide-floppy: Reached %s interrupt handler\n", - __FUNCTION__); + debug_log("Reached %s interrupt handler\n", __FUNCTION__); if (test_bit(PC_DMA_IN_PROGRESS, &pc->flags)) { if (HWIF(drive)->ide_dma_end(drive)) { @@ -361,23 +359,23 @@ static ide_startstop_t idefloppy_pc_intr (ide_drive_t *drive) pc->actually_transferred = pc->request_transfer; idefloppy_update_buffers(drive, pc); } - debug_log(KERN_INFO "ide-floppy: DMA finished\n"); + debug_log("%s: DMA finished\n", __FUNCTION__); } /* Clear the interrupt */ status.all = HWIF(drive)->INB(IDE_STATUS_REG); if (!status.b.drq) { /* No more interrupts */ - debug_log(KERN_INFO "Packet command completed, %d bytes " - "transferred\n", pc->actually_transferred); + debug_log("Packet command completed, %d bytes transferred\n", + pc->actually_transferred); + clear_bit(PC_DMA_IN_PROGRESS, &pc->flags); local_irq_enable_in_hardirq(); if (status.b.check || test_bit(PC_DMA_ERROR, &pc->flags)) { /* Error detected */ - debug_log(KERN_INFO "ide-floppy: %s: I/O error\n", - drive->name); + debug_log("%s: I/O error\n", drive->name); rq->errors++; if (pc->c[0] == GPCMD_REQUEST_SENSE) { printk(KERN_ERR "ide-floppy: I/O error in " @@ -438,9 +436,8 @@ static ide_startstop_t idefloppy_pc_intr (ide_drive_t *drive) NULL); return ide_started; } - debug_log(KERN_NOTICE "ide-floppy: The floppy wants to " - "send us more data than expected - " - "allowing transfer\n"); + debug_log("The floppy wants to send us more data than" + "expected - allowing transfer\n"); } } if (test_bit(PC_WRITING, &pc->flags)) { @@ -624,7 +621,7 @@ static ide_startstop_t idefloppy_issue_pc (ide_drive_t *drive, idefloppy_pc_t *p return ide_stopped; } - debug_log(KERN_INFO "Retry number - %d\n",pc->retries); + debug_log("Retry number - %d\n", pc->retries); pc->retries++; /* We haven't transferred any data yet */ @@ -676,9 +673,9 @@ static ide_startstop_t idefloppy_issue_pc (ide_drive_t *drive, idefloppy_pc_t *p } } -static void idefloppy_rw_callback (ide_drive_t *drive) +static void idefloppy_rw_callback(ide_drive_t *drive) { - debug_log(KERN_INFO "ide-floppy: Reached idefloppy_rw_callback\n"); + debug_log("Reached %s\n", __FUNCTION__); idefloppy_do_end_request(drive, 1, 0); return; @@ -686,8 +683,7 @@ static void idefloppy_rw_callback (ide_drive_t *drive) static void idefloppy_create_prevent_cmd (idefloppy_pc_t *pc, int prevent) { - debug_log(KERN_INFO "ide-floppy: creating prevent removal command, " - "prevent = %d\n", prevent); + debug_log("creating prevent removal command, prevent = %d\n", prevent); idefloppy_init_pc(pc); pc->c[0] = GPCMD_PREVENT_ALLOW_MEDIUM_REMOVAL; @@ -773,7 +769,7 @@ static void idefloppy_create_rw_cmd (idefloppy_t *floppy, idefloppy_pc_t *pc, int cmd = rq_data_dir(rq); debug_log("create_rw1%d_cmd: block == %d, blocks == %d\n", - 2 * test_bit (IDEFLOPPY_USE_READ12, &floppy->flags), + 2 * test_bit(IDEFLOPPY_USE_READ12, &floppy->flags), block, blocks); idefloppy_init_pc(pc); @@ -826,10 +822,10 @@ static ide_startstop_t idefloppy_do_request (ide_drive_t *drive, idefloppy_pc_t *pc; unsigned long block = (unsigned long)block_s; - debug_log(KERN_INFO "dev: %s, flags: %lx, errors: %d\n", + debug_log("dev: %s, flags: %lx, errors: %d\n", rq->rq_disk ? rq->rq_disk->disk_name : "?", rq->flags, rq->errors); - debug_log(KERN_INFO "sector: %ld, nr_sectors: %ld, " + debug_log("sector: %ld, nr_sectors: %ld, " "current_nr_sectors: %d\n", (long)rq->sector, rq->nr_sectors, rq->current_nr_sectors); @@ -1050,10 +1046,10 @@ static int idefloppy_get_capacity (ide_drive_t *drive) } } if (!i) { - debug_log( "Descriptor 0 Code: %d\n", + debug_log("Descriptor 0 Code: %d\n", descriptor->dc); } - debug_log( "Descriptor %d: %dkB, %d blocks, %d " + debug_log("Descriptor %d: %dkB, %d blocks, %d " "sector size\n", i, blocks * length / 1024, blocks, length); } @@ -1513,7 +1509,7 @@ static int idefloppy_open(struct inode *inode, struct file *filp) idefloppy_pc_t pc; int ret = 0; - debug_log(KERN_INFO "Reached idefloppy_open\n"); + debug_log("Reached %s\n", __FUNCTION__); if (!(floppy = ide_floppy_get(disk))) return -ENXIO; @@ -1574,7 +1570,7 @@ static int idefloppy_release(struct inode *inode, struct file *filp) ide_drive_t *drive = floppy->drive; idefloppy_pc_t pc; - debug_log(KERN_INFO "Reached idefloppy_release\n"); + debug_log("Reached %s\n", __FUNCTION__); if (floppy->openers == 1) { /* IOMEGA Clik! drives do not support lock/unlock commands */ diff --git a/drivers/ide/ide-floppy.h b/drivers/ide/ide-floppy.h index 4e12038..fb55d32 100644 --- a/drivers/ide/ide-floppy.h +++ b/drivers/ide/ide-floppy.h @@ -12,7 +12,8 @@ #define IDEFLOPPY_DEBUG( fmt, args... ) #if IDEFLOPPY_DEBUG_LOG -#define debug_log printk +#define debug_log(fmt, args...) \ + printk(KERN_INFO "ide-floppy: " fmt, ## args) #else #define debug_log(fmt, args... ) do {} while(0) #endif -- 1.5.3.7 ^ permalink raw reply related [flat|nested] 26+ messages in thread
* [RESEND PATCH 05/10] ide-floppy: factor out ioctl handlers from idefloppy_ioctl() 2008-01-03 13:20 ` [RESEND PATCH 04/10] ide-floppy: cleanup debugging macros Borislav Petkov @ 2008-01-03 13:20 ` Borislav Petkov 2008-01-03 13:20 ` [RESEND PATCH 06/10] ide-floppy: report DMA handling in idefloppy_pc_intr() properly Borislav Petkov 2008-01-05 15:12 ` [RESEND PATCH 05/10] ide-floppy: factor out ioctl handlers from idefloppy_ioctl() Bartlomiej Zolnierkiewicz 2008-01-04 1:19 ` [RESEND PATCH 04/10] ide-floppy: cleanup debugging macros Bartlomiej Zolnierkiewicz 1 sibling, 2 replies; 26+ messages in thread From: Borislav Petkov @ 2008-01-03 13:20 UTC (permalink / raw) To: linux-ide, linux-kernel; +Cc: bzolnier, Borislav Petkov There should be no functional change resulting from this patch. Signed-off-by: Borislav Petkov <bbpetkov@yahoo.de> --- drivers/ide/ide-floppy.c | 90 +++++++++++++++++++++++++++++----------------- 1 files changed, 57 insertions(+), 33 deletions(-) diff --git a/drivers/ide/ide-floppy.c b/drivers/ide/ide-floppy.c index 196a697..7823447 100644 --- a/drivers/ide/ide-floppy.c +++ b/drivers/ide/ide-floppy.c @@ -1600,6 +1600,58 @@ static int idefloppy_getgeo(struct block_device *bdev, struct hd_geometry *geo) return 0; } +static int idefloppy_lockdoor(struct inode *inode, idefloppy_pc_t *pc, + int event, unsigned int cmd) +{ + struct block_device *bdev = inode->i_bdev; + struct ide_floppy_obj *floppy = ide_floppy_g(bdev->bd_disk); + ide_drive_t *drive = floppy->drive; + + if (floppy->openers > 1) + return -EBUSY; + + /* The IOMEGA Clik! Drive doesn't support this command - + * no room for an eject mechanism */ + if (!test_bit(IDEFLOPPY_CLIK_DRIVE, &floppy->flags)) { + idefloppy_create_prevent_cmd(pc, event); + (void) idefloppy_queue_pc_tail(drive, pc); + } + + if (cmd == CDROMEJECT) { + idefloppy_create_start_stop_cmd(pc, 2); + (void) idefloppy_queue_pc_tail(drive, pc); + } + + return 0; +} + +static +int idefloppy_format_start(struct file *file, struct inode *inode, + void __user *argp) +{ + struct block_device *bdev = inode->i_bdev; + struct ide_floppy_obj *floppy = ide_floppy_g(bdev->bd_disk); + ide_drive_t *drive = floppy->drive; + int err; + + if (!(file->f_mode & 2)) + return -EPERM; + + if (floppy->openers > 1) { + /* Don't format if someone is using the disk */ + clear_bit(IDEFLOPPY_FORMAT_IN_PROGRESS, &floppy->flags); + return -EBUSY; + } + + set_bit(IDEFLOPPY_FORMAT_IN_PROGRESS, &floppy->flags); + + err = idefloppy_begin_format(drive, argp); + if (err) + clear_bit(IDEFLOPPY_FORMAT_IN_PROGRESS, &floppy->flags); + + return err; +} + static int idefloppy_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg) { @@ -1612,47 +1664,19 @@ static int idefloppy_ioctl(struct inode *inode, struct file *file, idefloppy_pc_t pc; switch (cmd) { + case CDROMEJECT: prevent = 0; /* fall through */ - case CDROM_LOCKDOOR: - if (floppy->openers > 1) - return -EBUSY; - /* The IOMEGA Clik! Drive doesn't support this command - - * no room for an eject mechanism */ - if (!test_bit(IDEFLOPPY_CLIK_DRIVE, &floppy->flags)) { - idefloppy_create_prevent_cmd(&pc, prevent); - (void) idefloppy_queue_pc_tail(drive, &pc); - } - if (cmd == CDROMEJECT) { - idefloppy_create_start_stop_cmd(&pc, 2); - (void) idefloppy_queue_pc_tail(drive, &pc); - } - return 0; + case CDROM_LOCKDOOR: + return idefloppy_lockdoor(inode, &pc, prevent, cmd); case IDEFLOPPY_IOCTL_FORMAT_SUPPORTED: return 0; case IDEFLOPPY_IOCTL_FORMAT_GET_CAPACITY: return idefloppy_get_format_capacities(drive, argp); case IDEFLOPPY_IOCTL_FORMAT_START: - - if (!(file->f_mode & 2)) - return -EPERM; - - if (floppy->openers > 1) { - - /* Don't format if someone is using the disk */ - clear_bit(IDEFLOPPY_FORMAT_IN_PROGRESS, - &floppy->flags); - return -EBUSY; - } - - set_bit(IDEFLOPPY_FORMAT_IN_PROGRESS, &floppy->flags); - - err = idefloppy_begin_format(drive, argp); - if (err) - clear_bit(IDEFLOPPY_FORMAT_IN_PROGRESS, &floppy->flags); - return err; + return idefloppy_format_start(file, inode, argp); /* * Note, the bit will be cleared when the device is * closed. This is the cleanest way to handle the @@ -1669,7 +1693,7 @@ static int idefloppy_ioctl(struct inode *inode, struct file *file, */ if (cmd != CDROM_SEND_PACKET && cmd != SCSI_IOCTL_SEND_COMMAND) err = scsi_cmd_ioctl(file, bdev->bd_disk->queue, - bdev->bd_disk, cmd, argp); + bdev->bd_disk, cmd, argp); else err = -ENOTTY; -- 1.5.3.7 ^ permalink raw reply related [flat|nested] 26+ messages in thread
* [RESEND PATCH 06/10] ide-floppy: report DMA handling in idefloppy_pc_intr() properly 2008-01-03 13:20 ` [RESEND PATCH 05/10] ide-floppy: factor out ioctl handlers from idefloppy_ioctl() Borislav Petkov @ 2008-01-03 13:20 ` Borislav Petkov 2008-01-03 13:20 ` [RESEND PATCH 07/10] ide-floppy: remove unnecessary ->handler != NULL check Borislav Petkov 2008-01-05 15:46 ` [RESEND PATCH 06/10] ide-floppy: report DMA handling in idefloppy_pc_intr() properly Bartlomiej Zolnierkiewicz 2008-01-05 15:12 ` [RESEND PATCH 05/10] ide-floppy: factor out ioctl handlers from idefloppy_ioctl() Bartlomiej Zolnierkiewicz 1 sibling, 2 replies; 26+ messages in thread From: Borislav Petkov @ 2008-01-03 13:20 UTC (permalink / raw) To: linux-ide, linux-kernel; +Cc: bzolnier, Borislav Petkov while at it: -cleanup small issues raised by scripts/checkpatch.pl -remove redundant and shorten some comments There should be no functionality change resulting from this patch Signed-off-by: Borislav Petkov <bbpetkov@yahoo.de> --- drivers/ide/ide-floppy.c | 195 ++++++++++++++++++++-------------------------- 1 files changed, 83 insertions(+), 112 deletions(-) diff --git a/drivers/ide/ide-floppy.c b/drivers/ide/ide-floppy.c index 7823447..5d0fd1f 100644 --- a/drivers/ide/ide-floppy.c +++ b/drivers/ide/ide-floppy.c @@ -5,9 +5,7 @@ * Copyright (C) 2000 - 2002 Paul Bristow <paul@paulbristow.net> * * The driver currently doesn't have any fancy features, just the bare - * minimum read/write support. - * - * This driver supports the following IDE floppy drives: + * minimum read/write support. It supports the following IDE floppy drives: * * LS-120/240 SuperDisk * Iomega Zip 100/250 @@ -75,8 +73,8 @@ static void ide_floppy_put(struct ide_floppy_obj *floppy) } /* - * Too bad. The drive wants to send us data which we are not ready to accept. - * Just throw it away. + * Too bad. The drive wants to send us data which we are not ready to accept. + * Just throw it away. */ static void idefloppy_discard_data (ide_drive_t *drive, unsigned int bcount) { @@ -94,10 +92,8 @@ static void idefloppy_write_zeros (ide_drive_t *drive, unsigned int bcount) /* - * idefloppy_do_end_request is used to finish servicing a request. - * - * For read/write requests, we will call ide_end_request to pass to the - * next buffer. + * Used to finish servicing a request. For read/write requests, we will call + * ide_end_request to pass to the next buffer. */ static int idefloppy_do_end_request(ide_drive_t *drive, int uptodate, int nsecs) { @@ -128,7 +124,7 @@ static int idefloppy_do_end_request(ide_drive_t *drive, int uptodate, int nsecs) return 0; } -static void idefloppy_input_buffers (ide_drive_t *drive, idefloppy_pc_t *pc, +static void idefloppy_input_buffers(ide_drive_t *drive, idefloppy_pc_t *pc, unsigned int bcount) { struct request *rq = pc->rq; @@ -162,7 +158,7 @@ static void idefloppy_input_buffers (ide_drive_t *drive, idefloppy_pc_t *pc, } } -static void idefloppy_output_buffers (ide_drive_t *drive, idefloppy_pc_t *pc, +static void idefloppy_output_buffers(ide_drive_t *drive, idefloppy_pc_t *pc, unsigned int bcount) { struct request *rq = pc->rq; @@ -198,7 +194,7 @@ static void idefloppy_output_buffers (ide_drive_t *drive, idefloppy_pc_t *pc, #endif } -static void idefloppy_update_buffers (ide_drive_t *drive, idefloppy_pc_t *pc) +static void idefloppy_update_buffers(ide_drive_t *drive, idefloppy_pc_t *pc) { struct request *rq = pc->rq; struct bio *bio = rq->bio; @@ -208,11 +204,11 @@ static void idefloppy_update_buffers (ide_drive_t *drive, idefloppy_pc_t *pc) } /* - * idefloppy_queue_pc_head generates a new packet command request in front - * of the request queue, before the current request, so that it will be - * processed immediately, on the next pass through the driver. + * Generates a new packet command request in front + * of the request queue, before the current request, so that it will be + * processed immediately, on the next pass through the driver. */ -static void idefloppy_queue_pc_head (ide_drive_t *drive,idefloppy_pc_t *pc, +static void idefloppy_queue_pc_head(ide_drive_t *drive, idefloppy_pc_t *pc, struct request *rq) { struct ide_floppy_obj *floppy = drive->driver_data; @@ -224,7 +220,7 @@ static void idefloppy_queue_pc_head (ide_drive_t *drive,idefloppy_pc_t *pc, (void) ide_do_drive_cmd(drive, rq, ide_preempt); } -static idefloppy_pc_t *idefloppy_next_pc_storage (ide_drive_t *drive) +static idefloppy_pc_t *idefloppy_next_pc_storage(ide_drive_t *drive) { idefloppy_t *floppy = drive->driver_data; @@ -233,7 +229,7 @@ static idefloppy_pc_t *idefloppy_next_pc_storage (ide_drive_t *drive) return (&floppy->pc_stack[floppy->pc_stack_index++]); } -static struct request *idefloppy_next_rq_storage (ide_drive_t *drive) +static struct request *idefloppy_next_rq_storage(ide_drive_t *drive) { idefloppy_t *floppy = drive->driver_data; @@ -242,11 +238,8 @@ static struct request *idefloppy_next_rq_storage (ide_drive_t *drive) return (&floppy->rq_stack[floppy->rq_stack_index++]); } -/* - * idefloppy_analyze_error is called on each failed packet command retry - * to analyze the request sense. - */ -static void idefloppy_analyze_error (ide_drive_t *drive, +/* Called on each failed packet command retry to analyze the request sense. */ +static void idefloppy_analyze_error(ide_drive_t *drive, rq_sense_res_t *result) { idefloppy_t *floppy = drive->driver_data; @@ -265,7 +258,7 @@ static void idefloppy_analyze_error (ide_drive_t *drive, result->sense_key, result->asc, result->ascq); } -static void idefloppy_request_sense_callback (ide_drive_t *drive) +static void idefloppy_request_sense_callback(ide_drive_t *drive) { idefloppy_t *floppy = drive->driver_data; u8 *buf = floppy->pc->buffer; @@ -283,10 +276,8 @@ static void idefloppy_request_sense_callback (ide_drive_t *drive) } } -/* - * General packet command callback function. - */ -static void idefloppy_pc_callback (ide_drive_t *drive) +/* General packet command callback function. */ +static void idefloppy_pc_callback(ide_drive_t *drive) { idefloppy_t *floppy = drive->driver_data; @@ -295,10 +286,7 @@ static void idefloppy_pc_callback (ide_drive_t *drive) idefloppy_do_end_request(drive, floppy->pc->error ? 0 : 1, 0); } -/* - * idefloppy_init_pc initializes a packet command. - */ -static void idefloppy_init_pc (idefloppy_pc_t *pc) +static void idefloppy_init_pc(idefloppy_pc_t *pc) { memset(pc->c, 0, 12); pc->retries = 0; @@ -309,7 +297,7 @@ static void idefloppy_init_pc (idefloppy_pc_t *pc) pc->callback = &idefloppy_pc_callback; } -static void idefloppy_create_request_sense_cmd (idefloppy_pc_t *pc) +static void idefloppy_create_request_sense_cmd(idefloppy_pc_t *pc) { idefloppy_init_pc(pc); pc->c[0] = GPCMD_REQUEST_SENSE; @@ -319,11 +307,10 @@ static void idefloppy_create_request_sense_cmd (idefloppy_pc_t *pc) } /* - * idefloppy_retry_pc is called when an error was detected during the - * last packet command. We queue a request sense packet command in - * the head of the request list. + * Called when an error was detected during the last packet command. We queue a + * request sense packet command in the head of the request list. */ -static void idefloppy_retry_pc (ide_drive_t *drive) +static void idefloppy_retry_pc(ide_drive_t *drive) { idefloppy_pc_t *pc; struct request *rq; @@ -336,11 +323,8 @@ static void idefloppy_retry_pc (ide_drive_t *drive) idefloppy_queue_pc_head(drive, pc, rq); } -/* - * idefloppy_pc_intr is the usual interrupt handler which will be called - * during a packet command. - */ -static ide_startstop_t idefloppy_pc_intr (ide_drive_t *drive) +/* The usual interrupt handler which will be called during a packet command. */ +static ide_startstop_t idefloppy_pc_intr(ide_drive_t *drive) { idefloppy_t *floppy = drive->driver_data; atapi_status_t status; @@ -349,17 +333,25 @@ static ide_startstop_t idefloppy_pc_intr (ide_drive_t *drive) idefloppy_pc_t *pc = floppy->pc; struct request *rq = pc->rq; unsigned int temp; + int dma_error = 0; debug_log("Reached %s interrupt handler\n", __FUNCTION__); if (test_bit(PC_DMA_IN_PROGRESS, &pc->flags)) { - if (HWIF(drive)->ide_dma_end(drive)) { + + dma_error = HWIF(drive)->ide_dma_end(drive); + if (dma_error) { + printk(KERN_ERR "%s: DMA %s error\n", drive->name, + rq_data_dir(rq) == WRITE ? + "write" : + "read"); set_bit(PC_DMA_ERROR, &pc->flags); } else { pc->actually_transferred = pc->request_transfer; idefloppy_update_buffers(drive, pc); + + debug_log("%s: DMA finished\n", __FUNCTION__); } - debug_log("%s: DMA finished\n", __FUNCTION__); } /* Clear the interrupt */ @@ -473,7 +465,7 @@ static ide_startstop_t idefloppy_pc_intr (ide_drive_t *drive) * It fails at high speeds on the Iomega ZIP drive, so there's a slower version * for that drive below. The algorithm is chosen based on drive type */ -static ide_startstop_t idefloppy_transfer_pc (ide_drive_t *drive) +static ide_startstop_t idefloppy_transfer_pc(ide_drive_t *drive) { ide_startstop_t startstop; idefloppy_t *floppy = drive->driver_data; @@ -498,7 +490,6 @@ static ide_startstop_t idefloppy_transfer_pc (ide_drive_t *drive) return ide_started; } - /* * What we have here is a classic case of a top half / bottom half * interrupt service routine. In interrupt mode, the device sends @@ -511,7 +502,7 @@ static ide_startstop_t idefloppy_transfer_pc (ide_drive_t *drive) * packet, we schedule the packet transfer to occur about 2-3 ticks * later in transfer_pc2. */ -static int idefloppy_transfer_pc2 (ide_drive_t *drive) +static int idefloppy_transfer_pc2(ide_drive_t *drive) { idefloppy_t *floppy = drive->driver_data; @@ -521,7 +512,7 @@ static int idefloppy_transfer_pc2 (ide_drive_t *drive) return IDEFLOPPY_WAIT_CMD; } -static ide_startstop_t idefloppy_transfer_pc1 (ide_drive_t *drive) +static ide_startstop_t idefloppy_transfer_pc1(ide_drive_t *drive) { idefloppy_t *floppy = drive->driver_data; ide_startstop_t startstop; @@ -554,11 +545,7 @@ static ide_startstop_t idefloppy_transfer_pc1 (ide_drive_t *drive) return ide_started; } -/** - * idefloppy_should_report_error() - * - * Supresses error messages resulting from Medium not present - */ +/* Supresses error messages resulting from Medium not present */ static inline int idefloppy_should_report_error(idefloppy_t *floppy) { if (floppy->sense_key == 0x02 && @@ -568,10 +555,7 @@ static inline int idefloppy_should_report_error(idefloppy_t *floppy) return 1; } -/* - * Issue a packet command - */ -static ide_startstop_t idefloppy_issue_pc (ide_drive_t *drive, idefloppy_pc_t *pc) +static ide_startstop_t idefloppy_issue_pc(ide_drive_t *drive, idefloppy_pc_t *pc) { idefloppy_t *floppy = drive->driver_data; ide_hwif_t *hwif = drive->hwif; @@ -591,9 +575,9 @@ static ide_startstop_t idefloppy_issue_pc (ide_drive_t *drive, idefloppy_pc_t *p #endif /* IDEFLOPPY_DEBUG_BUGS */ #endif - if (floppy->failed_pc == NULL && - pc->c[0] != GPCMD_REQUEST_SENSE) + if (floppy->failed_pc == NULL && pc->c[0] != GPCMD_REQUEST_SENSE) floppy->failed_pc = pc; + /* Set the current packet command */ floppy->pc = pc; @@ -659,7 +643,7 @@ static ide_startstop_t idefloppy_issue_pc (ide_drive_t *drive, idefloppy_pc_t *p pkt_xfer_routine = &idefloppy_transfer_pc; } - if (test_bit (IDEFLOPPY_DRQ_INTERRUPT, &floppy->flags)) { + if (test_bit(IDEFLOPPY_DRQ_INTERRUPT, &floppy->flags)) { /* Issue the packet command */ ide_execute_command(drive, WIN_PACKETCMD, pkt_xfer_routine, @@ -681,7 +665,7 @@ static void idefloppy_rw_callback(ide_drive_t *drive) return; } -static void idefloppy_create_prevent_cmd (idefloppy_pc_t *pc, int prevent) +static void idefloppy_create_prevent_cmd(idefloppy_pc_t *pc, int prevent) { debug_log("creating prevent removal command, prevent = %d\n", prevent); @@ -690,7 +674,7 @@ static void idefloppy_create_prevent_cmd (idefloppy_pc_t *pc, int prevent) pc->c[4] = prevent; } -static void idefloppy_create_read_capacity_cmd (idefloppy_pc_t *pc) +static void idefloppy_create_read_capacity_cmd(idefloppy_pc_t *pc) { idefloppy_init_pc(pc); pc->c[0] = GPCMD_READ_FORMAT_CAPACITIES; @@ -699,7 +683,7 @@ static void idefloppy_create_read_capacity_cmd (idefloppy_pc_t *pc) pc->request_transfer = 255; } -static void idefloppy_create_format_unit_cmd (idefloppy_pc_t *pc, int b, int l, +static void idefloppy_create_format_unit_cmd(idefloppy_pc_t *pc, int b, int l, int flags) { idefloppy_init_pc(pc); @@ -720,10 +704,8 @@ static void idefloppy_create_format_unit_cmd (idefloppy_pc_t *pc, int b, int l, set_bit(PC_WRITING, &pc->flags); } -/* - * A mode sense command is used to "sense" floppy parameters. - */ -static void idefloppy_create_mode_sense_cmd (idefloppy_pc_t *pc, u8 page_code, +/* A mode sense command is used to "sense" floppy parameters. */ +static void idefloppy_create_mode_sense_cmd(idefloppy_pc_t *pc, u8 page_code, u8 type) { u16 length = sizeof(idefloppy_mode_par_hdr_t); @@ -748,7 +730,7 @@ static void idefloppy_create_mode_sense_cmd (idefloppy_pc_t *pc, u8 page_code, pc->request_transfer = length; } -static void idefloppy_create_start_stop_cmd (idefloppy_pc_t *pc, int start) +static void idefloppy_create_start_stop_cmd(idefloppy_pc_t *pc, int start) { idefloppy_init_pc(pc); pc->c[0] = GPCMD_START_STOP_UNIT; @@ -761,7 +743,7 @@ static void idefloppy_create_test_unit_ready_cmd(idefloppy_pc_t *pc) pc->c[0] = GPCMD_TEST_UNIT_READY; } -static void idefloppy_create_rw_cmd (idefloppy_t *floppy, idefloppy_pc_t *pc, +static void idefloppy_create_rw_cmd(idefloppy_t *floppy, idefloppy_pc_t *pc, struct request *rq, unsigned long sector) { int block = sector / floppy->bs_factor; @@ -792,7 +774,8 @@ static void idefloppy_create_rw_cmd (idefloppy_t *floppy, idefloppy_pc_t *pc, } static void -idefloppy_blockpc_cmd(idefloppy_t *floppy, idefloppy_pc_t *pc, struct request *rq) +idefloppy_blockpc_cmd(idefloppy_t *floppy, idefloppy_pc_t *pc, + struct request *rq) { idefloppy_init_pc(pc); pc->callback = &idefloppy_rw_callback; @@ -812,10 +795,7 @@ idefloppy_blockpc_cmd(idefloppy_t *floppy, idefloppy_pc_t *pc, struct request *r pc->request_transfer = pc->buffer_size = rq->data_len; } -/* - * idefloppy_do_request is our request handling function. - */ -static ide_startstop_t idefloppy_do_request (ide_drive_t *drive, +static ide_startstop_t idefloppy_do_request(ide_drive_t *drive, struct request *rq, sector_t block_s) { idefloppy_t *floppy = drive->driver_data; @@ -874,10 +854,10 @@ static ide_startstop_t idefloppy_do_request (ide_drive_t *drive, } /* - * idefloppy_queue_pc_tail adds a special packet command request to the - * tail of the request queue, and waits for it to be serviced. + * Add a special packet command request to the tail of the request queue, + * and wait for it to be serviced. */ -static int idefloppy_queue_pc_tail (ide_drive_t *drive,idefloppy_pc_t *pc) +static int idefloppy_queue_pc_tail(ide_drive_t *drive, idefloppy_pc_t *pc) { struct ide_floppy_obj *floppy = drive->driver_data; struct request rq; @@ -891,10 +871,10 @@ static int idefloppy_queue_pc_tail (ide_drive_t *drive,idefloppy_pc_t *pc) } /* - * Look at the flexible disk page parameters. We will ignore the CHS - * capacity parameters and use the LBA parameters instead. + * Look at the flexible disk page parameters. We will ignore the CHS + * capacity parameters and use the LBA parameters instead. */ -static int idefloppy_get_flexible_disk_page (ide_drive_t *drive) +static int idefloppy_get_flexible_disk_page(ide_drive_t *drive) { idefloppy_t *floppy = drive->driver_data; idefloppy_pc_t pc; @@ -969,10 +949,10 @@ static int idefloppy_get_capability_page(ide_drive_t *drive) } /* - * Determine if a media is present in the floppy drive, and if so, - * its LBA capacity. + * Determine if a media is present in the floppy drive, and if so, + * its LBA capacity. */ -static int idefloppy_get_capacity (ide_drive_t *drive) +static int idefloppy_get_capacity(ide_drive_t *drive) { idefloppy_t *floppy = drive->driver_data; idefloppy_pc_t pc; @@ -1192,7 +1172,6 @@ static int idefloppy_begin_format(ide_drive_t *drive, int __user *arg) * If the drive does not support format progress indication, we just check * the dsc bit, and return either 0 or 65536. */ - static int idefloppy_get_format_progress(ide_drive_t *drive, int __user *arg) { idefloppy_t *floppy = drive->driver_data; @@ -1228,10 +1207,8 @@ static int idefloppy_get_format_progress(ide_drive_t *drive, int __user *arg) return (0); } -/* - * Return the current floppy capacity. - */ -static sector_t idefloppy_capacity (ide_drive_t *drive) +/* Return the current floppy capacity. */ +static sector_t idefloppy_capacity(ide_drive_t *drive) { idefloppy_t *floppy = drive->driver_data; unsigned long capacity = floppy->blocks * floppy->bs_factor; @@ -1240,10 +1217,9 @@ static sector_t idefloppy_capacity (ide_drive_t *drive) } /* - * idefloppy_identify_device checks if we can support a drive, - * based on the ATAPI IDENTIFY command results. + * Check if we can support a drive, based on the ATAPI IDENTIFY command results. */ -static int idefloppy_identify_device (ide_drive_t *drive,struct hd_driveid *id) +static int idefloppy_identify_device(ide_drive_t *drive, struct hd_driveid *id) { struct idefloppy_id_gcw gcw; #if IDEFLOPPY_DEBUG_INFO @@ -1394,10 +1370,7 @@ static void idefloppy_add_settings(ide_drive_t *drive) static inline void idefloppy_add_settings(ide_drive_t *drive) { ; } #endif -/* - * Driver initialization. - */ -static void idefloppy_setup (ide_drive_t *drive, idefloppy_t *floppy) +static void idefloppy_setup(ide_drive_t *drive, idefloppy_t *floppy) { struct idefloppy_id_gcw gcw; @@ -1406,14 +1379,13 @@ static void idefloppy_setup (ide_drive_t *drive, idefloppy_t *floppy) if (gcw.drq_type == 1) set_bit(IDEFLOPPY_DRQ_INTERRUPT, &floppy->flags); /* - * We used to check revisions here. At this point however - * I'm giving up. Just assume they are all broken, its easier. + * We used to check revisions here. At this point however I'm giving up. + * Just assume they are all broken, its easier. * - * The actual reason for the workarounds was likely - * a driver bug after all rather than a firmware bug, - * and the workaround below used to hide it. It should - * be fixed as of version 1.9, but to be on the safe side - * we'll leave the limitation below for the 2.2.x tree. + * The actual reason for the workarounds was likely a driver bug after + * all rather than a firmware bug, and the workaround below used to hide + * it. It should be fixed as of version 1.9, but to be on the safe side + * we'll leave the limitation below for the 2.2.x tree. */ if (!strncmp(drive->id->model, "IOMEGA ZIP 100 ATAPI", 20)) { @@ -1424,10 +1396,9 @@ static void idefloppy_setup (ide_drive_t *drive, idefloppy_t *floppy) } /* - * Guess what? The IOMEGA Clik! drive also needs the - * above fix. It makes nasty clicking noises without - * it, so please don't remove this. - */ + * Guess what? The IOMEGA Clik! drive also needs the above fix. It makes + * nasty clicking noises without it, so please don't remove this. + */ if (strncmp(drive->id->model, "IOMEGA Clik!", 11) == 0) { blk_queue_max_sectors(drive->queue, 64); set_bit(IDEFLOPPY_CLIK_DRIVE, &floppy->flags); @@ -1437,7 +1408,7 @@ static void idefloppy_setup (ide_drive_t *drive, idefloppy_t *floppy) idefloppy_add_settings(drive); } -static void ide_floppy_remove(ide_drive_t *drive) +static void idefloppy_remove(ide_drive_t *drive) { idefloppy_t *floppy = drive->driver_data; struct gendisk *g = floppy->disk; @@ -1479,7 +1450,7 @@ static ide_proc_entry_t idefloppy_proc[] = { }; #endif /* CONFIG_IDE_PROC_FS */ -static int ide_floppy_probe(ide_drive_t *); +static int idefloppy_probe(ide_drive_t *); static ide_driver_t idefloppy_driver = { .gen_driver = { @@ -1487,8 +1458,8 @@ static ide_driver_t idefloppy_driver = { .name = "ide-floppy", .bus = &ide_bus_type, }, - .probe = ide_floppy_probe, - .remove = ide_floppy_remove, + .probe = idefloppy_probe, + .remove = idefloppy_remove, .version = IDEFLOPPY_VERSION, .media = ide_floppy, .supports_dsc_overlap = 0, @@ -1733,7 +1704,7 @@ static struct block_device_operations idefloppy_ops = { .revalidate_disk= idefloppy_revalidate_disk }; -static int ide_floppy_probe(ide_drive_t *drive) +static int idefloppy_probe(ide_drive_t *drive) { idefloppy_t *floppy; struct gendisk *g; @@ -1796,7 +1767,7 @@ failed: MODULE_DESCRIPTION("ATAPI FLOPPY Driver"); -static void __exit idefloppy_exit (void) +static void __exit idefloppy_exit(void) { driver_unregister(&idefloppy_driver.gen_driver); } -- 1.5.3.7 ^ permalink raw reply related [flat|nested] 26+ messages in thread
* [RESEND PATCH 07/10] ide-floppy: remove unnecessary ->handler != NULL check 2008-01-03 13:20 ` [RESEND PATCH 06/10] ide-floppy: report DMA handling in idefloppy_pc_intr() properly Borislav Petkov @ 2008-01-03 13:20 ` Borislav Petkov 2008-01-03 13:20 ` [RESEND PATCH 08/10] ide-floppy: mv idefloppy_{should_,}report_error Borislav Petkov 2008-01-04 1:24 ` [RESEND PATCH 07/10] ide-floppy: remove unnecessary ->handler != NULL check Bartlomiej Zolnierkiewicz 2008-01-05 15:46 ` [RESEND PATCH 06/10] ide-floppy: report DMA handling in idefloppy_pc_intr() properly Bartlomiej Zolnierkiewicz 1 sibling, 2 replies; 26+ messages in thread From: Borislav Petkov @ 2008-01-03 13:20 UTC (permalink / raw) To: linux-ide, linux-kernel; +Cc: bzolnier, Borislav Petkov This BUG_ON is unneeded since the ->handler != NULL check is performed in ide_set_handler(). Signed-off-by: Borislav Petkov <bbpetkov@yahoo.de> --- drivers/ide/ide-floppy.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/ide/ide-floppy.c b/drivers/ide/ide-floppy.c index 5d0fd1f..2c139e7 100644 --- a/drivers/ide/ide-floppy.c +++ b/drivers/ide/ide-floppy.c @@ -421,7 +421,7 @@ static ide_startstop_t idefloppy_pc_intr(ide_drive_t *drive) "to send us more data than expected " "- discarding data\n"); idefloppy_discard_data(drive,bcount.all); - BUG_ON(HWGROUP(drive)->handler != NULL); + ide_set_handler(drive, &idefloppy_pc_intr, IDEFLOPPY_WAIT_CMD, @@ -453,8 +453,6 @@ static ide_startstop_t idefloppy_pc_intr(ide_drive_t *drive) pc->actually_transferred += bcount.all; pc->current_position += bcount.all; - BUG_ON(HWGROUP(drive)->handler != NULL); - /* And set the interrupt handler again */ ide_set_handler(drive, &idefloppy_pc_intr, IDEFLOPPY_WAIT_CMD, NULL); return ide_started; @@ -482,7 +480,7 @@ static ide_startstop_t idefloppy_transfer_pc(ide_drive_t *drive) "issuing a packet command\n"); return ide_do_reset(drive); } - BUG_ON(HWGROUP(drive)->handler != NULL); + /* Set the interrupt routine */ ide_set_handler(drive, &idefloppy_pc_intr, IDEFLOPPY_WAIT_CMD, NULL); /* Send the actual packet */ @@ -537,7 +535,7 @@ static ide_startstop_t idefloppy_transfer_pc1(ide_drive_t *drive) * 40 and 50msec work well. idefloppy_pc_intr will not be actually * used until after the packet is moved in about 50 msec. */ - BUG_ON(HWGROUP(drive)->handler != NULL); + ide_set_handler(drive, &idefloppy_pc_intr, /* service routine for packet command */ floppy->ticks, /* wait this long before "failing" */ -- 1.5.3.7 ^ permalink raw reply related [flat|nested] 26+ messages in thread
* [RESEND PATCH 08/10] ide-floppy: mv idefloppy_{should_,}report_error 2008-01-03 13:20 ` [RESEND PATCH 07/10] ide-floppy: remove unnecessary ->handler != NULL check Borislav Petkov @ 2008-01-03 13:20 ` Borislav Petkov 2008-01-03 13:20 ` [RESEND PATCH 09/10] ide-floppy: use test_bit wrappers for testing flags Borislav Petkov 2008-01-05 15:54 ` [RESEND PATCH 08/10] ide-floppy: mv idefloppy_{should_,}report_error Bartlomiej Zolnierkiewicz 2008-01-04 1:24 ` [RESEND PATCH 07/10] ide-floppy: remove unnecessary ->handler != NULL check Bartlomiej Zolnierkiewicz 1 sibling, 2 replies; 26+ messages in thread From: Borislav Petkov @ 2008-01-03 13:20 UTC (permalink / raw) To: linux-ide, linux-kernel; +Cc: bzolnier, Borislav Petkov Signed-off-by: Borislav Petkov <bbpetkov@yahoo.de> --- drivers/ide/ide-floppy.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/ide/ide-floppy.c b/drivers/ide/ide-floppy.c index 2c139e7..fd5fe7b 100644 --- a/drivers/ide/ide-floppy.c +++ b/drivers/ide/ide-floppy.c @@ -544,7 +544,7 @@ static ide_startstop_t idefloppy_transfer_pc1(ide_drive_t *drive) } /* Supresses error messages resulting from Medium not present */ -static inline int idefloppy_should_report_error(idefloppy_t *floppy) +static inline int idefloppy_report_error(idefloppy_t *floppy) { if (floppy->sense_key == 0x02 && floppy->asc == 0x3a && @@ -587,7 +587,7 @@ static ide_startstop_t idefloppy_issue_pc(ide_drive_t *drive, idefloppy_pc_t *pc */ if (!test_bit(PC_ABORT, &pc->flags)) { if (!test_bit(PC_SUPPRESS_ERROR, &pc->flags)) { - if (idefloppy_should_report_error(floppy)) + if (idefloppy_report_error(floppy)) printk(KERN_ERR "ide-floppy: %s: I/O error, " "pc = %2x, key = %2x, " "asc = %2x, ascq = %2x\n", @@ -809,7 +809,7 @@ static ide_startstop_t idefloppy_do_request(ide_drive_t *drive, if (rq->errors >= ERROR_MAX) { if (floppy->failed_pc != NULL) { - if (idefloppy_should_report_error(floppy)) + if (idefloppy_report_error(floppy)) printk(KERN_ERR "ide-floppy: %s: I/O error," " pc = %2x, key = %2x, asc = %2x," " ascq = %2x\n", -- 1.5.3.7 ^ permalink raw reply related [flat|nested] 26+ messages in thread
* [RESEND PATCH 09/10] ide-floppy: use test_bit wrappers for testing flags 2008-01-03 13:20 ` [RESEND PATCH 08/10] ide-floppy: mv idefloppy_{should_,}report_error Borislav Petkov @ 2008-01-03 13:20 ` Borislav Petkov 2008-01-03 13:20 ` [RESEND PATCH 10/10] ide-floppy: replace ntoh{s,l} and hton{s,l} calls with the generic byteorder macros Borislav Petkov 2008-01-05 16:10 ` [RESEND PATCH 09/10] ide-floppy: use test_bit wrappers for testing flags Bartlomiej Zolnierkiewicz 2008-01-05 15:54 ` [RESEND PATCH 08/10] ide-floppy: mv idefloppy_{should_,}report_error Bartlomiej Zolnierkiewicz 1 sibling, 2 replies; 26+ messages in thread From: Borislav Petkov @ 2008-01-03 13:20 UTC (permalink / raw) To: linux-ide, linux-kernel; +Cc: bzolnier, Borislav Petkov also, fix header comments and remove superfluous ones. There should be no functionality change resulting from this patch. Signed-off-by: Borislav Petkov <bbpetkov@yahoo.de> --- drivers/ide/ide-floppy.c | 45 ++++++++--------- drivers/ide/ide-floppy.h | 127 +++++++++++++++++++++------------------------- 2 files changed, 79 insertions(+), 93 deletions(-) diff --git a/drivers/ide/ide-floppy.c b/drivers/ide/ide-floppy.c index fd5fe7b..6c29b5f 100644 --- a/drivers/ide/ide-floppy.c +++ b/drivers/ide/ide-floppy.c @@ -337,7 +337,7 @@ static ide_startstop_t idefloppy_pc_intr(ide_drive_t *drive) debug_log("Reached %s interrupt handler\n", __FUNCTION__); - if (test_bit(PC_DMA_IN_PROGRESS, &pc->flags)) { + if (idefl_dma_ongoing(pc)) { dma_error = HWIF(drive)->ide_dma_end(drive); if (dma_error) { @@ -365,7 +365,7 @@ static ide_startstop_t idefloppy_pc_intr(ide_drive_t *drive) local_irq_enable_in_hardirq(); - if (status.b.check || test_bit(PC_DMA_ERROR, &pc->flags)) { + if (status.b.check || idefl_dma_err(pc)) { /* Error detected */ debug_log("%s: I/O error\n", drive->name); rq->errors++; @@ -404,7 +404,7 @@ static ide_startstop_t idefloppy_pc_intr(ide_drive_t *drive) printk(KERN_ERR "ide-floppy: CoD != 0 in idefloppy_pc_intr\n"); return ide_do_reset(drive); } - if (ireason.b.io == test_bit(PC_WRITING, &pc->flags)) { + if (ireason.b.io == idefl_data_dir(pc)) { /* Hopefully, we will never get here */ printk(KERN_ERR "ide-floppy: We wanted to %s, ", ireason.b.io ? "Write":"Read"); @@ -412,7 +412,7 @@ static ide_startstop_t idefloppy_pc_intr(ide_drive_t *drive) ireason.b.io ? "Read":"Write"); return ide_do_reset(drive); } - if (!test_bit(PC_WRITING, &pc->flags)) { + if (!idefl_data_dir(pc)) { /* Reading - Check that we have enough space */ temp = pc->actually_transferred + bcount.all; if (temp > pc->request_transfer) { @@ -432,7 +432,7 @@ static ide_startstop_t idefloppy_pc_intr(ide_drive_t *drive) "expected - allowing transfer\n"); } } - if (test_bit(PC_WRITING, &pc->flags)) { + if (idefl_data_dir(pc)) { if (pc->buffer != NULL) /* Write the current buffer */ HWIF(drive)->atapi_output_bytes(drive, @@ -579,14 +579,13 @@ static ide_startstop_t idefloppy_issue_pc(ide_drive_t *drive, idefloppy_pc_t *pc /* Set the current packet command */ floppy->pc = pc; - if (pc->retries > IDEFLOPPY_MAX_PC_RETRIES || - test_bit(PC_ABORT, &pc->flags)) { + if (pc->retries > IDEFLOPPY_MAX_PC_RETRIES || idefl_abort(pc)) { /* - * We will "abort" retrying a packet command in case - * a legitimate error code was received. + * We will "abort" retrying a packet command in case a + * legitimate error code was received. */ - if (!test_bit(PC_ABORT, &pc->flags)) { - if (!test_bit(PC_SUPPRESS_ERROR, &pc->flags)) { + if (!idefl_abort(pc)) { + if (!idefl_supp_err(pc)) { if (idefloppy_report_error(floppy)) printk(KERN_ERR "ide-floppy: %s: I/O error, " "pc = %2x, key = %2x, " @@ -616,7 +615,7 @@ static ide_startstop_t idefloppy_issue_pc(ide_drive_t *drive, idefloppy_pc_t *pc feature.all = 0; - if (test_bit(PC_DMA_RECOMMENDED, &pc->flags) && drive->using_dma) + if (idefl_dma_prefd(pc) && drive->using_dma) feature.b.dma = !hwif->dma_setup(drive); if (IDE_CONTROL_REG) @@ -633,7 +632,7 @@ static ide_startstop_t idefloppy_issue_pc(ide_drive_t *drive, idefloppy_pc_t *pc } /* Can we transfer the packet when we get the interrupt or wait? */ - if (test_bit(IDEFLOPPY_ZIP_DRIVE, &floppy->flags)) { + if (idefl_zip_drive(floppy)) { /* wait */ pkt_xfer_routine = &idefloppy_transfer_pc1; } else { @@ -641,7 +640,7 @@ static ide_startstop_t idefloppy_issue_pc(ide_drive_t *drive, idefloppy_pc_t *pc pkt_xfer_routine = &idefloppy_transfer_pc; } - if (test_bit(IDEFLOPPY_DRQ_INTERRUPT, &floppy->flags)) { + if (idefl_drq_intr(floppy)) { /* Issue the packet command */ ide_execute_command(drive, WIN_PACKETCMD, pkt_xfer_routine, @@ -749,11 +748,10 @@ static void idefloppy_create_rw_cmd(idefloppy_t *floppy, idefloppy_pc_t *pc, int cmd = rq_data_dir(rq); debug_log("create_rw1%d_cmd: block == %d, blocks == %d\n", - 2 * test_bit(IDEFLOPPY_USE_READ12, &floppy->flags), - block, blocks); + 2 * idefl_use_rw(floppy), block, blocks); idefloppy_init_pc(pc); - if (test_bit(IDEFLOPPY_USE_READ12, &floppy->flags)) { + if (idefl_use_rw(floppy)) { pc->c[0] = cmd == READ ? GPCMD_READ_12 : GPCMD_WRITE_12; put_unaligned(htonl(blocks), (unsigned int *) &pc->c[6]); } else { @@ -982,7 +980,7 @@ static int idefloppy_get_capacity(ide_drive_t *drive) switch (descriptor->dc) { /* Clik! drive returns this instead of CAPACITY_CURRENT */ case CAPACITY_UNFORMATTED: - if (!test_bit(IDEFLOPPY_CLIK_DRIVE, &floppy->flags)) + if (!idefl_clik_drive(floppy)) /* * If it is not a clik drive, break out * (maintains previous driver behaviour) @@ -1033,9 +1031,8 @@ static int idefloppy_get_capacity(ide_drive_t *drive) } /* Clik! disk does not support get_flexible_disk_page */ - if (!test_bit(IDEFLOPPY_CLIK_DRIVE, &floppy->flags)) { + if (!idefl_clik_drive(floppy)) (void) idefloppy_get_flexible_disk_page(drive); - } set_capacity(floppy->disk, floppy->blocks * floppy->bs_factor); return rc; @@ -1515,12 +1512,12 @@ static int idefloppy_open(struct inode *inode, struct file *filp) } set_bit(IDEFLOPPY_MEDIA_CHANGED, &floppy->flags); /* IOMEGA Clik! drives do not support lock/unlock commands */ - if (!test_bit(IDEFLOPPY_CLIK_DRIVE, &floppy->flags)) { + if (!idefl_clik_drive(floppy)) { idefloppy_create_prevent_cmd(&pc, 1); (void) idefloppy_queue_pc_tail(drive, &pc); } check_disk_change(inode->i_bdev); - } else if (test_bit(IDEFLOPPY_FORMAT_IN_PROGRESS, &floppy->flags)) { + } else if (idefl_format_in_progress(floppy)) { ret = -EBUSY; goto out_put_floppy; } @@ -1543,7 +1540,7 @@ static int idefloppy_release(struct inode *inode, struct file *filp) if (floppy->openers == 1) { /* IOMEGA Clik! drives do not support lock/unlock commands */ - if (!test_bit(IDEFLOPPY_CLIK_DRIVE, &floppy->flags)) { + if (!idefl_clik_drive(floppy)) { idefloppy_create_prevent_cmd(&pc, 0); (void) idefloppy_queue_pc_tail(drive, &pc); } @@ -1581,7 +1578,7 @@ static int idefloppy_lockdoor(struct inode *inode, idefloppy_pc_t *pc, /* The IOMEGA Clik! Drive doesn't support this command - * no room for an eject mechanism */ - if (!test_bit(IDEFLOPPY_CLIK_DRIVE, &floppy->flags)) { + if (!idefl_clik_drive(floppy)) { idefloppy_create_prevent_cmd(pc, event); (void) idefloppy_queue_pc_tail(drive, pc); } diff --git a/drivers/ide/ide-floppy.h b/drivers/ide/ide-floppy.h index fb55d32..053a8c8 100644 --- a/drivers/ide/ide-floppy.h +++ b/drivers/ide/ide-floppy.h @@ -1,9 +1,7 @@ #ifndef _IDE_FLOPPY_H #define _IDE_FLOPPY_H -/* - * The following are used to debug the driver. - */ +/* The following are used to debug the driver. */ #define IDEFLOPPY_DEBUG_LOG 0 #define IDEFLOPPY_DEBUG_INFO 0 #define IDEFLOPPY_DEBUG_BUGS 1 @@ -18,33 +16,28 @@ #define debug_log(fmt, args... ) do {} while(0) #endif -/* - * Some drives require a longer irq timeout. - */ +/* Some drives require a longer irq timeout. */ #define IDEFLOPPY_WAIT_CMD (5 * WAIT_CMD) /* - * After each failed packet command we issue a request sense command - * and retry the packet command IDEFLOPPY_MAX_PC_RETRIES times. + * After each failed packet command we issue a request sense command and retry + * the packet command IDEFLOPPY_MAX_PC_RETRIES times. */ #define IDEFLOPPY_MAX_PC_RETRIES 3 /* - * With each packet command, we allocate a buffer of - * IDEFLOPPY_PC_BUFFER_SIZE bytes. + * With each packet command, we allocate a buffer of IDEFLOPPY_PC_BUFFER_SIZE + * bytes. */ #define IDEFLOPPY_PC_BUFFER_SIZE 256 /* - * In various places in the driver, we need to allocate storage - * for packet commands and requests, which will remain valid while - * we leave the driver to wait for an interrupt or a timeout event. + * In various places in the driver, we need to allocate storage for packet + * commands and requests, which will remain valid while we leave the driver to + * wait for an interrupt or a timeout event. */ #define IDEFLOPPY_PC_STACK (10 + IDEFLOPPY_MAX_PC_RETRIES) -/* - * Our view of a packet command. - */ typedef struct idefloppy_packet_command_s { u8 c[12]; /* Actual packet bytes */ int retries; /* On each retry, we increment @@ -65,27 +58,30 @@ typedef struct idefloppy_packet_command_s { for set_bit */ } idefloppy_pc_t; -/* - * Packet command flag bits. - */ -#define PC_ABORT 0 /* Set when an error is considered \ - normal - We won't retry */ +/* Packet command flag bits. */ +#define PC_ABORT 0 /* Set when an error is considered \ + normal - We won't retry */ +#define PC_DMA_RECOMMENDED 2 /* 1 when we prefer to use DMA if \ + possible */ +#define PC_DMA_IN_PROGRESS 3 /* 1 while DMA in progress */ -#define PC_DMA_RECOMMENDED 2 /* 1 when we prefer to use DMA \ - if possible */ +#define PC_DMA_ERROR 4 /* 1 when encountered problem \ + during DMA */ -#define PC_DMA_IN_PROGRESS 3 /* 1 while DMA in progress */ +#define PC_WRITING 5 /* Data direction */ -#define PC_DMA_ERROR 4 /* 1 when encountered problem \ - during DMA */ +#define PC_SUPPRESS_ERROR 6 /* Suppress error reporting */ -#define PC_WRITING 5 /* Data direction */ +#define idefl_abort(pc) test_bit(PC_ABORT, &(pc)->flags) +#define idefl_dma_prefd(pc) test_bit(PC_DMA_RECOMMENDED, &(pc)->flags) +#define idefl_dma_ongoing(pc) test_bit(PC_DMA_IN_PROGRESS, &(pc)->flags) +#define idefl_dma_err(pc) test_bit(PC_DMA_ERROR, &(pc)->flags) +#define idefl_data_dir(pc) test_bit(PC_WRITING, &(pc)->flags) +#define idefl_supp_err(pc) test_bit(PC_SUPPRESS_ERROR, &(pc)->flags) -#define PC_SUPPRESS_ERROR 6 /* Suppress error reporting */ -/* - * Removable Block Access Capabilities Page - */ + +/* Removable Block Access Capabilities Page */ typedef struct { #if defined(__LITTLE_ENDIAN_BITFIELD) unsigned page_code :6; /* Page code - Should be 0x1b */ @@ -125,9 +121,7 @@ typedef struct { u8 reserved[8]; } idefloppy_cap_page_t; -/* - * Flexible disk page. - */ +/* Flexible disk page */ typedef struct { #if defined(__LITTLE_ENDIAN_BITFIELD) unsigned page_code :6; /* Page code - Should be 0x5 */ @@ -155,9 +149,7 @@ typedef struct { u8 reserved30[2]; } idefloppy_flex_disk_page_t; -/* - * Format capacity - */ +/* Format capacity */ typedef struct { u8 reserved[3]; u8 length; /* Length of the following @@ -185,9 +177,9 @@ typedef struct { #define CAPACITY_NO_CARTRIDGE 0x03 /* - * Most of our global data which we need to save even as we leave the - * driver due to an interrupt or a timer event is stored in a variable - * of type idefloppy_t, defined below. + * Most of our global data which we need to save even as we leave the driver + * due to an interrupt or a timer event is stored in a variable of type + * idefloppy_t, defined below. */ typedef struct ide_floppy_obj { ide_drive_t *drive; @@ -208,17 +200,13 @@ typedef struct ide_floppy_obj { /* We implement a circular array */ int rq_stack_index; - /* - * Last error information - */ + /* Last error information */ u8 sense_key, asc, ascq; /* delay this long before sending packet command */ u8 ticks; int progress_indication; - /* - * Device information - */ + /* Device information */ /* Current format */ int blocks, block_size, bs_factor; /* Last format capacity */ @@ -235,9 +223,7 @@ typedef struct ide_floppy_obj { #define IDEFLOPPY_TICKS_DELAY HZ/20 /* default delay for ZIP 100 (50ms) */ -/* - * Floppy flag bits values. - */ +/* Floppy flag bits values. */ #define IDEFLOPPY_DRQ_INTERRUPT 0 /* DRQ interrupt device */ #define IDEFLOPPY_MEDIA_CHANGED 1 /* Media may have changed */ #define IDEFLOPPY_USE_READ12 2 /* Use READ12/WRITE12 or \ @@ -249,32 +235,41 @@ typedef struct ide_floppy_obj { #define IDEFLOPPY_ZIP_DRIVE 5 /* Requires BH algorithm for \ packets */ -/* - * Defines for the mode sense command - */ + +#define idefl_drq_intr(f) test_bit(IDEFLOPPY_DRQ_INTERRUPT,\ + &(f)->flags) +#define idefl_media_changed(f) test_bit(IDEFLOPPY_MEDIA_CHANGED, \ + &(f)->flags) +#define idefl_use_rw(f) test_bit(IDEFLOPPY_USE_READ12, \ + &(f)->flags) +#define idefl_format_in_progress(f) test_bit(IDEFLOPPY_FORMAT_IN_PROGRESS, \ + &(f)->flags) +#define idefl_clik_drive(f) test_bit(IDEFLOPPY_CLIK_DRIVE, \ + &(f)->flags) +#define idefl_zip_drive(f) test_bit(IDEFLOPPY_ZIP_DRIVE,\ + &(f)->flags) + +/* Defines for the mode sense command */ #define MODE_SENSE_CURRENT 0x00 #define MODE_SENSE_CHANGEABLE 0x01 #define MODE_SENSE_DEFAULT 0x02 #define MODE_SENSE_SAVED 0x03 -/* - * IOCTLs used in low-level formatting. - */ - +/* IOCTLs used in low-level formatting. */ #define IDEFLOPPY_IOCTL_FORMAT_SUPPORTED 0x4600 #define IDEFLOPPY_IOCTL_FORMAT_GET_CAPACITY 0x4601 #define IDEFLOPPY_IOCTL_FORMAT_START 0x4602 #define IDEFLOPPY_IOCTL_FORMAT_GET_PROGRESS 0x4603 /* - * Error codes which are returned in rq->errors to the higher part - * of the driver. + * Error codes which are returned in rq->errors to the higher part + * of the driver. */ #define IDEFLOPPY_ERROR_GENERAL 101 /* - * The following is used to format the general configuration word of - * the ATAPI IDENTIFY DEVICE command. + * The following is used to format the general configuration word of the ATAPI + * IDENTIFY DEVICE command. */ struct idefloppy_id_gcw { #if defined(__LITTLE_ENDIAN_BITFIELD) @@ -298,9 +293,7 @@ struct idefloppy_id_gcw { #endif }; -/* - * REQUEST SENSE packet command result - Data Format. - */ +/* REQUEST SENSE packet command result - Data Format. */ typedef struct { #if defined(__LITTLE_ENDIAN_BITFIELD) unsigned error_code :7; /* Current error (0x70) */ @@ -334,15 +327,11 @@ typedef struct { u8 pad[2]; /* Padding to 20 bytes */ } rq_sense_res_t; -/* - * Pages of the SELECT SENSE / MODE SENSE packet commands. - */ +/* Pages of the SELECT SENSE / MODE SENSE packet commands. */ #define IDEFLOPPY_CAPABILITIES_PAGE 0x1b #define IDEFLOPPY_FLEXIBLE_DISK_PAGE 0x05 -/* - * Mode Parameter Header for the MODE SENSE packet command - */ +/* Mode Parameter Header for the MODE SENSE packet command */ typedef struct { u16 mode_data_length; /* Length of the following data transfer */ -- 1.5.3.7 ^ permalink raw reply related [flat|nested] 26+ messages in thread
* [RESEND PATCH 10/10] ide-floppy: replace ntoh{s,l} and hton{s,l} calls with the generic byteorder macros 2008-01-03 13:20 ` [RESEND PATCH 09/10] ide-floppy: use test_bit wrappers for testing flags Borislav Petkov @ 2008-01-03 13:20 ` Borislav Petkov 2008-01-04 1:29 ` Bartlomiej Zolnierkiewicz 2008-01-05 16:10 ` [RESEND PATCH 09/10] ide-floppy: use test_bit wrappers for testing flags Bartlomiej Zolnierkiewicz 1 sibling, 1 reply; 26+ messages in thread From: Borislav Petkov @ 2008-01-03 13:20 UTC (permalink / raw) To: linux-ide, linux-kernel; +Cc: bzolnier, Borislav Petkov Signed-off-by: Borislav Petkov <bbpetkov@yahoo.de> --- drivers/ide/ide-floppy.c | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/drivers/ide/ide-floppy.c b/drivers/ide/ide-floppy.c index 6c29b5f..ddab66c 100644 --- a/drivers/ide/ide-floppy.c +++ b/drivers/ide/ide-floppy.c @@ -695,8 +695,8 @@ static void idefloppy_create_format_unit_cmd(idefloppy_pc_t *pc, int b, int l, pc->buffer[1] ^= 0x20; /* ... turn off DCRT bit */ pc->buffer[3] = 8; - put_unaligned(htonl(b), (unsigned int *)(&pc->buffer[4])); - put_unaligned(htonl(l), (unsigned int *)(&pc->buffer[8])); + put_unaligned(cpu_to_be32(b), (unsigned int *)(&pc->buffer[4])); + put_unaligned(cpu_to_be32(l), (unsigned int *)(&pc->buffer[8])); pc->buffer_size=12; set_bit(PC_WRITING, &pc->flags); } @@ -723,7 +723,7 @@ static void idefloppy_create_mode_sense_cmd(idefloppy_pc_t *pc, u8 page_code, printk(KERN_ERR "ide-floppy: unsupported page code " "in create_mode_sense_cmd\n"); } - put_unaligned(htons(length), (u16 *) &pc->c[7]); + put_unaligned(cpu_to_be16(length), (u16 *) &pc->c[7]); pc->request_transfer = length; } @@ -753,12 +753,12 @@ static void idefloppy_create_rw_cmd(idefloppy_t *floppy, idefloppy_pc_t *pc, idefloppy_init_pc(pc); if (idefl_use_rw(floppy)) { pc->c[0] = cmd == READ ? GPCMD_READ_12 : GPCMD_WRITE_12; - put_unaligned(htonl(blocks), (unsigned int *) &pc->c[6]); + put_unaligned(cpu_to_be32(blocks), (unsigned int *) &pc->c[6]); } else { pc->c[0] = cmd == READ ? GPCMD_READ_10 : GPCMD_WRITE_10; - put_unaligned(htons(blocks), (unsigned short *) &pc->c[7]); + put_unaligned(cpu_to_be16(blocks), (unsigned short *) &pc->c[7]); } - put_unaligned(htonl(block), (unsigned int *) &pc->c[2]); + put_unaligned(cpu_to_be32(block), (unsigned int *) &pc->c[2]); pc->callback = &idefloppy_rw_callback; pc->rq = rq; pc->b_count = cmd == READ ? 0 : rq->bio->bi_size; @@ -890,10 +890,10 @@ static int idefloppy_get_flexible_disk_page(ide_drive_t *drive) set_disk_ro(floppy->disk, floppy->wp); page = (idefloppy_flex_disk_page_t *) (header + 1); - page->transfer_rate = ntohs(page->transfer_rate); - page->sector_size = ntohs(page->sector_size); - page->cyls = ntohs(page->cyls); - page->rpm = ntohs(page->rpm); + page->transfer_rate = be16_to_cpu(page->transfer_rate); + page->sector_size = be16_to_cpu(page->sector_size); + page->cyls = be16_to_cpu(page->cyls); + page->rpm = be16_to_cpu(page->rpm); capacity = page->cyls * page->heads * page->sectors * page->sector_size; if (memcmp (page, &floppy->flex_disk_page, @@ -972,8 +972,8 @@ static int idefloppy_get_capacity(ide_drive_t *drive) descriptor = (idefloppy_cap_desc_t *) (header + 1); for (i = 0; i < descriptors; i++, descriptor++) { - blocks = descriptor->blocks = ntohl(descriptor->blocks); - length = descriptor->length = ntohs(descriptor->length); + blocks = descriptor->blocks = be32_to_cpu(descriptor->blocks); + length = descriptor->length = be16_to_cpu(descriptor->length); if (!i) { @@ -1100,8 +1100,8 @@ static int idefloppy_get_format_capacities(ide_drive_t *drive, int __user *arg) if (i == 0) continue; /* Skip the first descriptor */ - blocks = ntohl(descriptor->blocks); - length = ntohs(descriptor->length); + blocks = be32_to_cpu(descriptor->blocks); + length = be16_to_cpu(descriptor->length); if (put_user(blocks, argp)) return(-EFAULT); -- 1.5.3.7 ^ permalink raw reply related [flat|nested] 26+ messages in thread
* Re: [RESEND PATCH 10/10] ide-floppy: replace ntoh{s,l} and hton{s,l} calls with the generic byteorder macros 2008-01-03 13:20 ` [RESEND PATCH 10/10] ide-floppy: replace ntoh{s,l} and hton{s,l} calls with the generic byteorder macros Borislav Petkov @ 2008-01-04 1:29 ` Bartlomiej Zolnierkiewicz 0 siblings, 0 replies; 26+ messages in thread From: Bartlomiej Zolnierkiewicz @ 2008-01-04 1:29 UTC (permalink / raw) To: Borislav Petkov; +Cc: linux-ide, linux-kernel On Thursday 03 January 2008, Borislav Petkov wrote: > Signed-off-by: Borislav Petkov <bbpetkov@yahoo.de> minor thing: WARNING: line over 80 characters #88: FILE: drivers/ide/ide-floppy.c:759: + put_unaligned(cpu_to_be16(blocks), (unsigned short *) &pc->c[7]); seems like it can be fixed by removing space between '(unsigned short *)' and '&pc->c[7]' otherwise looks good, please move it at the beginning of the patch series PS I need some sleep so the rest of patches have to wait till tomorrow... ^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [RESEND PATCH 09/10] ide-floppy: use test_bit wrappers for testing flags 2008-01-03 13:20 ` [RESEND PATCH 09/10] ide-floppy: use test_bit wrappers for testing flags Borislav Petkov 2008-01-03 13:20 ` [RESEND PATCH 10/10] ide-floppy: replace ntoh{s,l} and hton{s,l} calls with the generic byteorder macros Borislav Petkov @ 2008-01-05 16:10 ` Bartlomiej Zolnierkiewicz 1 sibling, 0 replies; 26+ messages in thread From: Bartlomiej Zolnierkiewicz @ 2008-01-05 16:10 UTC (permalink / raw) To: Borislav Petkov; +Cc: linux-ide, linux-kernel There are two issues here: * set_bit()/test_bit() are atomic operations and they don't see to be necessary in case of ide-floppy.c (standard '|'/'&' should be enough) * using wrappers for these operations is not a bad idea but doing it _now_ just makes it harder for us to figure out how to introduced common ATA Packet command interface for all ATAPI device drivers (the other drivers are using very similar flag handling and flag names currently) so I would say that we should defer introducting these wrappers for now (patch converting set_bit()/test_bit() to '|'/'&' would still be welcomed). On Thursday 03 January 2008, Borislav Petkov wrote: > also, fix header comments and remove superfluous ones. There should be no > functionality change resulting from this patch. fixes for comments look fine but they should be merged with the other patch (the one containing checkpatch.pl/comments fixes) Thanks, Bart ^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [RESEND PATCH 08/10] ide-floppy: mv idefloppy_{should_,}report_error 2008-01-03 13:20 ` [RESEND PATCH 08/10] ide-floppy: mv idefloppy_{should_,}report_error Borislav Petkov 2008-01-03 13:20 ` [RESEND PATCH 09/10] ide-floppy: use test_bit wrappers for testing flags Borislav Petkov @ 2008-01-05 15:54 ` Bartlomiej Zolnierkiewicz 1 sibling, 0 replies; 26+ messages in thread From: Bartlomiej Zolnierkiewicz @ 2008-01-05 15:54 UTC (permalink / raw) To: Borislav Petkov; +Cc: linux-ide, linux-kernel On Thursday 03 January 2008, Borislav Petkov wrote: > Signed-off-by: Borislav Petkov <bbpetkov@yahoo.de> > --- > drivers/ide/ide-floppy.c | 6 +++--- > 1 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/drivers/ide/ide-floppy.c b/drivers/ide/ide-floppy.c > index 2c139e7..fd5fe7b 100644 > --- a/drivers/ide/ide-floppy.c > +++ b/drivers/ide/ide-floppy.c > @@ -544,7 +544,7 @@ static ide_startstop_t idefloppy_transfer_pc1(ide_drive_t *drive) > } > > /* Supresses error messages resulting from Medium not present */ > -static inline int idefloppy_should_report_error(idefloppy_t *floppy) > +static inline int idefloppy_report_error(idefloppy_t *floppy) wait, this function does indeed check if it _should_ report the error (it doesn't report it itself)... however... > { > if (floppy->sense_key == 0x02 && > floppy->asc == 0x3a && > @@ -587,7 +587,7 @@ static ide_startstop_t idefloppy_issue_pc(ide_drive_t *drive, idefloppy_pc_t *pc > */ > if (!test_bit(PC_ABORT, &pc->flags)) { > if (!test_bit(PC_SUPPRESS_ERROR, &pc->flags)) { > - if (idefloppy_should_report_error(floppy)) > + if (idefloppy_report_error(floppy)) > printk(KERN_ERR "ide-floppy: %s: I/O error, " > "pc = %2x, key = %2x, " > "asc = %2x, ascq = %2x\n", > @@ -809,7 +809,7 @@ static ide_startstop_t idefloppy_do_request(ide_drive_t *drive, > > if (rq->errors >= ERROR_MAX) { > if (floppy->failed_pc != NULL) { > - if (idefloppy_should_report_error(floppy)) > + if (idefloppy_report_error(floppy)) > printk(KERN_ERR "ide-floppy: %s: I/O error," > " pc = %2x, key = %2x, asc = %2x," > " ascq = %2x\n", if you move the printk() into the function the new name would suddenly make sense! :) it may be also worth to remove 'inline' from idefloppy_report_error() while at it (this function is not performance critical and this should cut some bytes from the driver binary) ^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [RESEND PATCH 07/10] ide-floppy: remove unnecessary ->handler != NULL check 2008-01-03 13:20 ` [RESEND PATCH 07/10] ide-floppy: remove unnecessary ->handler != NULL check Borislav Petkov 2008-01-03 13:20 ` [RESEND PATCH 08/10] ide-floppy: mv idefloppy_{should_,}report_error Borislav Petkov @ 2008-01-04 1:24 ` Bartlomiej Zolnierkiewicz 1 sibling, 0 replies; 26+ messages in thread From: Bartlomiej Zolnierkiewicz @ 2008-01-04 1:24 UTC (permalink / raw) To: Borislav Petkov; +Cc: linux-ide, linux-kernel On Thursday 03 January 2008, Borislav Petkov wrote: > This BUG_ON is unneeded since the ->handler != NULL check is performed in > ide_set_handler(). > > Signed-off-by: Borislav Petkov <bbpetkov@yahoo.de> looks good, please move it at the beginning of the patch series ^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [RESEND PATCH 06/10] ide-floppy: report DMA handling in idefloppy_pc_intr() properly 2008-01-03 13:20 ` [RESEND PATCH 06/10] ide-floppy: report DMA handling in idefloppy_pc_intr() properly Borislav Petkov 2008-01-03 13:20 ` [RESEND PATCH 07/10] ide-floppy: remove unnecessary ->handler != NULL check Borislav Petkov @ 2008-01-05 15:46 ` Bartlomiej Zolnierkiewicz 2008-01-05 21:45 ` Borislav Petkov 1 sibling, 1 reply; 26+ messages in thread From: Bartlomiej Zolnierkiewicz @ 2008-01-05 15:46 UTC (permalink / raw) To: Borislav Petkov; +Cc: linux-ide, linux-kernel On Thursday 03 January 2008, Borislav Petkov wrote: > while at it: > -cleanup small issues raised by scripts/checkpatch.pl > -remove redundant and shorten some comments Could you split the above coding style fixes into a separate patch? > There should be no functionality change resulting from this patch The patch fixes the DMA error reporting so this is not true. :) > Signed-off-by: Borislav Petkov <bbpetkov@yahoo.de> > --- > drivers/ide/ide-floppy.c | 195 ++++++++++++++++++++-------------------------- > 1 files changed, 83 insertions(+), 112 deletions(-) > > diff --git a/drivers/ide/ide-floppy.c b/drivers/ide/ide-floppy.c > index 7823447..5d0fd1f 100644 > --- a/drivers/ide/ide-floppy.c > +++ b/drivers/ide/ide-floppy.c > @@ -5,9 +5,7 @@ > * Copyright (C) 2000 - 2002 Paul Bristow <paul@paulbristow.net> > * > * The driver currently doesn't have any fancy features, just the bare > - * minimum read/write support. this comment should be removed as it is not true anymore (SG_IO and IDEFLOPPY_IOCTL_FORMAT_* ioctls are supported) [...] > @@ -208,11 +204,11 @@ static void idefloppy_update_buffers (ide_drive_t *drive, idefloppy_pc_t *pc) > } > > /* > - * idefloppy_queue_pc_head generates a new packet command request in front > - * of the request queue, before the current request, so that it will be > - * processed immediately, on the next pass through the driver. > + * Generates a new packet command request in front a lot of space left in the above line > + * of the request queue, before the current request, so that it will be > + * processed immediately, on the next pass through the driver. > */ > -static void idefloppy_queue_pc_head (ide_drive_t *drive,idefloppy_pc_t *pc, > +static void idefloppy_queue_pc_head(ide_drive_t *drive, idefloppy_pc_t *pc, > struct request *rq) > { > struct ide_floppy_obj *floppy = drive->driver_data; [...] > @@ -554,11 +545,7 @@ static ide_startstop_t idefloppy_transfer_pc1 (ide_drive_t *drive) > return ide_started; > } > > -/** > - * idefloppy_should_report_error() > - * > - * Supresses error messages resulting from Medium not present > - */ > +/* Supresses error messages resulting from Medium not present */ missing '.' > @@ -792,7 +774,8 @@ static void idefloppy_create_rw_cmd (idefloppy_t *floppy, idefloppy_pc_t *pc, > } > > static void > -idefloppy_blockpc_cmd(idefloppy_t *floppy, idefloppy_pc_t *pc, struct request *rq) > +idefloppy_blockpc_cmd(idefloppy_t *floppy, idefloppy_pc_t *pc, > + struct request *rq) might as well be converted to match the coding style: static void idefloppy_blockpc_cmd... [...] > @@ -1437,7 +1408,7 @@ static void idefloppy_setup (ide_drive_t *drive, idefloppy_t *floppy) > idefloppy_add_settings(drive); > } > > -static void ide_floppy_remove(ide_drive_t *drive) > +static void idefloppy_remove(ide_drive_t *drive) Hmm, no. The driver is called ide-floppy (ide_floppy) and it is more readable this way. > { > idefloppy_t *floppy = drive->driver_data; > struct gendisk *g = floppy->disk; > @@ -1479,7 +1450,7 @@ static ide_proc_entry_t idefloppy_proc[] = { > }; > #endif /* CONFIG_IDE_PROC_FS */ > > -static int ide_floppy_probe(ide_drive_t *); > +static int idefloppy_probe(ide_drive_t *); ditto [...] > @@ -1733,7 +1704,7 @@ static struct block_device_operations idefloppy_ops = { > .revalidate_disk= idefloppy_revalidate_disk > }; > > -static int ide_floppy_probe(ide_drive_t *drive) > +static int idefloppy_probe(ide_drive_t *drive) ditto otherwise looks good ^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [RESEND PATCH 06/10] ide-floppy: report DMA handling in idefloppy_pc_intr() properly 2008-01-05 15:46 ` [RESEND PATCH 06/10] ide-floppy: report DMA handling in idefloppy_pc_intr() properly Bartlomiej Zolnierkiewicz @ 2008-01-05 21:45 ` Borislav Petkov 2008-01-06 15:21 ` Bartlomiej Zolnierkiewicz 0 siblings, 1 reply; 26+ messages in thread From: Borislav Petkov @ 2008-01-05 21:45 UTC (permalink / raw) To: Bartlomiej Zolnierkiewicz; +Cc: linux-ide, linux-kernel On Sat, Jan 05, 2008 at 04:46:05PM +0100, Bartlomiej Zolnierkiewicz wrote: > Hmm, no. The driver is called ide-floppy (ide_floppy) and it is more > readable this way. > > > { > > idefloppy_t *floppy = drive->driver_data; > > struct gendisk *g = floppy->disk; > > @@ -1479,7 +1450,7 @@ static ide_proc_entry_t idefloppy_proc[] = { > > }; > > #endif /* CONFIG_IDE_PROC_FS */ > > > > -static int ide_floppy_probe(ide_drive_t *); > > +static int idefloppy_probe(ide_drive_t *); > > ditto > > [...] > > > @@ -1733,7 +1704,7 @@ static struct block_device_operations idefloppy_ops = { > > .revalidate_disk= idefloppy_revalidate_disk > > }; > > > > -static int ide_floppy_probe(ide_drive_t *drive) > > +static int idefloppy_probe(ide_drive_t *drive) > > ditto Shouldn't those also conform to the driver function format idefloppy_bla() - after all, those function names are unambiguous for the whole file...? -- Regards/Gruß, Boris. ^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [RESEND PATCH 06/10] ide-floppy: report DMA handling in idefloppy_pc_intr() properly 2008-01-05 21:45 ` Borislav Petkov @ 2008-01-06 15:21 ` Bartlomiej Zolnierkiewicz 0 siblings, 0 replies; 26+ messages in thread From: Bartlomiej Zolnierkiewicz @ 2008-01-06 15:21 UTC (permalink / raw) To: bbpetkov; +Cc: linux-ide, linux-kernel On Saturday 05 January 2008, Borislav Petkov wrote: > On Sat, Jan 05, 2008 at 04:46:05PM +0100, Bartlomiej Zolnierkiewicz wrote: > > Hmm, no. The driver is called ide-floppy (ide_floppy) and it is more > > readable this way. > > > > > { > > > idefloppy_t *floppy = drive->driver_data; > > > struct gendisk *g = floppy->disk; > > > @@ -1479,7 +1450,7 @@ static ide_proc_entry_t idefloppy_proc[] = { > > > }; > > > #endif /* CONFIG_IDE_PROC_FS */ > > > > > > -static int ide_floppy_probe(ide_drive_t *); > > > +static int idefloppy_probe(ide_drive_t *); > > > > ditto > > > > [...] > > > > > @@ -1733,7 +1704,7 @@ static struct block_device_operations idefloppy_ops = { > > > .revalidate_disk= idefloppy_revalidate_disk > > > }; > > > > > > -static int ide_floppy_probe(ide_drive_t *drive) > > > +static int idefloppy_probe(ide_drive_t *drive) > > > > ditto > Shouldn't those also conform to the driver function format idefloppy_bla() - > after all, those function names are unambiguous for the whole file...? Why conform to something sub-optimal instead of changing it? + I was using ide_floppy_* in the new code to tag the areas that were rewritten. Currently it doesn't look that optimistic since there are five ide_floppy_* functions and fifty idefloppy_* ones but I'm hoping that this statistics will improve after your patches. :) Thanks, Bart ^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [RESEND PATCH 05/10] ide-floppy: factor out ioctl handlers from idefloppy_ioctl() 2008-01-03 13:20 ` [RESEND PATCH 05/10] ide-floppy: factor out ioctl handlers from idefloppy_ioctl() Borislav Petkov 2008-01-03 13:20 ` [RESEND PATCH 06/10] ide-floppy: report DMA handling in idefloppy_pc_intr() properly Borislav Petkov @ 2008-01-05 15:12 ` Bartlomiej Zolnierkiewicz 1 sibling, 0 replies; 26+ messages in thread From: Bartlomiej Zolnierkiewicz @ 2008-01-05 15:12 UTC (permalink / raw) To: Borislav Petkov; +Cc: linux-ide, linux-kernel looks good, some minor issues noted below On Thursday 03 January 2008, Borislav Petkov wrote: > There should be no functional change resulting from this patch. > > Signed-off-by: Borislav Petkov <bbpetkov@yahoo.de> > --- > drivers/ide/ide-floppy.c | 90 +++++++++++++++++++++++++++++----------------- > 1 files changed, 57 insertions(+), 33 deletions(-) > > diff --git a/drivers/ide/ide-floppy.c b/drivers/ide/ide-floppy.c > index 196a697..7823447 100644 > --- a/drivers/ide/ide-floppy.c > +++ b/drivers/ide/ide-floppy.c > @@ -1600,6 +1600,58 @@ static int idefloppy_getgeo(struct block_device *bdev, struct hd_geometry *geo) > return 0; > } > > +static int idefloppy_lockdoor(struct inode *inode, idefloppy_pc_t *pc, > + int event, unsigned int cmd) > +{ > + struct block_device *bdev = inode->i_bdev; if 'drive' is passed as an argument, 'inode' and 'bdev' can be removed ('floppy' can be obtained from drive->driver_data) > + struct ide_floppy_obj *floppy = ide_floppy_g(bdev->bd_disk); > + ide_drive_t *drive = floppy->drive; > + > + if (floppy->openers > 1) > + return -EBUSY; > + > + /* The IOMEGA Clik! Drive doesn't support this command - > + * no room for an eject mechanism */ > + if (!test_bit(IDEFLOPPY_CLIK_DRIVE, &floppy->flags)) { > + idefloppy_create_prevent_cmd(pc, event); > + (void) idefloppy_queue_pc_tail(drive, pc); > + } > + > + if (cmd == CDROMEJECT) { > + idefloppy_create_start_stop_cmd(pc, 2); > + (void) idefloppy_queue_pc_tail(drive, pc); > + } > + > + return 0; > +} > + > +static > +int idefloppy_format_start(struct file *file, struct inode *inode, > + void __user *argp) > +{ > + struct block_device *bdev = inode->i_bdev; > + struct ide_floppy_obj *floppy = ide_floppy_g(bdev->bd_disk); > + ide_drive_t *drive = floppy->drive; > + int err; > + > + if (!(file->f_mode & 2)) > + return -EPERM; if this check is left in idefloppy_ioctl() it is enough to pass 'drive' and 'argp' to idefloppy_format_start() > + if (floppy->openers > 1) { > + /* Don't format if someone is using the disk */ > + clear_bit(IDEFLOPPY_FORMAT_IN_PROGRESS, &floppy->flags); > + return -EBUSY; > + } > + > + set_bit(IDEFLOPPY_FORMAT_IN_PROGRESS, &floppy->flags); > + > + err = idefloppy_begin_format(drive, argp); idefloppy_begin_format() is called only by idefloppy_format_start() so it would make sense to just merge the latter function into the former one > + if (err) > + clear_bit(IDEFLOPPY_FORMAT_IN_PROGRESS, &floppy->flags); > + > + return err; > +} > + > static int idefloppy_ioctl(struct inode *inode, struct file *file, > unsigned int cmd, unsigned long arg) > { > @@ -1612,47 +1664,19 @@ static int idefloppy_ioctl(struct inode *inode, struct file *file, > idefloppy_pc_t pc; > > switch (cmd) { > + stray newline, no need for it > case CDROMEJECT: > prevent = 0; by adding: if (cmd == CDROMEJECT) prevent = 0; to idefloppy_lockdoor() it is possible to remove the above line (together with 'prevent' variable) > /* fall through */ > - case CDROM_LOCKDOOR: > - if (floppy->openers > 1) > - return -EBUSY; > > - /* The IOMEGA Clik! Drive doesn't support this command - > - * no room for an eject mechanism */ > - if (!test_bit(IDEFLOPPY_CLIK_DRIVE, &floppy->flags)) { > - idefloppy_create_prevent_cmd(&pc, prevent); > - (void) idefloppy_queue_pc_tail(drive, &pc); > - } > - if (cmd == CDROMEJECT) { > - idefloppy_create_start_stop_cmd(&pc, 2); > - (void) idefloppy_queue_pc_tail(drive, &pc); > - } > - return 0; > + case CDROM_LOCKDOOR: > + return idefloppy_lockdoor(inode, &pc, prevent, cmd); [...] > @@ -1669,7 +1693,7 @@ static int idefloppy_ioctl(struct inode *inode, struct file *file, > */ > if (cmd != CDROM_SEND_PACKET && cmd != SCSI_IOCTL_SEND_COMMAND) > err = scsi_cmd_ioctl(file, bdev->bd_disk->queue, > - bdev->bd_disk, cmd, argp); > + bdev->bd_disk, cmd, argp); > else > err = -ENOTTY; > this chunk doesn't seem to be needed ^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [RESEND PATCH 04/10] ide-floppy: cleanup debugging macros 2008-01-03 13:20 ` [RESEND PATCH 04/10] ide-floppy: cleanup debugging macros Borislav Petkov 2008-01-03 13:20 ` [RESEND PATCH 05/10] ide-floppy: factor out ioctl handlers from idefloppy_ioctl() Borislav Petkov @ 2008-01-04 1:19 ` Bartlomiej Zolnierkiewicz 1 sibling, 0 replies; 26+ messages in thread From: Bartlomiej Zolnierkiewicz @ 2008-01-04 1:19 UTC (permalink / raw) To: Borislav Petkov; +Cc: linux-ide, linux-kernel On Thursday 03 January 2008, Borislav Petkov wrote: > There should be no functional change resulting from this patch. the patch is fine but the description is a bit inaccurate: * some debug_log() calls were not using "ide-floppy: " prefix * a few used printk levels different than KERN_INFO (KERN_NOTICE and KERN_ERR, which is the default one if no level is given) please fix the description and move the patch at the beggining of the patch series > Signed-off-by: Borislav Petkov <bbpetkov@yahoo.de> > --- > drivers/ide/ide-floppy.c | 58 +++++++++++++++++++++------------------------ > drivers/ide/ide-floppy.h | 3 +- > 2 files changed, 29 insertions(+), 32 deletions(-) > > diff --git a/drivers/ide/ide-floppy.c b/drivers/ide/ide-floppy.c > index 4fb6128..196a697 100644 > --- a/drivers/ide/ide-floppy.c > +++ b/drivers/ide/ide-floppy.c > @@ -105,7 +105,7 @@ static int idefloppy_do_end_request(ide_drive_t *drive, int uptodate, int nsecs) > struct request *rq = HWGROUP(drive)->rq; > int error; > > - debug_log(KERN_INFO "Reached idefloppy_end_request\n"); > + debug_log("Reached %s\n", __FUNCTION__); > > switch (uptodate) { > case 0: error = IDEFLOPPY_ERROR_GENERAL; break; > @@ -257,13 +257,12 @@ static void idefloppy_analyze_error (ide_drive_t *drive, > floppy->progress_indication = result->sksv[0] & 0x80 ? > (u16)get_unaligned((u16 *)(result->sksv+1)):0x10000; > if (floppy->failed_pc) > - debug_log(KERN_INFO "ide-floppy: pc = %x, sense key = %x, " > - "asc = %x, ascq = %x\n", floppy->failed_pc->c[0], > - result->sense_key, result->asc, result->ascq); > + debug_log("pc = %x, sense key = %x, asc = %x, ascq = %x\n", > + floppy->failed_pc->c[0], result->sense_key, > + result->asc, result->ascq); > else > - debug_log(KERN_INFO "ide-floppy: sense key = %x, asc = %x, " > - "ascq = %x\n", result->sense_key, > - result->asc, result->ascq); > + debug_log("sense key = %x, asc = %x, ascq = %x\n", > + result->sense_key, result->asc, result->ascq); > } > > static void idefloppy_request_sense_callback (ide_drive_t *drive) > @@ -271,7 +270,7 @@ static void idefloppy_request_sense_callback (ide_drive_t *drive) > idefloppy_t *floppy = drive->driver_data; > u8 *buf = floppy->pc->buffer; > > - debug_log(KERN_INFO "ide-floppy: Reached %s\n", __FUNCTION__); > + debug_log("Reached %s\n", __FUNCTION__); > > if (!floppy->pc->error) { > idefloppy_analyze_error(drive, (rq_sense_res_t *) buf); > @@ -291,7 +290,7 @@ static void idefloppy_pc_callback (ide_drive_t *drive) > { > idefloppy_t *floppy = drive->driver_data; > > - debug_log(KERN_INFO "ide-floppy: Reached %s\n", __FUNCTION__); > + debug_log("Reached %s\n", __FUNCTION__); > > idefloppy_do_end_request(drive, floppy->pc->error ? 0 : 1, 0); > } > @@ -351,8 +350,7 @@ static ide_startstop_t idefloppy_pc_intr (ide_drive_t *drive) > struct request *rq = pc->rq; > unsigned int temp; > > - debug_log(KERN_INFO "ide-floppy: Reached %s interrupt handler\n", > - __FUNCTION__); > + debug_log("Reached %s interrupt handler\n", __FUNCTION__); > > if (test_bit(PC_DMA_IN_PROGRESS, &pc->flags)) { > if (HWIF(drive)->ide_dma_end(drive)) { > @@ -361,23 +359,23 @@ static ide_startstop_t idefloppy_pc_intr (ide_drive_t *drive) > pc->actually_transferred = pc->request_transfer; > idefloppy_update_buffers(drive, pc); > } > - debug_log(KERN_INFO "ide-floppy: DMA finished\n"); > + debug_log("%s: DMA finished\n", __FUNCTION__); > } > > /* Clear the interrupt */ > status.all = HWIF(drive)->INB(IDE_STATUS_REG); > > if (!status.b.drq) { /* No more interrupts */ > - debug_log(KERN_INFO "Packet command completed, %d bytes " > - "transferred\n", pc->actually_transferred); > + debug_log("Packet command completed, %d bytes transferred\n", > + pc->actually_transferred); > + > clear_bit(PC_DMA_IN_PROGRESS, &pc->flags); > > local_irq_enable_in_hardirq(); > > if (status.b.check || test_bit(PC_DMA_ERROR, &pc->flags)) { > /* Error detected */ > - debug_log(KERN_INFO "ide-floppy: %s: I/O error\n", > - drive->name); > + debug_log("%s: I/O error\n", drive->name); > rq->errors++; > if (pc->c[0] == GPCMD_REQUEST_SENSE) { > printk(KERN_ERR "ide-floppy: I/O error in " > @@ -438,9 +436,8 @@ static ide_startstop_t idefloppy_pc_intr (ide_drive_t *drive) > NULL); > return ide_started; > } > - debug_log(KERN_NOTICE "ide-floppy: The floppy wants to " > - "send us more data than expected - " > - "allowing transfer\n"); > + debug_log("The floppy wants to send us more data than" > + "expected - allowing transfer\n"); > } > } > if (test_bit(PC_WRITING, &pc->flags)) { > @@ -624,7 +621,7 @@ static ide_startstop_t idefloppy_issue_pc (ide_drive_t *drive, idefloppy_pc_t *p > return ide_stopped; > } > > - debug_log(KERN_INFO "Retry number - %d\n",pc->retries); > + debug_log("Retry number - %d\n", pc->retries); > > pc->retries++; > /* We haven't transferred any data yet */ > @@ -676,9 +673,9 @@ static ide_startstop_t idefloppy_issue_pc (ide_drive_t *drive, idefloppy_pc_t *p > } > } > > -static void idefloppy_rw_callback (ide_drive_t *drive) > +static void idefloppy_rw_callback(ide_drive_t *drive) > { > - debug_log(KERN_INFO "ide-floppy: Reached idefloppy_rw_callback\n"); > + debug_log("Reached %s\n", __FUNCTION__); > > idefloppy_do_end_request(drive, 1, 0); > return; > @@ -686,8 +683,7 @@ static void idefloppy_rw_callback (ide_drive_t *drive) > > static void idefloppy_create_prevent_cmd (idefloppy_pc_t *pc, int prevent) > { > - debug_log(KERN_INFO "ide-floppy: creating prevent removal command, " > - "prevent = %d\n", prevent); > + debug_log("creating prevent removal command, prevent = %d\n", prevent); > > idefloppy_init_pc(pc); > pc->c[0] = GPCMD_PREVENT_ALLOW_MEDIUM_REMOVAL; > @@ -773,7 +769,7 @@ static void idefloppy_create_rw_cmd (idefloppy_t *floppy, idefloppy_pc_t *pc, > int cmd = rq_data_dir(rq); > > debug_log("create_rw1%d_cmd: block == %d, blocks == %d\n", > - 2 * test_bit (IDEFLOPPY_USE_READ12, &floppy->flags), > + 2 * test_bit(IDEFLOPPY_USE_READ12, &floppy->flags), > block, blocks); > > idefloppy_init_pc(pc); > @@ -826,10 +822,10 @@ static ide_startstop_t idefloppy_do_request (ide_drive_t *drive, > idefloppy_pc_t *pc; > unsigned long block = (unsigned long)block_s; > > - debug_log(KERN_INFO "dev: %s, flags: %lx, errors: %d\n", > + debug_log("dev: %s, flags: %lx, errors: %d\n", > rq->rq_disk ? rq->rq_disk->disk_name : "?", > rq->flags, rq->errors); > - debug_log(KERN_INFO "sector: %ld, nr_sectors: %ld, " > + debug_log("sector: %ld, nr_sectors: %ld, " > "current_nr_sectors: %d\n", (long)rq->sector, > rq->nr_sectors, rq->current_nr_sectors); > > @@ -1050,10 +1046,10 @@ static int idefloppy_get_capacity (ide_drive_t *drive) > } > } > if (!i) { > - debug_log( "Descriptor 0 Code: %d\n", > + debug_log("Descriptor 0 Code: %d\n", > descriptor->dc); > } > - debug_log( "Descriptor %d: %dkB, %d blocks, %d " > + debug_log("Descriptor %d: %dkB, %d blocks, %d " > "sector size\n", i, blocks * length / 1024, blocks, > length); > } > @@ -1513,7 +1509,7 @@ static int idefloppy_open(struct inode *inode, struct file *filp) > idefloppy_pc_t pc; > int ret = 0; > > - debug_log(KERN_INFO "Reached idefloppy_open\n"); > + debug_log("Reached %s\n", __FUNCTION__); > > if (!(floppy = ide_floppy_get(disk))) > return -ENXIO; > @@ -1574,7 +1570,7 @@ static int idefloppy_release(struct inode *inode, struct file *filp) > ide_drive_t *drive = floppy->drive; > idefloppy_pc_t pc; > > - debug_log(KERN_INFO "Reached idefloppy_release\n"); > + debug_log("Reached %s\n", __FUNCTION__); > > if (floppy->openers == 1) { > /* IOMEGA Clik! drives do not support lock/unlock commands */ > diff --git a/drivers/ide/ide-floppy.h b/drivers/ide/ide-floppy.h > index 4e12038..fb55d32 100644 > --- a/drivers/ide/ide-floppy.h > +++ b/drivers/ide/ide-floppy.h > @@ -12,7 +12,8 @@ > #define IDEFLOPPY_DEBUG( fmt, args... ) > > #if IDEFLOPPY_DEBUG_LOG > -#define debug_log printk > +#define debug_log(fmt, args...) \ > + printk(KERN_INFO "ide-floppy: " fmt, ## args) > #else > #define debug_log(fmt, args... ) do {} while(0) > #endif ^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [RESEND PATCH 03/10] ide-floppy: convert to generic packet commands 2008-01-03 13:20 ` [RESEND PATCH 03/10] ide-floppy: convert to generic packet commands Borislav Petkov 2008-01-03 13:20 ` [RESEND PATCH 04/10] ide-floppy: cleanup debugging macros Borislav Petkov @ 2008-01-04 1:04 ` Bartlomiej Zolnierkiewicz 1 sibling, 0 replies; 26+ messages in thread From: Bartlomiej Zolnierkiewicz @ 2008-01-04 1:04 UTC (permalink / raw) To: Borislav Petkov; +Cc: linux-ide, linux-kernel, Jens Axboe On Thursday 03 January 2008, Borislav Petkov wrote: > Replace the ide-floppy packet commands opcode defines with the generic ones. > Add a missing GPCMD_WRITE_12 (opcode 0xaa) to the generic ones in cdrom.h. The > last one can be found in the current version of INF-8090, p.905. > > CC: Jens Axboe <axboe@kernel.dk> > Signed-off-by: Borislav Petkov <bbpetkov@yahoo.de> please move this patch at the beggining of the patch series so it can be applied immediately (patch #2 needs some more work) > --- > drivers/ide/ide-floppy.c | 26 +++++++++++++------------- > drivers/ide/ide-floppy.h | 21 --------------------- Please also note that patch #2 moved these defines to ide-floppy.h and now patch #3 removes them so by re-ordering patches you can make patch #2 simpler. [ This is a general hint for optimizing patches to make them smaller and easier to maintain, it also makes reviewer's job easier. ] [...] > --- a/include/linux/cdrom.h > +++ b/include/linux/cdrom.h > @@ -480,6 +480,7 @@ struct cdrom_generic_command > #define GPCMD_TEST_UNIT_READY 0x00 > #define GPCMD_VERIFY_10 0x2f > #define GPCMD_WRITE_10 0x2a > +#define GPCMD_WRITE_12 0xaa /* ide floppy */ 0xaa is a generic SCSI opcode so the above comment is not necessary > #define GPCMD_WRITE_AND_VERIFY_10 0x2e > /* This is listed as optional in ATAPI 2.6, but is (curiously) > * missing from Mt. Fuji, Table 57. It _is_ mentioned in Mt. Fuji ^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [RESEND PATCH 02/10] ide-floppy: move ide-floppy struct and macro defs into its own header. While at it 2008-01-03 13:20 ` [RESEND PATCH 02/10] ide-floppy: move ide-floppy struct and macro defs into its own header. While at it Borislav Petkov 2008-01-03 13:20 ` [RESEND PATCH 03/10] ide-floppy: convert to generic packet commands Borislav Petkov @ 2008-01-04 22:49 ` Bartlomiej Zolnierkiewicz 2008-01-05 12:45 ` Borislav Petkov 1 sibling, 1 reply; 26+ messages in thread From: Bartlomiej Zolnierkiewicz @ 2008-01-04 22:49 UTC (permalink / raw) To: Borislav Petkov; +Cc: linux-ide, linux-kernel Hi, Hmm, contrary to ide-cd.c case there doesn't seem to be a need currently for moving code out of ide-floppy.c (and this patch series doesn't change that). Besides it would be better to just remove some structs like it has been done with i.e. struct atapi_capabilities_page in ide-cd.c case [1] because: * it is easier to audit/debug the code if you don't have to look at typedefs all the time just to see which bytes/bits the code is really accessing * not using typedefs will make the source code significantly smaller * documentation is publically available * these structs are not memory mapped [1] http://www.mail-archive.com/linux-kernel@vger.kernel.org/msg242747.html On Thursday 03 January 2008, Borislav Petkov wrote: > - do a white-space cleanup > - remove old crufty code untouched since at least 2005 Please try to not mix things like moving code around and doing actual changes because it makes patch review difficult (i.e. it took me quite a while to find "old crufty code" that has been removed)... Sometimes having more "trivial" patches is better... > - shorten lines longer than 80ish columns > - shorten some LAAARGE typenames. typedefs are evil (exceptions are rare) and should die :) > There should be no functional changes resulting from this patch. > > Signed-off-by: Borislav Petkov <bbpetkov@yahoo.de> > --- > drivers/ide/ide-floppy.c | 763 ++++++++++++---------------------------------- > drivers/ide/ide-floppy.h | 382 +++++++++++++++++++++++ > 2 files changed, 581 insertions(+), 564 deletions(-) > > diff --git a/drivers/ide/ide-floppy.c b/drivers/ide/ide-floppy.c > index 785fbde..52d09c1 100644 > --- a/drivers/ide/ide-floppy.c > +++ b/drivers/ide/ide-floppy.c [...] > -} idefloppy_capabilities_page_t; [...] > -} idefloppy_flexible_disk_page_t; [...] > -} idefloppy_capacity_descriptor_t; as mentioned earlier it would be best to just remove these structs/typedefs [ respective structures are described in SFF-8070i spec, it is useful to audit the final code against the spec to catch potential coding mistakes early ] [...] > -#if 0 > -/* > - * Special requests for our block device strategy routine. > - */ > -#define IDEFLOPPY_FIRST_RQ 90 > - > -/* > - * IDEFLOPPY_PC_RQ is used to queue a packet command in the request queue. > - */ > -#define IDEFLOPPY_PC_RQ 90 > - > -#define IDEFLOPPY_LAST_RQ 90 > - > -/* > - * A macro which can be used to check if a given request command > - * originated in the driver or in the buffer cache layer. > - */ > -#define IDEFLOPPY_RQ_CMD(cmd) ((cmd >= IDEFLOPPY_FIRST_RQ) && (cmd <= IDEFLOPPY_LAST_RQ)) > - > -#endif Well, it was already removed, the patch is in IDE tree (and thus in -mm). http://kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.24-rc6/2.6.24-rc6-mm1/broken-out/ide-mm-ide-floppy-remove-dead-code.patch If possible please base your patches against IDE tree or the latest -mm patch. [...] > -} idefloppy_inquiry_result_t; [...] > -} idefloppy_request_sense_result_t; [...] > -} idefloppy_mode_parameter_header_t; more structs/typedefs heading for /dev/null [...] > @@ -1689,9 +1304,12 @@ static int idefloppy_identify_device (ide_drive_t *drive,struct hd_driveid *id) > printk(KERN_INFO "Write buffer size(?): %d bytes\n",id->buf_size*512); > printk(KERN_INFO "DMA: %s",id->capability & 0x01 ? "Yes\n":"No\n"); > printk(KERN_INFO "LBA: %s",id->capability & 0x02 ? "Yes\n":"No\n"); > - printk(KERN_INFO "IORDY can be disabled: %s",id->capability & 0x04 ? "Yes\n":"No\n"); > - printk(KERN_INFO "IORDY supported: %s",id->capability & 0x08 ? "Yes\n":"Unknown\n"); > - printk(KERN_INFO "ATAPI overlap supported: %s",id->capability & 0x20 ? "Yes\n":"No\n"); > + printk(KERN_INFO "IORDY can be disabled: %s", > + id->capability & 0x04 ? "Yes\n":"No\n"); > + printk(KERN_INFO "IORDY supported: %s", > + id->capability & 0x08 ? "Yes\n":"Unknown\n"); > + printk(KERN_INFO "ATAPI overlap supported: %s", > + id->capability & 0x20 ? "Yes\n":"No\n"); > printk(KERN_INFO "PIO Cycle Timing Category: %d\n",id->tPIO); > printk(KERN_INFO "DMA Cycle Timing Category: %d\n",id->tDMA); > printk(KERN_INFO "Single Word DMA supported modes:\n"); > @@ -1713,12 +1331,16 @@ static int idefloppy_identify_device (ide_drive_t *drive,struct hd_driveid *id) > sprintf(buffer, "Not supported"); > else > sprintf(buffer, "%d ns",id->eide_dma_min); > - printk(KERN_INFO "Minimum Multi-word DMA cycle per word: %s\n", buffer); > + printk(KERN_INFO "Minimum Multi-word DMA cycle per word: %s\n", > + buffer); > + > if (id->eide_dma_time == 0) > sprintf(buffer, "Not supported"); > else > sprintf(buffer, "%d ns",id->eide_dma_time); > - printk(KERN_INFO "Manufacturer\'s Recommended Multi-word cycle: %s\n", buffer); > + printk(KERN_INFO "Manufacturer\'s Recommended Multi-word" > + " cycle: %s\n", buffer); > + > if (id->eide_pio == 0) > sprintf(buffer, "Not supported"); > else > @@ -1731,7 +1353,8 @@ static int idefloppy_identify_device (ide_drive_t *drive,struct hd_driveid *id) > sprintf(buffer, "%d ns",id->eide_pio_iordy); > printk(KERN_INFO "Minimum PIO cycle with IORDY: %s\n", buffer); > } else > - printk(KERN_INFO "According to the device, fields 64-70 are not valid.\n"); > + printk(KERN_INFO "According to the device, fields 64-70 are not" > + " valid.\n"); > #endif /* IDEFLOPPY_DEBUG_INFO */ > > if (gcw.protocol != 2) identify dumping has been removed by: http://kernel.org/pub/linux/kernel/people/bart/pata-2.6/patches/ide-floppy-tape-remove-debug-code-for-dumping-identify-data.patch [ not in -mm yet ] Please rework/resubmit this patch (preferably splitted on few smaller ones). Thanks, Bart PS please also check your patches with scripts/checkpatch.pl before posting ^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [RESEND PATCH 02/10] ide-floppy: move ide-floppy struct and macro defs into its own header. While at it 2008-01-04 22:49 ` [RESEND PATCH 02/10] ide-floppy: move ide-floppy struct and macro defs into its own header. While at it Bartlomiej Zolnierkiewicz @ 2008-01-05 12:45 ` Borislav Petkov 2008-01-05 13:15 ` Bartlomiej Zolnierkiewicz 0 siblings, 1 reply; 26+ messages in thread From: Borislav Petkov @ 2008-01-05 12:45 UTC (permalink / raw) To: Bartlomiej Zolnierkiewicz; +Cc: linux-ide, linux-kernel On Fri, Jan 04, 2008 at 11:49:09PM +0100, Bartlomiej Zolnierkiewicz wrote: > > Hi, Hi Bart, > Hmm, contrary to ide-cd.c case there doesn't seem to be a need currently for > moving code out of ide-floppy.c (and this patch series doesn't change that). ?, you mean this patch series _does_ change that, meaning it moves the struct defs into a header file. Do i get this correctly that we don't need the header file and the struct defs should remain in the .c file? > Besides it would be better to just remove some structs like it has been done > with i.e. struct atapi_capabilities_page in ide-cd.c case [1] because: [...] > typedefs are evil (exceptions are rare) and should die :) > i'm redoing them right now against ide-2.6.git and will post when ready. By the way, i have done some more cleanups in the meantime. Should i include them into this series or send them later? -- Regards/Gruß, Boris. ^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [RESEND PATCH 02/10] ide-floppy: move ide-floppy struct and macro defs into its own header. While at it 2008-01-05 12:45 ` Borislav Petkov @ 2008-01-05 13:15 ` Bartlomiej Zolnierkiewicz 0 siblings, 0 replies; 26+ messages in thread From: Bartlomiej Zolnierkiewicz @ 2008-01-05 13:15 UTC (permalink / raw) To: bbpetkov; +Cc: linux-ide, linux-kernel Hi, On Saturday 05 January 2008, Borislav Petkov wrote: > On Fri, Jan 04, 2008 at 11:49:09PM +0100, Bartlomiej Zolnierkiewicz wrote: > > > > Hi, > Hi Bart, > > > Hmm, contrary to ide-cd.c case there doesn't seem to be a need currently for > > moving code out of ide-floppy.c (and this patch series doesn't change that). > ?, you mean this patch series _does_ change that, meaning it moves the struct I mean that even with this patch series applied there is no need to for header file since ide-floppy will still be the only user of it. > defs into a header file. Do i get this correctly that we don't need the header > file and the struct defs should remain in the .c file? Yes. > > Besides it would be better to just remove some structs like it has been done > > with i.e. struct atapi_capabilities_page in ide-cd.c case [1] because: > > [...] > > > typedefs are evil (exceptions are rare) and should die :) > > > > i'm redoing them right now against ide-2.6.git and will post when ready. By the ide-2.6.git is for syncing with Linus, the development tree is kept in quilt tree and is merged by Andrew to -mm. Please get the quilt patch series from: http://www.kernel.org/pub/linux/kernel/people/bart/pata-2.6/ or use the latest 2.6.24-rc6-mm1 kernel (should have most of IDE patches). > way, i have done some more cleanups in the meantime. Should i include them into > this series or send them later? Include! :) Thanks, Bart PS I still have to comment on patches #5/6/8/9. ^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [RESEND PATCH 01/10] move ide-floppy historical changelog to Documentation/ide/ChangeLog.ide-floppy.1996-2002; 2008-01-03 13:20 ` [RESEND PATCH 01/10] move ide-floppy historical changelog to Documentation/ide/ChangeLog.ide-floppy.1996-2002; Borislav Petkov 2008-01-03 13:20 ` [RESEND PATCH 02/10] ide-floppy: move ide-floppy struct and macro defs into its own header. While at it Borislav Petkov @ 2008-01-04 0:36 ` Bartlomiej Zolnierkiewicz 1 sibling, 0 replies; 26+ messages in thread From: Bartlomiej Zolnierkiewicz @ 2008-01-04 0:36 UTC (permalink / raw) To: Borislav Petkov; +Cc: linux-ide, linux-kernel On Thursday 03 January 2008, Borislav Petkov wrote: > Signed-off-by: Borislav Petkov <bbpetkov@yahoo.de> applied with two minor fixes (and sorry for being such a pedant ;): * Summary line moved to patch description and "ide-floppy: cleanup header" used instead. Please try to keep summary line within 80-columns limit, otherwise it makes git-log output etc ugly. * I don't know why scripts/checkpatch.pl doesn't complain but quilt did: Warning: trailing whitespace in lines 44,46,61,62 of Documentation/ide/ChangeLog.ide-floppy.1996-2002 so I fixed it manually. ^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [RESEND PATCH 0/10] ide-floppy redux p1 2008-01-03 13:19 [RESEND PATCH 0/10] ide-floppy redux p1 Borislav Petkov 2008-01-03 13:20 ` [RESEND PATCH 01/10] move ide-floppy historical changelog to Documentation/ide/ChangeLog.ide-floppy.1996-2002; Borislav Petkov @ 2008-01-04 0:14 ` Bartlomiej Zolnierkiewicz 1 sibling, 0 replies; 26+ messages in thread From: Bartlomiej Zolnierkiewicz @ 2008-01-04 0:14 UTC (permalink / raw) To: Borislav Petkov; +Cc: linux-ide, linux-kernel Hi, On Thursday 03 January 2008, Borislav Petkov wrote: > > Hi Bart, > > here's the unfinished redux of ide-floppy which i'm REsending now so that we could > sinchronize trees. The original send got busted in vger's filters due to syntax > error in the Message-ID tag. > > Documentation/ide/ChangeLog.ide-floppy.1996-2002 | 64 ++ > drivers/ide/ide-floppy.c | 1248 +++++++--------------- > drivers/ide/ide-floppy.h | 351 ++++++ > include/linux/cdrom.h | 1 + > 4 files changed, 819 insertions(+), 845 deletions(-) I applied patch #1, patches #3, #4, #7 and #10 can be applied immediately if you move them at the beggining of the patch series. The rest requires some more work but they are "almost there" (more comments in replies to particular patches). Thanks, Bart ^ permalink raw reply [flat|nested] 26+ messages in thread
end of thread, other threads:[~2008-01-06 15:10 UTC | newest]
Thread overview: 26+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-01-03 13:19 [RESEND PATCH 0/10] ide-floppy redux p1 Borislav Petkov
2008-01-03 13:20 ` [RESEND PATCH 01/10] move ide-floppy historical changelog to Documentation/ide/ChangeLog.ide-floppy.1996-2002; Borislav Petkov
2008-01-03 13:20 ` [RESEND PATCH 02/10] ide-floppy: move ide-floppy struct and macro defs into its own header. While at it Borislav Petkov
2008-01-03 13:20 ` [RESEND PATCH 03/10] ide-floppy: convert to generic packet commands Borislav Petkov
2008-01-03 13:20 ` [RESEND PATCH 04/10] ide-floppy: cleanup debugging macros Borislav Petkov
2008-01-03 13:20 ` [RESEND PATCH 05/10] ide-floppy: factor out ioctl handlers from idefloppy_ioctl() Borislav Petkov
2008-01-03 13:20 ` [RESEND PATCH 06/10] ide-floppy: report DMA handling in idefloppy_pc_intr() properly Borislav Petkov
2008-01-03 13:20 ` [RESEND PATCH 07/10] ide-floppy: remove unnecessary ->handler != NULL check Borislav Petkov
2008-01-03 13:20 ` [RESEND PATCH 08/10] ide-floppy: mv idefloppy_{should_,}report_error Borislav Petkov
2008-01-03 13:20 ` [RESEND PATCH 09/10] ide-floppy: use test_bit wrappers for testing flags Borislav Petkov
2008-01-03 13:20 ` [RESEND PATCH 10/10] ide-floppy: replace ntoh{s,l} and hton{s,l} calls with the generic byteorder macros Borislav Petkov
2008-01-04 1:29 ` Bartlomiej Zolnierkiewicz
2008-01-05 16:10 ` [RESEND PATCH 09/10] ide-floppy: use test_bit wrappers for testing flags Bartlomiej Zolnierkiewicz
2008-01-05 15:54 ` [RESEND PATCH 08/10] ide-floppy: mv idefloppy_{should_,}report_error Bartlomiej Zolnierkiewicz
2008-01-04 1:24 ` [RESEND PATCH 07/10] ide-floppy: remove unnecessary ->handler != NULL check Bartlomiej Zolnierkiewicz
2008-01-05 15:46 ` [RESEND PATCH 06/10] ide-floppy: report DMA handling in idefloppy_pc_intr() properly Bartlomiej Zolnierkiewicz
2008-01-05 21:45 ` Borislav Petkov
2008-01-06 15:21 ` Bartlomiej Zolnierkiewicz
2008-01-05 15:12 ` [RESEND PATCH 05/10] ide-floppy: factor out ioctl handlers from idefloppy_ioctl() Bartlomiej Zolnierkiewicz
2008-01-04 1:19 ` [RESEND PATCH 04/10] ide-floppy: cleanup debugging macros Bartlomiej Zolnierkiewicz
2008-01-04 1:04 ` [RESEND PATCH 03/10] ide-floppy: convert to generic packet commands Bartlomiej Zolnierkiewicz
2008-01-04 22:49 ` [RESEND PATCH 02/10] ide-floppy: move ide-floppy struct and macro defs into its own header. While at it Bartlomiej Zolnierkiewicz
2008-01-05 12:45 ` Borislav Petkov
2008-01-05 13:15 ` Bartlomiej Zolnierkiewicz
2008-01-04 0:36 ` [RESEND PATCH 01/10] move ide-floppy historical changelog to Documentation/ide/ChangeLog.ide-floppy.1996-2002; Bartlomiej Zolnierkiewicz
2008-01-04 0:14 ` [RESEND PATCH 0/10] ide-floppy redux p1 Bartlomiej Zolnierkiewicz
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).