Change in coreboot[master]: soc/intel/xeon_sp/skx: Make devicetree config and ops generic

[Marc Jones (Code Review)]

Marc Jones has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/45848 )

Change subject: soc/intel/xeon_sp/skx: Make devicetree config and ops generic
......................................................................

soc/intel/xeon_sp/skx: Make devicetree config and ops generic

Prepare for common ACPI and de-duplication.
Change the mainboard devicetree so that:
 soc_intel_xeon_sp_skx_ops -> soc_intel_xeon_sp_ops
 soc_intel_xeon_sp_skx_config -> soc_intel_xeon_sp_config

This allows for common code between skx and cpx in future
changes.

Change-Id: Ib4509d54371aca02cc96f7a18821fac8ce5404aa
Signed-off-by: Marc Jones 
---
M src/mainboard/ocp/tiogapass/devicetree.cb
M src/soc/intel/xeon_sp/skx/chip.c
M src/soc/intel/xeon_sp/skx/chip.h
M src/soc/intel/xeon_sp/skx/soc_acpi.c
4 files changed, 5 insertions(+), 5 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/48/45848/1

diff --git a/src/mainboard/ocp/tiogapass/devicetree.cb b/src/mainboard/ocp/tiogapass/devicetree.cb
index 33f4090..01a6467 100644
--- a/src/mainboard/ocp/tiogapass/devicetree.cb
+++ b/src/mainboard/ocp/tiogapass/devicetree.cb
@@ -1,6 +1,6 @@
 ## SPDX-License-Identifier: GPL-2.0-or-later

-chip soc/intel/xeon_sp/skx
+chip soc/intel/xeon_sp

register "pirqa_routing" = "PCH_IRQ11"
    register "pirqb_routing" = "PCH_IRQ10"
diff --git a/src/soc/intel/xeon_sp/skx/chip.c b/src/soc/intel/xeon_sp/skx/chip.c
index 845d7cb..589ca03 100644
--- a/src/soc/intel/xeon_sp/skx/chip.c
+++ b/src/soc/intel/xeon_sp/skx/chip.c
@@ -575,7 +575,7 @@
    mainboard_silicon_init_params(silupd);
 }

-struct chip_operations soc_intel_xeon_sp_skx_ops = {
+struct chip_operations soc_intel_xeon_sp_ops = {
    CHIP_NAME("Intel Skylake-SP")
    .enable_dev = soc_enable_dev,
    .init = soc_init,
diff --git a/src/soc/intel/xeon_sp/skx/chip.h b/src/soc/intel/xeon_sp/skx/chip.h
index adb70e5..c3966e5 100644
--- a/src/soc/intel/xeon_sp/skx/chip.h
+++ b/src/soc/intel/xeon_sp/skx/chip.h
@@ -7,7 +7,7 @@
 #include <intelblocks/cfg.h>
 #include <soc/irq.h>

-struct soc_intel_xeon_sp_skx_config {
+struct soc_intel_xeon_sp_config {
    /* Common struct containing soc config data required by common code */
    struct soc_intel_common_config common_soc_config;

@@ -74,7 +74,7 @@
    uint32_t tcc_offset;
 };

-typedef struct soc_intel_xeon_sp_skx_config config_t;
+typedef struct soc_intel_xeon_sp_config config_t;

/* soc acpi function prototypes. To be removed when acpi.c is replaced by common/acpi.c */
 void uncore_inject_dsdt(void);
diff --git a/src/soc/intel/xeon_sp/skx/soc_acpi.c b/src/soc/intel/xeon_sp/skx/soc_acpi.c
index c116506..8139dc4 100644
--- a/src/soc/intel/xeon_sp/skx/soc_acpi.c
+++ b/src/soc/intel/xeon_sp/skx/soc_acpi.c
@@ -586,7 +586,7 @@
    acpi_slit_t *slit;
    acpi_dmar_t *dmar;

-	const struct soc_intel_xeon_sp_skx_config *const config = config_of(device);
+	const struct soc_intel_xeon_sp_config *const config = config_of(device);

/* SRAT */
    current = ALIGN(current, 8);

[Stefan Reinauer (Code Review)]

Stefan Reinauer has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/45848 )

Change subject: soc/intel/xeon_sp/skx: Make devicetree config and ops generic
......................................................................

Patch Set 3: Code-Review+2

[Angel Pons (Code Review)]

Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/45848 )

Change subject: soc/intel/xeon_sp/skx: Make devicetree config and ops generic
......................................................................

Patch Set 3: Code-Review+2

[Marc Jones (Code Review)]

Marc Jones has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/45848 )

Change subject: soc/intel/xeon_sp/skx: Make devicetree config and ops generic
......................................................................

Patch Set 3: Code-Review-2

I broke static.c with this change. The cpx/chip.h isn't automatically added. I need to figure out if those need to be combined first or if they can stay separated in the directories but still picked up by the build.

[Angel Pons (Code Review)]

Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/45848 )

Change subject: soc/intel/xeon_sp/skx: Make devicetree config and ops generic
......................................................................

Patch Set 3: -Code-Review
> Patch Set 3: Code-Review-2
>
> I broke static.c with this change. The cpx/chip.h isn't automatically added. I need to figure out if those need to be combined first or if they can stay separated in the directories but still picked up by the build.

Ugh, I can see why...

[Angel Pons (Code Review)]

Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/45848 )

Change subject: soc/intel/xeon_sp/skx: Make devicetree config and ops generic
......................................................................

Patch Set 3:

(1 comment)

https://review.coreboot.org/c/coreboot/+/45848/3/src/soc/intel/xeon_sp/skx/c... 
File src/soc/intel/xeon_sp/skx/chip.h:

