Subrata Banik (subrata.banik@intel.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/17229
-gerrit
commit 496b60c93619526ac58332a636cb870f8b7307ff Author: Subrata Banik subrata.banik@intel.com Date: Fri Nov 4 13:26:41 2016 +0530
soc/intel/skylake: Fix SATA booting to OS issue.
SATA device remain unrecognized if connected at Port 2.
Port control and Status register(PCS) by default set by hardware to the disabled state as a result of an initial power on reset. The same read by OS during booting causes disabling of SATA ports and can't detect any devices.
BRANCH=none BUG=chrome-os-partner:59335 TEST=Build and boot SKL from SATA device connected at Port 2.
Change-Id: I4866ca44567f5024edaca2d48098af5b4c67a7ac Signed-off-by: Subrata Banik subrata.banik@intel.com --- src/soc/intel/skylake/Makefile.inc | 1 + src/soc/intel/skylake/sata.c | 70 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 71 insertions(+)
diff --git a/src/soc/intel/skylake/Makefile.inc b/src/soc/intel/skylake/Makefile.inc index 32eb708..f02f956 100644 --- a/src/soc/intel/skylake/Makefile.inc +++ b/src/soc/intel/skylake/Makefile.inc @@ -73,6 +73,7 @@ ramstage-y += pei_data.c ramstage-y += pmc.c ramstage-y += pmutil.c ramstage-$(CONFIG_PLATFORM_USES_FSP2_0) += reset.c +ramstage-y += sata.c ramstage-y += sd.c ramstage-y += smbus.c ramstage-y += smbus_common.c diff --git a/src/soc/intel/skylake/sata.c b/src/soc/intel/skylake/sata.c new file mode 100644 index 0000000..7269a95 --- /dev/null +++ b/src/soc/intel/skylake/sata.c @@ -0,0 +1,70 @@ +/* + * This file is part of the coreboot project. + * + * Copyright (C) 2016 Intel Corporation. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#include <device/device.h> +#include <device/pci.h> +#include <device/pci_def.h> +#include <device/pci_ids.h> +#include <soc/ramstage.h> + +static void *get_ahci_bar(void) +{ + device_t dev = PCH_DEV_SATA; + uint32_t bar; + + bar = pci_read_config32(dev, PCI_BASE_ADDRESS_5); + + return (void *)(bar & ~PCI_BASE_ADDRESS_MEM_ATTR_MASK); +} + +/* + * SATA Port control and Status. Byu default, the SATA ports are set (by HW) + * to the disabled state (e.g. bits[3:0] == '0') as a result of an initial + * power on reset. When enabled by software as per SATA port mapping, + * the ports can transition between the on, partial and can detect devices. + */ +static void sata_final(device_t dev) +{ + void *ahcibar = get_ahci_bar(); + u8 port_impl; + + dev = PCH_DEV_SATA; + /* Read Ports Implemented (GHC_PI) */ + port_impl = read32(ahcibar + 0x0c); + port_impl = ~port_impl & 0x07; + /* Port enable */ + pci_write_config8(dev, 0x92, port_impl); +} + +static struct device_operations sata_ops = { + .read_resources = &pci_dev_read_resources, + .set_resources = &pci_dev_set_resources, + .enable_resources = &pci_dev_enable_resources, + .final = sata_final, + .ops_pci = &soc_pci_ops, +}; + +static const unsigned short pci_device_ids[] = { + 0x9d03, /* SKL-U Base */ + 0x9d07, /* SKL-Y Premium, SKL-U Premium */ + 0xa282, /* KBL */ + 0 +}; + +static const struct pci_driver pch_sata __pci_driver = { + .ops = &sata_ops, + .vendor = PCI_VENDOR_ID_INTEL, + .devices = pci_device_ids, +};