Change in ...coreboot[master]: src/soc/intel/common: Clear GPIO driver ownership when not requested

List overview All Threads
Download

newer

older

Change in ...coreboot[master]:...

Keith Short (Code Review)

1 Feb 2019 1 Feb '19

11:56 p.m.

Keith Short has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/31209

Change subject: src/soc/intel/common: Clear GPIO driver ownership when not requested ......................................................................

src/soc/intel/common: Clear GPIO driver ownership when not requested

The default state of the HOSTSW_OWN register in the PCH is zero, which configures GPIO pins for ACPI ownership. The board variabt GPIO tables can request specific pins to be configured for GPIO driver ownership. This change sets the HOSTSW_OWN ownership bit when requested and explicitly clears the ownership bit if not requested.

BUG=b:120884290 BRANCH=none TEST=Build coreboot on sarien. Verified UEFI to coreboot transition boots successfully.

Change-Id: Ia82539dbbbc7cf5dfb9223902d563cafec1a73e5 Signed-off-by: Keith Short keithshort@chromium.org --- M src/soc/intel/common/block/gpio/gpio.c 1 file changed, 17 insertions(+), 10 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/09/31209/1

diff --git a/src/soc/intel/common/block/gpio/gpio.c b/src/soc/intel/common/block/gpio/gpio.c index 294218c..51e7b47 100644 --- a/src/soc/intel/common/block/gpio/gpio.c +++ b/src/soc/intel/common/block/gpio/gpio.c @@ -131,23 +131,30 @@ static void gpio_configure_owner(const struct pad_config *cfg, const struct pad_community *comm) { - uint16_t hostsw_reg; + uint32_t hostsw_own; + uint16_t hostsw_own_offset; int pin;

pin = relative_pad_in_comm(comm, cfg->pad);

- /* The 4th bit in pad_config 1 (RO) is used to indicate if the pad - * needs GPIO driver ownership. - */ - if (!(cfg->pad_config[1] & PAD_CFG1_GPIO_DRIVER)) - return; - /* Based on the gpio pin number configure the corresponding bit in * HOSTSW_OWN register. Value of 0x1 indicates GPIO Driver onwership. */ - hostsw_reg = comm->host_own_reg_0; - hostsw_reg += gpio_group_index_scaled(comm, pin, sizeof(uint32_t)); - pcr_or32(comm->port, hostsw_reg, gpio_bitmask_within_group(comm, pin)); + hostsw_own_offset = comm->host_own_reg_0; + hostsw_own_offset += gpio_group_index_scaled(comm, pin, sizeof(uint32_t)); + + hostsw_own = pcr_read32(comm->port, hostsw_own_offset); + + /* The 4th bit in pad_config 1 (RO) is used to indicate if the pad + * needs GPIO driver ownership. Set the bit if GPIO driver ownership + * requested, otherwise clear the bit. + */ + if (cfg->pad_config[1] & PAD_CFG1_GPIO_DRIVER) + hostsw_own |= gpio_bitmask_within_group(comm, pin); + else + hostsw_own &= ~gpio_bitmask_within_group(comm, pin); + + pcr_write32(comm->port, hostsw_own_offset, hostsw_own); }

static void gpi_enable_smi(const struct pad_config *cfg,

Attachments:

attachment.htm (text/html — 5.4 KB)

Show replies by date

build bot (Jenkins) (Code Review)

1 Feb 1 Feb

11:56 p.m.

build bot (Jenkins) has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/31209 )

Change subject: src/soc/intel/common: Clear GPIO driver ownership when not requested ......................................................................

Patch Set 1:

(1 comment)

https://review.coreboot.org/#/c/31209/1/src/soc/intel/common/block/gpio/gpio... File src/soc/intel/common/block/gpio/gpio.c:

https://review.coreboot.org/#/c/31209/1/src/soc/intel/common/block/gpio/gpio... PS1, Line 144: hostsw_own_offset += gpio_group_index_scaled(comm, pin, sizeof(uint32_t)); line over 80 characters

-- To view, visit https://review.coreboot.org/c/coreboot/+/31209 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: Ia82539dbbbc7cf5dfb9223902d563cafec1a73e5 Gerrit-Change-Number: 31209 Gerrit-PatchSet: 1 Gerrit-Owner: Keith Short keithshort@chromium.org Gerrit-Reviewer: Keith Short keithshort@chromium.org Gerrit-Reviewer: Patrick Rudolph siro@das-labor.org Gerrit-CC: build bot (Jenkins) no-reply@coreboot.org Gerrit-Comment-Date: Fri, 01 Feb 2019 23:56:32 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

