Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751430AbYHKGCu (ORCPT ); Mon, 11 Aug 2008 02:02:50 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1750842AbYHKGCk (ORCPT ); Mon, 11 Aug 2008 02:02:40 -0400 Received: from fg-out-1718.google.com ([72.14.220.158]:31184 "EHLO fg-out-1718.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750781AbYHKGCi (ORCPT ); Mon, 11 Aug 2008 02:02:38 -0400 DomainKey-Signature: a=rsa-sha1; c=nofws; d=googlemail.com; s=gamma; h=date:to:cc:subject:message-id:reply-to:mail-followup-to:references :mime-version:content-type:content-disposition:in-reply-to :user-agent:from; b=TTRCybo4cMiy9n3SsWAe9ED9J9Z6jU3z5MKPDcOSDlODMDz8iNXNOpIo+0OBdOVV1f hfz/C9ZAdH6Cw0LwWthTjwD3epmYBZSM3LE8+UtgsQLmwhiC5mM0OCLGoGkHsh3OtzTp FQw+cI5tFH063MIB32zMo053rWECF1Jasbxjc= Date: Mon, 11 Aug 2008 08:02:32 +0200 To: Bartlomiej Zolnierkiewicz Cc: linux-ide@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH 11/22] ide: add ide_set_media_lock() helper Message-ID: <20080811060232.GA15436@gollum.tnic> Reply-To: petkovbb@gmail.com Mail-Followup-To: petkovbb@gmail.com, Bartlomiej Zolnierkiewicz , linux-ide@vger.kernel.org, linux-kernel@vger.kernel.org References: <20080810153527.16255.2504.sendpatchset@localhost.localdomain> <20080810153645.16255.80542.sendpatchset@localhost.localdomain> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20080810153645.16255.80542.sendpatchset@localhost.localdomain> User-Agent: Mutt/1.5.17+20080114 (2008-01-14) From: Borislav Petkov Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 9134 Lines: 267 Hi, On Sun, Aug 10, 2008 at 05:36:45PM +0200, Bartlomiej Zolnierkiewicz wrote: > * Set IDE_AFLAG_NO_DOORLOCK in idetape_get_mode_sense_result(), check it > in ide_tape_set_media_lock() and cleanup idetape_create_prevent_cmd(). > > * Set IDE_AFLAG_NO_DOORLOCK in ide_floppy_create_read_capacity_cmd() and > check it instead of IDE_AFLAG_CLIK_DRIVE in ide_floppy_set_media_lock(). > > * Add ide_set_media_lock() helper and convert ide-{floppy,tape}.c to use it. > > * Remove no longer used ide*_create_prevent_cmd()/ide*_set_media_lock(). > > * Update comment in accordingly. > > Cc: Borislav Petkov > Signed-off-by: Bartlomiej Zolnierkiewicz > --- > drivers/ide/ide-atapi.c | 15 +++++++++++++++ > drivers/ide/ide-floppy.c | 32 +++++++------------------------- > drivers/ide/ide-tape.c | 41 ++++++++++------------------------------- > include/linux/ide.h | 6 ++++-- > 4 files changed, 36 insertions(+), 58 deletions(-) > > Index: b/drivers/ide/ide-atapi.c > =================================================================== > --- a/drivers/ide/ide-atapi.c > +++ b/drivers/ide/ide-atapi.c > @@ -162,6 +162,21 @@ int ide_queue_pc_tail(ide_drive_t *drive > } > EXPORT_SYMBOL_GPL(ide_queue_pc_tail); > > +int ide_set_media_lock(ide_drive_t *drive, struct gendisk *disk, int on) > +{ > + struct ide_atapi_pc pc; > + > + if (drive->atapi_flags & IDE_AFLAG_NO_DOORLOCK) > + return 0; > + > + ide_init_pc(&pc); > + pc.c[0] = ALLOW_MEDIUM_REMOVAL; Are we switching to SCSI opcodes? What about the generic packet commands in ? > + pc.c[4] = on; > + > + return ide_queue_pc_tail(drive, disk, &pc); > +} > +EXPORT_SYMBOL_GPL(ide_set_media_lock); > + > /* TODO: unify the code thus making some arguments go away */ > ide_startstop_t ide_pc_intr(ide_drive_t *drive, struct ide_atapi_pc *pc, > ide_handler_t *handler, unsigned int timeout, ide_expiry_t *expiry, > Index: b/drivers/ide/ide-floppy.c > =================================================================== > --- a/drivers/ide/ide-floppy.c > +++ b/drivers/ide/ide-floppy.c > @@ -324,15 +324,6 @@ static ide_startstop_t idefloppy_issue_p > IDEFLOPPY_WAIT_CMD, NULL); > } > > -static void idefloppy_create_prevent_cmd(struct ide_atapi_pc *pc, int prevent) > -{ > - debug_log("creating prevent removal command, prevent = %d\n", prevent); > - > - ide_init_pc(pc); > - pc->c[0] = GPCMD_PREVENT_ALLOW_MEDIUM_REMOVAL; > - pc->c[4] = prevent; > -} > - > void ide_floppy_create_read_capacity_cmd(struct ide_atapi_pc *pc) > { > ide_init_pc(pc); > @@ -711,6 +702,8 @@ static void idefloppy_setup(ide_drive_t > if (strncmp((char *)&id[ATA_ID_PROD], "IOMEGA Clik!", 11) == 0) { > blk_queue_max_sectors(drive->queue, 64); > drive->atapi_flags |= IDE_AFLAG_CLIK_DRIVE; > + /* IOMEGA Clik! drives do not support lock/unlock commands */ > + drive->atapi_flags |= IDE_AFLAG_NO_DOORLOCK; > } > > (void) ide_floppy_get_capacity(drive); > @@ -781,18 +774,6 @@ static ide_driver_t idefloppy_driver = { > #endif > }; > > -static void ide_floppy_set_media_lock(ide_drive_t *drive, int on) > -{ > - struct ide_floppy_obj *floppy = drive->driver_data; > - struct ide_atapi_pc pc; > - > - /* IOMEGA Clik! drives do not support lock/unlock commands */ > - if ((drive->atapi_flags & IDE_AFLAG_CLIK_DRIVE) == 0) { > - idefloppy_create_prevent_cmd(&pc, on); > - (void)ide_queue_pc_tail(drive, floppy->disk, &pc); > - } > -} > - > static int idefloppy_open(struct inode *inode, struct file *filp) > { > struct gendisk *disk = inode->i_bdev->bd_disk; > @@ -841,7 +822,7 @@ static int idefloppy_open(struct inode * > } > > drive->atapi_flags |= IDE_AFLAG_MEDIA_CHANGED; > - ide_floppy_set_media_lock(drive, 1); > + ide_set_media_lock(drive, disk, 1); > check_disk_change(inode->i_bdev); > } else if (drive->atapi_flags & IDE_AFLAG_FORMAT_IN_PROGRESS) { > ret = -EBUSY; > @@ -864,7 +845,7 @@ static int idefloppy_release(struct inod > debug_log("Reached %s\n", __func__); > > if (floppy->openers == 1) { > - ide_floppy_set_media_lock(drive, 0); > + ide_set_media_lock(drive, disk, 0); > drive->atapi_flags &= ~IDE_AFLAG_FORMAT_IN_PROGRESS; > } > > @@ -890,16 +871,17 @@ static int ide_floppy_lockdoor(ide_drive > unsigned long arg, unsigned int cmd) > { > idefloppy_floppy_t *floppy = drive->driver_data; > + struct gendisk *disk = floppy->disk; > int prevent = (arg && cmd != CDROMEJECT) ? 1 : 0; > > if (floppy->openers > 1) > return -EBUSY; > > - ide_floppy_set_media_lock(drive, prevent); > + ide_set_media_lock(drive, disk, prevent); > > if (cmd == CDROMEJECT) { > idefloppy_create_start_stop_cmd(pc, 2); > - (void)ide_queue_pc_tail(drive, floppy->disk, pc); > + (void)ide_queue_pc_tail(drive, disk, pc); > } > > return 0; > Index: b/drivers/ide/ide-tape.c > =================================================================== > --- a/drivers/ide/ide-tape.c > +++ b/drivers/ide/ide-tape.c > @@ -1213,32 +1213,6 @@ static void idetape_create_locate_cmd(id > pc->flags |= PC_FLAG_WAIT_FOR_DSC; > } > > -static int idetape_create_prevent_cmd(ide_drive_t *drive, > - struct ide_atapi_pc *pc, int prevent) > -{ > - idetape_tape_t *tape = drive->driver_data; > - > - /* device supports locking according to capabilities page */ > - if (!(tape->caps[6] & 0x01)) > - return 0; > - > - ide_init_pc(pc); > - pc->c[0] = ALLOW_MEDIUM_REMOVAL; > - pc->c[4] = prevent; > - return 1; > -} > - > -static int ide_tape_set_media_lock(ide_drive_t *drive, int on) > -{ > - struct ide_tape_obj *tape = drive->driver_data; > - struct ide_atapi_pc pc; > - > - if (!idetape_create_prevent_cmd(drive, &pc, on)) > - return 0; > - > - return ide_queue_pc_tail(drive, tape->disk, &pc); > -} > - > static void __ide_tape_discard_merge_buffer(ide_drive_t *drive) > { > idetape_tape_t *tape = drive->driver_data; > @@ -1871,7 +1845,7 @@ static int idetape_mtioctop(ide_drive_t > * attempting to eject. > */ > if (tape->door_locked) { > - if (!ide_tape_set_media_lock(drive, 0)) > + if (!ide_set_media_lock(drive, disk, 0)) > tape->door_locked = DOOR_UNLOCKED; > } > ide_tape_discard_merge_buffer(drive, 0); > @@ -1916,13 +1890,13 @@ static int idetape_mtioctop(ide_drive_t > case MTFSR: > case MTBSR: > case MTLOCK: > - retval = ide_tape_set_media_lock(drive, 1); > + retval = ide_set_media_lock(drive, disk, 1); > if (retval) > return retval; > tape->door_locked = DOOR_EXPLICITLY_LOCKED; > return 0; > case MTUNLOCK: > - retval = ide_tape_set_media_lock(drive, 0); > + retval = ide_set_media_lock(drive, disk, 0); > if (retval) > return retval; > tape->door_locked = DOOR_UNLOCKED; > @@ -2086,7 +2060,7 @@ static int idetape_chrdev_open(struct in > > /* Lock the tape drive door so user can't eject. */ > if (tape->chrdev_dir == IDETAPE_DIR_NONE) { > - if (!ide_tape_set_media_lock(drive, 1)) { > + if (!ide_set_media_lock(drive, tape->disk, 1)) { > if (tape->door_locked != DOOR_EXPLICITLY_LOCKED) > tape->door_locked = DOOR_LOCKED; > } > @@ -2139,7 +2113,7 @@ static int idetape_chrdev_release(struct > (void) idetape_rewind_tape(drive); > if (tape->chrdev_dir == IDETAPE_DIR_NONE) { > if (tape->door_locked == DOOR_LOCKED) { > - if (!ide_tape_set_media_lock(drive, 0)) > + if (!ide_set_media_lock(drive, tape->disk, 0)) > tape->door_locked = DOOR_UNLOCKED; > } > } > @@ -2217,6 +2191,11 @@ static void idetape_get_mode_sense_resul > } > > memcpy(&tape->caps, caps, 20); > + > + /* device lacks locking support according to capabilities page */ > + if ((caps[6] & 1) == 0) > + drive->atapi_flags |= IDE_AFLAG_NO_DOORLOCK; > + > if (caps[7] & 0x02) > tape->blk_size = 512; > else if (caps[7] & 0x04) > Index: b/include/linux/ide.h > =================================================================== > --- a/include/linux/ide.h > +++ b/include/linux/ide.h > @@ -317,10 +317,10 @@ struct ide_acpi_hwif_link; > enum { > IDE_AFLAG_DRQ_INTERRUPT = (1 << 0), > IDE_AFLAG_MEDIA_CHANGED = (1 << 1), > - > - /* ide-cd */ > /* Drive cannot lock the door. */ > IDE_AFLAG_NO_DOORLOCK = (1 << 2), > + > + /* ide-cd */ > /* Drive cannot eject the disc. */ > IDE_AFLAG_NO_EJECT = (1 << 3), > /* Drive is a pre ATAPI 1.2 drive. */ > @@ -1140,6 +1140,8 @@ void ide_queue_pc_head(ide_drive_t *, st > struct request *); > int ide_queue_pc_tail(ide_drive_t *, struct gendisk *, struct ide_atapi_pc *); > > +int ide_set_media_lock(ide_drive_t *, struct gendisk *, int); > + > ide_startstop_t ide_pc_intr(ide_drive_t *drive, struct ide_atapi_pc *pc, > ide_handler_t *handler, unsigned int timeout, ide_expiry_t *expiry, > void (*update_buffers)(ide_drive_t *, struct ide_atapi_pc *), -- Regards/Gruss, Boris. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/