21 May, 2019

1 commit

  • Add SPDX license identifiers to all files which:

    - Have no license information of any form

    - Have MODULE_LICENCE("GPL*") inside which was used in the initial
    scan/conversion to ignore the file

    These files fall under the project license, GPL v2 only. The resulting SPDX
    license identifier is:

    GPL-2.0-only

    Signed-off-by: Thomas Gleixner
    Signed-off-by: Greg Kroah-Hartman

    Thomas Gleixner
     

14 Feb, 2014

1 commit


26 Jul, 2012

1 commit

  • This patch converts the drivers in drivers/ata/* to use module_pci_driver()
    macro which makes the code smaller and a bit simpler.

    Signed-off-by: Axel Lin
    Cc: Alan Cox
    Cc: Jeff Garzik
    Cc: Mikael Pettersson
    Cc: Mark Lord
    Cc: Jeremy Higdon
    Cc: Benjamin Herrenschmidt
    Signed-off-by: Jeff Garzik

    Axel Lin
     

14 Mar, 2011

1 commit


28 Jan, 2011

1 commit


08 Jan, 2011

4 commits

  • Fix 8 errors and 3 warnings given by checkpatch.pl:

    - *switch* and *case* not on the same indentation level;

    - no space between *for*/*switch*/*while* and open parenthesis;

    - space between an unary operator and its operand;

    - spaces before tabs;

    - lines over 80 characters.

    In addition to these changes, also do the following:

    - add new line after variable definitions;

    - fix the style of some multi-line comments.

    Signed-off-by: Sergei Shtylyov
    Signed-off-by: Jeff Garzik

    Sergei Shtylyov
     
  • Allow hpt3x2n_pci_clock() to calculate the average f_CNT register value iff
    HighPoint BIOS hasn't saved one, just like the 'pata_hpt37x' driver (reading
    the full 16-bit register, unlike what that driver does), so that this driver
    would work correctly on e.g. non-x86 machine with 66 MHz PCI.

    I'm not sure why Alan has only done this in one driver and not the other...

    Signed-off-by: Sergei Shtylyov
    Signed-off-by: Jeff Garzik

    Sergei Shtylyov
     
  • Commit 28e21c8c0d44cd63bad4c62f94ef0c5a1cb8402c (pata_hpt3x2n: Add HPT371N
    support and other bits) forgot to update the driver's Kconfig entry, heading
    comment, and module description (that also wrongly claims support of HPT302)
    which may confuse users...

    Signed-off-by: Sergei Shtylyov
    Signed-off-by: Jeff Garzik

    Sergei Shtylyov
     
  • The Marvell bridge chips used on HighPoint SATA cards do not seem to support
    the UltraDMA modes 1, 2, and 3 as well as any MWDMA modes; these cards are
    based on HPT372/372A/372N/374 chips (judging from the vendor drivers), so
    the Linux drivers need to have a mode_filter() method for these chips...

    Signed-off-by: Sergei Shtylyov
    Signed-off-by: Jeff Garzik

    Sergei Shtylyov
     

26 May, 2010

1 commit

  • Separate out ata_pci_bmdma_prepare_host() and ata_pci_bmdma_init_one()
    from their SFF counterparts. SFF ones no longer try to initialize
    BMDMA or set PCI master.

    Signed-off-by: Tejun Heo
    Signed-off-by: Jeff Garzik

    Tejun Heo
     

20 May, 2010

1 commit

  • Separate out ata_bmdma_qc_issue() from ata_sff_qc_issue() such that
    ata_sff_qc_issue() only deals with non-BMDMA SFF protocols (PIO and
    nodata) while ata_bmdma_qc_issue() deals with the BMDMA protocols and
    uses ata_sff_qc_issue() for non-DMA commands. All the users are
    updated accordingly.

    Signed-off-by: Tejun Heo
    Signed-off-by: Jeff Garzik

    Tejun Heo
     

02 Mar, 2010

4 commits

  • This allows parallel scan and the like to be set without having to stop
    using the existing full helper functions. This patch merely adds the argument
    and fixes up the callers. It doesn't undo the special cases already in the
    tree or add any new parallel callers.

    Signed-off-by: Alan Cox
    Signed-off-by: Jeff Garzik

    Alan Cox
     
  • Describe UDMA timing bits 18-20 and 21 separately; add a note to bit
    31 about it being meaningful for PIO only. Reformat the whole comment,
    while at it...

    Signed-off-by: Sergei Shtylyov
    Signed-off-by: Jeff Garzik

    Sergei Shtylyov
     
  • As these drivers' set_piomode() and set_dmamode() methods are almost
    identical, factor out the common hpt{37x|3x2n}_set_mode() function
    to be called by both of them, the same as in 'pata_hpt366' driver.

    This results in ~5% decrease in the 'pata_hpt37x' driver binary
    size and in ~4% decrease in the 'pata_hpt3x2n' driver binary size
    (as measured on x86-32).

    Signed-off-by: Sergei Shtylyov
    Signed-off-by: Jeff Garzik

    Sergei Shtylyov
     
  • The UltraDMA Tss timing must be stretched with ATA clock of 66 MHz, but the
    driver only does this when PCI clock is 66 MHz, whereas it always programs
    DPLL clock (which is used as the ATA clock) to 66 MHz.

    Signed-off-by: Sergei Shtylyov
    Cc:
    Signed-off-by: Jeff Garzik

    Sergei Shtylyov
     

17 Dec, 2009

1 commit

  • The clock turnaround code still doesn't work for several reasons:

    - 'USE_DPLL' flag in 'ap->host->private_data' is never initialized
    or updated, so the driver can only set the chip to the DPLL clock
    mode, not the PCI mode;

    - the driver doesn't serialize access to the channels depending on
    the current clock mode like the vendor drivers, so the clock
    turnaround is only executed "optionally", not always as it should be;

    - the wrong ports are written to when hpt3x2n_set_clock() is called
    for the secondary channel;

    - hpt3x2n_set_clock() can inadvertently enable the disabled channels
    when resetting the channel state machines.

    Signed-off-by: Sergei Shtylyov
    Cc: stable@kernel.org
    Signed-off-by: Jeff Garzik

    Sergei Shtylyov
     

04 Dec, 2009

3 commits

  • Remove superfluous timings table entry while at it.

    Signed-off-by: Bartlomiej Zolnierkiewicz
    Acked-by: Sergei Shtylyov
    Signed-off-by: Jeff Garzik

    Bartlomiej Zolnierkiewicz
     
  • Some places were using PCI_CLASS_REVISION instead of PCI_REVISION_ID, so
    they weren't converted by commit 44c10138fd4bbc4b6d6bff0873c24902f2a9da65
    (PCI: Change all drivers to use pci_device->revision).

    Signed-off-by: Sergei Shtylyov
    Signed-off-by: Jeff Garzik

    Sergei Shtylyov
     
  • These drivers inherited from the older 'hpt366' IDE driver the buggy timing
    register masks in their set_piomode() metods. As a result, too low command
    cycle active time is programmed for slow PIO modes. Quite fortunately, it's
    later "fixed up" by the set_dmamode() methods which also "helpfully" reprogram
    the command timings, usually to PIO mode 4; unfortunately, setting an UltraDMA
    mode #N also reprograms already set PIO data timings, usually to MWDMA mode #
    max(N, 2) timings...

    However, the drivers added some breakage of their own too: the bit that they
    set/clear to control the FIFO is sometimes wrong -- it's actually the MSB of
    the command cycle setup time; also, setting it in DMA mode is wrong as this
    bit is only for PIO actually and clearing it for PIO modes is not needed as
    no mode in any timing table has it set...

    Fix all this, inverting the masks while at it, like in the 'hpt366' and
    'pata_hpt366' drivers; bump the drivers' versions, accounting for recent
    patches that forgot to do it...

    Signed-off-by: Sergei Shtylyov
    Cc: stable@kernel.org
    Signed-off-by: Jeff Garzik

    Sergei Shtylyov
     

03 Dec, 2009

2 commits


25 Mar, 2009

1 commit


18 Apr, 2008

7 commits

  • 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: Tejun Heo

    Tejun Heo
     
  • Currently reset methods are not specified directly in the
    ata_port_operations table. If a LLD wants to use custom reset
    methods, it should construct and use a error_handler which uses those
    reset methods. It's done this way for two reasons.

    First, the ops table already contained too many methods and adding
    four more of them would noticeably increase the amount of necessary
    boilerplate code all over low level drivers.

    Second, as ->error_handler uses those reset methods, it can get
    confusing. ie. By overriding ->error_handler, those reset ops can be
    made useless making layering a bit hazy.

    Now that ops table uses inheritance, the first problem doesn't exist
    anymore. The second isn't completely solved but is relieved by
    providing default values - most drivers can just override what it has
    implemented and don't have to concern itself about higher level
    callbacks. In fact, there currently is no driver which actually
    modifies error handling behavior. Drivers which override
    ->error_handler just wraps the standard error handler only to prepare
    the controller for EH. I don't think making ops layering strict has
    any noticeable benefit.

    This patch makes ->prereset, ->softreset, ->hardreset, ->postreset and
    their PMP counterparts propoer ops. Default ops are provided in the
    base ops tables and drivers are converted to override individual reset
    methods instead of creating custom error_handler.

    * ata_std_error_handler() doesn't use sata_std_hardreset() if SCRs
    aren't accessible. sata_promise doesn't need to use separate
    error_handlers for PATA and SATA anymore.

    * softreset is broken for sata_inic162x and sata_sx4. As libata now
    always prefers hardreset, this doesn't really matter but the ops are
    forced to NULL using ATA_OP_NULL for documentation purpose.

    * pata_hpt374 needs to use different prereset for the first and second
    PCI functions. This used to be done by branching from
    hpt374_error_handler(). The proper way to do this is to use
    separate ops and port_info tables for each function. Converted.

    Signed-off-by: Tejun Heo

    Tejun Heo
     
  • port_info->private_data is currently used for two purposes - to record
    private data about the port_info or to specify host->private_data to
    use when allocating ata_host.

    This overloading is confusing and counter-intuitive in that
    port_info->private_data becomes host->private_data instead of
    port->private_data. In addition, port_info and host don't correspond
    to each other 1-to-1. Currently, the first non-NULL
    port_info->private_data is used.

    This patch makes port_info->private_data just be what it is -
    private_data for the port_info where LLD can jot down extra info.
    libata no longer sets host->private_data to the first non-NULL
    port_info->private_data, @host_priv argument is added to
    ata_pci_init_one() instead. LLDs which use ata_pci_init_one() can use
    this argument to pass in pointer to host private data. LLDs which
    don't should use init-register model anyway and can initialize
    host->private_data directly.

    Adding @host_priv instead of using init-register model for LLDs which
    use ata_pci_init_one() is suggested by Alan Cox.

    Signed-off-by: Tejun Heo
    Cc: Alan Cox

    Tejun Heo
     
  • ata_pci_init_one() is the only function which uses ops->irq_handler
    and pi->sht. Other initialization functions take the same information
    as arguments. This causes confusion and duplicate unused entries in
    structures.

    Make ata_pci_init_one() take sht as an argument and use ata_interrupt
    implicitly. All current users use ata_interrupt and if different irq
    handler is necessary open coding ata_pci_init_one() using
    ata_prepare_sff_host() and ata_activate_sff_host can be done under ten
    lines including error handling and driver which requires custom
    interrupt handler is likely to require custom initialization anyway.

    As ata_pci_init_one() was the last user of ops->irq_handler, this
    patch also kills the field.

    Signed-off-by: Tejun Heo

    Tejun Heo
     
  • libata lets low level drivers build ata_port_operations table and
    register it with libata core layer. This allows low level drivers
    high level of flexibility but also burdens them with lots of
    boilerplate entries.

    This becomes worse for drivers which support related similar
    controllers which differ slightly. They share most of the operations
    except for a few. However, the driver still needs to list all
    operations for each variant. This results in large number of
    duplicate entries, which is not only inefficient but also error-prone
    as it becomes very difficult to tell what the actual differences are.

    This duplicate boilerplates all over the low level drivers also make
    updating the core layer exteremely difficult and error-prone. When
    compounded with multi-branched development model, it ends up
    accumulating inconsistencies over time. Some of those inconsistencies
    cause immediate problems and fixed. Others just remain there dormant
    making maintenance increasingly difficult.

    To rectify the problem, this patch implements ata_port_operations
    inheritance. To allow LLDs to easily re-use their own ops tables
    overriding only specific methods, this patch implements poor man's
    class inheritance. An ops table has ->inherits field which can be set
    to any ops table as long as it doesn't create a loop. When the host
    is started, the inheritance chain is followed and any operation which
    isn't specified is taken from the nearest ancestor which has it
    specified. This operation is called finalization and done only once
    per an ops table and the LLD doesn't have to do anything special about
    it other than making the ops table non-const such that libata can
    update it.

    libata provides four base ops tables lower drivers can inherit from -
    base, sata, pmp, sff and bmdma. To avoid overriding these ops
    accidentaly, these ops are declared const and LLDs should always
    inherit these instead of using them directly.

    After finalization, all the ops table are identical before and after
    the patch except for setting .irq_handler to ata_interrupt in drivers
    which didn't use to. The .irq_handler doesn't have any actual effect
    and the field will soon be removed by later patch.

    * sata_sx4 is still using old style EH and currently doesn't take
    advantage of ops inheritance.

    Signed-off-by: Tejun Heo

    Tejun Heo
     
  • libata lets low level drivers build scsi_host_template and register it
    to the SCSI layer. This allows low level drivers high level of
    flexibility but also burdens them with lots of boilerplate entries.

    This patch implements SHT initializers which can be used to initialize
    all the boilerplate entries in a sht. Three variants of them are
    implemented - BASE, BMDMA and NCQ - for different types of drivers.
    Note that entries can be overriden by putting individual initializers
    after the helper macro.

    All sht tables are identical before and after this patch.

    Signed-off-by: Tejun Heo

    Tejun Heo
     
  • PCI device should be powered up or powered up before its PCI regsiters
    are accessed. Although PCI configuration register access is allowed
    in D3hot, PCI device is free to reset its status when transiting from
    D3hot to D0 causing configuration data to change.

    Many libata SFF drivers which use ata_pci_init_one() read and update
    configuration registers before calling ata_pci_init_one() which
    enables the PCI device. Also, in resume paths, some drivers access
    registers without resuming the PCI device.

    This patch adds a call to pcim_enable_device() in init path if
    register is accessed before calling ata_pci_init_one() and make resume
    paths first resume PCI devices, access PCI configuration regiters then
    resume ATA host.

    While at it...

    * cmd640 was strange in that it set ->resume even when CONFIG_PM is
    not. This is by-product of minimal build fix. Updated.

    * In cs5530, Don't BUG() on reinit failure. Just whine and fail
    resume.

    Signed-off-by: Tejun Heo

    Tejun Heo
     

13 Oct, 2007

4 commits


15 Aug, 2007

1 commit

  • Fix several inconsistencies in these drivers WRT reporting the clocks:

    - when using DPLL mode, 'pata_hpt37x' driver reported the DPLL frequency as the
    PCI clock -- make it properly report both clocks and add the same ability to
    the 'pata_hpt3x2n' driver;

    - both drivers sometimes use "pata_hpt3*:" and sometimes "hpt3*:" in the
    messages -- make them use only the former one;

    - the message about failed DPLL stablizatios deserves KERN_ERR and a bang. :-)

    Signed-off-by: Sergei Shtylyov
    Signed-off-by: Jeff Garzik

    Sergei Shtylyov
     

10 Jul, 2007

2 commits


25 May, 2007

1 commit


12 May, 2007

1 commit

  • The intention of using port_mask in SFF init helpers was to eventually
    support exoctic configurations such as combination of legacy and
    native port on the same controller. This never became actually
    necessary and the related code always has been subtly broken one way
    or the other. Now that new init model is in place, there is no reason
    to make common helpers capable of handling all corner cases. Exotic
    cases can simply dealt within LLDs as necessary.

    This patch removes port_mask handling in SFF init helpers. SFF init
    helpers don't take n_ports argument and interpret it into port_mask
    anymore. All information is carried via port_info. n_ports argument
    is dropped and always two ports are allocated. LLD can tell SFF to
    skip certain port by marking it dummy. Note that SFF code has been
    treating unuvailable ports this way for a long time until recent
    breakage fix from Linus and is consistent with how other drivers
    handle with unavailable ports.

    This fixes 1-port legacy host handling still broken after the recent
    native mode fix and simplifies SFF init logic. The following changes
    are made...

    * ata_pci_init_native_host() and ata_init_legacy_host() both now try
    to initialized whatever they can and mark failed ports dummy. They
    return 0 if any port is successfully initialized.

    * ata_pci_prepare_native_host() and ata_pci_init_one() now doesn't
    take n_ports argument. All info should be specified via port_info
    array. Always two ports are allocated.

    * ata_pci_init_bmdma() exported to be used by LLDs in exotic cases.

    * port_info handling in all LLDs are standardized - all port_info
    arrays are const stack variable named ppi. Unless the second port
    is different from the first, its port_info is specified as NULL
    (tells libata that it's identical to the last non-NULL port_info).

    * pata_hpt37x/hpt3x2n: don't modify static variable directly. Make an
    on-stack copy instead as ata_piix does.

    * pata_uli: It has 4 ports instead of 2. Don't use
    ata_pci_prepare_native_host(). Allocate the host explicitly and use
    init helpers. It's simple enough.

    Signed-off-by: Tejun Heo
    Signed-off-by: Jeff Garzik

    Tejun Heo
     

01 May, 2007

1 commit

  • Add @deadline to prereset and reset methods and make them honor it.
    ata_wait_ready() which directly takes @deadline is implemented to be
    used as the wait function. This patch is in preparation for EH timing
    improvements.

    * ata_wait_ready() never does busy sleep. It's only used from EH and
    no wait in EH is that urgent. This function also prints 'be
    patient' message automatically after 5 secs of waiting if more than
    3 secs is remaining till deadline.

    * ata_bus_post_reset() now fails with error code if any of its wait
    fails. This is important because earlier reset tries will have
    shorter timeout than the spec requires. If a device fails to
    respond before the short timeout, reset should be retried with
    longer timeout rather than silently ignoring the device.

    There are three behavior differences.

    1. Timeout is applied to both devices at once, not separately. This
    is more consistent with what the spec says.

    2. When a device passes devchk but fails to become ready before
    deadline. Previouly, post_reset would just succeed and let
    device classification remove the device. New code fails the
    reset thus causing reset retry. After a few times, EH will give
    up disabling the port.

    3. When slave device passes devchk but fails to become accessible
    (TF-wise) after reset. Original code disables dev1 after 30s
    timeout and continues as if the device doesn't exist, while the
    patched code fails reset. When this happens, new code fails
    reset on whole port rather than proceeding with only the primary
    device.

    If the failing device is suffering transient problems, new code
    retries reset which is a better behavior. If the failing device is
    actually broken, the net effect is identical to it, but not to the
    other device sharing the channel. In the previous code, reset would
    have succeeded after 30s thus detecting the working one. In the new
    code, reset fails and whole port gets disabled. IMO, it's a
    pathological case anyway (broken device sharing bus with working
    one) and doesn't really matter.

    * ata_bus_softreset() is changed to return error code from
    ata_bus_post_reset(). It used to return 0 unconditionally.

    * Spin up waiting is to be removed and not converted to honor
    deadline.

    * To be on the safe side, deadline is set to 40s for the time being.

    Signed-off-by: Tejun Heo
    Signed-off-by: Jeff Garzik

    Tejun Heo
     

29 Apr, 2007

1 commit

  • Yes its no longer 3x2n but 3xxn, I can rename it if you want Jeff

    - Don't reset both ports each time (Sergei)
    - If we can't get a DPLL then abort entirely
    - Use ioport access for clock (from drivers/ide)
    - Add HPT371N support (from drivers/ide)

    Signed-off-by: Alan Cox
    Signed-off-by: Andrew Morton
    Signed-off-by: Jeff Garzik

    Alan Cox