summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAamir Bohra <aamir.bohra@intel.com>2017-05-17 15:13:08 +0530
committerAaron Durbin <adurbin@chromium.org>2017-05-22 18:12:27 +0200
commitfd8e00092a7d2b5ccc9bb832a8eafa2f2d1cddbf (patch)
tree178a41f97ce161be407b4af4d49a38c6bd0c1d34
parent1b1ecae0a410b3f24ac5b959e8a13a7a97729b5e (diff)
downloadcoreboot-fd8e00092a7d2b5ccc9bb832a8eafa2f2d1cddbf.tar.xz
soc/intel/skylake: Use Intel SATA common code
Use SATA common code from soc/intel/common/block/sata and clean up code. Change-Id: Ib5d65f1afda6b2f8098f1c006623a48cf2690593 Signed-off-by: Aamir Bohra <aamir.bohra@intel.com> Reviewed-on: https://review.coreboot.org/19735 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Aaron Durbin <adurbin@chromium.org> Reviewed-by: Philippe Mathieu-Daudé <philippe.mathieu.daude@gmail.com>
-rw-r--r--src/soc/intel/skylake/Kconfig1
-rw-r--r--src/soc/intel/skylake/Makefile.inc1
-rw-r--r--src/soc/intel/skylake/sata.c74
3 files changed, 1 insertions, 75 deletions
diff --git a/src/soc/intel/skylake/Kconfig b/src/soc/intel/skylake/Kconfig
index e7cca3255a..80cdde63f8 100644
--- a/src/soc/intel/skylake/Kconfig
+++ b/src/soc/intel/skylake/Kconfig
@@ -60,6 +60,7 @@ config CPU_SPECIFIC_OPTIONS
select SOC_INTEL_COMMON_BLOCK_PCR
select SOC_INTEL_COMMON_BLOCK_RTC
select SOC_INTEL_COMMON_BLOCK_SA
+ select SOC_INTEL_COMMON_BLOCK_SATA
select SOC_INTEL_COMMON_BLOCK_SMBUS
select SOC_INTEL_COMMON_BLOCK_UART
select SOC_INTEL_COMMON_BLOCK_XHCI
diff --git a/src/soc/intel/skylake/Makefile.inc b/src/soc/intel/skylake/Makefile.inc
index 21f2f74811..3ce88a73af 100644
--- a/src/soc/intel/skylake/Makefile.inc
+++ b/src/soc/intel/skylake/Makefile.inc
@@ -70,7 +70,6 @@ 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 += sgx.c
ramstage-y += smi.c
diff --git a/src/soc/intel/skylake/sata.c b/src/soc/intel/skylake/sata.c
deleted file mode 100644
index 277d6da246..0000000000
--- a/src/soc/intel/skylake/sata.c
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * 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. By 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 slumber states
- * and can detect devices. When disabled, the port is in the off state and
- * can't detect any devices.
- */
-static void sata_final(device_t dev)
-{
- void *ahcibar = get_ahci_bar();
- u32 port_impl, temp;
-
- dev = PCH_DEV_SATA;
- /* Read Ports Implemented (GHC_PI) */
- port_impl = read32(ahcibar + 0x0c) & 0x07;
- /* Port enable */
- temp = pci_read_config32(dev, 0x92);
- temp |= port_impl;
- pci_write_config32(dev, 0x92, temp);
-
-}
-
-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 */
- 0x282a, /* KBL */
- 0
-};
-
-static const struct pci_driver pch_sata __pci_driver = {
- .ops = &sata_ops,
- .vendor = PCI_VENDOR_ID_INTEL,
- .devices = pci_device_ids,
-};