Aaron Durbin (Code Review)

11:58 p.m.

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

Change subject: src/soc/intel/common: Clear GPIO driver ownership when not requested ......................................................................

Patch Set 1: Code-Review+2

-- To view, visit https://review.coreboot.org/c/coreboot/+/31209 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: Ia82539dbbbc7cf5dfb9223902d563cafec1a73e5 Gerrit-Change-Number: 31209 Gerrit-PatchSet: 1 Gerrit-Owner: Keith Short keithshort@chromium.org Gerrit-Reviewer: Aaron Durbin adurbin@chromium.org Gerrit-Reviewer: Keith Short keithshort@chromium.org Gerrit-Reviewer: Patrick Rudolph siro@das-labor.org Gerrit-CC: build bot (Jenkins) no-reply@coreboot.org Gerrit-Comment-Date: Fri, 01 Feb 2019 23:58:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

Keith Short (Code Review)

2 Feb 2 Feb

12:09 a.m.

Hello Aaron Durbin, Patrick Rudolph, build bot (Jenkins),

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

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

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

Change subject: src/soc/intel/common: Clear GPIO driver ownership when not requested ......................................................................

src/soc/intel/common: Clear GPIO driver ownership when not requested

BUG=b:120884290 BRANCH=none TEST=Build coreboot on sarien. Verified UEFI to coreboot transition boots successfully.

Change-Id: Ia82539dbbbc7cf5dfb9223902d563cafec1a73e5 Signed-off-by: Keith Short keithshort@chromium.org --- M src/soc/intel/common/block/gpio/gpio.c 1 file changed, 17 insertions(+), 10 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/09/31209/2

-- To view, visit https://review.coreboot.org/c/coreboot/+/31209 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: Ia82539dbbbc7cf5dfb9223902d563cafec1a73e5 Gerrit-Change-Number: 31209 Gerrit-PatchSet: 2 Gerrit-Owner: Keith Short keithshort@chromium.org Gerrit-Reviewer: Aaron Durbin adurbin@chromium.org Gerrit-Reviewer: Keith Short keithshort@chromium.org Gerrit-Reviewer: Patrick Rudolph siro@das-labor.org Gerrit-Reviewer: build bot (Jenkins) no-reply@coreboot.org Gerrit-MessageType: newpatchset

build bot (Jenkins) (Code Review)

12:09 a.m.

build bot (Jenkins) has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/31209 )

Change subject: src/soc/intel/common: Clear GPIO driver ownership when not requested ......................................................................

Patch Set 2:

(1 comment)

https://review.coreboot.org/#/c/31209/2/src/soc/intel/common/block/gpio/gpio... File src/soc/intel/common/block/gpio/gpio.c:

https://review.coreboot.org/#/c/31209/2/src/soc/intel/common/block/gpio/gpio... PS2, Line 144: hostsw_own_offset += gpio_group_index_scaled(comm, pin, sizeof(uint32_t)); line over 80 characters

-- To view, visit https://review.coreboot.org/c/coreboot/+/31209 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: Ia82539dbbbc7cf5dfb9223902d563cafec1a73e5 Gerrit-Change-Number: 31209 Gerrit-PatchSet: 2 Gerrit-Owner: Keith Short keithshort@chromium.org Gerrit-Reviewer: Aaron Durbin adurbin@chromium.org Gerrit-Reviewer: Keith Short keithshort@chromium.org Gerrit-Reviewer: Patrick Rudolph siro@das-labor.org Gerrit-Reviewer: build bot (Jenkins) no-reply@coreboot.org Gerrit-Comment-Date: Sat, 02 Feb 2019 00:09:46 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

Keith Short (Code Review)

12:10 a.m.

Keith Short has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/31209 )

Change subject: src/soc/intel/common: Clear GPIO driver ownership when not requested ......................................................................

Patch Set 2:

(1 comment)

https://review.coreboot.org/#/c/31209/1/src/soc/intel/common/block/gpio/gpio... File src/soc/intel/common/block/gpio/gpio.c:

https://review.coreboot.org/#/c/31209/1/src/soc/intel/common/block/gpio/gpio... PS1, Line 144: hostsw_own_offset += gpio_group_index_scaled(comm, pin, sizeof(uint32_t));

...

line over 80 characters

Done

