summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFurquan Shaikh <furquan@google.com>2020-04-27 15:41:35 -0700
committerFurquan Shaikh <furquan@google.com>2020-04-28 22:56:51 +0000
commit088b9e337cfa0bce05ddbdbc643c29676e842f8f (patch)
treeb10df42f75fb7379b593f398554da758a671af7d
parent69c0469bb94662f0fff523fe6eeb84911b397a47 (diff)
soc/amd/sata: Move SATA PCI device from DSDT to SSDT
This change adds support in common block SATA driver to add a PCI device for SATA in SSDT and removes the SATA device from DSDT. This makes it easier to ensure that we don't accidentally make the DSDT and SSDT entries inconsistent w.r.t. ACPI name and scope. BUG=b:153858769 Change-Id: I16ac36d997496ff33c5b44ec9bd2731b2b8799eb Signed-off-by: Furquan Shaikh <furquan@google.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/40769 Reviewed-by: Aaron Durbin <adurbin@chromium.org> Reviewed-by: Angel Pons <th3fanbus@gmail.com> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
-rw-r--r--src/soc/amd/common/block/sata/sata.c2
-rw-r--r--src/soc/amd/stoneyridge/acpi/sb_pci0_fch.asl5
2 files changed, 2 insertions, 5 deletions
diff --git a/src/soc/amd/common/block/sata/sata.c b/src/soc/amd/common/block/sata/sata.c
index f9b6549494..2dd0d425a1 100644
--- a/src/soc/amd/common/block/sata/sata.c
+++ b/src/soc/amd/common/block/sata/sata.c
@@ -1,6 +1,7 @@
/* SPDX-License-Identifier: GPL-2.0-only */
/* This file is part of the coreboot project. */
+#include <arch/acpigen.h>
#include <device/device.h>
#include <device/pci.h>
#include <device/pci_ids.h>
@@ -19,6 +20,7 @@ static struct device_operations sata_ops = {
.enable_resources = pci_dev_enable_resources,
.init = soc_enable_sata_features,
.acpi_name = sata_acpi_name,
+ .acpi_fill_ssdt = acpi_device_write_pci_dev,
};
static const unsigned short pci_device_ids[] = {
diff --git a/src/soc/amd/stoneyridge/acpi/sb_pci0_fch.asl b/src/soc/amd/stoneyridge/acpi/sb_pci0_fch.asl
index 8cf8da4e24..cfd2f1df7b 100644
--- a/src/soc/amd/stoneyridge/acpi/sb_pci0_fch.asl
+++ b/src/soc/amd/stoneyridge/acpi/sb_pci0_fch.asl
@@ -23,11 +23,6 @@ Method(_OSC,4)
/* Describe the Southbridge devices */
-/* 0:11.0 - SATA */
-Device(STCR) {
- Name(_ADR, 0x00110000)
-} /* end STCR */
-
/* 0:14.0 - SMBUS */
Device(SBUS) {
Name(_ADR, 0x00140000)