Skip to content

L
linux
Switch branch/tag
  1. 18 Apr, 2009 21 commits
    • Tejun Heo's avatar
      ide-tape,floppy: fix failed command completion after request sense · ea7066af
      Tejun Heo authored 
      Impact: fix infinite retry loop

After a command failed, ide-tape and floppy inserts REQUEST_SENSE in
front of the failed command and according to the result, sets
pc->retries, flags and errors.  After REQUEST_SENSE is complete, the
failed command is again at the front of the queue and if the verdict
was to terminate the request, the issue functions tries to complete it
directly by calling drive->pc_callback() and returning ide_stopped.

However, drive->pc_callback() doesn't complete a request.  It only
prepares for completion of the request.  As a result, this creates an
infinite loop where the failed request is retried perpetually.

Fix it by actually ending the request by calling ide_complete_rq().
Signed-off-by: default avatarTejun Heo <tj@kernel.org>
      ea7066af
    • Tejun Heo's avatar
      ide-pm: don't abuse rq->data · fc38b521
      Tejun Heo authored 
      Impact: cleanup rq->data usage

ide-pm uses rq->data to carry pointer to struct request_pm_state
through request queue and rq->special is used to carray pointer to
local struct ide_cmd, which isn't necessary.  Use rq->special for
request_pm_state instead and use local ide_cmd in
ide_start_power_step().
Signed-off-by: default avatarTejun Heo <tj@kernel.org>
Cc: Jens Axboe <axboe@kernel.dk>
      fc38b521
    • Tejun Heo's avatar
      ide-cd,atapi: use bio for internal commands · 5c4be572
      Tejun Heo authored 
      Impact: unify request data buffer handling

rq->data is used mostly to pass kernel buffer through request queue
without using bio.  There are only a couple of places which still do
this in kernel and converting to bio isn't difficult.

This patch converts ide-cd and atapi to use bio instead of rq->data
for request sense and internal pc commands.  With previous change to
unify sense request handling, this is relatively easily achieved by
adding blk_rq_map_kern() during sense_rq prep and PC issue.

If blk_rq_map_kern() fails for sense, the error is deferred till sense
issue and aborts the failed command which triggered the sense.  Note
that this is a slim possibility as sense prep is done on each command
issue, so for the above condition to actually trigger, all preps since
the last sense issue till the issue of the request which would require
a sense should fail.

* do_request functions might sleep now.  This should be okay as ide
  request_fn - do_ide_request() - is invoked only from make_request
  and plug work.  Make sure this is the case by adding might_sleep()
  to do_ide_request().

* Functions which access the read sense data before the sense request
  is complete now should access bio_data(sense_rq->bio) as the sense
  buffer might have been copied during blk_rq_map_kern().

* ide-tape updated to map sg.

* cdrom_do_block_pc() now doesn't have to deal with REQ_TYPE_ATA_PC
  special case.  Simplified.

* tp_ops->output/input_data path dropped from ide_pc_intr().
Signed-off-by: default avatarTejun Heo <tj@kernel.org>
      5c4be572
    • Borislav Petkov's avatar
      ide-atapi: convert ide-{floppy,tape} to using preallocated sense buffer · 6b544fcc
      Borislav Petkov authored 
      Since we're issuing REQ_TYPE_SENSE now we need to allow those types of
rqs in the ->do_request callbacks. As a future improvement, sense_len
assignment might be unified across all ATAPI devices. Borislav to
check with specs and test.

As a result, get rid of ide_queue_pc_head() and
drive->request_sense_rq.

tj: * Init request sense ide_atapi_pc from sense request.  In the
      longer timer, it would probably better to fold
      ide_create_request_sense_cmd() into its only current user -
      ide_floppy_get_format_progress().

    * ide_retry_pc() no longer takes @disk.

CC: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
CC: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Signed-off-by: default avatarBorislav Petkov <petkovbb@gmail.com>
Signed-off-by: default avatarTejun Heo <tj@kernel.org>
      6b544fcc
    • Borislav Petkov's avatar
      ide-cd: convert to using generic sense request · 746d5e43
      Borislav Petkov authored 
      Preallocate a sense request in the ->do_request method and reinitialize
it only on demand, in case it's been consumed in the IRQ handler path.
The reason for this is that we don't want to be mapping rq to bio in
the IRQ path and introduce all kinds of unnecessary hacks to the block
layer.

tj: * Both user and kernel PC requests expect sense data to be stored
      in separate storage other than drive->sense_data.  Copy sense
      data to rq->sense on completion if rq->sense is not NULL.  This
      fixes bogus sense data on PC requests.

