Change in coreboot[master]: drivers/crb,pc80: Drop __RAMSTAGE_ guards

[Kyösti Mälkki (Code Review)]

Kyösti Mälkki has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/36631 )

Change subject: drivers/crb,pc80: Drop __RAMSTAGE_ guards
......................................................................

drivers/crb,pc80: Drop __RAMSTAGE_ guards

Change-Id: Ia6e161c3b4fc44292cdac692a2918c522680d60d
Signed-off-by: Kyösti Mälkki 
---
M src/drivers/crb/tis.c
M src/drivers/pc80/tpm/tis.c
2 files changed, 4 insertions(+), 9 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/31/36631/1

diff --git a/src/drivers/crb/tis.c b/src/drivers/crb/tis.c
index 94bfb9e..7cb506d 100644
--- a/src/drivers/crb/tis.c
+++ b/src/drivers/crb/tis.c
@@ -104,8 +104,6 @@
    return 0;
 }

-#ifdef __RAMSTAGE__
-
 static void crb_tpm_fill_ssdt(struct device *dev)
 {
    const char *path = acpi_device_path(dev);
@@ -154,6 +152,7 @@
    dev->ops = &crb_ops;
 }

-struct chip_operations drivers_crb_ops = {CHIP_NAME("CRB TPM").enable_dev = enable_dev};
-
-#endif /* __RAMSTAGE__ */
+struct chip_operations drivers_crb_ops = {
+	CHIP_NAME("CRB TPM")
+	.enable_dev = enable_dev
+};
diff --git a/src/drivers/pc80/tpm/tis.c b/src/drivers/pc80/tpm/tis.c
index 5927377..47f15b9 100644
--- a/src/drivers/pc80/tpm/tis.c
+++ b/src/drivers/pc80/tpm/tis.c
@@ -721,8 +721,6 @@
    return tis_readresponse(recvbuf, recv_len);
 }

-#ifdef __RAMSTAGE__
-
 /*
  * tis_setup_interrupt()
  *
@@ -1006,5 +1004,3 @@
    CHIP_NAME("LPC TPM")
    .enable_dev = enable_dev
 };
-
-#endif /* __RAMSTAGE__ */

Change in coreboot[master]: drivers/pc80/tpm: Replace __RAMSTAGE_ guards

[Kyösti Mälkki (Code Review)]

Hello Philipp Deppenwiese, build bot (Jenkins),

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

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

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

Change subject: drivers/pc80/tpm: Replace __RAMSTAGE_ guards
......................................................................

drivers/pc80/tpm: Replace __RAMSTAGE_ guards

Change-Id: Ia6e161c3b4fc44292cdac692a2918c522680d60d
Signed-off-by: Kyösti Mälkki 
---
M src/drivers/pc80/tpm/tis.c
1 file changed, 7 insertions(+), 7 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/31/36631/2

Change in coreboot[master]: drivers/pc80/tpm: Replace __RAMSTAGE_ guards

[Kyösti Mälkki (Code Review)]

Hello Philipp Deppenwiese, build bot (Jenkins),

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

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

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

Change subject: drivers/pc80/tpm: Replace __RAMSTAGE_ guards
......................................................................

drivers/pc80/tpm: Replace __RAMSTAGE_ guards

Change-Id: Ia6e161c3b4fc44292cdac692a2918c522680d60d
Signed-off-by: Kyösti Mälkki 
---
M src/drivers/pc80/tpm/tis.c
1 file changed, 5 insertions(+), 5 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/31/36631/3

Change in coreboot[master]: drivers/pc80/tpm: Replace __RAMSTAGE_ guards

[Kyösti Mälkki (Code Review)]

Kyösti Mälkki has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/36631 )

Change subject: drivers/pc80/tpm: Replace __RAMSTAGE_ guards
......................................................................

Patch Set 3:

I am speculating whether ENV_RAMSTAGE or DEVTREE_EARLY is better guard here.

Change in coreboot[master]: drivers/pc80/tpm: Replace __RAMSTAGE_ guards

[Arthur Heymans (Code Review)]

Arthur Heymans has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/36631 )

Change subject: drivers/pc80/tpm: Replace __RAMSTAGE_ guards
......................................................................

Patch Set 5: Code-Review+1

Change in coreboot[master]: drivers/pc80/tpm: Replace __RAMSTAGE_ guards

[Aaron Durbin (Code Review)]

Aaron Durbin has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/36631 )

Change subject: drivers/pc80/tpm: Replace __RAMSTAGE_ guards
......................................................................

Patch Set 5: Code-Review+2

Change in coreboot[master]: drivers/pc80/tpm: Replace __RAMSTAGE_ guards

[Kyösti Mälkki (Code Review)]

Kyösti Mälkki has submitted this change. ( https://review.coreboot.org/c/coreboot/+/36631 )

Change subject: drivers/pc80/tpm: Replace __RAMSTAGE_ guards
......................................................................

drivers/pc80/tpm: Replace __RAMSTAGE_ guards

Change-Id: Ia6e161c3b4fc44292cdac692a2918c522680d60d
Signed-off-by: Kyösti Mälkki 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/36631
Reviewed-by: Arthur Heymans 
Reviewed-by: Aaron Durbin 
Tested-by: build bot (Jenkins) 
---
M src/drivers/pc80/tpm/tis.c
1 file changed, 5 insertions(+), 5 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Aaron Durbin: Looks good to me, approved
  Arthur Heymans: Looks good to me, but someone else must approve

diff --git a/src/drivers/pc80/tpm/tis.c b/src/drivers/pc80/tpm/tis.c
index 5927377..1baab26 100644
--- a/src/drivers/pc80/tpm/tis.c
+++ b/src/drivers/pc80/tpm/tis.c
@@ -721,8 +721,6 @@
    return tis_readresponse(recvbuf, recv_len);
 }

-#ifdef __RAMSTAGE__
-
 /*
  * tis_setup_interrupt()
  *
@@ -769,7 +767,7 @@
 static void lpc_tpm_set_resources(struct device *dev)
 {
    tpm_config_t *config = (tpm_config_t *)dev->chip_info;
-	struct resource *res;
+	DEVTREE_CONST struct resource *res;

for (res = dev->resource_list; res; res = res->next) {
    	if (!(res->flags & IORESOURCE_ASSIGNED))
@@ -783,8 +781,10 @@
    		continue;
    	}

+#if !DEVTREE_EARLY
    	res->flags |= IORESOURCE_STORED;
    	report_resource_stored(dev, res, " <tpm>");
+#endif
    }
 }

@@ -973,8 +973,10 @@
    acpigen_pop_len(); /* Device */
    acpigen_pop_len(); /* Scope */

+#if !DEVTREE_EARLY
    printk(BIOS_INFO, "%s.%s: %s %s\n", path, acpi_device_name(dev),
           dev->chip_ops->name, dev_path(dev));
+#endif
 }

static const char *lpc_tpm_acpi_name(const struct device *dev)
@@ -1006,5 +1008,3 @@
    CHIP_NAME("LPC TPM")
    .enable_dev = enable_dev
 };
-
-#endif /* __RAMSTAGE__ */