diff options
| author | Wenkai Du <wenkai.du@intel.com> | 2014-12-05 14:04:10 -0800 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2015-04-13 13:00:56 +0200 |
| commit | 038cce2c2ec540163563a42c784f1c32564ee1b4 (patch) | |
| tree | 2af0813dad056ab48d1630d603a8b172c7578a31 | |
| parent | 8c916ec8346182b6b2d085d4663be556c376f414 (diff) | |
broadwell: Fix incorrect SATA port map mask
WPT-LP has 4 SATA ports. Current code assumes 6 SATA ports and as a result,
some reserved bits are written with 1. No specific issue has been observed
so far.
BUG=None
BRANCH=None
TEST=Verify SATA PCI configure space dump on Auron
Change-Id: I737719b3d5cd788158cd5b6991405ba098be4078
Signed-off-by: Stefan Reinauer <reinauer@chromium.org>
Original-Commit-Id: 2b55587a74ac5d45354dc123937b562290468855
Original-Change-Id: I9c53ac86e2bf72901647bd2cfa48ac0ce31abea0
Original-Signed-off-by: Wenkai Du <wenkai.du@intel.com>
Original-Reviewed-on: https://chromium-review.googlesource.com/233661
Original-Reviewed-by: Duncan Laurie <dlaurie@chromium.org>
Reviewed-on: http://review.coreboot.org/9479
Tested-by: build bot (Jenkins)
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
| -rw-r--r-- | src/soc/intel/broadwell/sata.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/soc/intel/broadwell/sata.c b/src/soc/intel/broadwell/sata.c index fd1e9f156a..d3cf52527d 100644 --- a/src/soc/intel/broadwell/sata.c +++ b/src/soc/intel/broadwell/sata.c @@ -65,7 +65,7 @@ static void sata_init(struct device *dev) /* for AHCI, Port Enable is managed in memory mapped space */ reg16 = pci_read_config16(dev, 0x92); - reg16 &= ~0x3f; + reg16 &= ~0xf; reg16 |= 0x8000 | config->sata_port_map; pci_write_config16(dev, 0x92, reg16); udelay(2); @@ -84,7 +84,7 @@ static void sata_init(struct device *dev) /* SATA Initialization register */ reg32 = 0x183; - reg32 |= (config->sata_port_map ^ 0x3f) << 24; + reg32 |= (config->sata_port_map ^ 0xf) << 24; reg32 |= (config->sata_devslp_mux & 1) << 15; pci_write_config32(dev, 0x94, reg32); @@ -237,7 +237,7 @@ static void sata_enable(device_t dev) config_t *config = dev->chip_info; u16 map = 0x0060; - map |= (config->sata_port_map ^ 0x3f) << 8; + map |= (config->sata_port_map ^ 0xf) << 8; pci_write_config16(dev, 0x90, map); } |