24 Jul, 2011
1 commit
-
Saves text by removing nearly duplicated text format strings by
creating ata__printk functions and printf extension %pV.ata defconfig size shrinks ~5% (~8KB), allyesconfig ~2.5% (~13KB)
Format string duplication comes from:
#define ata_link_printk(link, lv, fmt, args...) do { \
if (sata_pmp_attached((link)->ap) || (link)->ap->slave_link) \
printk("%sata%u.%02u: "fmt, lv, (link)->ap->print_id, \
(link)->pmp , ##args); \
else \
printk("%sata%u: "fmt, lv, (link)->ap->print_id , ##args); \
} while(0)Coalesce long formats.
$ size drivers/ata/built-in.*
text data bss dec hex filename
544969 73893 116584 735446 b38d6 drivers/ata/built-in.allyesconfig.ata.o
558429 73893 117864 750186 b726a drivers/ata/built-in.allyesconfig.dev_level.o
141328 14689 4220 160237 271ed drivers/ata/built-in.defconfig.ata.o
149567 14689 4220 168476 2921c drivers/ata/built-in.defconfig.dev_level.oSigned-off-by: Joe Perches
Signed-off-by: Jeff Garzik
02 Mar, 2011
1 commit
22 Oct, 2010
1 commit
-
Intel IDE-R devices are part of the Intel AMT management setup. They don't
have any special configuration registers or settings so the ata_generic
driver will support them fully.Rather than add a huge table of IDs for each chipset and keep sending in
new ones this patch autodetects them.Signed-off-by: Alan Cox
Acked-by: Tejun Heo
Signed-off-by: Jeff Garzik
02 Aug, 2010
1 commit
-
Commit 1529c69adc (ata_generic: implement ATA_GEN_* flags and force
enable DMA on MBP 7,1) implemented ATA_GEN_FORCE_DMA for forcing DMA
mode and applied it to CENATEK but forgot to remove the original hard
coded logic. This is removal of redundant logic and doesn't affect
correctness.Signed-off-by: Tejun Heo
Reported-by: Andy Whitcroft
Signed-off-by: Jeff Garzik
02 Jul, 2010
2 commits
-
IDE mode of MCP89 on MBP 7,1 doesn't set DMA enable bits in the BMDMA
status register. Make the following changes to work around the problem.* Instead of using hard coded 1 in id->driver_data as class code
match, use ATA_GEN_CLASS_MATCH and carry the matched id in
host->private_data.* Instead of matching PCI_VENDOR_ID_CENATEK, use ATA_GEN_FORCE_DMA
flag in id instead.* Add ATA_GEN_FORCE_DMA to the id entry of MBP 7,1.
Signed-off-by: Tejun Heo
Cc: Peer Chen
Cc: stable@kernel.org
Reported-by: Anders Østhus
Reported-by: Andreas Graf
Reported-by: Benoit Gschwind
Reported-by: Damien Cassou
Reported-by: tixetsal@juno.com
Signed-off-by: Jeff Garzik -
For yet unknown reason, MCP89 on MBP 7,1 doesn't work w/ ahci under
linux but the controller doesn't require explicit mode setting and
works fine with ata_generic. Make ahci ignore the controller on MBP
7,1 and let ata_generic take it for now.Reported in bko#15923.
https://bugzilla.kernel.org/show_bug.cgi?id=15923
NVIDIA is investigating why ahci mode doesn't work.
Signed-off-by: Tejun Heo
Cc: Peer Chen
Cc: stable@kernel.org
Reported-by: Anders Østhus
Reported-by: Andreas Graf
Reported-by: Benoit Gschwind
Reported-by: Damien Cassou
Reported-by: tixetsal@juno.com
Signed-off-by: Jeff Garzik
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
02 Mar, 2010
1 commit
-
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
04 Dec, 2009
1 commit
-
We were never able to get docs for this out of Toshiba for years. Dave
Barnes produced a NetBSD driver however and from that we can fill in the
needed tables.As we correct the PCI identifiers a bit also update the old ide generic driver
at the same time so it stays compiling.Signed-off-by: Alan Cox
Signed-off-by: Jeff Garzik
25 Mar, 2009
1 commit
-
No functional changes in this patch.
Signed-off-by: Erik Inge Bolsø
Signed-off-by: Jeff Garzik
29 Dec, 2008
1 commit
-
There currently are the following looping constructs.
* __ata_port_for_each_link() for all available links
* ata_port_for_each_link() for edge links
* ata_link_for_each_dev() for all devices
* ata_link_for_each_dev_reverse() for all devices in reverse orderNow there's a need for looping construct which is similar to
__ata_port_for_each_link() but iterates over PMP links before the host
link. Instead of adding another one with long name, do the following
cleanup.* Implement and export ata_link_next() and ata_dev_next() which take
@mode parameter and can be used to build custom loop.
* Implement ata_for_each_link() and ata_for_each_dev() which take
looping mode explicitly.The following iteration modes are implemented.
* ATA_LITER_EDGE : loop over edge links
* ATA_LITER_HOST_FIRST : loop over all links, host link first
* ATA_LITER_PMP_FIRST : loop over all links, PMP links first* ATA_DITER_ENABLED : loop over enabled devices
* ATA_DITER_ENABLED_REVERSE : loop over enabled devices in reverse order
* ATA_DITER_ALL : loop over all devices
* ATA_DITER_ALL_REVERSE : loop over all devices in reverse orderThis change removes exlicit device enabledness checks from many loops
and makes it clear which ones are iterated over in which direction.Signed-off-by: Tejun Heo
Signed-off-by: Jeff Garzik
28 Oct, 2008
1 commit
-
Signed-off-by: Jeff Garzik
06 May, 2008
1 commit
-
A couple of distributions (Fedora, Ubuntu) were having weird problems with the
ATI IXP series PATA controllers being reported as simplex. At the heart of
the problem is that both distros ignored the recommendations to load pata_acpi
and ata_generic *AFTER* specific host drivers.The underlying cause however is that if you D3 and then D0 an ATI IXP it
helpfully throws away some configuration and won't let you rewrite it.Add checks to ata_generic and pata_acpi to pin ATIIXP devices. Possibly the
real answer here is to quirk them and pin them, but right now we can't do that
before they've been pcim_enable()'d by a driver.I'm indebted to David Gero for this. His bug report not only reported the
problem but identified the cause correctly and he had tested the right values
to prove what was going on[If you backport this for 2.6.24 you will need to pull in the 2.6.25
removal of the bogus WARN_ON() in pcim_enagle]Signed-off-by: Alan Cox
Tested-by: David Gero
Signed-off-by: Andrew Morton
Signed-off-by: Jeff Garzik
18 Apr, 2008
6 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
-
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 -
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
-
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
23 Jan, 2008
3 commits
-
Not much to do here. It's an ata memory as disk.
Signed-off-by: Alan Cox
Signed-off-by: Jeff Garzik -
ata_id_to_dma_mode() isn't quite generic. The function is basically
privately implemented ata_id_xfermask() combined with hardcoded mode
printing and configuration which are specific to ata_generic.Kill the function and open code it in generic_set_mode() using generic
xfermode handling functions.Signed-off-by: Tejun Heo
Signed-off-by: Jeff Garzik -
Unindent loop body in generic_set_mode(). This is to ease future
change.Signed-off-by: Tejun Heo
Signed-off-by: Jeff Garzik
13 Oct, 2007
6 commits
-
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
-
Make the following functions deal with ata_link instead of ata_port.
* ata_set_mode()
* ata_eh_autopsy() and related functions
* ata_eh_report() and related functions
* suspend/resume related functions
* ata_eh_recover() and related functionsSigned-off-by: Tejun Heo
Signed-off-by: Jeff Garzik -
Multiple links and different number of devices per link should be
considered to iterate over links and devices. This patch implements
and uses link and device iterators - ata_port_for_each_link() and
ata_link_for_each_dev() - and ata_link_max_devices().This change makes a lot of functions iterate over only possible
devices instead of from dev 0 to dev ATA_MAX_DEVICES. All such
changes have been examined and nothing should be broken.While at it, add a separating comment before device helpers to
distinguish them better from link helpers and others.Signed-off-by: Tejun Heo
Signed-off-by: Jeff Garzik -
Introduce ata_link. It abstracts PHY and sits between ata_port and
ata_device. This new level of abstraction is necessary to support
SATA Port Multiplier, which basically adds a bunch of links (PHYs) to
a ATA host port. Fields related to command execution, spd_limit and
EH are per-link and thus moved to ata_link.This patch only defines the host link. Multiple link handling will be
added later. Also, a lot of ap->link derefences are added but many of
them will be removed as each part is converted to deal directly with
ata_link instead of ata_port.This patch introduces no behavior change.
Signed-off-by: Tejun Heo
Cc: James Bottomley
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
10 Jul, 2007
2 commits
-
The ATA_UDMAx masks are self-documenting, and far better than manually
writing in the hex mask.Note that pata_it8213 mask differed from the comment. Added a FIXME there.
Signed-off-by: Jeff Garzik
-
This flag only has meaning in old-EH drivers, and these drivers have
already been converted to the new EH. Remove.Signed-off-by: Jeff Garzik
03 Jul, 2007
1 commit
-
Mirrors change in IT821X
Signed-off-by: Alan Cox
Signed-off-by: Jeff Garzik
22 May, 2007
1 commit
-
Signed-off-by: Jeff Garzik
12 May, 2007
2 commits
-
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 -
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
1 commit
-
Versus upstream as requested
Last of the trivial switches to cable_detect methods.
Signed-off-by: Alan Cox
Signed-off-by: Jeff Garzik
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
26 Feb, 2007
2 commits
-
Bump versions based on changes submitted during 2.6.21 merge window.
Signed-off-by: Jeff Garzik
-
Signed-off-by: Alan Cox
Signed-off-by: Jeff Garzik
10 Feb, 2007
1 commit
-
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
