From 60453ff2cbd1befe24959fba1d24f734406444e3 Mon Sep 17 00:00:00 2001 From: Francis Rowe Date: Fri, 06 Nov 2015 02:45:49 -0500 Subject: Update coreboot to new version (use latest stable kgpe-d16 tree) --- (limited to 'resources/libreboot/patch/kgpe-d16/0052-southbridge-amd-sb700-Indicate-iSATA-eSATA-port-type.patch') diff --git a/resources/libreboot/patch/kgpe-d16/0052-southbridge-amd-sb700-Indicate-iSATA-eSATA-port-type.patch b/resources/libreboot/patch/kgpe-d16/0052-southbridge-amd-sb700-Indicate-iSATA-eSATA-port-type.patch new file mode 100644 index 0000000..a53e25e --- /dev/null +++ b/resources/libreboot/patch/kgpe-d16/0052-southbridge-amd-sb700-Indicate-iSATA-eSATA-port-type.patch @@ -0,0 +1,94 @@ +From 0092df93ab131ead3c4f738e35a8371c603f9f83 Mon Sep 17 00:00:00 2001 +From: Timothy Pearson +Date: Tue, 9 Jun 2015 19:34:16 -0500 +Subject: [PATCH 052/143] southbridge/amd/sb700: Indicate iSATA/eSATA port + type + +Change-Id: I8ee757d07c82c151b36def6b709163ff144d244f +Signed-off-by: Timothy Pearson +--- + src/mainboard/asus/kgpe-d16/mainboard.c | 16 ++++++++++++++++ + src/southbridge/amd/sb700/sata.c | 19 +++++++++++++++++++ + src/southbridge/amd/sb700/sb700.h | 1 + + 3 files changed, 36 insertions(+) + +diff --git a/src/mainboard/asus/kgpe-d16/mainboard.c b/src/mainboard/asus/kgpe-d16/mainboard.c +index 8de6f26..77e55db 100644 +--- a/src/mainboard/asus/kgpe-d16/mainboard.c ++++ b/src/mainboard/asus/kgpe-d16/mainboard.c +@@ -99,6 +99,22 @@ void sb7xx_51xx_setup_sata_phys(struct device *dev) + pci_write_config16(dev, 0xaa, 0xa07a); + } + ++/* override the default SATA port setup */ ++void sb7xx_51xx_setup_sata_port_indication(void *sata_bar5) ++{ ++ uint32_t dword; ++ ++ /* RPR7.9 Program Port Indication Registers */ ++ dword = read32(sata_bar5 + 0xf8); ++ dword &= ~(0x3f << 12); /* All ports are iSATA */ ++ dword &= ~0x3f; ++ write32(sata_bar5 + 0xf8, dword); ++ ++ dword = read32(sata_bar5 + 0xfc); ++ dword &= ~(0x1 << 20); /* No eSATA ports are present */ ++ write32(sata_bar5 + 0xfc, dword); ++} ++ + struct chip_operations mainboard_ops = { + .enable_dev = mainboard_enable, + }; +diff --git a/src/southbridge/amd/sb700/sata.c b/src/southbridge/amd/sb700/sata.c +index d97288a..d35f84d 100644 +--- a/src/southbridge/amd/sb700/sata.c ++++ b/src/southbridge/amd/sb700/sata.c +@@ -78,6 +78,23 @@ void __attribute__((weak)) sb7xx_51xx_setup_sata_phys(struct device *dev) + pci_write_config16(dev, 0xaa, 0xA07A); + } + ++/* This function can be overloaded in mainboard.c */ ++void __attribute__((weak)) sb7xx_51xx_setup_sata_port_indication(void *sata_bar5) ++{ ++ uint32_t dword; ++ ++ /* RPR7.9 Program Port Indication Registers */ ++ dword = read32(sata_bar5 + 0xf8); ++ dword &= ~(0x3f << 12); /* Ports 0 and 1 are eSATA */ ++ dword |= (0x3 << 12); ++ dword &= ~0x3f; ++ write32(sata_bar5 + 0xf8, dword); ++ ++ dword = read32(sata_bar5 + 0xfc); ++ dword |= 0x1 << 20; /* At least one eSATA port is present */ ++ write32(sata_bar5 + 0xfc, dword); ++} ++ + static void sata_init(struct device *dev) + { + u8 byte; +@@ -248,7 +265,9 @@ static void sata_init(struct device *dev) + /* Program the watchdog counter to 0x10 */ + byte = 0x10; + pci_write_config8(dev, 0x46, byte); ++ + sb7xx_51xx_setup_sata_phys(dev); ++ sb7xx_51xx_setup_sata_port_indication(sata_bar5); + + /* Enable the I/O, MM, BusMaster access for SATA */ + byte = pci_read_config8(dev, 0x4); +diff --git a/src/southbridge/amd/sb700/sb700.h b/src/southbridge/amd/sb700/sb700.h +index 941a4fd..8f792e7 100644 +--- a/src/southbridge/amd/sb700/sb700.h ++++ b/src/southbridge/amd/sb700/sb700.h +@@ -74,6 +74,7 @@ void sb7xx_51xx_before_pci_init(void); + #include + /* allow override in mainboard.c */ + void sb7xx_51xx_setup_sata_phys(struct device *dev); ++void sb7xx_51xx_setup_sata_port_indication(void *sata_bar5); + + #endif + +-- +1.7.9.5 + -- cgit v0.9.1