-- To view, visit https://review.coreboot.org/c/coreboot/+/31209 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: Ia82539dbbbc7cf5dfb9223902d563cafec1a73e5 Gerrit-Change-Number: 31209 Gerrit-PatchSet: 2 Gerrit-Owner: Keith Short keithshort@chromium.org Gerrit-Reviewer: Aaron Durbin adurbin@chromium.org Gerrit-Reviewer: Keith Short keithshort@chromium.org Gerrit-Reviewer: Patrick Rudolph siro@das-labor.org Gerrit-Reviewer: build bot (Jenkins) no-reply@coreboot.org Gerrit-Comment-Date: Sat, 02 Feb 2019 00:10:12 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: build bot (Jenkins) no-reply@coreboot.org Gerrit-MessageType: comment

Keith Short (Code Review)

12:16 a.m.

Hello Aaron Durbin, Patrick Rudolph, build bot (Jenkins),

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

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

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

Change subject: src/soc/intel/common: Clear GPIO driver ownership when not requested ......................................................................

src/soc/intel/common: Clear GPIO driver ownership when not requested

BUG=b:120884290 BRANCH=none TEST=Build coreboot on sarien. Verified UEFI to coreboot transition boots successfully.

Change-Id: Ia82539dbbbc7cf5dfb9223902d563cafec1a73e5 Signed-off-by: Keith Short keithshort@chromium.org --- M src/soc/intel/common/block/gpio/gpio.c 1 file changed, 18 insertions(+), 10 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/09/31209/3

-- To view, visit https://review.coreboot.org/c/coreboot/+/31209 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: Ia82539dbbbc7cf5dfb9223902d563cafec1a73e5 Gerrit-Change-Number: 31209 Gerrit-PatchSet: 3 Gerrit-Owner: Keith Short keithshort@chromium.org Gerrit-Reviewer: Aaron Durbin adurbin@chromium.org Gerrit-Reviewer: Keith Short keithshort@chromium.org Gerrit-Reviewer: Patrick Rudolph siro@das-labor.org Gerrit-Reviewer: build bot (Jenkins) no-reply@coreboot.org Gerrit-MessageType: newpatchset

Keith Short (Code Review)

12:18 a.m.

Keith Short has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/31209 )

Change subject: src/soc/intel/common: Clear GPIO driver ownership when not requested ......................................................................

Patch Set 3:

(1 comment)

My apologies for the multiple patches - had the wrong editor when trying to fix the line too long error.

https://review.coreboot.org/#/c/31209/1/src/soc/intel/common/block/gpio/gpio... File src/soc/intel/common/block/gpio/gpio.c:

https://review.coreboot.org/#/c/31209/1/src/soc/intel/common/block/gpio/gpio... PS1, Line 144: hostsw_own_offset += gpio_group_index_scaled(comm, pin, sizeof(uint32_t));

...

Done

Done

-- To view, visit https://review.coreboot.org/c/coreboot/+/31209 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: Ia82539dbbbc7cf5dfb9223902d563cafec1a73e5 Gerrit-Change-Number: 31209 Gerrit-PatchSet: 3 Gerrit-Owner: Keith Short keithshort@chromium.org Gerrit-Reviewer: Aaron Durbin adurbin@chromium.org Gerrit-Reviewer: Keith Short keithshort@chromium.org Gerrit-Reviewer: Patrick Rudolph siro@das-labor.org Gerrit-Reviewer: build bot (Jenkins) no-reply@coreboot.org Gerrit-Comment-Date: Sat, 02 Feb 2019 00:18:11 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: Keith Short keithshort@chromium.org Comment-In-Reply-To: build bot (Jenkins) no-reply@coreboot.org Gerrit-MessageType: comment

Furquan Shaikh (Code Review)

3 Feb 3 Feb

9:01 p.m.

Furquan Shaikh has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/31209 )

Change subject: src/soc/intel/common: Clear GPIO driver ownership when not requested ......................................................................

Patch Set 3: Code-Review+2

-- To view, visit https://review.coreboot.org/c/coreboot/+/31209 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: Ia82539dbbbc7cf5dfb9223902d563cafec1a73e5 Gerrit-Change-Number: 31209 Gerrit-PatchSet: 3 Gerrit-Owner: Keith Short keithshort@chromium.org Gerrit-Reviewer: Aaron Durbin adurbin@chromium.org Gerrit-Reviewer: Furquan Shaikh furquan@google.com Gerrit-Reviewer: Keith Short keithshort@chromium.org Gerrit-Reviewer: Patrick Rudolph siro@das-labor.org Gerrit-Reviewer: build bot (Jenkins) no-reply@coreboot.org Gerrit-Comment-Date: Sun, 03 Feb 2019 21:01:06 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

