01 Aug, 2007
3 commits
-
Add Tecra M3 to the broken suspend blacklist. Tecra M3 doesn't have
proper DMI_PRODUCT_NAME but has an OEM_STRING instead. Match it.Signed-off-by: Tejun Heo
Signed-off-by: Jeff Garzik -
Separate out broken suspend blacklist matching into
piix_broken_suspend().Signed-off-by: Tejun Heo
Signed-off-by: Jeff Garzik -
Rename __pci_reenable_device() to pci_reenable_device().
Signed-off-by: Tejun Heo
Signed-off-by: Jeff Garzik
25 Jul, 2007
1 commit
-
ACPI implementations in several TOSHIBA laptops are weird and burn cpu
cycles for tens of seconds while trying to suspend if the PCI device
for the ATA controller is disabled when the ACPI suspend is called.This patch uses DMI to match those machines and bypass device disable
on those machines during suspend. As the device needs to be put into
enabled state on resume without affecting PCI enable count, matching
resume callback uses __pci_reenable_device().This bug is reported in bugzilla bug 7780.
http://bugzilla.kernel.org/show_bug.cgi?id=7780
Signed-off-by: Tejun Heo
Signed-off-by: Jeff Garzik
13 Jul, 2007
2 commits
-
* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6: (34 commits)
PCI: Only build PCI syscalls on architectures that want them
PCI: limit pci_get_bus_and_slot to domain 0
PCI: hotplug: acpiphp: avoid acpiphp "cannot get bridge info" PCI hotplug failure
PCI: hotplug: acpiphp: remove hot plug parameter write to PCI host bridge
PCI: hotplug: acpiphp: fix slot poweroff problem on systems without _PS3
PCI: hotplug: pciehp: wait for 1 second after power off slot
PCI: pci_set_power_state(): check for PM capabilities earlier
PCI: cpci_hotplug: Convert to use the kthread API
PCI: add pci_try_set_mwi
PCI: pcie: remove SPIN_LOCK_UNLOCKED
PCI: ROUND_UP macro cleanup in drivers/pci
PCI: remove pci_dac_dma_... APIs
PCI: pci-x-pci-express-read-control-interfaces cleanups
PCI: Fix typo in include/linux/pci.h
PCI: pci_ids, remove double or more empty lines
PCI: pci_ids, add atheros and 3com_2 vendors
PCI: pci_ids, reorder some entries
PCI: i386: traps, change VENDOR to DEVICE
PCI: ATM: lanai, change VENDOR to DEVICE
PCI: Change all drivers to use pci_device->revision
... -
The last two slots of MAP 00b of ich6m was incorrectly marked as
reserved. This is left over from converting the entry to allow 00b.
This causes no real problem. It only makes the driver print annoying
warning message. Fix it.[patch also proferred by Pierre Tardy at the end of 2006 -jg]
Signed-off-by: Tejun Heo
--
drivers/ata/ata_piix.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Signed-off-by: Jeff Garzik
12 Jul, 2007
1 commit
-
Instead of all drivers reading pci config space to get the revision
ID, they can now use the pci_device->revision member.This exposes some issues where drivers where reading a word or a dword
for the revision number, and adding useless error-handling around the
read. Some drivers even just read it for no purpose of all.In devices where the revision ID is being copied over and used in what
appears to be the equivalent of hotpath, I have left the copy code
and the cached copy as not to influence the driver's performance.Compile tested with make all{yes,mod}config on x86_64 and i386.
Signed-off-by: Auke Kok
Acked-by: Dave Jones
Signed-off-by: Greg Kroah-Hartman
10 Jul, 2007
3 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
-
Signed-off-by: Christian Lamparter
Signed-off-by: Jeff Garzik -
Fix various bugs in pio/mwdma mode programming.
* Control bits in the timing register wasn't cleared properly while
programming PIO mode.* MWDMA mode programming cleared the wrong part of control bits.
* MWDMA mode programming cleared udma_mask even when the controller
doesn't support UDMA.Signed-off-by: Tejun Heo
Cc: Art Haas
Signed-off-by: Jeff Garzik
25 May, 2007
1 commit
-
Acer Aspire 2023WLMi uses short 40c cable. Add quirk for it.
Signed-off-by: Tejun Heo
Cc: Steve H.
Signed-off-by: Jeff Garzik
22 May, 2007
1 commit
-
With cable methods in place we don't need a custom error handler for SATA
so get rid of itSigned-off-by: Alan Cox
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
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
29 Apr, 2007
2 commits
-
Versus upstream as requested
Last of the trivial switches to cable_detect methods.
Signed-off-by: Alan Cox
Signed-off-by: Jeff Garzik -
The Asus W5F laptop uses a short cable instead of the 80-wire style, and thus
needs to be in the ich_laptop special cases for correct detection and support
of UDMA/100 for the hard drive. I noticed this because I have the W5F laptop,
and was tracing apparent slowness.Signed-off-by: Robin H. Johnson
Signed-off-by: Jeff Garzik
09 Mar, 2007
1 commit
-
A while ago I modified the libata code so that drivers can return -ENOENT
for unknown ports not fiddle with the EH flags and print stuff directly.
Somewhere along the line ata_piix didn't get fully converted.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
1 commit
-
Bump versions based on changes submitted during 2.6.21 merge window.
Signed-off-by: Jeff Garzik
23 Feb, 2007
1 commit
-
Duplicate ids noticed by Kay Sievers
Although 100% different, this is based on a patch by Greg Kroah-Hartman
Signed-off-by: Jeff Garzik
10 Feb, 2007
8 commits
-
The ATA_ENABLE_PATA define was never meant to be permanent, and in
recent kernels, it's already been unconditionally enabled. Remove.Signed-off-by: Jeff Garzik
-
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 -
Signed-off-by: Andrew Morton
Signed-off-by: Jeff Garzik -
This I believe completes the PIIX range of support for libata
This adds the table entries needed for the PIIX3, both a new PCI
identifier and a new mode list. It also fixes an erroneous access to PCI
configuration 0x48 on non UDMA capable chips.Signed-off-by: Alan Cox
Signed-off-by: Jeff Garzik -
In Acer Aspire hdd is connected to ICH7 via 40c cable, however it is
short cable and it is UDMA66 capable.Signed-off-by: J J
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
16 Dec, 2006
2 commits
-
piix_init_one() allocates host private data which should be freed by
piix_host_stop(). ich_pata_ops wasn't converted to piix_host_stop()
while merging, leaking 4 bytes on driver detach. Fix it.This was spotted using Kmemleak by Catalin Marinas.
Signed-off-by: Tejun Heo
Cc: Catalin Marinas
Signed-off-by: Jeff Garzik -
This updated patch adds the Intel ICH9 IDE mode SATA controller DID's.
Signed-off-by: Jason Gaston
Acked-by: Tejun Heo
Cc: Jeff Garzik
Signed-off-by: Andrew Morton
Signed-off-by: Jeff Garzik
05 Dec, 2006
1 commit
-
Signed-off-by: Alan Cox
Signed-off-by: Jeff Garzik
03 Dec, 2006
1 commit
-
libata switched to IRQ-driven IDENTIFY when IRQ-driven PIO was
introduced. This has caused a lot of problems including device
misdetection and phantom device.ATA_FLAG_DETECT_POLLING was added recently to selectively use polling
IDENTIFY on problemetic drivers but many controllers and devices are
affected by this problem and trying to adding ATA_FLAG_DETECT_POLLING
for each such case is diffcult and not very rewarding.This patch makes libata always use polling IDENTIFY. This is
consistent with libata's original behavior and drivers/ide's behavior.Signed-off-by: Tejun Heo
Signed-off-by: Jeff Garzik
02 Dec, 2006
4 commits
-
Now that PCS isn't used for device detection anymore...
* esb_sata is identical to ich5_sata
* no reason to know present_shift
* no reason to store map_db in host private areaThe MAP table itself is left because it can be used for SCR access.
Signed-off-by: Jeff Garzik
-
PATA PIIX uses reset signature + TF r/w test for device presence
detection, which doesn't always work. It sometimes reports phantom
device which results in IDENTIFY timeouts.SATA PIIX uses some combination of PCS + reset signature + TF r/w test
for device presence detection. No combination satifies all and for
some controllers, there doesn't seem to be any combination which
works reliably.This patch makes both PATA and SATA piix's use reset signature + TF
r/w + polling IDENTIFY for device detection. This is what the old
libata (before irq-pio and new EH) did and what IDE does.This patch also removes now obsolete PIIX_FLAG_IGNORE_PCS, force_pcs
and related code.Signed-off-by: Jeff Garzik
-
* move common flags into PIIX_PATA_FLAGS and PIIX_SATA_FLAGS
* kill unnecessary ATA_FLAG_SRSTSigned-off-by: Jeff Garzik
-
[deweerdt@free.fr: build fix]
Signed-off-by: Alan Cox
Signed-off-by: Frederik Deweerdt
Cc: Tejun Heo
Signed-off-by: Andrew Morton
Signed-off-by: Jeff Garzik
02 Nov, 2006
1 commit
-
This reverts commit f833229c96c0bf53c05995e4bd58709d9e9edd67:
According to reviewers and the lspci data provided in commit message
itself, PCI ID 0x7110 should not have been added to ata_piix.Signed-off-by: Jeff Garzik
01 Nov, 2006
2 commits
-
ICH7M was separated from ICH6M to allow undocumented MAP value 01b
which was spotted on an ASUS notebook. However, there is also
notebooks with MAP value 01b on ICH6M. This patch re-merges ICH6M and
ICH7M entries and allows MAP value 01b for both.This problem has been reported and initial patch provided by Jonathan
Dieter.Signed-off-by: Tejun Heo
Cc: Jonathan Dieter
Cc: Tom Deblauwe
Signed-off-by: Jeff Garzik -
Hi Jeff,
I tested the PATA support on my old VAIO notebook, and it failed to find
my piix device:00:07.1 Class 0101: 8086:7111 (rev 01) (prog-if 80 [Master])
Control: I/O+ Mem- BusMaster+ SpecCycle- MemWINV- VGASnoop-
ParErr- Stepping- SERR- FastB2B-
Status: Cap- 66MHz- UDF- FastB2B+ ParErr- DEVSEL=medium >TAbort-
SERR-
Signed-off-by: Jeff Garzik