https://review.coreboot.org/c/coreboot/+/45848/3/src/soc/intel/xeon_sp/skx/c... 
PS3, Line 10: struct soc_intel_xeon_sp_config {
This struct needs to be found inside `soc/intel/xeon_sp/chip.h`. #include directives would work.

[Marc Jones (Code Review)]

Hello build bot (Jenkins), Stefan Reinauer, Angel Pons, Patrick Rudolph,

I'd like you to reexamine a change. Please visit

https://review.coreboot.org/c/coreboot/+/45848

to look at the new patch set (#4).

Change subject: soc/intel/xeon_sp/skx: Make devicetree config and ops generic
......................................................................

soc/intel/xeon_sp/skx: Make devicetree config and ops generic

Prepare for common ACPI and de-duplication.
Change the mainboard devicetree so that:
 soc_intel_xeon_sp_skx_ops -> soc_intel_xeon_sp_ops
 soc_intel_xeon_sp_skx_config -> soc_intel_xeon_sp_config

This allows for common code between skx and cpx in future
changes.

Change-Id: Ib4509d54371aca02cc96f7a18821fac8ce5404aa
Signed-off-by: Marc Jones 
---
M src/mainboard/ocp/tiogapass/devicetree.cb
M src/soc/intel/xeon_sp/skx/chip.c
M src/soc/intel/xeon_sp/skx/skx.h
M src/soc/intel/xeon_sp/skx/soc_acpi.c
4 files changed, 5 insertions(+), 5 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/48/45848/4

[Marc Jones (Code Review)]

Hello build bot (Jenkins), Stefan Reinauer, Angel Pons, Patrick Rudolph,

I'd like you to reexamine a change. Please visit

https://review.coreboot.org/c/coreboot/+/45848

to look at the new patch set (#5).

Change subject: soc/intel/xeon_sp/skx: Make devicetree config and ops generic
......................................................................

soc/intel/xeon_sp/skx: Make devicetree config and ops generic

Prepare for common ACPI and de-duplication.
Change the mainboard devicetree so that:
 soc_intel_xeon_sp_skx_ops -> soc_intel_xeon_sp_ops
 soc_intel_xeon_sp_skx_config -> soc_intel_xeon_sp_config

This allows for common code between skx and cpx in future
changes.

Change-Id: Ib4509d54371aca02cc96f7a18821fac8ce5404aa
Signed-off-by: Marc Jones 
---
M src/mainboard/ocp/tiogapass/devicetree.cb
M src/soc/intel/xeon_sp/skx/chip.c
M src/soc/intel/xeon_sp/skx/skx.h
M src/soc/intel/xeon_sp/skx/soc_acpi.c
4 files changed, 5 insertions(+), 5 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/48/45848/5

[Marc Jones (Code Review)]

Marc Jones has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/45848 )

Change subject: soc/intel/xeon_sp/skx: Make devicetree config and ops generic
......................................................................

Patch Set 5: -Code-Review

The static.c issue is fixed by CB:45969.

[Marc Jones (Code Review)]

Marc Jones has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/45848 )

Change subject: soc/intel/xeon_sp/skx: Make devicetree config and ops generic
......................................................................

Patch Set 5:

(1 comment)

https://review.coreboot.org/c/coreboot/+/45848/3/src/soc/intel/xeon_sp/skx/c... 
File src/soc/intel/xeon_sp/skx/chip.h:

https://review.coreboot.org/c/coreboot/+/45848/3/src/soc/intel/xeon_sp/skx/c... 
PS3, Line 10: struct soc_intel_xeon_sp_config {
> This struct needs to be found inside `soc/intel/xeon_sp/chip.h`. #include directives would work.

Done

Change in coreboot[master]: [WIP]soc/intel/xeon_sp/skx: Make devicetree config and ops generic

[Marc Jones (Code Review)]

Hello build bot (Jenkins), Stefan Reinauer, Angel Pons, Patrick Rudolph,

I'd like you to reexamine a change. Please visit

https://review.coreboot.org/c/coreboot/+/45848

to look at the new patch set (#6).

Change subject: [WIP]soc/intel/xeon_sp/skx: Make devicetree config and ops generic
......................................................................

[WIP]soc/intel/xeon_sp/skx: Make devicetree config and ops generic

Prepare for common ACPI and de-duplication.
Change the mainboard devicetree so that:
 soc_intel_xeon_sp_skx_ops -> soc_intel_xeon_sp_ops
 soc_intel_xeon_sp_skx_config -> soc_intel_xeon_sp_config

This allows for common code between skx and cpx in future
changes.

Change-Id: Ib4509d54371aca02cc96f7a18821fac8ce5404aa
Signed-off-by: Marc Jones 
---
M src/mainboard/ocp/tiogapass/devicetree.cb
M src/soc/intel/xeon_sp/skx/chip.c
M src/soc/intel/xeon_sp/skx/skx.h
M src/soc/intel/xeon_sp/skx/soc_acpi.c
4 files changed, 5 insertions(+), 5 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/48/45848/6

Change in coreboot[master]: [WIP]soc/intel/xeon_sp/skx: Make devicetree config and ops generic

[Marc Jones (Code Review)]

Marc Jones has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/45848 )

Change subject: [WIP]soc/intel/xeon_sp/skx: Make devicetree config and ops generic
......................................................................

Patch Set 6: Code-Review-2

WIP - look at combining chip config ops.

Change in coreboot[master]: [WIP]soc/intel/xeon_sp/skx: Make devicetree config and ops generic

[Marc Jones (Code Review)]

Marc Jones has abandoned this change. ( https://review.coreboot.org/c/coreboot/+/45848 )

Change subject: [WIP]soc/intel/xeon_sp/skx: Make devicetree config and ops generic
......................................................................

Abandoned