Patrick Georgi (Code Review)

5 Feb 5 Feb

1:27 p.m.

Patrick Georgi has submitted this change and it was merged. ( https://review.coreboot.org/c/coreboot/+/31209 )

Change subject: src/soc/intel/common: Clear GPIO driver ownership when not requested ......................................................................

src/soc/intel/common: Clear GPIO driver ownership when not requested

BUG=b:120884290 BRANCH=none TEST=Build coreboot on sarien. Verified UEFI to coreboot transition boots successfully.

Change-Id: Ia82539dbbbc7cf5dfb9223902d563cafec1a73e5 Signed-off-by: Keith Short keithshort@chromium.org Reviewed-on: https://review.coreboot.org/c/31209 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Furquan Shaikh furquan@google.com --- M src/soc/intel/common/block/gpio/gpio.c 1 file changed, 18 insertions(+), 10 deletions(-)

Approvals: build bot (Jenkins): Verified Furquan Shaikh: Looks good to me, approved

diff --git a/src/soc/intel/common/block/gpio/gpio.c b/src/soc/intel/common/block/gpio/gpio.c index 294218c..6390315 100644 --- a/src/soc/intel/common/block/gpio/gpio.c +++ b/src/soc/intel/common/block/gpio/gpio.c @@ -131,23 +131,31 @@ static void gpio_configure_owner(const struct pad_config *cfg, const struct pad_community *comm) { - uint16_t hostsw_reg; + uint32_t hostsw_own; + uint16_t hostsw_own_offset; int pin;

pin = relative_pad_in_comm(comm, cfg->pad);

- /* The 4th bit in pad_config 1 (RO) is used to indicate if the pad - * needs GPIO driver ownership. - */ - if (!(cfg->pad_config[1] & PAD_CFG1_GPIO_DRIVER)) - return; - /* Based on the gpio pin number configure the corresponding bit in * HOSTSW_OWN register. Value of 0x1 indicates GPIO Driver onwership. */ - hostsw_reg = comm->host_own_reg_0; - hostsw_reg += gpio_group_index_scaled(comm, pin, sizeof(uint32_t)); - pcr_or32(comm->port, hostsw_reg, gpio_bitmask_within_group(comm, pin)); + hostsw_own_offset = comm->host_own_reg_0; + hostsw_own_offset += gpio_group_index_scaled(comm, pin, + sizeof(uint32_t)); + + hostsw_own = pcr_read32(comm->port, hostsw_own_offset); + + /* The 4th bit in pad_config 1 (RO) is used to indicate if the pad + * needs GPIO driver ownership. Set the bit if GPIO driver ownership + * requested, otherwise clear the bit. + */ + if (cfg->pad_config[1] & PAD_CFG1_GPIO_DRIVER) + hostsw_own |= gpio_bitmask_within_group(comm, pin); + else + hostsw_own &= ~gpio_bitmask_within_group(comm, pin); + + pcr_write32(comm->port, hostsw_own_offset, hostsw_own); }

static void gpi_enable_smi(const struct pad_config *cfg,

-- To view, visit https://review.coreboot.org/c/coreboot/+/31209 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: Ia82539dbbbc7cf5dfb9223902d563cafec1a73e5 Gerrit-Change-Number: 31209 Gerrit-PatchSet: 4 Gerrit-Owner: Keith Short keithshort@chromium.org Gerrit-Reviewer: Aaron Durbin adurbin@chromium.org Gerrit-Reviewer: Furquan Shaikh furquan@google.com Gerrit-Reviewer: Keith Short keithshort@chromium.org Gerrit-Reviewer: Patrick Georgi pgeorgi@google.com Gerrit-Reviewer: Patrick Rudolph siro@das-labor.org Gerrit-Reviewer: build bot (Jenkins) no-reply@coreboot.org Gerrit-MessageType: merged

2122

days inactive

2126

days old

coreboot-gerrit@coreboot.org

9 comments

5 participants

tags (0)

participants (5)

Aaron Durbin (Code Review)
build bot (Jenkins) (Code Review)
Furquan Shaikh (Code Review)
Keith Short (Code Review)
Patrick Georgi (Code Review)