GNUBoot/coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

southbridge/amd/sb700: Do drive detection even in AHCI mode

Browse source 
SeaBIOS AHCI drive detection randomly fails for drives present
on the secondary channel of each AHCI SATA BAR.  Forcing native
drive detection in AHCI mode resolves this issue.

Change-Id: I34eb1d5d3f2f8aefb749a4eeb911c1373d184938
Signed-off-by: Timothy Pearson <tpearson@raptorengineeringinc.com>
Reviewed-on: http://review.coreboot.org/11997
Tested-by: build bot (Jenkins)
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
This commit is contained in:
Timothy Pearson 2015-06-20 21:31:15 -05:00 committed by Martin Roth
parent 795ee1a6cd
commit 398540f568
1 changed files with 53 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

99
src/southbridge/amd/sb700/sata.c
View file

@ -297,65 +297,72 @@ static void sata_init(struct device *dev)
if (port_count > max_port_count) if (port_count > max_port_count)
port_count = max_port_count; port_count = max_port_count;
if (!sata_ahci_mode) { /* RPR7.7 SATA drive detection. */
/* RPR7.7 SATA drive detection. */ /* Use BAR5+0x128,BAR0 for Primary Slave */
/* Use BAR5+0x128,BAR0 for Primary Slave */ /* Use BAR5+0x1A8,BAR0 for Primary Slave */
/* Use BAR5+0x1A8,BAR0 for Primary Slave */ /* Use BAR5+0x228,BAR2 for Secondary Master */
/* Use BAR5+0x228,BAR2 for Secondary Master */ /* Use BAR5+0x2A8,BAR2 for Secondary Slave */
/* Use BAR5+0x2A8,BAR2 for Secondary Slave */ /* Use BAR5+0x328,PATA_BAR0/2 for Primary/Secondary Master emulation */
/* Use BAR5+0x328,PATA_BAR0/2 for Primary/Secondary Master emulation */ /* Use BAR5+0x3A8,PATA_BAR0/2 for Primary/Secondary Slave emulation */
/* Use BAR5+0x3A8,PATA_BAR0/2 for Primary/Secondary Slave emulation */ for (i = 0; i < port_count; i++) {
for (i = 0; i < port_count; i++) { byte = read8(sata_bar5 + 0x128 + 0x80 * i);
printk(BIOS_SPEW, "SATA port %i status = %x\n", i, byte);
byte &= 0xF;
if (byte == 0x1) {
/* If the drive status is 0x1 then we see it but we aren't talking to it. */
/* Try to do something about it. */
printk(BIOS_SPEW, "SATA device detected but not talking. Trying lower speed.\n");
/* Read in Port-N Serial ATA Control Register */
byte = read8(sata_bar5 + 0x12C + 0x80 * i);
/* Set Reset Bit and 1.5g bit */
byte |= 0x11;
write8((sata_bar5 + 0x12C + 0x80 * i), byte);
/* Wait 1ms */
mdelay(1);
/* Clear Reset Bit */
byte &= ~0x01;
write8((sata_bar5 + 0x12C + 0x80 * i), byte);
/* Wait 1ms */
mdelay(1);
/* Reread status */
byte = read8(sata_bar5 + 0x128 + 0x80 * i); byte = read8(sata_bar5 + 0x128 + 0x80 * i);
printk(BIOS_SPEW, "SATA port %i status = %x\n", i, byte); printk(BIOS_SPEW, "SATA port %i status = %x\n", i, byte);
byte &= 0xF; byte &= 0xF;
if (byte == 0x1) { }
/* If the drive status is 0x1 then we see it but we aren't talking to it. */
/* Try to do something about it. */
printk(BIOS_SPEW, "SATA device detected but not talking. Trying lower speed.\n");
/* Read in Port-N Serial ATA Control Register */ if (byte == 0x3) {
byte = read8(sata_bar5 + 0x12C + 0x80 * i); for (j = 0; j < 10; j++) {
if (i < 4)
/* Set Reset Bit and 1.5g bit */ current_bar = ((i / 2) == 0) ? sata_bar0 : sata_bar2;
byte |= 0x11; else
write8((sata_bar5 + 0x12C + 0x80 * i), byte); current_bar = ide_bar0;
if (!sata_drive_detect(i, current_bar))
/* Wait 1ms */ break;
mdelay(1);
/* Clear Reset Bit */
byte &= ~0x01;
write8((sata_bar5 + 0x12C + 0x80 * i), byte);
/* Wait 1ms */
mdelay(1);
/* Reread status */
byte = read8(sata_bar5 + 0x128 + 0x80 * i);
printk(BIOS_SPEW, "SATA port %i status = %x\n", i, byte);
byte &= 0xF;
} }
if (sata_ahci_mode)
if (byte == 0x3) { printk(BIOS_DEBUG, "AHCI device %d is %sready after %i tries\n",
for (j = 0; j < 10; j++) { i,
if (i < 4) (j == 10) ? "not " : "",
current_bar = ((i / 2) == 0) ? sata_bar0 : sata_bar2; (j == 10) ? j : j + 1);
else else
current_bar = ide_bar0;
if (!sata_drive_detect(i, current_bar))
break;
}
printk(BIOS_DEBUG, "%s %s device is %sready after %i tries\n", printk(BIOS_DEBUG, "%s %s device is %sready after %i tries\n",
(i / 2) ? "Secondary" : "Primary", (i / 2) ? "Secondary" : "Primary",
(i % 2 ) ? "Slave" : "Master", (i % 2 ) ? "Slave" : "Master",
(j == 10) ? "not " : "", (j == 10) ? "not " : "",
(j == 10) ? j : j + 1); (j == 10) ? j : j + 1);
} else { } else {
if (sata_ahci_mode)
printk(BIOS_DEBUG, "No AHCI SATA drive on Slot%i\n", i);
else
printk(BIOS_DEBUG, "No %s %s SATA drive on Slot%i\n", printk(BIOS_DEBUG, "No %s %s SATA drive on Slot%i\n",
(i / 2) ? "Secondary" : "Primary", (i / 2) ? "Secondary" : "Primary",
(i % 2 ) ? "Slave" : "Master", i); (i % 2 ) ? "Slave" : "Master", i);
}
} }
} }