1. 18 4月, 2008 40 次提交
    • T
      libata: make SFF support optional · 127102ae
      Tejun Heo 提交于
      Now that SFF support is completely separated out from the core layer,
      it can be made optional.  Add CONFIG_ATA_SFF and let SFF drivers
      depend on it.  If CONFIG_ATA_SFF isn't set, all codes in libata-sff.c
      and data structures for SFF support are disabled.  This saves good
      number of bytes for small systems.
      Signed-off-by: NTejun Heo <htejun@gmail.com>
      127102ae
    • T
      libata: don't use ap->ioaddr in non-SFF drivers · 350756f6
      Tejun Heo 提交于
      ap->ioaddr is to carry addresses for TF and BMDMA registers of a SFF
      controller, don't abuse it in non-SFF controllers.
      Signed-off-by: NTejun Heo <htejun@gmail.com>
      350756f6
    • T
      libata: clean up dummy port_ops · 182d7bba
      Tejun Heo 提交于
      Now that SFF assumptions are removed from core layer, dummy port_ops
      can be slimmed down.  Chop it down.
      Signed-off-by: NTejun Heo <htejun@gmail.com>
      182d7bba
    • T
      libata: kill ata_noop_dev_select() · c9f75b04
      Tejun Heo 提交于
      Now that SFF assumptions are separated out from non-SFF reset
      sequence, port_ops->sff_dev_select() is no longer necessary for
      non-SFF controllers.  Kill ata_noop_dev_select() and ->sff_dev_select
      initialization from base and other non-SFF port_ops.
      Signed-off-by: NTejun Heo <htejun@gmail.com>
      c9f75b04
    • T
      libata: remove check_status from non-SFF drivers · 520d06f9
      Tejun Heo 提交于
      Now that all SFF stuff is separated out of core layer, core layer
      doesn't call ops->[alt_]check_status().  In fact, no one calls them
      for non-SFF drivers anymore.  Kill them.
      Signed-off-by: NTejun Heo <htejun@gmail.com>
      520d06f9
    • T
      libata: replace tf_read with qc_fill_rtf for non-SFF drivers · 4c9bf4e7
      Tejun Heo 提交于
      Now that all SFF stuff is separated out of core layer, core layer
      doesn't call ops->tf_read directly.  It gets called only via
      ops->qc_fill_rtf() for non-SFF drivers.  This patch directly
      implements private ops->qc_fill_rtf() for non-SFF controllers and kill
      ops->tf_read().
      
      This is much cleaner for non-SFF controllers as some of them have to
      cache SFF register values in private data structure and report the
      cached values via ops->tf_read().  Also, ops->tf_read() gets nasty for
      controllers which don't have clear notion of TF registers when
      operation is not in progress.
      
      As this change makes default ops->qc_fill_rtf unnecessary, move
      ata_sff_qc_fill_rtf() form ata_base_port_ops to ata_sff_port_ops where
      it belongs.
      Signed-off-by: NTejun Heo <htejun@gmail.com>
      4c9bf4e7
    • T
      libata: drop @finish_qc from ata_qc_complete_multiple() · 79f97dad
      Tejun Heo 提交于
      ata_qc_complete_multiple() took @finish_qc and called it on every qc
      before completing it.  This was to give opportunity to update TF cache
      before ata_qc_complete() tries to fill result_tf.  Now that result TF
      is a separate operation, this is no longer necessary.
      
      Update sata_sil24, which was the only user of this mechanism, such
      that it implements its own ops->qc_fill_rtf() and drop @finish_qc from
      ata_qc_complete_multiple().
      Signed-off-by: NTejun Heo <htejun@gmail.com>
      79f97dad
    • T
      libata: add qc_fill_rtf port operation · 22183bf5
      Tejun Heo 提交于
      On command completion, ata_qc_complete() directly called ops->tf_read
      to fill qc->result_tf.  This patch adds ops->qc_fill_rtf to replace
      hardcoded ops->tf_read usage.
      
      ata_sff_qc_fill_rtf() which uses ops->tf_read to fill result_tf is
      implemented and set in ata_base_port_ops and other ops tables which
      don't inherit from ata_base_port_ops, so this patch doesn't introduce
      any behavior change.
      
      ops->qc_fill_rtf() is similar to ops->sff_tf_read() but can only be
      called when a command finishes.  As some non-SFF controllers don't
      have TF registers defined unless they're associated with in-flight
      commands, this limited operation makes life easier for those drivers
      and help lifting SFF assumptions from libata core layer.
      Signed-off-by: NTejun Heo <htejun@gmail.com>
      22183bf5
    • T
      libata: unify mechanism to request follow-up SRST · 305d2a1a
      Tejun Heo 提交于
      Previously, there were two ways to trigger follow-up SRST from
      hardreset method - returning -EAGAIN and leaving all device classes
      unmodified.  Drivers never used the latter mechanism and the only use
      case for the former was when hardreset couldn't classify.
      
      Drop the latter mechanism and let -EAGAIN mean "perform follow-up SRST
      if classification is required".  This change removes unnecessary
      follow-up SRSTs and simplifies reset implementations.
      Signed-off-by: NTejun Heo <htejun@gmail.com>
      305d2a1a
    • T
      libata: move PMP SCR access failure during reset to ata_eh_reset() · 5958e302
      Tejun Heo 提交于
      If PMP fan-out reset fails and SCR isn't accessible, PMP should be
      reset.  This used to be tested by sata_pmp_std_hardreset() and
      communicated to EH by -ERESTART.  However, this logic is generic and
      doesn't really have much to do with specific hardreset implementation.
      
      This patch moves SCR access failure detection logic to ata_eh_reset()
      where it belongs.  As this makes sata_pmp_std_hardreset() identical to
      sata_std_hardreset(), the function is killed and replaced with the
      standard method.
      Signed-off-by: NTejun Heo <htejun@gmail.com>
      5958e302
    • T
      libata: clear SError after link resume · ac371987
      Tejun Heo 提交于
      SError used to be cleared in ->postreset.  This has small hotplug race
      condition.  If a device is plugged in after reset is complete but
      postreset hasn't run yet, its hotplug event gets lost when SError is
      cleared.  This patch makes sata_link_resume() clear SError.  This
      kills the race condition and makes a lot of sense as some PMP and host
      PHYs don't work properly without SError cleared.
      
      This change makes sata_pmp_std_{pre|post}_reset()'s unnecessary as
      they become identical to ata_std counterparts.  It also simplifies
      sata_pmp_hardreset() and ahci_vt8251_hardreset().
      Signed-off-by: NTejun Heo <htejun@gmail.com>
      ac371987
    • T
      libata: implement and use sata_std_hardreset() · 57c9efdf
      Tejun Heo 提交于
      Implement sata_std_hardreset(), which simply wraps around
      sata_link_hardreset().  sata_std_hardreset() becomes new standard
      hardreset method for sata_port_ops and sata_sff_hardreset() moves from
      ata_base_port_ops to ata_sff_port_ops, which is where it really
      belongs.
      
      ata_is_builtin_hardreset() is added so that both
      ata_std_error_handler() and ata_sff_error_handler() skip both builtin
      hardresets if SCR isn't accessible.
      
      piix_sidpr_hardreset() in ata_piix.c is identical to
      sata_std_hardreset() in functionality and got replaced with the
      standard function.
      Signed-off-by: NTejun Heo <htejun@gmail.com>
      57c9efdf
    • T
      libata: move generic hardreset code from sata_sff_hardreset() to sata_link_hardreset() · 9dadd45b
      Tejun Heo 提交于
      sata_sff_hardreset() contains link readiness wait logic which isn't
      SFF specific.  Move that part into sata_link_hardreset(), which now
      takes two more parameters - @online and @check_ready.  Both are
      optional.  The former is out parameter for link onlineness after
      reset.  The latter is used to wait for link readiness after hardreset.
      
      Users of sata_link_hardreset() is updated to use new funtionality and
      ahci_hardreset() is updated to use sata_link_hardreset() instead of
      sata_sff_hardreset().  This doesn't really cause any behavior change.
      Signed-off-by: NTejun Heo <htejun@gmail.com>
      9dadd45b
    • T
      ahci: use ata_wait_after_reset() instead of ata_sff_wait_ready() · a89611e8
      Tejun Heo 提交于
      Implement ahci_check_ready() and replace ata_sff_wait_after_reset()
      with ata_wait_after_reset().  As ahci was faking TF access, this
      change doesn't result in any functional difference.
      Signed-off-by: NTejun Heo <htejun@gmail.com>
      a89611e8
    • T
      libata: separate out ata_wait_ready() and implement ata_wait_after_reset() · aa2731ad
      Tejun Heo 提交于
      Factor out waiting logic (which is common to all ATA controllers) from
      ata_sff_wait_ready() into ata_wait_ready().  ata_wait_ready() takes
      @check_ready function pointer and uses it to poll for readiness.  This
      allows non-SFF controllers to use ata_wait_ready() to wait for link
      readiness.
      
      This patch also implements ata_wait_after_reset() - generic version of
      ata_sff_wait_after_reset() - using ata_wait_ready().
      
      ata_sff_wait_ready() is reimplemented using ata_wait_ready() and
      ata_sff_check_ready().  Functionality remains the same.
      Signed-off-by: NTejun Heo <htejun@gmail.com>
      aa2731ad
    • T
      libata: restructure SFF post-reset readiness waits · 705e76be
      Tejun Heo 提交于
      Previously, post-softreset readiness is waited as follows.
      
      1. ata_sff_wait_after_reset() waits for 150ms and then for
         ATA_TMOUT_FF_WAIT if status is 0xff and other conditions meet.
      
      2. ata_bus_softreset() finishes with -ENODEV if status is still 0xff.
         If not, continue to #3.
      
      3. ata_bus_post_reset() waits readiness of dev0 and/or dev1 depending
         on devmask using ata_sff_wait_ready().
      
      And for post-hardreset readiness,
      
      1. ata_sff_wait_after_reset() waits for 150ms and then for
         ATA_TMOUT_FF_WAIT if status is 0xff and other conditions meet.
      
      2. sata_sff_hardreset waits for device readiness using
         ata_sff_wait_ready().
      
      This patch merges and unifies post-reset readiness waits into
      ata_sff_wait_ready() and ata_sff_wait_after_reset().
      
      ATA_TMOUT_FF_WAIT handling is merged into ata_sff_wait_ready().  If TF
      status is 0xff, link status is unknown and the port is SATA, it will
      continue polling till ATA_TMOUT_FF_WAIT.
      
      ata_sff_wait_after_reset() is updated to perform the following steps.
      
      1. waits for 150ms.
      
      2. waits for dev0 readiness using ata_sff_wait_ready().  Note that
         this is done regardless of devmask, as ata_sff_wait_ready() handles
         0xff status correctly, this preserves the original behavior except
         that it may wait longer after softreset if link is online but
         status is 0xff.  This behavior change is very unlikely to cause any
         actual difference and is intended.  It brings softreset behavior to
         that of hardreset.
      
      3. waits for dev1 readiness just the same way ata_bus_post_reset() did.
      
      Now both soft and hard resets call ata_sff_wait_after_reset() after
      reset to wait for readiness after resets.  As
      ata_sff_wait_after_reset() contains calls to ->sff_dev_select(),
      explicit call near the end of sata_sff_hardreset() is removed.
      
      This change makes reset implementation simpler and more consistent.
      
      While at it, make the magical 150ms wait post-reset wait duration a
      constant and ata_sff_wait_ready() and ata_sff_wait_after_reset() take
      @link instead of @ap.  This is to make them consistent with other
      reset helpers and ease core changes.
      
      pata_scc is updated accordingly.
      Signed-off-by: NTejun Heo <htejun@gmail.com>
      705e76be
    • T
      libata: separate out ata_std_postreset() from ata_sff_postreset() · 203c75b8
      Tejun Heo 提交于
      Separate out generic ATA portion from ata_sff_postreset() into
      ata_std_postreset() and implement ata_sff_postreset() using the std
      version.
      
      ata_base_port_ops now has ata_std_postreset() for its postreset and
      ata_sff_port_ops overrides it to ata_sff_postreset().
      
      This change affects pdc_adma, ahci, sata_fsl and sata_sil24.  pdc_adma
      now specifies postreset to ata_sff_postreset() explicitly.  sata_fsl
      and sata_sil24 now use ata_std_postreset() which makes no difference
      to them.  ahci now calls ata_std_postreset() from its own postreset
      method, which causes no behavior difference.
      Signed-off-by: NTejun Heo <htejun@gmail.com>
      203c75b8
    • T
      libata: separate out ata_std_prereset() from ata_sff_prereset() · 0aa1113d
      Tejun Heo 提交于
      Separate out generic ATA portion from ata_sff_prereset() into
      ata_std_prereset() and implement ata_sff_prereset() using the std
      version.  Waiting for device readiness is the only SFF specific part.
      
      ata_base_port_ops now has ata_std_prereset() for its prereset and
      ata_sff_port_ops overrides it to ata_sff_prereset().  This change can
      affect pdc_adma, ahci, sata_fsl and sata_sil24.  pdc_adma implements
      its own prereset using ata_sff_prereset() and the rest has hardreset
      and thus are unaffected by this change.
      
      This change reflects real world situation.  There is no generic way to
      wait for device readiness for non-SFF controllers and some of them
      don't have any mechanism for that.  Non-sff drivers which don't have
      hardreset should wrap ata_std_prereset() and wait for device readiness
      itself but there's no such driver now and isn't likely to be popular
      in the future either.
      Signed-off-by: NTejun Heo <htejun@gmail.com>
      0aa1113d
    • T
      libata: clean up port_ops->sff_irq_clear() · 288623a0
      Tejun Heo 提交于
      ->sff_irq_clear() is called only from SFF interrupt handler, so there
      is no reason to initialize it for non-SFF controllers.  Also,
      ata_sff_irq_clear() can handle both BMDMA and non-BMDMA SFF
      controllers.
      
      This patch kills ata_noop_irq_clear() and removes it from base
      port_ops and sets ->sff_irq_clear to ata_sff_irq_clear() in sff
      port_ops instead of bmdma port_ops.
      Signed-off-by: NTejun Heo <htejun@gmail.com>
      288623a0
    • T
      libata: rename SFF port ops · 5682ed33
      Tejun Heo 提交于
      Add sff_ prefix to SFF specific port ops.
      
      This rename is in preparation of separating SFF support out of libata
      core layer.  This patch strictly renames ops and doesn't introduce any
      behavior difference.
      Signed-off-by: NTejun Heo <htejun@gmail.com>
      5682ed33
    • T
      libata: rename SFF functions · 9363c382
      Tejun Heo 提交于
      SFF functions have confusing names.  Some have sff prefix, some have
      bmdma, some std, some pci and some none.  Unify the naming by...
      
      * SFF functions which are common to both BMDMA and non-BMDMA are
        prefixed with ata_sff_.
      
      * SFF functions which are specific to BMDMA are prefixed with
        ata_bmdma_.
      
      * SFF functions which are specific to PCI but apply to both BMDMA and
        non-BMDMA are prefixed with ata_pci_sff_.
      
      * SFF functions which are specific to PCI and BMDMA are prefixed with
        ata_pci_bmdma_.
      
      * Drop generic prefixes from LLD specific routines.  For example,
        bfin_std_dev_select -> bfin_dev_select.
      
      The following renames are noteworthy.
      
        ata_qc_issue_prot() -> ata_sff_qc_issue()
        ata_pci_default_filter() -> ata_bmdma_mode_filter()
        ata_dev_try_classify() -> ata_sff_dev_classify()
      
      This rename is in preparation of separating SFF support out of libata
      core layer.  This patch strictly renames functions and doesn't
      introduce any behavior difference.
      Signed-off-by: NTejun Heo <htejun@gmail.com>
      9363c382
    • M
      sata_mv fix ifctl handling · b67a1064
      Mark Lord 提交于
      Fix handling of the SATA_INTERFACE_CFG register to match datasheet requirements.
      Signed-off-by: NMark Lord <mlord@pobox.com>
      Signed-off-by: NJeff Garzik <jeff@garzik.org>
      b67a1064
    • M
      sata_mv clean up mv_stop_edma usage · b562468c
      Mark Lord 提交于
      Clean up uses of mv_stop_edma{_engine}() to match datasheet requirements.
      Signed-off-by: NMark Lord <mlord@pobox.com>
      Signed-off-by: NJeff Garzik <jeff@garzik.org>
      b562468c
    • M
      sata_mv cosmetic fixes · e12bef50
      Mark Lord 提交于
      Various cosmetic fixes in preparation for real code changes later on.
      Signed-off-by: NMark Lord <mlord@pobox.com>
      Signed-off-by: NJeff Garzik <jeff@garzik.org>
      e12bef50
    • Y
      use ATA_TAG_INTERNAL in ata_tag_internal() · 83c063dd
      Yoichi Yuasa 提交于
      It should be ATA_TAG_INTERNAL.
      Signed-off-by: NYoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
      Signed-off-by: NJeff Garzik <jeff@garzik.org>
      83c063dd
    • C
      Add 'short help text' to ATA_ACPI so it's [de]selectable. · c30484d7
      Chris Wedgwood 提交于
      ATA_ACPI isn't selectable right now because it lacks 'short help
      text'.  This means it's always enabled and always enables ACPI_DOCK.
      Add text so it's now [de]selectable.
      
      cc: Jeff Garzik <jeff@garzik.org>
      cc: Tejun Heo <htejun@gmail.com>
      cc: Len Brown <len.brown@intel.com>
      Signed-off-by: NChris Wedgwood <cw@f00f.org>
      Signed-off-by: NJeff Garzik <jeff@garzik.org>
      c30484d7
    • T
      pdc_adma: kill adma_host_stop() · fc4712d1
      Tejun Heo 提交于
      adma_host_stop() does the same thing that adma_port_stop() does.  Kill
      it.
      Signed-off-by: NTejun Heo <htejun@gmail.com>
      Cc: Mark Lord <liml@rtr.ca>
      Signed-off-by: NJeff Garzik <jeff@garzik.org>
      fc4712d1
    • T
      pdc_adma: inherit ata_sff_port_ops · b0316b15
      Tejun Heo 提交于
      With the previous ops standardization, pdc_adma now can inherit
      ata_sff_port_ops instead of ata_base_port_ops.  Make the change.
      Signed-off-by: NTejun Heo <htejun@gmail.com>
      Cc: Mark Lord <liml@rtr.ca>
      Signed-off-by: NJeff Garzik <jeff@garzik.org>
      b0316b15
    • T
      libata/pdc_adma: make SFF EH handle non-bmdma SFF drivers and standardize pdc_adma ops · ed82f964
      Tejun Heo 提交于
      pdc_adma has interface similar to SFF but has its own DMA interface.
      It currently implements noop bmdma ops to avoid crashing
      ata_bmdma_error_handler() which BTW actually is EH for SFF drivers.
      
      This patch makes ata_bmdma_error_handler() dereference bmdma ops iff
      bmdma_addr is initialized as done in ata_bmdma_post_internal_cmd.
      This change allows pdc_adma to standardize ops and use SFF
      error_handler and post_internal_cmd.
      Signed-off-by: NTejun Heo <htejun@gmail.com>
      Cc: Mark Lord <liml@rtr.ca>
      Signed-off-by: NJeff Garzik <jeff@garzik.org>
      ed82f964
    • T
      libata: kill unused ata_flush_cache() · d8b81b80
      Tejun Heo 提交于
      ata_flush_code() hasn't been in use for quite some time now.  Kill it.
      Signed-off-by: NTejun Heo <htejun@gmail.com>
      Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
      Signed-off-by: NJeff Garzik <jeff@garzik.org>
      d8b81b80
    • T
      libata: implement ATA_QCFLAG_RETRY · 03faab78
      Tejun Heo 提交于
      Currently whether a command should be retried after failure is
      determined inside ata_eh_finish().  Add ATA_QCFLAG_RETRY and move the
      logic into ata_eh_autopsy().  This makes things clearer and helps
      extending retry determination logic.
      Signed-off-by: NTejun Heo <htejun@gmail.com>
      Signed-off-by: NJeff Garzik <jeff@garzik.org>
      03faab78
    • T
      libata: make ata_tf_to_lba[48]() generic · a5987e0a
      Tejun Heo 提交于
      ata_tf_to_lba[48]() currently return LBA in tf + 1 for
      ata_read_native_max_address().  Make them return LBA and make it
      global so that it can be used to read LBA off TF for other purposes.
      ata_read_native_max_address() now adds 1 itself.
      Signed-off-by: NTejun Heo <htejun@gmail.com>
      Signed-off-by: NJeff Garzik <jeff@garzik.org>
      a5987e0a
    • J
      [libata] sata_nv: disable ADMA by default · 06993d22
      Jeff Garzik 提交于
      Continues to have open issues, and engineering support is extremely difficult
      to come by, according to fellow NVIDIA engineers.
      Signed-off-by: NJeff Garzik <jgarzik@redhat.com>
      06993d22
    • A
      libata annotations · 826cd156
      Al Viro 提交于
      Signed-off-by: NAl Viro <viro@zeniv.linux.org.uk>
      Signed-off-by: NJeff Garzik <jeff@garzik.org>
      826cd156
    • T
      ata_piix: kill ich6_sata_ahci and clean up · 9c0bf675
      Tejun Heo 提交于
      ich6_sata_ahci and ich6_sata are identical.  Kill ich6_sata_ahci and
      drop _ahci postfixes from controller ids, which doesn't really mean
      anything at this point.
      Signed-off-by: NTejun Heo <htejun@gmail.com>
      Signed-off-by: NJeff Garzik <jeff@garzik.org>
      9c0bf675
    • T
      ata_piix: don't attach to ICH6M in ahci mode · 5016d7d2
      Tejun Heo 提交于
      ata_piix when attached to ICH6M in AHCI mode doesn't provide any
      benefit over using ahci and has detection problems.  Don't let
      ata_piix claim ICH6M if it's in AHCI mode.
      
      This change makes ICH6R the only one which ata_piix can attach to even
      when it's in ahci mode which is necessary as some devices don't work
      properly under ahci mode.  Drop PIIX_FLAG_AHCI and match the
      controller directly so that piix_disable_ahci() is called only for it.
      
      This change makes PIIX_SCC no longer used and it gets dropped too.
      
      This fixes bz 9491.
      Signed-off-by: NTejun Heo <htejun@gmail.com>
      Cc: Robert M. Albrecht <romal@gmx.de>
      Signed-off-by: NJeff Garzik <jeff@garzik.org>
      5016d7d2
    • T
      pata_scc: fix compile warning · c1796d98
      Tejun Heo 提交于
      Missed one during mass conversion (dc14c0c5).  Fix it.  Spotted by
      Stephen Rothwell.
      Signed-off-by: NTejun Heo <htejun@gmail.com>
      Cc: Stephen Rothwell <sfr@canb.auug.org.au>
      Signed-off-by: NJeff Garzik <jeff@garzik.org>
      c1796d98
    • A
      libata: isolate and rework cable logic · 15a5551c
      Alan Cox 提交于
      Signed-off-by: NAlan Cox <alan@redhat.com>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NJeff Garzik <jeff@garzik.org>
      15a5551c
    • Z
      ata: SWNCQ should be enabled by default · d21279f4
      Zoltan Boszormenyi 提交于
      Signed-off-by: NZoltan Boszormenyi <zboszor@dunaweb.hu>
      Cc: Robert Hancock <hancockr@shaw.ca>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NJeff Garzik <jeff@garzik.org>
      d21279f4
    • H
      pata_amd: fix sparse warning · d9c74fbe
      Harvey Harrison 提交于
      Current code is essentially choosing between dividing by 1 or
      dividing by two, make the conditions a little more obvious.
      
      As a bonus, removes a sparse error:
      drivers/ata/pata_amd.c:59:11: warning: symbol '__x' shadows an earlier one
      drivers/ata/pata_amd.c:59:11: originally declared here
      Signed-off-by: NHarvey Harrison <harvey.harrison@gmail.com>
      Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NJeff Garzik <jeff@garzik.org>
      d9c74fbe