As a result, remove cdrom_queue_request_sense.

CC: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
CC: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Signed-off-by: default avatarBorislav Petkov <petkovbb@gmail.com>
Signed-off-by: default avatarTejun Heo <tj@kernel.org>
      746d5e43
    • Borislav Petkov's avatar
      ide: add helpers for preparing sense requests · a1df5169
      Borislav Petkov authored 
      This is in preparation of removing the queueing of a sense request out
of the IRQ handler path.

Use struct request_sense as a general sense buffer for all ATAPI
devices ide-{floppy,tape,cd}.

tj: * blk_get_request(__GFP_WAIT) can't be called from do_request() as
      it can cause deadlock.  Converted to use inline struct request
      and blk_rq_init().

    * Added xfer / cdb len selection depending on device type.

    * All sense prep logics folded into ide_prep_sense() which never
      fails.

    * hwif->rq clearing and sense_rq used handling moved into
      ide_queue_sense_rq().

    * blk_rq_map_kern() conversion is moved to later patch.

CC: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
CC: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Signed-off-by: default avatarBorislav Petkov <petkovbb@gmail.com>
Signed-off-by: default avatarTejun Heo <tj@kernel.org>
      a1df5169
    • Tejun Heo's avatar
      ide-cd: don't abuse rq->buffer · cbfd082a
      Tejun Heo authored 
      Impact: rq->buffer usage cleanup

ide-cd uses rq->buffer to carry pointer to the original request when
issuing REQUEST_SENSE.  Use rq->special instead.
Signed-off-by: default avatarTejun Heo <tj@kernel.org>
Cc: Jens Axboe <axboe@kernel.dk>
      cbfd082a
    • Tejun Heo's avatar
      ide-atapi: don't abuse rq->buffer · c267cc1c
      Tejun Heo authored 
      Impact: rq->buffer usage cleanup

ide-atapi uses rq->buffer as private opaque value for internal special
requests.  rq->special isn't used for these cases (the only case where
rq->special is used is for ide-tape rw requests).  Use rq->special
instead.
Signed-off-by: default avatarTejun Heo <tj@kernel.org>
Cc: Jens Axboe <axboe@kernel.dk>
      c267cc1c
    • Tejun Heo's avatar
      ide-taskfile: don't abuse rq->buffer · eace4cb0
      Tejun Heo authored 
      Impact: rq->buffer usage cleanup

ide_raw_taskfile() directly uses rq->buffer to carry pointer to the
data buffer.  This complicates both block interface and ide backend
request handling.  Use blk_rq_map_kern() instead and drop special
handling for REQ_TYPE_ATA_TASKFILE from ide_map_sg().

Note that REQ_RW setting is moved upwards as blk_rq_map_kern() uses it
to initialize bio rw flag.
Signed-off-by: default avatarTejun Heo <tj@kernel.org>
Cc: Jens Axboe <axboe@kernel.dk>
      eace4cb0
    • Tejun Heo's avatar
      ide-floppy: block pc always uses bio · 7f006dc2
      Tejun Heo authored 
      Impact: remove unnecessary code path

Block pc requests always use bio and rq->data is always NULL.  No need
to worry about !rq->bio cases in idefloppy_block_pc_cmd().  Note that
ide-atapi uses ide_pio_bytes() for bio PIO transfer which handle sg
fine.
Signed-off-by: default avatarTejun Heo <tj@kernel.org>
Cc: Jens Axboe <axboe@kernel.dk>
      7f006dc2
    • Tejun Heo's avatar
      ide-cd: clear sense buffer before issuing request sense · 1873b90c
      Tejun Heo authored 
      Impact: code simplification

ide_cd_request_sense_fixup() clears the tail of the sense buffer if
the device didn't completely fill it.  This patch makes
cdrom_queue_request_sense() clear the sense buffer before issuing the
command instead of clearing it afterwards.  This simplifies code and
eases future changes.
Signed-off-by: default avatarTejun Heo <tj@kernel.org>
      1873b90c
    • Tejun Heo's avatar
      ide kill unused ide_cmd->special · 46a802e8
      Tejun Heo authored 
      Impact: removal of unused field

No one uses ide_cmd->special anymore.  Kill it.
Signed-off-by: default avatarTejun Heo <tj@kernel.org>
      46a802e8
    • Tejun Heo's avatar
      ide: don't set REQ_SOFTBARRIER · 55f3f399
      Tejun Heo authored 
      ide doesn't have to worry about REQ_SOFTBARRIER.  Don't set it.
