Change in ...coreboot[master]: mb/google/octopus: Add custom SAR values for Blooguard

[Tony Huang (Code Review)]

Tony Huang has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/33935

Change subject: mb/google/octopus: Add custom SAR values for Blooguard
......................................................................

mb/google/octopus: Add custom SAR values for Blooguard

Blooguard would use different SAR values.
Use sku-id to load SAR values.

BUG=b:135078377
BRANCH=octopus
TEST=build

Change-Id: Id80df28a961eb1f62714558df2b219aa552ecb97
Signed-off-by: Tony Huang 
---
M src/mainboard/google/octopus/variants/bloog/Makefile.inc
A src/mainboard/google/octopus/variants/bloog/mainboard.c
2 files changed, 33 insertions(+), 0 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/35/33935/1

diff --git a/src/mainboard/google/octopus/variants/bloog/Makefile.inc b/src/mainboard/google/octopus/variants/bloog/Makefile.inc
index 9fb63f5..152b46e 100644
--- a/src/mainboard/google/octopus/variants/bloog/Makefile.inc
+++ b/src/mainboard/google/octopus/variants/bloog/Makefile.inc
@@ -1,3 +1,4 @@
 bootblock-y += gpio.c

ramstage-y += gpio.c
+ramstage-y += mainboard.c
diff --git a/src/mainboard/google/octopus/variants/bloog/mainboard.c b/src/mainboard/google/octopus/variants/bloog/mainboard.c
new file mode 100644
index 0000000..46dba61
--- /dev/null
+++ b/src/mainboard/google/octopus/variants/bloog/mainboard.c
@@ -0,0 +1,32 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright 2019 Google LLC
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#include <boardid.h>
+#include <ec/google/chromeec/ec.h>
+#include <sar.h>
+
+const char *get_wifi_sar_cbfs_filename(void)
+{
+	const char *filename = NULL;
+	uint32_t sku_id;
+
+	if (google_chromeec_cbi_get_sku_id(&sku_id))
+		return NULL;
+
+	if (sku_id == 49 || sku_id == 50 || sku_id == 51 || sku_id == 52)
+		filename = "wifi_sar-blooguard.hex";
+
+	return filename;
+}

[Tony Huang (Code Review)]

Hello Karthik Ramasubramanian, Marco Chen, Wisley Chen, Justin TerAvest, build bot (Jenkins), Furquan Shaikh,

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

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

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

Change subject: mb/google/octopus: Add custom SAR values for Blooguard
......................................................................

mb/google/octopus: Add custom SAR values for Blooguard

Blooguard would prefer to use it's own SAR values.
Use sku-id to load the SAR values.

BUG=b:135078377
BRANCH=octopus
TEST=build

Change-Id: Id80df28a961eb1f62714558df2b219aa552ecb97
Signed-off-by: Tony Huang 
---
M src/mainboard/google/octopus/variants/bloog/Makefile.inc
A src/mainboard/google/octopus/variants/bloog/mainboard.c
2 files changed, 33 insertions(+), 0 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/35/33935/2

[Tony Huang (Code Review)]

Hello Karthik Ramasubramanian, Marco Chen, Wisley Chen, Justin TerAvest, build bot (Jenkins), Furquan Shaikh,

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

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

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

Change subject: mb/google/octopus: Add custom SAR values for Blooguard
......................................................................

mb/google/octopus: Add custom SAR values for Blooguard

Blooguard would prefer to use it's own SAR values.
Use sku-id to load the SAR values.

BUG=b:135078377
BRANCH=octopus
TEST=build and verify SAR load by sku-id

Change-Id: Id80df28a961eb1f62714558df2b219aa552ecb97
Signed-off-by: Tony Huang 
---
M src/mainboard/google/octopus/variants/bloog/Makefile.inc
A src/mainboard/google/octopus/variants/bloog/mainboard.c
2 files changed, 33 insertions(+), 0 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/35/33935/3

[Paul Menzel (Code Review)]

Paul Menzel has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/33935 )

Change subject: mb/google/octopus: Add custom SAR values for Blooguard
......................................................................

Patch Set 3:

(1 comment)

https://review.coreboot.org/#/c/33935/3//COMMIT_MSG 
Commit Message:

https://review.coreboot.org/#/c/33935/3//COMMIT_MSG@7 
PS3, Line 7: Blooguard
What is Blooguard?

[Tony Huang (Code Review)]

Tony Huang has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/33935 )

Change subject: mb/google/octopus: Add custom SAR values for Blooguard
......................................................................

