[M] Change in coreboot[master]: soc/intel/{brasswell, denverton_ns}: Remove NOOP second SSDT

[Arthur Heymans (Code Review)]

Attention is currently required from: Jeff Daly, Vanessa Eusebio.

Arthur Heymans has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/76130?usp=email )

Change subject: soc/intel/{brasswell, denverton_ns}: Remove NOOP second SSDT
......................................................................

soc/intel/{brasswell, denverton_ns}: Remove NOOP second SSDT

A second SSDT is never added as only NOOP weak functions exist.

Signed-off-by: Arthur Heymans 
Change-Id: Icbe032cb133416caf7d48e00e070cfc26419fcfb
---
M src/soc/intel/braswell/acpi.c
M src/soc/intel/braswell/fadt.c
D src/soc/intel/braswell/include/soc/acpi.h
M src/soc/intel/braswell/placeholders.c
M src/soc/intel/braswell/southcluster.c
M src/soc/intel/denverton_ns/acpi.c
M src/soc/intel/denverton_ns/include/soc/acpi.h
M src/soc/intel/denverton_ns/lpc.c
8 files changed, 0 insertions(+), 79 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/30/76130/1

diff --git a/src/soc/intel/braswell/acpi.c b/src/soc/intel/braswell/acpi.c
index 6423ebe..765f13e 100644
--- a/src/soc/intel/braswell/acpi.c
+++ b/src/soc/intel/braswell/acpi.c
@@ -12,7 +12,6 @@
 #include <cpu/x86/smm.h>
 #include <device/pci.h>
 #include <drivers/intel/gma/opregion.h>
-#include <soc/acpi.h>
 #include <soc/device_nvs.h>
 #include <soc/gfx.h>
 #include <soc/iomap.h>
@@ -317,29 +316,3 @@
    /* Add a method to notify processor nodes */
    acpigen_write_processor_cnot(pattrs->num_cpus);
 }
-
-unsigned long southcluster_write_acpi_tables(const struct device *device, unsigned long current,
-					     struct acpi_rsdp *rsdp)
-{
-	acpi_header_t *ssdt2 = (acpi_header_t *)current;
-	memset(ssdt2, 0, sizeof(acpi_header_t));
-	acpi_create_serialio_ssdt(ssdt2);
-	if (ssdt2->length) {
-		current += ssdt2->length;
-		acpi_add_table(rsdp, ssdt2);
-		printk(BIOS_DEBUG, "ACPI:     * SSDT2 @ %p Length %x\n", ssdt2, ssdt2->length);
-		current = acpi_align_current(current);
-
-	} else {
-		ssdt2 = NULL;
-		printk(BIOS_DEBUG, "ACPI:     * SSDT2 not generated.\n");
-	}
-
-	printk(BIOS_DEBUG, "current = %lx\n", current);
-
-	return current;
-}
-
-__weak void acpi_create_serialio_ssdt(acpi_header_t *ssdt)
-{
-}
diff --git a/src/soc/intel/braswell/fadt.c b/src/soc/intel/braswell/fadt.c
index ac1653d..e4e225e 100644
--- a/src/soc/intel/braswell/fadt.c
+++ b/src/soc/intel/braswell/fadt.c
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0-only */

#include <acpi/acpi.h>
-#include <soc/acpi.h>
 #include <soc/iomap.h>
 #include <soc/pm.h>

diff --git a/src/soc/intel/braswell/include/soc/acpi.h b/src/soc/intel/braswell/include/soc/acpi.h
deleted file mode 100644
index fa4c804..0000000
--- a/src/soc/intel/braswell/include/soc/acpi.h
+++ /dev/null
@@ -1,12 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-
-#ifndef _SOC_ACPI_H_
-#define _SOC_ACPI_H_
-
-#include <acpi/acpi.h>
-
-void acpi_create_serialio_ssdt(acpi_header_t *ssdt);
-unsigned long southcluster_write_acpi_tables(const struct device *device,
-	unsigned long current, struct acpi_rsdp *rsdp);
-
-#endif /* _SOC_ACPI_H_ */
diff --git a/src/soc/intel/braswell/placeholders.c b/src/soc/intel/braswell/placeholders.c
index 15514f9..160dfb6 100644
--- a/src/soc/intel/braswell/placeholders.c
+++ b/src/soc/intel/braswell/placeholders.c
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0-only */

