24 Jul, 2011
1 commit
-
Saves a bit of text as the call takes fewer args.
Coalesce a few formats.
Convert a few bare printks to pr_cont.$ size drivers/ata/built-in.o*
text data bss dec hex filename
558429 73893 117864 750186 b726a drivers/ata/built-in.o.allyesconfig.new
559574 73893 117888 751355 b76fb drivers/ata/built-in.o.allyesconfig.old
149567 14689 4220 168476 2921c drivers/ata/built-in.o.defconfig.new
149851 14689 4220 168760 29338 drivers/ata/built-in.o.defconfig.oldSigned-off-by: Joe Perches
Signed-off-by: Jeff Garzik
31 Mar, 2011
1 commit
-
Fixes generated by 'codespell' and manually reviewed.
Signed-off-by: Lucas De Marchi
26 May, 2010
1 commit
-
Separate out BMDMA irq handler from SFF irq handler. The misnamed
host_intr() functions are renamed to ata_sff_port_intr() and
ata_bmdma_port_intr(). Common parts are factored into
__ata_sff_port_intr() and __ata_sff_interrupt() and used by sff and
bmdma interrupt routines.All BMDMA drivers now use ata_bmdma_interrupt() or
ata_bmdma_port_intr() while all non-BMDMA SFF ones use
ata_sff_interrupt() or ata_sff_port_intr().For now, ata_pci_sff_init_one() uses ata_bmdma_interrupt() as it's
used by both SFF and BMDMA drivers.Signed-off-by: Tejun Heo
Signed-off-by: Jeff Garzik
20 May, 2010
1 commit
-
Both qc_prep functions deal only with BMDMA PRD setup and PIO only SFF
drivers don't need them. Rename to ata_bmdma_[dumb_]qc_prep() and
relocate.All usages are renamed except for pdc_adma and sata_qstor. Those two
drivers are not BMDMA drivers and don't need to call BMDMA qc_prep
functions. Calls to ata_sff_qc_prep() in the two drivers are removed.Signed-off-by: Tejun Heo
Signed-off-by: Jeff Garzik
04 Dec, 2009
1 commit
-
It has been dead for the last three years (== since the initial driver
merge) and probability that it will ever get fixed is quite low.Since there is no reason to keep this dead code around any longer just
remove it (it can still be retrieved from the git history if necessary).Signed-off-by: Bartlomiej Zolnierkiewicz
Signed-off-by: Jeff Garzik
07 Apr, 2009
1 commit
-
Replace all DMA_32BIT_MASK macro with DMA_BIT_MASK(32)
Signed-off-by: Yang Hongyang
Signed-off-by: Andrew Morton
Signed-off-by: Linus Torvalds
25 Mar, 2009
1 commit
-
No functional changes in this patch.
Signed-off-by: Erik Inge Bolsø
Signed-off-by: Jeff Garzik
18 Apr, 2008
5 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
-
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
-
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
-
Over the time, port info, ops and sht structures developed quite a bit
of inconsistencies. This patch updates drivers.* Enable/disable_pm callbacks added to all ahci ops tables.
* Every driver for SFF controllers now uses ata_sff_port_start()
instead of ata_port_start() unless the driver has custom
implementation.* Every driver for SFF controllers now uses ata_pci_default_filter()
unless the driver has custom implementation.* Removed an odd port_info->sht initialization from ata_piix.c.
Likely a merge byproduct.* A port which has ATA_FLAG_SATA set doesn't need to set cable_detect
to ata_cable_sata(). Remove it from via and mv port ops.* Some drivers had unnecessary .max_sectors initialization which is
ignored and was missing .slave_destroy callback. Fixed.* Removed unnecessary sht initializations port_info's.
* Removed onsolete scsi device suspend/resume callbacks from
pata_bf54x.* No reason to set ata_pci_default_filter() and bmdma functions for
PIO-only drivers. Remove those callbacks and replace
ata_bmdma_irq_clear with ata_noop_irq_clear.* pata_platform sets port_start to ata_dummy_ret0. port_start can
just be set to NULL.* sata_fsl supports NCQ but was missing qc_defer. Fixed.
* pata_rb600_cf implements dummy port_start. Removed.
Signed-off-by: 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
02 Feb, 2008
1 commit
-
This patch converts users of pci_enable_device_bars() to the new
pci_enable_device_{io,mem} interface.The new API fits nicely, except maybe for the QLA case where a bit of
code re-organization might be a good idea but I prefer sticking to the
simple patch as I don't have hardware to test on.I'll also need some feedback on the cs5520 change.
Signed-off-by: Benjamin Herrenschmidt
Signed-off-by: Greg Kroah-Hartman
23 Jan, 2008
1 commit
-
Signed-off-by: Al Viro
Signed-off-by: Jeff Garzik
13 Oct, 2007
5 commits
-
* remove pointless pci_dev_to_dev() wrapper. Just directly reference
the embedded struct device like everyone else does.* pata_cs5520: delete cs5520_remove_one(), it was a duplicate of
ata_pci_remove_one()* linux/libata.h: don't bother including linux/pci.h, we don't need it.
Simply declare 'struct pci_dev' and assume interested parties will
include the header, as they should be doing anyway.* linux/libata.h: consolidate all CONFIG_PCI declarations into a
single location in the header.Signed-off-by: Jeff Garzik
-
Currently, port configuration reporting has the following problems.
* iomapped address is reported instead of raw address
* report contains irrelevant fields or lacks necessary fields for
non-SFF controllers.
* host->irq/irq2 are there just for reporting and hacky.This patch implements and uses ata_port_desc() and
ata_port_pbar_desc(). ata_port_desc() is almost identical to
ata_ehi_push_desc() except that it takes @ap instead of @ehi, has no
locking requirement, can only be used during host initialization and "
" is used as separator instead of ", ". ata_port_pbar_desc() is a
helper to ease reporting of a PCI BAR or an offsetted address into it.LLD pushes whatever description it wants using the above two
functions. The accumulated description is printed on host
registration after "[S/P]ATA max MAX_XFERMODE ".SFF init helpers and ata_host_activate() automatically add
descriptions for addresses and irq respectively, so only LLDs which
isn't standard SFF need to add custom descriptions. In many cases,
such controllers need to report different things anyway.Signed-off-by: Tejun Heo
Signed-off-by: Jeff Garzik -
This avoids allocating DMA buffers if not needed but at the moment is
mostly just a neatness item.Signed-off-by: Alan Cox
Signed-off-by: Jeff Garzik -
It was always set to ata_port_disable(). Removed the hook, and replaced
the very few ap->ops->port_disable() callsites with direct calls to
ata_port_disable().Signed-off-by: Jeff Garzik
-
* ->irq_ack() is redundant to what the irq handler already
performs... chk-status + irq-clear. Furthermore, it is only
called in one place, when screaming-irq-debugging is enabled,
so we don't want to bother with a hook just for that.* ata_dummy_irq_on() is only ever used in drivers that have
no callpath reaching ->irq_on(). Remove .irq_on hook from
those drivers, and the now-unused ata_dummy_irq_on()Signed-off-by: Jeff Garzik
31 Aug, 2007
1 commit
-
Bump the versions for drivers that were modified, but had not already
had a version number bump.Signed-off-by: Jeff Garzik
21 Jul, 2007
1 commit
-
Signed-off-by: Alan Cox
Signed-off-by: Linux Torvalds
10 Jul, 2007
1 commit
-
Add ata_dumb_qc_prep and supporting logic so that a driver can just
specify it needs to be helped in this area. 64K entries are split
as with drivers/ide.Signed-off-by: Alan Cox
Signed-off-by: Jeff Garzik
03 Jul, 2007
1 commit
-
host->irq and host->irq2 should be set before ata_host_register() for
IRQ reporting to work. Move up host->irq assignment in
ata_host_activate() and add it to ata_pci_init_one() native path and
pata_cs5520.The port info printing in ata_host_register() doesn't fit all the
different controllers. It should probably be moved out to LLDs with
some helpers in the future.Signed-off-by: Tejun Heo
Signed-off-by: Jeff Garzik
22 May, 2007
1 commit
-
Signed-off-by: Jeff Garzik
12 May, 2007
1 commit
-
Reimplement suspend/resume support using sdev->manage_start_stop.
* Device suspend/resume is now SCSI layer's responsibility and the
code is simplified a lot.* DPM is dropped. This also simplifies code a lot. Suspend/resume
status is port-wide now.* ata_scsi_device_suspend/resume() and ata_dev_ready() removed.
* Resume now has to wait for disk to spin up before proceeding. I
couldn't find easy way out as libata is in EH waiting for the
disk to be ready and sd is waiting for EH to complete to issue
START_STOP.* sdev->manage_start_stop is set to 1 in ata_scsi_slave_config().
This fixes spindown on shutdown and suspend-to-disk.Signed-off-by: Tejun Heo
Signed-off-by: Jeff Garzik
29 Apr, 2007
2 commits
-
Convert pdc_adma, pata_cs5520, pata_isapnp, pata_ixp4xx_cf,
pata_legacy, pata_mpc52xx, pata_mpiix, pata_pcmcia, pata_pdc2027x,
pata_platform, pata_qdi, pata_scc and pata_winbond to new init model.* init_one()'s now follow more consistent init order
* cs5520 now registers one host with two ports, not two hosts. If any
of the two ports are disabled, it's made dummy as other drivers do.Tested pdc_adma and pata_legacy. Both are as broken as before. The
rest are compile tested only.Signed-off-by: Tejun Heo
Signed-off-by: Jeff Garzik -
Roll-up of ->cable_detect feature addition patches, authored and
signed-off-by Alan Cox.Signed-off-by: Jeff Garzik
15 Mar, 2007
1 commit
-
Signed-off-by: Al Viro
Acked-by: Jeff Garzik
Signed-off-by: Linus Torvalds
03 Mar, 2007
1 commit
-
Add missing #ifdef CONFIG_PM conditionals around all PM related parts
in libata LLDs.Signed-off-by: Tejun Heo
Signed-off-by: Jeff Garzik
02 Mar, 2007
1 commit
-
Clearing drvdata in ->remove_one causes NULL pointer deference. Clear
drvdata only in ata_host_release() after all resources are freed.Signed-off-by: Tejun Heo
Signed-off-by: Jeff Garzik
26 Feb, 2007
2 commits
-
Bump versions based on changes submitted during 2.6.21 merge window.
Signed-off-by: Jeff Garzik
-
No code changes.
Signed-off-by: Jeff Garzik
21 Feb, 2007
1 commit
-
The CS5520 isn't just an ATA controller and we must not
pci_disable_device it as it turns into pci_disable_computer.Signed-off-by: Alan Cox
Signed-off-by: Jeff Garzik
10 Feb, 2007
4 commits
-
This patch is against each libata driver.
Two IRQ calls are added in ata_port_operations.
- irq_on() is used to enable interrupts.
- irq_ack() is used to acknowledge a device interrupt.In most drivers, ata_irq_on() and ata_irq_ack() are used for
irq_on and irq_ack respectively.In some drivers (ex: ahci, sata_sil24) which cannot use them
as is, ata_dummy_irq_on() and ata_dummy_irq_ack() are used.Signed-off-by: Kou Ishizaki
Signed-off-by: Akira Iguchi
Signed-off-by: Jeff Garzik -
Convert libata core layer and LLDs to use iomap.
* managed iomap is used. Pointer to pcim_iomap_table() is cached at
host->iomap and used through out LLDs. This basically replaces
host->mmio_base.* if possible, pcim_iomap_regions() is used
Most iomap operation conversions are taken from Jeff Garzik
's iomap branch.Signed-off-by: Tejun Heo
Signed-off-by: Jeff Garzik -
Update libata LLDs to use devres. Core layer is already converted to
support managed LLDs. This patch simplifies initialization and fixes
many resource related bugs in init failure and detach path. For
example, all converted drivers now handle ata_device_add() failure
gracefully without excessive resource rollback code.As most resources are released automatically on driver detach, many
drivers don't need or can do with much simpler ->{port|host}_stop().
In general, stop callbacks are need iff port or host needs to be given
commands to shut it down. Note that freezing is enough in many cases
and ports are automatically frozen before being detached.Signed-off-by: Tejun Heo
Signed-off-by: Jeff Garzik -
Most of these contributed by that mysterious figger known as A.C.
Signed-off-by: Jeff Garzik
03 Dec, 2006
1 commit
-
sht->max_sectors is overrided unconditionally in ->slave_configure.
There's no reason to set it to any value.Signed-off-by: Tejun Heo
02 Dec, 2006
1 commit
-
The CS5520 doesn't need much help to resume but we do need to restore
pcicfg which may have been reset to the BIOS default which is
sometimes incorrect.Signed-off-by: Alan Cox
Signed-off-by: Jeff Garzik
29 Nov, 2006
1 commit
-
Many LLDs are missing sht->slave_destroy. The method is mandatory to
support device warm unplugging (echo 1 > /sys/.../delete). Without
it, libata might access released scsi device.Signed-off-by: Tejun Heo