Patch Set 3:

(1 comment)

https://review.coreboot.org/#/c/33935/3//COMMIT_MSG 
Commit Message:

https://review.coreboot.org/#/c/33935/3//COMMIT_MSG@7 
PS3, Line 7: Blooguard
> What is Blooguard?

Hi Paul,
The google project name is Bloog.
Bloog is 12-inch LCD.
While Blooguard is 14-inch LCD so need different SAR value.

[Tony Huang (Code Review)]

Tony Huang has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/33935 )

Change subject: mb/google/octopus: Add custom SAR values for Blooguard
......................................................................

Patch Set 3:

(1 comment)

https://review.coreboot.org/#/c/33935/3//COMMIT_MSG 
Commit Message:

https://review.coreboot.org/#/c/33935/3//COMMIT_MSG@7 
PS3, Line 7: Blooguard
> Hi Paul, […]

Correct typo.
While Blooguard is 14-inch LCD so have different SAR value from 12-inch LCD device.

[Paul Menzel (Code Review)]

Paul Menzel has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/33935 )

Change subject: mb/google/octopus: Add custom SAR values for Blooguard
......................................................................

Patch Set 3:

(1 comment)

https://review.coreboot.org/#/c/33935/3//COMMIT_MSG 
Commit Message:

https://review.coreboot.org/#/c/33935/3//COMMIT_MSG@7 
PS3, Line 7: Blooguard
> Correct typo. […]

Thank you. Could you please update the commit message accordingly?

[Karthik Ramasubramanian (Code Review)]

Karthik Ramasubramanian has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/33935 )

Change subject: mb/google/octopus: Add custom SAR values for Blooguard
......................................................................

Patch Set 3:

(2 comments)

https://review.coreboot.org/#/c/33935/3/src/mainboard/google/octopus/variant... 
File src/mainboard/google/octopus/variants/bloog/mainboard.c:

https://review.coreboot.org/#/c/33935/3/src/mainboard/google/octopus/variant... 
PS3, Line 15: 
Rename this file to variant.c since it is consistent with the naming convention within octopus.

https://review.coreboot.org/#/c/33935/3/src/mainboard/google/octopus/variant... 
PS3, Line 25: google_chromeec_cbi_get_sku_id
Use get_board_sku() instead of reaching out to EC. get_board_sku will return the cached value if it is valid.

[Tony Huang (Code Review)]

Hello Karthik Ramasubramanian, Marco Chen, Wisley Chen, Justin TerAvest, build bot (Jenkins), Furquan Shaikh,

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

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

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

Change subject: mb/google/octopus: Add custom SAR values for Blooguard
......................................................................

mb/google/octopus: Add custom SAR values for Blooguard

Google project name is Bloog.
Bloog is 12-inch LCD.
Blooguard is 14-inch LCD so would prefer to use a different SAR values instead.
Use sku-id to load the SAR values.

BUG=b:135078377
BRANCH=octopus
TEST=build and verify SAR load by sku-id

Change-Id: Id80df28a961eb1f62714558df2b219aa552ecb97
Signed-off-by: Tony Huang 
---
M src/mainboard/google/octopus/variants/bloog/Makefile.inc
A src/mainboard/google/octopus/variants/bloog/mainboard.c
2 files changed, 33 insertions(+), 0 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/35/33935/4

[Tony Huang (Code Review)]

Hello Karthik Ramasubramanian, Marco Chen, Wisley Chen, Justin TerAvest, build bot (Jenkins), Furquan Shaikh,

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

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

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

Change subject: mb/google/octopus: Add custom SAR values for Blooguard
......................................................................

mb/google/octopus: Add custom SAR values for Blooguard

Google project name is Bloog.
Bloog is 12-inch LCD.
Blooguard is 14-inch LCD so would prefer to use a different SAR values instead.
Use sku-id to load the SAR values.

BUG=b:135078377
BRANCH=octopus
TEST=build and verify SAR load by sku-id

Change-Id: Id80df28a961eb1f62714558df2b219aa552ecb97
Signed-off-by: Tony Huang 
---
M src/mainboard/google/octopus/variants/bloog/Makefile.inc
A src/mainboard/google/octopus/variants/bloog/variant.c
2 files changed, 37 insertions(+), 0 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/35/33935/5

[Tony Huang (Code Review)]

Tony Huang has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/33935 )

Change subject: mb/google/octopus: Add custom SAR values for Blooguard
......................................................................

Patch Set 5:

(2 comments)