#include <device/pci_rom.h>
-#include <soc/acpi.h>

/* Rmodules don't like weak symbols. */
 u32 map_oprom_vendev(u32 vendev) { return vendev; }
diff --git a/src/soc/intel/braswell/southcluster.c b/src/soc/intel/braswell/southcluster.c
index a0df97c..fbc02be 100644
--- a/src/soc/intel/braswell/southcluster.c
+++ b/src/soc/intel/braswell/southcluster.c
@@ -14,7 +14,6 @@
 #include <pc80/isa-dma.h>
 #include <pc80/i8254.h>
 #include <pc80/i8259.h>
-#include <soc/acpi.h>
 #include <soc/iomap.h>
 #include <soc/irq.h>
 #include <soc/lpc.h>
@@ -524,7 +523,6 @@
 static struct device_operations device_ops = {
    .read_resources			= sc_read_resources,
    .set_resources			= pci_dev_set_resources,
-	.write_acpi_tables		= southcluster_write_acpi_tables,
    .init				= sc_init,
    .enable				= southcluster_enable_dev,
    .scan_bus			= scan_static_bus,
diff --git a/src/soc/intel/denverton_ns/acpi.c b/src/soc/intel/denverton_ns/acpi.c
index feb6d6f..4dc9dd8 100644
--- a/src/soc/intel/denverton_ns/acpi.c
+++ b/src/soc/intel/denverton_ns/acpi.c
@@ -146,35 +146,6 @@
    	return MP_IRQ_POLARITY_HIGH;
 }

-unsigned long southcluster_write_acpi_tables(const struct device *device,
-					     unsigned long current,
-					     struct acpi_rsdp *rsdp)
-{
-	acpi_header_t *ssdt2;
-
-	current = (ALIGN_UP(current, 16));
-
-	ssdt2 = (acpi_header_t *)current;
-	memset(ssdt2, 0, sizeof(acpi_header_t));
-	acpi_create_serialio_ssdt(ssdt2);
-	if (ssdt2->length) {
-		current += ssdt2->length;
-		acpi_add_table(rsdp, ssdt2);
-		printk(BIOS_DEBUG, "ACPI:     * SSDT2 @ %p Length %x\n", ssdt2,
-		       ssdt2->length);
-		current = (ALIGN_UP(current, 16));
-	} else {
-		ssdt2 = NULL;
-		printk(BIOS_DEBUG, "ACPI:     * SSDT2 not generated.\n");
-	}
-
-	printk(BIOS_DEBUG, "current = %lx\n", current);
-
-	return current;
-}
-
-__weak void acpi_create_serialio_ssdt(acpi_header_t *ssdt) {}
-
 static unsigned long acpi_fill_dmar(unsigned long current)
 {
    uint64_t vtbar;
diff --git a/src/soc/intel/denverton_ns/include/soc/acpi.h b/src/soc/intel/denverton_ns/include/soc/acpi.h
index 41a60d0..5e7f0f3 100644
--- a/src/soc/intel/denverton_ns/include/soc/acpi.h
+++ b/src/soc/intel/denverton_ns/include/soc/acpi.h
@@ -5,11 +5,7 @@

#include <acpi/acpi.h>

-void acpi_create_serialio_ssdt(acpi_header_t *ssdt);
 unsigned long acpi_madt_irq_overrides(unsigned long current);
-unsigned long southcluster_write_acpi_tables(const struct device *device,
-					     unsigned long current,
-					     struct acpi_rsdp *rsdp);
 unsigned long systemagent_write_acpi_tables(const struct device *dev,
    				    unsigned long start,
    				    struct acpi_rsdp *const rsdp);
diff --git a/src/soc/intel/denverton_ns/lpc.c b/src/soc/intel/denverton_ns/lpc.c
index 7ebca1e..4885024 100644
--- a/src/soc/intel/denverton_ns/lpc.c
+++ b/src/soc/intel/denverton_ns/lpc.c
@@ -518,9 +518,6 @@
 static struct device_operations device_ops = {
    .read_resources = lpc_read_resources,
    .set_resources = pci_dev_set_resources,
-#if CONFIG(HAVE_ACPI_TABLES)
-	.write_acpi_tables = southcluster_write_acpi_tables,
-#endif
    .enable_resources = lpc_enable_resources,
    .init = lpc_init,
    .enable = southcluster_enable_dev,