Signed-off-by: default avatarTejun Heo <tj@kernel.org>
      55f3f399
    • Tejun Heo's avatar
      ide: use blk_run_queue() instead of blk_start_queueing() · 853280a4
      Tejun Heo authored 
      blk_start_queueing() is being phased out in favor of
[__]blk_run_queue().  Switch.
Signed-off-by: default avatarTejun Heo <tj@kernel.org>
      853280a4
    • Tejun Heo's avatar
      ide-tape: remove back-to-back REQUEST_SENSE detection · 1e75540e
      Tejun Heo authored 
      Impact: fix an oops which always triggers

ide_tape_issue_pc() assumed drive->pc isn't NULL on invocation when
checking for back-to-back request sense issues but drive->pc can be
NULL and even when it's not NULL, it's not safe to dereference it once
the previous command is complete because pc could have been freed or
was on stack.  Kill back-to-back REQUEST_SENSE detection.
Signed-off-by: default avatarTejun Heo <tj@kernel.org>
      1e75540e
    • Tejun Heo's avatar
      block: clear req->errors on bio completion only for fs requests · 6f41469c
      Tejun Heo authored 
      Impact: subtle behavior change

For fs requests, rq is only carrier of bios and rq error status as a
whole doesn't mean much.  This is the reason why rq->errors is being
cleared on each partial completion of a request as on each partial
completion the error status is transferred to the respective bios.

For pc requests, rq->errors is used to carry error status to the
issuer and thus __end_that_request_first() doesn't clear it on such
cases.

The condition was fine till now as only fs and pc requests have used
bio and thus the bio completion path.  However, future changes will
unify data accesses to bio and all non fs users care about rq error
status.  Clear rq->errors on bio completion only for fs requests.

In general, the implicit clearing is a bit too subtle especially as
the meaning of rq->errors is completely dependent on low level
drivers.  Unifying / cleaning up rq->errors usage and letting llds
manage it would be better.  TODO comment added.
Signed-off-by: default avatarTejun Heo <tj@kernel.org>
Acked-by: default avatarJens Axboe <axboe@kernel.dk>
      6f41469c
    • Sergei Shtylyov's avatar
      cs5536: define dma_sff_read_status() method · 15da90b5
      Sergei Shtylyov authored 
      The driver somehow got merged with the initializer for the dma_sff_read_status()
method missing which caused kernel panic on bootup.

This should fix the kernel.org bug #13026...
Signed-off-by: default avatarSergei Shtylyov <sshtylyov@ru.mvista.com>
Reported-by: default avatarArnd Hannemann <hannemann@nets.rwth-aachen.de>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
      15da90b5
    • Bartlomiej Zolnierkiewicz's avatar
      ide: fix barriers support · f505d49f
      Bartlomiej Zolnierkiewicz authored 
      Freeing non-slab objects is bad and results in an oops.  Fix it.
Reported-and-tested-by: default avatarAndrew Price <andy@andrewprice.me.uk>
Cc: Theodore Tso <tytso@mit.edu>
Cc: "Rafael J. Wysocki" <rjw@sisk.pl>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
      f505d49f
    • Jack Stone's avatar
      ide: Remove void casts · d5f840bf
      Jack Stone authored 
      Remove uneeded void casts
Signed-off-by: default avatarJack Stone <jwjstone@fastmail.fm>
Cc: jeff@garzik.org
Cc: kernel-janitors@vger.kernel.org
Cc: Jack Stone <jwjstone@fastmail.fm>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
      d5f840bf
    • Sergei Shtylyov's avatar
      hpt366: use ATA_DMA_* constants · 59c8d04f
      Sergei Shtylyov authored 
      Use ATA_DMA_* constants instead of the bare numbers for the BMIDE register bits.
Signed-off-by: default avatarSergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
      59c8d04f
    • Sergei Shtylyov's avatar
      hpt366: fix HPT370 DMA timeouts · c018f1ee
      Sergei Shtylyov authored 
      The big driver change in 2.4.19-rc1 introduced a regression for many HPT370[A]
chips -- DMA stopped to work completely, only causing endless timeouts...

The culprit has been identified (at last!): it turned to be the code resetting
the DMA state machine before each transfer. Stop doing it now as this counter-
measure has clearly caused more harm than good.

This should fix the kernel.org bug #7703.
Signed-off-by: default avatarSergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
      c018f1ee
  3. 17 Apr, 2009 19 commits
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7