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

soc/intel/common/block: Fix SATA chipset register definitions anomalies 

SATA PCH configuration space registers bit mapping is different
for various SOCs hence common API between SPT-PCH and CNL-PCH causing
issue.

Add new Kconfig option to address this delta between different PCH.

Change-Id: Iafed4fe09fe513c8087453ea78364a693e1e8a8a
Signed-off-by: Subrata Banik <subrata.banik@intel.com>
Reviewed-on: https://review.coreboot.org/23589
Reviewed-by: Furquan Shaikh <furquan@google.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
This commit is contained in:
Subrata Banik 2018-02-06 15:20:19 +05:30
parent 9076b7bd07
commit 828c39eb6b
2 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/soc/intel/common/block/sata/Kconfig
View File

@ -2,3 +2,13 @@ config SOC_INTEL_COMMON_BLOCK_SATA
bool bool
help help
Intel Processor common SATA support Intel Processor common SATA support
config SOC_AHCI_PORT_IMPLEMENTED_INVERT
depends on SOC_INTEL_COMMON_BLOCK_SATA
bool
help
SATA PCI configuration space offset 0x92 Port
implement register bit 0-2 represents respective
SATA port enable status as in 0 = Disable; 1 = Enable.
If this option is selected then port enable status will be
inverted as in 0 = Enable; 1 = Disable.

17
src/soc/intel/common/block/sata/sata.c
View File

@ -22,10 +22,9 @@
#define SATA_ABAR_PORT_IMPLEMENTED 0x0c #define SATA_ABAR_PORT_IMPLEMENTED 0x0c
#define SATA_PCI_CFG_PORT_CTL_STS 0x92 #define SATA_PCI_CFG_PORT_CTL_STS 0x92
static void *get_ahci_bar(void) static void *sata_get_ahci_bar(struct device *dev)
{ {
uintptr_t bar; uintptr_t bar;
device_t dev = PCH_DEV_SATA;
bar = pci_read_config32(dev, PCI_BASE_ADDRESS_5); bar = pci_read_config32(dev, PCI_BASE_ADDRESS_5);
return (void *)(bar & ~PCI_BASE_ADDRESS_MEM_ATTR_MASK); return (void *)(bar & ~PCI_BASE_ADDRESS_MEM_ATTR_MASK);
@ -39,19 +38,23 @@ static void *get_ahci_bar(void)
* and can detect devices. When disabled, the port is in the off state and * and can detect devices. When disabled, the port is in the off state and
* can't detect any devices. * can't detect any devices.
*/ */
static void sata_final(device_t dev) static void sata_final(struct device *dev)
{ {
void *ahcibar = get_ahci_bar(); void *ahcibar = sata_get_ahci_bar(dev);
u32 port_impl, temp; u32 port_impl, temp;
dev = PCH_DEV_SATA;
/* Set Bus Master */ /* Set Bus Master */
temp = pci_read_config32(dev, PCI_COMMAND); temp = pci_read_config32(dev, PCI_COMMAND);
pci_write_config32(dev, PCI_COMMAND, temp | PCI_COMMAND_MASTER); pci_write_config32(dev, PCI_COMMAND, temp | PCI_COMMAND_MASTER);
/* Read Ports Implemented (GHC_PI) */ /* Read Ports Implemented (GHC_PI) */
port_impl = read32(ahcibar + SATA_ABAR_PORT_IMPLEMENTED) & 0x07; port_impl = read32(ahcibar + SATA_ABAR_PORT_IMPLEMENTED);
if (IS_ENABLED(CONFIG_SOC_AHCI_PORT_IMPLEMENTED_INVERT))
port_impl = ~port_impl;
port_impl &= 0x07; /* bit 0-2 */
/* Port enable */ /* Port enable */
temp = pci_read_config32(dev, SATA_PCI_CFG_PORT_CTL_STS); temp = pci_read_config32(dev, SATA_PCI_CFG_PORT_CTL_STS);
temp |= port_impl; temp |= port_impl;