https://review.coreboot.org/#/c/33935/3/src/mainboard/google/octopus/variant... 
File src/mainboard/google/octopus/variants/bloog/mainboard.c:

https://review.coreboot.org/#/c/33935/3/src/mainboard/google/octopus/variant... 
PS3, Line 15:
> Rename this file to variant.c since it is consistent with the naming convention within octopus.

Done

https://review.coreboot.org/#/c/33935/3/src/mainboard/google/octopus/variant... 
PS3, Line 25: google_chromeec_cbi_get_sku_id
> Use get_board_sku() instead of reaching out to EC. […]

Done

[Paul Menzel (Code Review)]

Paul Menzel has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/33935 )

Change subject: mb/google/octopus: Add custom SAR values for Blooguard
......................................................................

Patch Set 5: Code-Review+1

[Karthik Ramasubramanian (Code Review)]

Karthik Ramasubramanian has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/33935 )

Change subject: mb/google/octopus: Add custom SAR values for Blooguard
......................................................................

Patch Set 5: Code-Review+2

[Tony Huang (Code Review)]

Tony Huang has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/33935 )

Change subject: mb/google/octopus: Add custom SAR values for Blooguard
......................................................................

Patch Set 5:

Hi Karthik,
Could you help cherry-pick this change to chromium ToT?
Thank you

[Furquan Shaikh (Code Review)]

Furquan Shaikh has submitted this change and it was merged. ( https://review.coreboot.org/c/coreboot/+/33935 )

Change subject: mb/google/octopus: Add custom SAR values for Blooguard
......................................................................

mb/google/octopus: Add custom SAR values for Blooguard

Google project name is Bloog.
Bloog is 12-inch LCD.
Blooguard is 14-inch LCD so would prefer to use a different SAR values instead.
Use sku-id to load the SAR values.

BUG=b:135078377
BRANCH=octopus
TEST=build and verify SAR load by sku-id

Change-Id: Id80df28a961eb1f62714558df2b219aa552ecb97
Signed-off-by: Tony Huang 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/33935
Tested-by: build bot (Jenkins) 
Reviewed-by: Paul Menzel 
Reviewed-by: Karthik Ramasubramanian 
---
M src/mainboard/google/octopus/variants/bloog/Makefile.inc
A src/mainboard/google/octopus/variants/bloog/variant.c
2 files changed, 37 insertions(+), 0 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Paul Menzel: Looks good to me, but someone else must approve
  Karthik Ramasubramanian: Looks good to me, approved

diff --git a/src/mainboard/google/octopus/variants/bloog/Makefile.inc b/src/mainboard/google/octopus/variants/bloog/Makefile.inc
index 9fb63f5..ba865e9 100644
--- a/src/mainboard/google/octopus/variants/bloog/Makefile.inc
+++ b/src/mainboard/google/octopus/variants/bloog/Makefile.inc
@@ -1,3 +1,4 @@
 bootblock-y += gpio.c

ramstage-y += gpio.c
+ramstage-y += variant.c
diff --git a/src/mainboard/google/octopus/variants/bloog/variant.c b/src/mainboard/google/octopus/variants/bloog/variant.c
new file mode 100644
index 0000000..58b3bc4
--- /dev/null
+++ b/src/mainboard/google/octopus/variants/bloog/variant.c
@@ -0,0 +1,36 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright 2019 Google LLC
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#include <boardid.h>
+#include <ec/google/chromeec/ec.h>
+#include <sar.h>
+#include <baseboard/variants.h>
+
+#define SKU_UNKNOWN     0xFFFFFFFF
+
+const char *get_wifi_sar_cbfs_filename(void)
+{
+	const char *filename = NULL;
+	uint32_t sku_id;
+	sku_id = get_board_sku();
+
+	if (sku_id == SKU_UNKNOWN)
+		return NULL;
+
+	if (sku_id == 49 || sku_id == 50 || sku_id == 51 || sku_id == 52)
+		filename = "wifi_sar-blooguard.hex";
+
+	return filename;
+}

Change in coreboot[master]: mb/google/octopus: Add custom SAR values for Blooguard

[Karthik Ramasubramanian (Code Review)]

Karthik Ramasubramanian has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/33935 )

Change subject: mb/google/octopus: Add custom SAR values for Blooguard
......................................................................

Patch Set 6:
> Patch Set 5:
>
> Hi Karthik,
> Could you help cherry-pick this change to chromium ToT?
> Thank you

Cherry-picked the change to chromium ToT. Please follow the change there