diff options
author | Francis Rowe <info@gluglug.org.uk> | 2015-10-19 00:12:53 +0100 |
---|---|---|
committer | Francis Rowe <info@gluglug.org.uk> | 2015-10-19 02:32:36 +0100 |
commit | 0622df6194dbb1b2120743c0fd1cc5e72c380128 (patch) | |
tree | 4c858b8c5667fe001a9907ae0578b4ec28a8f513 /resources/libreboot/patch/kgpe-d16/0069-southbridge-amd-sb700-Fix-SATA-port-4-5-drive-detect.patch | |
parent | 5999dba5f71f1c05040a551d2420ab8c7f3a9da4 (diff) | |
download | librebootfr-0622df6194dbb1b2120743c0fd1cc5e72c380128.tar.gz librebootfr-0622df6194dbb1b2120743c0fd1cc5e72c380128.zip |
KGPE-D16: update patch set (also update coreboot and vboot)
Also contains other fixes from coreboot, like:
* 551cff0 Derive lvds_dual_channel from EDID timings.
^ makes single/dual channel LVDS selection on GM45 automatic
* 26fc544 lenovo/t60: Enable native intel gfx init.
^ was being maintained in libreboot, now upstreamed so not needed
Framebuffer mode was disabled for the KGPE-D16, because only
text-mode works at the moment.
Diffstat (limited to 'resources/libreboot/patch/kgpe-d16/0069-southbridge-amd-sb700-Fix-SATA-port-4-5-drive-detect.patch')
-rw-r--r-- | resources/libreboot/patch/kgpe-d16/0069-southbridge-amd-sb700-Fix-SATA-port-4-5-drive-detect.patch | 95 |
1 files changed, 0 insertions, 95 deletions
diff --git a/resources/libreboot/patch/kgpe-d16/0069-southbridge-amd-sb700-Fix-SATA-port-4-5-drive-detect.patch b/resources/libreboot/patch/kgpe-d16/0069-southbridge-amd-sb700-Fix-SATA-port-4-5-drive-detect.patch deleted file mode 100644 index b515a7ac..00000000 --- a/resources/libreboot/patch/kgpe-d16/0069-southbridge-amd-sb700-Fix-SATA-port-4-5-drive-detect.patch +++ /dev/null @@ -1,95 +0,0 @@ -From 26a5ebad4ca95370319d630f323b5a982cc113c0 Mon Sep 17 00:00:00 2001 -From: Timothy Pearson <kb9vqf@pearsoncomputing.net> -Date: Mon, 22 Jun 2015 02:56:10 -0500 -Subject: [PATCH 069/146] southbridge/amd/sb700: Fix SATA port 4/5 drive - detection - ---- - src/southbridge/amd/sb700/sata.c | 42 ++++++++++++++++++++++++++++++++++---- - 1 file changed, 38 insertions(+), 4 deletions(-) - -diff --git a/src/southbridge/amd/sb700/sata.c b/src/southbridge/amd/sb700/sata.c -index f27ec49..da6f107 100644 ---- a/src/southbridge/amd/sb700/sata.c -+++ b/src/southbridge/amd/sb700/sata.c -@@ -126,6 +126,8 @@ static void sata_init(struct device *dev) - uint8_t port_count; - uint8_t max_port_count; - uint8_t hba_reset_count; -+ uint8_t ide_io_enabled; -+ uint8_t ide_legacy_io_enabled; - - sata_ahci_mode = 0; - if (get_option(&nvram, "sata_ahci_mode") == CB_SUCCESS) -@@ -170,15 +172,27 @@ retry_init: - } - } - -- /* Disable combined mode */ -+ /* Enable combined mode */ - byte = pci_read_config8(sm_dev, 0xad); -- byte &= ~(1 << 3); -+ byte |= (1 << 3); - pci_write_config8(sm_dev, 0xad, byte); - - device_t ide_dev; - /* IDE Device */ - ide_dev = dev_find_slot(0, PCI_DEVFN(0x14, 1)); - -+ /* Disable legacy IDE mode (enable PATA_BAR0/2) */ -+ byte = pci_read_config8(ide_dev, 0x09); -+ ide_legacy_io_enabled = !(byte & 0x1); -+ byte |= 0x1; -+ pci_write_config8(ide_dev, 0x09, byte); -+ -+ /* Enable IDE I/O access (enable PATA_BAR0/2) */ -+ byte = pci_read_config8(ide_dev, 0x04); -+ ide_io_enabled = byte & 0x1; -+ byte |= 0x1; -+ pci_write_config8(ide_dev, 0x04, byte); -+ - /* RPR 7.2 SATA Initialization */ - /* Set the interrupt Mapping to INTG# */ - byte = pci_read_config8(sm_dev, 0xaf); -@@ -425,7 +439,8 @@ retry_init: - - /* Disable SATA controller */ - byte = pci_read_config8(sm_dev, 0xad); -- byte &= ~(0x1); -+ byte &= ~(1 << 0); -+ byte &= ~(1 << 3); - pci_write_config8(sm_dev, 0xad, byte); - - mdelay(100); -@@ -460,8 +475,27 @@ retry_init: - } - } - -+ /* Restore IDE I/O access */ -+ if (!ide_io_enabled) { -+ byte = pci_read_config8(ide_dev, 0x04); -+ byte &= ~0x1; -+ pci_write_config8(ide_dev, 0x04, byte); -+ } -+ -+ /* Re-enable legacy IDE mode */ -+ if (ide_legacy_io_enabled) { -+ byte = pci_read_config8(ide_dev, 0x09); -+ byte &= ~0x1; -+ pci_write_config8(ide_dev, 0x09, byte); -+ } -+ - /* Below is CIM InitSataLateFar */ -- if (!sata_ahci_mode) { -+ if (sata_ahci_mode) { -+ /* Disable combined mode */ -+ byte = pci_read_config8(sm_dev, 0xad); -+ byte &= ~(1 << 3); -+ pci_write_config8(sm_dev, 0xad, byte); -+ } else { - /* Enable interrupts from the HBA */ - byte = read8(sata_bar5 + 0x4); - byte |= 1 << 1; --- -1.7.9.5 - |