mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
To: Tejun Heo <htejun@gmail.com>
Cc: axboe@suse.de, jgarzik@pobox.com, James.Bottomley@steeleye.com,
	linux-kernel@vger.kernel.org
Subject: Re: [PATCH linux-2.6-block:post-2.6.15 09/10] blk: add FUA support to IDE
Date: Thu, 17 Nov 2005 21:39:32 +0100	[thread overview]
Message-ID: <58cb370e0511171239i16e0aaffr237ef7af68ece946@mail.gmail.com> (raw)
In-Reply-To: <20051117153509.5A77ED53@htj.dyndns.org>

On 11/17/05, Tejun Heo <htejun@gmail.com> wrote:
> 09_blk_ide-add-fua-support.patch
>
>         Add FUA support to IDE
>
> Signed-off-by: Tejun Heo <htejun@gmail.com>
>
>  drivers/ide/ide-disk.c |   57 +++++++++++++++++++++++++++++++++++++++++--------
>  include/linux/hdreg.h  |   16 ++++++++++++-
>  include/linux/ide.h    |    3 ++
>  3 files changed, 65 insertions(+), 11 deletions(-)
>
> Index: work/drivers/ide/ide-disk.c
> ===================================================================
> --- work.orig/drivers/ide/ide-disk.c    2005-11-18 00:35:06.000000000 +0900
> +++ work/drivers/ide/ide-disk.c 2005-11-18 00:35:07.000000000 +0900
> @@ -164,13 +164,14 @@ static ide_startstop_t __ide_do_rw_disk(
>         ide_hwif_t *hwif        = HWIF(drive);
>         unsigned int dma        = drive->using_dma;
>         u8 lba48                = (drive->addressing == 1) ? 1 : 0;
> +       int fua                 = blk_fua_rq(rq);
>         task_ioreg_t command    = WIN_NOP;
>         ata_nsector_t           nsectors;
>
>         nsectors.all            = (u16) rq->nr_sectors;
>
>         if (hwif->no_lba48_dma && lba48 && dma) {
> -               if (block + rq->nr_sectors > 1ULL << 28)
> +               if (block + rq->nr_sectors > 1ULL << 28 || fua)
>                         dma = 0;
>                 else
>                         lba48 = 0;
> @@ -226,6 +227,16 @@ static ide_startstop_t __ide_do_rw_disk(
>                         hwif->OUTB(tasklets[6], IDE_HCYL_REG);
>                         hwif->OUTB(0x00|drive->select.all,IDE_SELECT_REG);
>                 } else {
> +                       if (unlikely(fua)) {
> +                               /*
> +                                * This happens if LBA48 addressing is
> +                                * turned off during operation.
> +                                */
> +                               printk(KERN_ERR "%s: FUA write but LBA48 off\n",
> +                                      drive->name);
> +                               goto fail;
> +                       }
> +
>                         hwif->OUTB(0x00, IDE_FEATURE_REG);
>                         hwif->OUTB(nsectors.b.low, IDE_NSECTOR_REG);
>                         hwif->OUTB(block, IDE_SECTOR_REG);
> @@ -253,9 +264,12 @@ static ide_startstop_t __ide_do_rw_disk(
>         if (dma) {
>                 if (!hwif->dma_setup(drive)) {
>                         if (rq_data_dir(rq)) {
> -                               command = lba48 ? WIN_WRITEDMA_EXT : WIN_WRITEDMA;
> -                               if (drive->vdma)
> -                                       command = lba48 ? WIN_WRITE_EXT: WIN_WRITE;
> +                               if (!fua) {
> +                                       command = lba48 ? WIN_WRITEDMA_EXT : WIN_WRITEDMA;
> +                                       if (drive->vdma)
> +                                               command = lba48 ? WIN_WRITE_EXT: WIN_WRITE;
> +                               } else
> +                                       command = ATA_CMD_WRITE_FUA_EXT;

What does happen for fua && drive->vdma case?

>                         } else {
>                                 command = lba48 ? WIN_READDMA_EXT : WIN_READDMA;
>                                 if (drive->vdma)
> @@ -284,8 +298,20 @@ static ide_startstop_t __ide_do_rw_disk(
>         } else {
>                 if (drive->mult_count) {
>                         hwif->data_phase = TASKFILE_MULTI_OUT;
> -                       command = lba48 ? WIN_MULTWRITE_EXT : WIN_MULTWRITE;
> +                       if (!fua)
> +                               command = lba48 ? WIN_MULTWRITE_EXT : WIN_MULTWRITE;
> +                       else
> +                               command = ATA_CMD_WRITE_MULTI_FUA_EXT;
>                 } else {
> +                       if (unlikely(fua)) {
> +                               /*
> +                                * This happens if multisector PIO is
> +                                * turned off during operation.
> +                                */
> +                               printk(KERN_ERR "%s: FUA write but in single "
> +                                      "sector PIO mode\n", drive->name);
> +                               goto fail;
> +                       }

Wouldn't it be better to do the following check at the beginning
of __ide_do_rw_disk() (after checking for dma vs lba48):

        if (fua) {
                if (!lba48 || ((!dma || drive->vdma) && !drive->mult_count))
                        goto fail_fua;
        }

...

and fail the request if needed *before* actually touching any
hardware registers?

fail_fua:
        printk(KERN_ERR "%s: FUA write unsupported (lba48=%u dma=%u"
                                       " vdma=%u mult_count=%u)\n", drive->name,
                                       lba48, dma, drive->vdma,
drive->mult_count);
        ide_end_request(drive, 0, 0);
        return ide_stopped;

>                         hwif->data_phase = TASKFILE_OUT;
>                         command = lba48 ? WIN_WRITE_EXT : WIN_WRITE;
>                 }
> @@ -295,6 +321,10 @@ static ide_startstop_t __ide_do_rw_disk(
>
>                 return pre_task_out_intr(drive, rq);
>         }
> +
> + fail:
> +       ide_end_request(drive, 0, 0);
> +       return ide_stopped;
>  }
>
>  /*
> @@ -846,7 +876,7 @@ static void idedisk_setup (ide_drive_t *
>  {
>         struct hd_driveid *id = drive->id;
>         unsigned long long capacity;
> -       int barrier;
> +       int barrier, fua;
>
>         idedisk_add_settings(drive);
>
> @@ -967,10 +997,19 @@ static void idedisk_setup (ide_drive_t *
>                         barrier = 0;
>         }
>
> -       printk(KERN_INFO "%s: cache flushes %ssupported\n",
> -               drive->name, barrier ? "" : "not ");
> +       fua = barrier && idedisk_supports_lba48(id) && ide_id_has_fua(id);
> +       /* When using PIO, FUA needs multisector. */
> +       if ((!drive->using_dma || drive->hwif->no_lba48_dma) &&
> +           drive->mult_count == 0)
> +               fua = 0;

Shouldn't this check also for drive->vdma?

> +
> +       printk(KERN_INFO "%s: cache flushes %ssupported%s\n",
> +              drive->name, barrier ? "" : "not ",
> +              fua ? " w/ FUA" : "");
>         if (barrier) {
> -               blk_queue_ordered(drive->queue, QUEUE_ORDERED_DRAIN_FLUSH,
> +               unsigned ordered = fua ? QUEUE_ORDERED_DRAIN_FUA
> +                                      : QUEUE_ORDERED_DRAIN_FLUSH;
> +               blk_queue_ordered(drive->queue, ordered,
>                                   idedisk_prepare_flush, GFP_KERNEL);
>                 blk_queue_issue_flush_fn(drive->queue, idedisk_issue_flush);
>         } else if (!drive->wcache)
> Index: work/include/linux/hdreg.h
> ===================================================================
> --- work.orig/include/linux/hdreg.h     2005-11-18 00:06:46.000000000 +0900
> +++ work/include/linux/hdreg.h  2005-11-18 00:35:07.000000000 +0900
> @@ -550,7 +550,13 @@ struct hd_driveid {
>                                          * cmd set-feature supported extensions
>                                          * 15:  Shall be ZERO
>                                          * 14:  Shall be ONE
> -                                        * 13:6 reserved
> +                                        * 13:  IDLE IMMEDIATE w/ UNLOAD FEATURE
> +                                        * 12:11 reserved for technical report
> +                                        * 10:  URG for WRITE STREAM
> +                                        *  9:  URG for READ STREAM
> +                                        *  8:  64-bit World wide name
> +                                        *  7:  WRITE DMA QUEUED FUA EXT
> +                                        *  6:  WRITE DMA/MULTIPLE FUA EXT
>                                          *  5:  General Purpose Logging
>                                          *  4:  Streaming Feature Set
>                                          *  3:  Media Card Pass Through
> @@ -600,7 +606,13 @@ struct hd_driveid {
>                                          * command set-feature default
>                                          * 15:  Shall be ZERO
>                                          * 14:  Shall be ONE
> -                                        * 13:6 reserved
> +                                        * 13:  IDLE IMMEDIATE w/ UNLOAD FEATURE
> +                                        * 12:11 reserved for technical report
> +                                        * 10:  URG for WRITE STREAM
> +                                        *  9:  URG for READ STREAM
> +                                        *  8:  64-bit World wide name
> +                                        *  7:  WRITE DMA QUEUED FUA EXT
> +                                        *  6:  WRITE DMA/MULTIPLE FUA EXT
>                                          *  5:  General Purpose Logging enabled
>                                          *  4:  Valid CONFIGURE STREAM executed
>                                          *  3:  Media Card Pass Through enabled
> Index: work/include/linux/ide.h
> ===================================================================
> --- work.orig/include/linux/ide.h       2005-11-18 00:14:29.000000000 +0900
> +++ work/include/linux/ide.h    2005-11-18 00:35:07.000000000 +0900
> @@ -1503,6 +1503,9 @@ extern struct bus_type ide_bus_type;
>  /* check if CACHE FLUSH (EXT) command is supported (bits defined in ATA-6) */
>  #define ide_id_has_flush_cache(id)     ((id)->cfs_enable_2 & 0x3000)
>
> +/* check if WRITE DMA FUA EXT command is supported (defined in ATA-8) */
> +#define ide_id_has_fua(id)             ((id)->cfsse & 0x0040)
> +
>  /* some Maxtor disks have bit 13 defined incorrectly so check bit 10 too */
>  #define ide_id_has_flush_cache_ext(id) \
>         (((id)->cfs_enable_2 & 0x2400) == 0x2400)
>
>

  reply	other threads:[~2005-11-17 20:39 UTC|newest]

Thread overview: 32+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2005-11-17 15:36 [PATCH linux-2.6-block:post-2.6.15 00/10] blk: reimplementation of I/O barrier Tejun Heo
2005-11-17 15:36 ` [PATCH linux-2.6-block:post-2.6.15 01/10] blk: add @uptodate to end_that_request_last() and @error to rq_end_io_fn() Tejun Heo
2005-11-17 15:36 ` [PATCH linux-2.6-block:post-2.6.15 02/10] blk: separate out bio init part from __make_request Tejun Heo
2005-11-17 15:36 ` [PATCH linux-2.6-block:post-2.6.15 03/10] blk: reimplement handling of barrier request Tejun Heo
2005-11-17 15:36 ` [PATCH linux-2.6-block:post-2.6.15 04/10] blk: update SCSI to use new blk_ordered Tejun Heo
2005-11-17 15:36 ` [PATCH linux-2.6-block:post-2.6.15 05/10] blk: add FUA support to SCSI disk Tejun Heo
2005-11-17 15:36 ` [PATCH linux-2.6-block:post-2.6.15 06/10] blk: update libata to use new blk_ordered Tejun Heo
2005-11-17 15:36 ` [PATCH linux-2.6-block:post-2.6.15 07/10] blk: add FUA support to libata Tejun Heo
2005-11-17 15:36 ` [PATCH linux-2.6-block:post-2.6.15 08/10] blk: update IDE to use new blk_ordered Tejun Heo
2005-11-17 20:11   ` Bartlomiej Zolnierkiewicz
2005-11-18 15:07     ` Tejun Heo
2005-11-18 15:59       ` Bartlomiej Zolnierkiewicz
2005-11-22  2:44         ` Tejun Heo
2005-11-22  8:36           ` Bartlomiej Zolnierkiewicz
2005-11-22  8:39             ` Bartlomiej Zolnierkiewicz
2005-11-23  7:23             ` Tejun Heo
2005-11-23  8:40               ` Bartlomiej Zolnierkiewicz
2005-11-23  8:46                 ` Jens Axboe
2005-11-23  9:00                   ` Tejun
2005-11-23  9:05                     ` Bartlomiej Zolnierkiewicz
2005-11-17 15:36 ` [PATCH linux-2.6-block:post-2.6.15 09/10] blk: add FUA support to IDE Tejun Heo
2005-11-17 20:39   ` Bartlomiej Zolnierkiewicz [this message]
2005-11-18 15:25     ` Tejun Heo
2005-11-18 16:17       ` Bartlomiej Zolnierkiewicz
2005-11-18 17:02         ` Alan Cox
2005-11-18 16:38           ` Bartlomiej Zolnierkiewicz
2005-11-18 17:41             ` Alan Cox
2005-11-24 11:58         ` Tejun Heo
2005-11-24 12:21           ` Tejun Heo
2005-11-24 14:21             ` Bartlomiej Zolnierkiewicz
2005-11-17 15:37 ` [PATCH linux-2.6-block:post-2.6.15 10/10] blk: I/O barrier documentation Tejun Heo
2005-11-17 16:20 ` [PATCH linux-2.6-block:post-2.6.15 00/10] blk: reimplementation of I/O barrier Jeff Garzik

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=58cb370e0511171239i16e0aaffr237ef7af68ece946@mail.gmail.com \
    --to=bzolnier@gmail.com \
    --cc=James.Bottomley@steeleye.com \
    --cc=axboe@suse.de \
    --cc=htejun@gmail.com \
    --cc=jgarzik@pobox.com \
    --cc=linux-kernel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®