Angel Pons has uploaded this change for review.

View Change

sb/intel/i82801jx/sata.c: Drop always-false is_mobile check

Also remove the meaningless `sata_traffic_monitor` devicetree option.
Function parameters will be removed in a reproducible follow-up.

Change-Id: I70cf1e06cc8ace504a22be9f9c4441e3070f9e29
Signed-off-by: Angel Pons <th3fanbus@gmail.com>
---
M src/mainboard/intel/dg43gt/devicetree.cb
M src/southbridge/intel/i82801jx/chip.h
M src/southbridge/intel/i82801jx/sata.c
3 files changed, 2 insertions(+), 17 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/36/44336/1

diff --git a/src/mainboard/intel/dg43gt/devicetree.cb b/src/mainboard/intel/dg43gt/devicetree.cb
index de2d71d..bb2456f 100644
--- a/src/mainboard/intel/dg43gt/devicetree.cb
+++ b/src/mainboard/intel/dg43gt/devicetree.cb
@@ -22,7 +22,6 @@
 			# Set AHCI mode.
 			register "sata_port_map"	= "0x1f"
 			register "sata_clock_request"	= "0"
-			register "sata_traffic_monitor"	= "0"
 
 			# Enable PCIe ports 0,2,3 as slots.
 			register "pcie_slot_implemented" = "0xb"
diff --git a/src/southbridge/intel/i82801jx/chip.h b/src/southbridge/intel/i82801jx/chip.h
index cdc1cc5..e9632d2 100644
--- a/src/southbridge/intel/i82801jx/chip.h
+++ b/src/southbridge/intel/i82801jx/chip.h
@@ -43,7 +43,6 @@
 	/* IDE configuration */
 	uint8_t sata_port_map : 6;
 	int sata_clock_request : 1;
-	int sata_traffic_monitor : 1;
 
 	int c4onc3_enable:1;
 	int c5_enable : 1;
diff --git a/src/southbridge/intel/i82801jx/sata.c b/src/southbridge/intel/i82801jx/sata.c
index 0372460..b3bed1e 100644
--- a/src/southbridge/intel/i82801jx/sata.c
+++ b/src/southbridge/intel/i82801jx/sata.c
@@ -138,9 +138,6 @@
 
 	/* Get the chip configuration */
 	const config_t *const config = dev->chip_info;
-
-	const u16 devid = pci_read_config16(dev, PCI_DEVICE_ID);
-	const int is_mobile = (devid == 0x2928) || (devid == 0x2929);
 	u8 sata_mode;
 
 	printk(BIOS_DEBUG, "i82801jx_sata: initializing...\n");
@@ -202,20 +199,10 @@
 	sclkcg |= 0x193;
 	pci_write_config32(dev, 0x94, sclkcg);
 
-	if (is_mobile && config->sata_traffic_monitor) {
-		struct device *const lpc_dev = pcidev_on_root(0x1f, 0);
-		if (((pci_read_config8(lpc_dev, D31F0_CxSTATE_CNF) >> 3) & 3) == 3) {
-			u8 reg8 = pci_read_config8(dev, 0x9c);
-			reg8 &= ~(0x1f << 2);
-			reg8 |= 3 << 2;
-			pci_write_config8(dev, 0x9c, reg8);
-		}
-	}
-
 	if (sata_mode == 0)
-		sata_enable_ahci_mmap(dev, config->sata_port_map, is_mobile);
+		sata_enable_ahci_mmap(dev, config->sata_port_map, 0);
 
-	sata_program_indexed(dev, is_mobile);
+	sata_program_indexed(dev, 0);
 }
 
 static void sata_enable(struct device *dev)

To view, visit change 44336. To unsubscribe, or for help writing mail filters, visit settings.