Change in coreboot[master]: soc/intel/common/block/smm/smihandler: Fix compilation under x86_64

[Patrick Rudolph (Code Review)]

Patrick Rudolph has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/48172 )

Change subject: soc/intel/common/block/smm/smihandler: Fix compilation under x86_64
......................................................................

soc/intel/common/block/smm/smihandler: Fix compilation under x86_64

Change-Id: Ie44ded11a6a9ddd2a1163d2f57dad6935e1ea167
Signed-off-by: Patrick Rudolph 
---
M src/soc/intel/common/block/smm/smihandler.c
1 file changed, 2 insertions(+), 2 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/72/48172/1

diff --git a/src/soc/intel/common/block/smm/smihandler.c b/src/soc/intel/common/block/smm/smihandler.c
index 270b1aa..74d5719 100644
--- a/src/soc/intel/common/block/smm/smihandler.c
+++ b/src/soc/intel/common/block/smm/smihandler.c
@@ -292,7 +292,7 @@
 {
    u8 sub_command, ret;
    void *io_smi;
-	uint32_t reg_ebx;
+	uintptr_t reg_ebx;

io_smi = find_save_state(save_state_ops, APM_CNT_SMMSTORE);
    if (!io_smi)
@@ -409,7 +409,7 @@
    if ((pm1_sts & PWRBTN_STS) && (pm1_en & PWRBTN_EN)) {
    	/* power button pressed */
    	elog_gsmi_add_event(ELOG_TYPE_POWER_BUTTON);
-		pmc_disable_pm1_control(-1UL);
+		pmc_disable_pm1_control(~0);
    	pmc_enable_pm1_control(SLP_EN | (SLP_TYP_S5 << SLP_TYP_SHIFT));
    }
 }

[Arthur Heymans (Code Review)]

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

Change subject: soc/intel/common/block/smm/smihandler: Fix compilation under x86_64
......................................................................

Patch Set 1:

(1 comment)

https://review.coreboot.org/c/coreboot/+/48172/1/src/soc/intel/common/block/... 
File src/soc/intel/common/block/smm/smihandler.c:

https://review.coreboot.org/c/coreboot/+/48172/1/src/soc/intel/common/block/... 
PS1, Line 295: uint32_t
this explicitly truncates get_reg, which you should probably not change here.

[Patrick Rudolph (Code Review)]

Hello build bot (Jenkins), Patrick Rudolph,

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

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

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

Change subject: soc/intel/common/block/smm/smihandler: Fix compilation under x86_64
......................................................................

soc/intel/common/block/smm/smihandler: Fix compilation under x86_64

Change-Id: Ie44ded11a6a9ddd2a1163d2f57dad6935e1ea167
Signed-off-by: Patrick Rudolph 
---
M src/soc/intel/common/block/smm/smihandler.c
1 file changed, 2 insertions(+), 2 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/72/48172/2

[Patrick Rudolph (Code Review)]

Patrick Rudolph has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/48172 )

Change subject: soc/intel/common/block/smm/smihandler: Fix compilation under x86_64
......................................................................

Patch Set 2:

(1 comment)

https://review.coreboot.org/c/coreboot/+/48172/1/src/soc/intel/common/block/... 
File src/soc/intel/common/block/smm/smihandler.c:

https://review.coreboot.org/c/coreboot/+/48172/1/src/soc/intel/common/block/... 
PS1, Line 295: uint32_t
> this explicitly truncates get_reg, which you should probably not change here.

Ack

[Arthur Heymans (Code Review)]

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

Change subject: soc/intel/common/block/smm/smihandler: Fix compilation under x86_64
......................................................................

Patch Set 2: Code-Review+2

[Angel Pons (Code Review)]

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

Change subject: soc/intel/common/block/smm/smihandler: Fix compilation under x86_64
......................................................................

Patch Set 2: Code-Review+2

[Patrick Rudolph (Code Review)]

Patrick Rudolph has submitted this change. ( https://review.coreboot.org/c/coreboot/+/48172 )

Change subject: soc/intel/common/block/smm/smihandler: Fix compilation under x86_64
......................................................................

soc/intel/common/block/smm/smihandler: Fix compilation under x86_64

Change-Id: Ie44ded11a6a9ddd2a1163d2f57dad6935e1ea167
Signed-off-by: Patrick Rudolph 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/48172
Tested-by: build bot (Jenkins) 
Reviewed-by: Arthur Heymans 
Reviewed-by: Angel Pons 
---
M src/soc/intel/common/block/smm/smihandler.c
1 file changed, 2 insertions(+), 2 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Arthur Heymans: Looks good to me, approved
  Angel Pons: Looks good to me, approved

diff --git a/src/soc/intel/common/block/smm/smihandler.c b/src/soc/intel/common/block/smm/smihandler.c
index 270b1aa..dc32970 100644
--- a/src/soc/intel/common/block/smm/smihandler.c
+++ b/src/soc/intel/common/block/smm/smihandler.c
@@ -304,7 +304,7 @@
    reg_ebx = save_state_ops->get_reg(io_smi, RBX);

/* drivers/smmstore/smi.c */
-	ret = smmstore_exec(sub_command, (void *)reg_ebx);
+	ret = smmstore_exec(sub_command, (void *)(uintptr_t)reg_ebx);
    save_state_ops->set_reg(io_smi, RAX, ret);
 }

@@ -409,7 +409,7 @@
    if ((pm1_sts & PWRBTN_STS) && (pm1_en & PWRBTN_EN)) {
    	/* power button pressed */
    	elog_gsmi_add_event(ELOG_TYPE_POWER_BUTTON);
-		pmc_disable_pm1_control(-1UL);
+		pmc_disable_pm1_control(~0);
    	pmc_enable_pm1_control(SLP_EN | (SLP_TYP_S5 << SLP_TYP_SHIFT));
    }
 }