lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] libata: preserve SATA SPD setting over hard resets

Browse Source 
Don't overwrite SPD setting during hard reset.  This change has the
(intended) side effect of honoring the BIOS configuration.

Signed-off-by: Tejun Heo <htejun@gmail.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
This commit is contained in:
Tejun Heo
2006-04-01 01:38:18 +09:00
committed by Jeff Garzik
parent e82cbdb9a3
commit 852ee16a91
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/scsi/libata-core.c
View File

@@ -2132,9 +2132,11 @@ err_out:
static int sata_phy_resume(struct ata_port *ap) static int sata_phy_resume(struct ata_port *ap)
{ {
unsigned long timeout = jiffies + (HZ * 5); unsigned long timeout = jiffies + (HZ * 5);
u32 sstatus; u32 scontrol, sstatus;
scr_write_flush(ap, SCR_CONTROL, 0x300); scontrol = scr_read(ap, SCR_CONTROL);
scontrol = (scontrol & 0x0f0) | 0x300;
scr_write_flush(ap, SCR_CONTROL, scontrol);
/* Wait for phy to become ready, if necessary. */ /* Wait for phy to become ready, if necessary. */
do { do {
@@ -2247,10 +2249,14 @@ int ata_std_softreset(struct ata_port *ap, int verbose, unsigned int *classes)
*/ */
int sata_std_hardreset(struct ata_port *ap, int verbose, unsigned int *class) int sata_std_hardreset(struct ata_port *ap, int verbose, unsigned int *class)
{ {
u32 scontrol;
DPRINTK("ENTER\n"); DPRINTK("ENTER\n");
/* Issue phy wake/reset */ /* Issue phy wake/reset */
scr_write_flush(ap, SCR_CONTROL, 0x301); scontrol = scr_read(ap, SCR_CONTROL);
scontrol = (scontrol & 0x0f0) | 0x301;
scr_write_flush(ap, SCR_CONTROL, scontrol);
/* /*
* Couldn't find anything in SATA I/II specs, but AHCI-1.1 * Couldn't find anything in SATA I/II specs, but AHCI-1.1