Tony Huang has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/36015 )
Change subject: mb/google/octopus: Override VBT selection for Blooguard ......................................................................
mb/google/octopus: Override VBT selection for Blooguard
Disable DRRS on Blooguard SKU - 49, 50, 51, 52
BUG=b:142632381 BRANCH=octopus TEST=emerge-octopus coreboot chromeos-bootimage check i915_drrs_status shows DRRS supported NO when SKU ID is blooguard.
Cq-Depend: chrome-internal:1983227 Change-Id: I36a313fd2beacb878da7383f733e206067c1c0fb Signed-off-by: Tony Huang tony-huang@quanta.corp-partner.google.com --- M src/mainboard/google/octopus/variants/bloog/variant.c 1 file changed, 13 insertions(+), 0 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/15/36015/1
diff --git a/src/mainboard/google/octopus/variants/bloog/variant.c b/src/mainboard/google/octopus/variants/bloog/variant.c index 6484080..656e3b1 100644 --- a/src/mainboard/google/octopus/variants/bloog/variant.c +++ b/src/mainboard/google/octopus/variants/bloog/variant.c @@ -17,6 +17,7 @@ #include <ec/google/chromeec/ec.h> #include <sar.h> #include <baseboard/variants.h> +#include <drivers/intel/gma/opregion.h>
#define SKU_UNKNOWN 0xFFFFFFFF
@@ -37,3 +38,15 @@
return filename; } + +const char *mainboard_vbt_filename(void) +{ + uint32_t sku_id; + + sku_id = get_board_sku(); + + if (sku_id == 49 || sku_id == 50 || sku_id == 51 || sku_id == 52) + return "vbt_blooguard.bin"; + else + return "vbt.bin"; +}
Karthik Ramasubramanian has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/36015 )
Change subject: mb/google/octopus: Override VBT selection for Blooguard ......................................................................
Patch Set 1:
(2 comments)
https://review.coreboot.org/c/coreboot/+/36015/1/src/mainboard/google/octopu... File src/mainboard/google/octopus/variants/bloog/variant.c:
https://review.coreboot.org/c/coreboot/+/36015/1/src/mainboard/google/octopu... PS1, Line 48: 49 Prefer to define either a macro or enum at the top, so that it is easy to read what SKUs these numbers represent.
https://review.coreboot.org/c/coreboot/+/36015/1/src/mainboard/google/octopu... PS1, Line 50: else Nit: else statement is not required. Just vbt.bin can be returned if the sku does not match.
Hello Karthik Ramasubramanian, Marco Chen, Wisley Chen, Justin TerAvest, Chen Wisley, build bot (Jenkins), Furquan Shaikh,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/36015
to look at the new patch set (#2).
Change subject: mb/google/octopus: Override VBT selection for Blooguard ......................................................................
mb/google/octopus: Override VBT selection for Blooguard
Disable DRRS on Blooguard SKU - 49, 50, 51, 52
BUG=b:142632381 BRANCH=octopus TEST=emerge-octopus coreboot chromeos-bootimage check i915_drrs_status shows DRRS supported NO when SKU ID is blooguard.
Cq-Depend: chrome-internal:1983227 Change-Id: I36a313fd2beacb878da7383f733e206067c1c0fb Signed-off-by: Tony Huang tony-huang@quanta.corp-partner.google.com --- M src/mainboard/google/octopus/variants/bloog/variant.c 1 file changed, 22 insertions(+), 0 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/15/36015/2
build bot (Jenkins) has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/36015 )
Change subject: mb/google/octopus: Override VBT selection for Blooguard ......................................................................
Patch Set 2:
(8 comments)
https://review.coreboot.org/c/coreboot/+/36015/2/src/mainboard/google/octopu... File src/mainboard/google/octopus/variants/bloog/variant.c:
https://review.coreboot.org/c/coreboot/+/36015/2/src/mainboard/google/octopu... PS2, Line 26: SKU_49_BLOOGUARD = 49, /* kb blit, no USI Stylus */ code indent should use tabs where possible
https://review.coreboot.org/c/coreboot/+/36015/2/src/mainboard/google/octopu... PS2, Line 26: SKU_49_BLOOGUARD = 49, /* kb blit, no USI Stylus */ please, no spaces at the start of a line
https://review.coreboot.org/c/coreboot/+/36015/2/src/mainboard/google/octopu... PS2, Line 27: SKU_50_BLOOGUARD = 50, /* kb blit, USI Stylus */ code indent should use tabs where possible
https://review.coreboot.org/c/coreboot/+/36015/2/src/mainboard/google/octopu... PS2, Line 27: SKU_50_BLOOGUARD = 50, /* kb blit, USI Stylus */ please, no spaces at the start of a line
https://review.coreboot.org/c/coreboot/+/36015/2/src/mainboard/google/octopu... PS2, Line 28: SKU_51_BLOOGUARD = 51, /* no kb blit, no USI Stylus */ code indent should use tabs where possible
https://review.coreboot.org/c/coreboot/+/36015/2/src/mainboard/google/octopu... PS2, Line 28: SKU_51_BLOOGUARD = 51, /* no kb blit, no USI Stylus */ please, no spaces at the start of a line
https://review.coreboot.org/c/coreboot/+/36015/2/src/mainboard/google/octopu... PS2, Line 29: SKU_52_BLOOGUARD = 52, /* no kb blit, USI Stylus */ code indent should use tabs where possible
https://review.coreboot.org/c/coreboot/+/36015/2/src/mainboard/google/octopu... PS2, Line 29: SKU_52_BLOOGUARD = 52, /* no kb blit, USI Stylus */ please, no spaces at the start of a line
Tony Huang has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/36015 )
Change subject: mb/google/octopus: Override VBT selection for Blooguard ......................................................................
Patch Set 2:
(2 comments)
https://review.coreboot.org/c/coreboot/+/36015/1/src/mainboard/google/octopu... File src/mainboard/google/octopus/variants/bloog/variant.c:
https://review.coreboot.org/c/coreboot/+/36015/1/src/mainboard/google/octopu... PS1, Line 48: 49
Prefer to define either a macro or enum at the top, so that it is easy to read what SKUs these numbe […]
Add enum to represent SKUs
https://review.coreboot.org/c/coreboot/+/36015/1/src/mainboard/google/octopu... PS1, Line 50: else
Nit: else statement is not required. Just vbt.bin can be returned if the sku does not match.
Done
Hello Karthik Ramasubramanian, Marco Chen, Wisley Chen, Justin TerAvest, Chen Wisley, build bot (Jenkins), Furquan Shaikh,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/36015
to look at the new patch set (#3).
Change subject: mb/google/octopus: Override VBT selection for Blooguard ......................................................................
mb/google/octopus: Override VBT selection for Blooguard
Disable DRRS on Blooguard SKU - 49, 50, 51, 52
BUG=b:142632381 BRANCH=octopus TEST=emerge-octopus coreboot chromeos-bootimage check i915_drrs_status shows DRRS supported NO when SKU ID is blooguard.
Cq-Depend: chrome-internal:1983227 Change-Id: I36a313fd2beacb878da7383f733e206067c1c0fb Signed-off-by: Tony Huang tony-huang@quanta.corp-partner.google.com --- M src/mainboard/google/octopus/variants/bloog/variant.c 1 file changed, 21 insertions(+), 0 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/15/36015/3
Tony Huang has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/36015 )
Change subject: mb/google/octopus: Override VBT selection for Blooguard ......................................................................
Patch Set 3:
(8 comments)
https://review.coreboot.org/c/coreboot/+/36015/2/src/mainboard/google/octopu... File src/mainboard/google/octopus/variants/bloog/variant.c:
https://review.coreboot.org/c/coreboot/+/36015/2/src/mainboard/google/octopu... PS2, Line 26: SKU_49_BLOOGUARD = 49, /* kb blit, no USI Stylus */
please, no spaces at the start of a line
Done
https://review.coreboot.org/c/coreboot/+/36015/2/src/mainboard/google/octopu... PS2, Line 26: SKU_49_BLOOGUARD = 49, /* kb blit, no USI Stylus */
code indent should use tabs where possible
Done
https://review.coreboot.org/c/coreboot/+/36015/2/src/mainboard/google/octopu... PS2, Line 27: SKU_50_BLOOGUARD = 50, /* kb blit, USI Stylus */
code indent should use tabs where possible
Done
https://review.coreboot.org/c/coreboot/+/36015/2/src/mainboard/google/octopu... PS2, Line 27: SKU_50_BLOOGUARD = 50, /* kb blit, USI Stylus */
please, no spaces at the start of a line
Done
https://review.coreboot.org/c/coreboot/+/36015/2/src/mainboard/google/octopu... PS2, Line 28: SKU_51_BLOOGUARD = 51, /* no kb blit, no USI Stylus */
please, no spaces at the start of a line
Done
https://review.coreboot.org/c/coreboot/+/36015/2/src/mainboard/google/octopu... PS2, Line 28: SKU_51_BLOOGUARD = 51, /* no kb blit, no USI Stylus */
code indent should use tabs where possible
Done
https://review.coreboot.org/c/coreboot/+/36015/2/src/mainboard/google/octopu... PS2, Line 29: SKU_52_BLOOGUARD = 52, /* no kb blit, USI Stylus */
code indent should use tabs where possible
Done
https://review.coreboot.org/c/coreboot/+/36015/2/src/mainboard/google/octopu... PS2, Line 29: SKU_52_BLOOGUARD = 52, /* no kb blit, USI Stylus */
please, no spaces at the start of a line
Done
Marco Chen has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/36015 )
Change subject: mb/google/octopus: Override VBT selection for Blooguard ......................................................................
Patch Set 3:
(2 comments)
https://review.coreboot.org/c/coreboot/+/36015/3/src/mainboard/google/octopu... File src/mainboard/google/octopus/variants/bloog/variant.c:
https://review.coreboot.org/c/coreboot/+/36015/3/src/mainboard/google/octopu... PS3, Line 40: if (sku_id == 33 || sku_id == 34 || sku_id == 35 || sku_id == 36) Also add them to the enum list.
https://review.coreboot.org/c/coreboot/+/36015/3/src/mainboard/google/octopu... PS3, Line 43: if (sku_id == 49 || sku_id == 50 || sku_id == 51 || sku_id == 52) use the enum to keep consistent.
Hello Karthik Ramasubramanian, Marco Chen, Wisley Chen, Justin TerAvest, Chen Wisley, build bot (Jenkins), Furquan Shaikh,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/36015
to look at the new patch set (#4).
Change subject: mb/google/octopus: Override VBT selection for Blooguard ......................................................................
mb/google/octopus: Override VBT selection for Blooguard
Disable DRRS on Blooguard SKU - 49, 50, 51, 52
BUG=b:142632381 BRANCH=octopus TEST=emerge-octopus coreboot chromeos-bootimage check i915_drrs_status shows DRRS supported NO when SKU ID is blooguard.
Cq-Depend: chrome-internal:1983227 Change-Id: I36a313fd2beacb878da7383f733e206067c1c0fb Signed-off-by: Tony Huang tony-huang@quanta.corp-partner.google.com --- M src/mainboard/google/octopus/variants/bloog/variant.c 1 file changed, 29 insertions(+), 2 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/15/36015/4
Tony Huang has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/36015 )
Change subject: mb/google/octopus: Override VBT selection for Blooguard ......................................................................
Patch Set 4:
(2 comments)
Please help review. Thanks
https://review.coreboot.org/c/coreboot/+/36015/3/src/mainboard/google/octopu... File src/mainboard/google/octopus/variants/bloog/variant.c:
https://review.coreboot.org/c/coreboot/+/36015/3/src/mainboard/google/octopu... PS3, Line 40: if (sku_id == 33 || sku_id == 34 || sku_id == 35 || sku_id == 36)
Also add them to the enum list.
Done
https://review.coreboot.org/c/coreboot/+/36015/3/src/mainboard/google/octopu... PS3, Line 43: if (sku_id == 49 || sku_id == 50 || sku_id == 51 || sku_id == 52)
use the enum to keep consistent.
Done
Karthik Ramasubramanian has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/36015 )
Change subject: mb/google/octopus: Override VBT selection for Blooguard ......................................................................
Patch Set 4: Code-Review+2
Tony Huang has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/36015 )
Change subject: mb/google/octopus: Override VBT selection for Blooguard ......................................................................
Patch Set 4:
Hi Karthik, Please help cherry-pick to gerrit ToT. Thanks
Karthik Ramasubramanian has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/36015 )
Change subject: mb/google/octopus: Override VBT selection for Blooguard ......................................................................
Patch Set 4:
Patch Set 4:
Hi Karthik, Please help cherry-pick to gerrit ToT. Thanks
Hi Tony,
I will do it once this CL gets merged in upstream.
Thanks and Regards, Karthik.
Tony Huang has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/36015 )
Change subject: mb/google/octopus: Override VBT selection for Blooguard ......................................................................
Patch Set 4:
Patch Set 4:
Patch Set 4:
Hi Karthik, Please help cherry-pick to gerrit ToT. Thanks
Hi Tony,
I will do it once this CL gets merged in upstream.
Thanks and Regards, Karthik.
Hi Karthik,
Got it.
Thank you
Patrick Georgi has submitted this change. ( https://review.coreboot.org/c/coreboot/+/36015 )
Change subject: mb/google/octopus: Override VBT selection for Blooguard ......................................................................
mb/google/octopus: Override VBT selection for Blooguard
Disable DRRS on Blooguard SKU - 49, 50, 51, 52
BUG=b:142632381 BRANCH=octopus TEST=emerge-octopus coreboot chromeos-bootimage check i915_drrs_status shows DRRS supported NO when SKU ID is blooguard.
Cq-Depend: chrome-internal:1983227 Change-Id: I36a313fd2beacb878da7383f733e206067c1c0fb Signed-off-by: Tony Huang tony-huang@quanta.corp-partner.google.com Reviewed-on: https://review.coreboot.org/c/coreboot/+/36015 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Karthik Ramasubramanian kramasub@google.com --- M src/mainboard/google/octopus/variants/bloog/variant.c 1 file changed, 29 insertions(+), 2 deletions(-)
Approvals: build bot (Jenkins): Verified Karthik Ramasubramanian: Looks good to me, approved
diff --git a/src/mainboard/google/octopus/variants/bloog/variant.c b/src/mainboard/google/octopus/variants/bloog/variant.c index 6484080..4bbaa8e 100644 --- a/src/mainboard/google/octopus/variants/bloog/variant.c +++ b/src/mainboard/google/octopus/variants/bloog/variant.c @@ -17,9 +17,21 @@ #include <ec/google/chromeec/ec.h> #include <sar.h> #include <baseboard/variants.h> +#include <drivers/intel/gma/opregion.h>
#define SKU_UNKNOWN 0xFFFFFFFF
+enum { + SKU_33_BLOOG = 33, /* no kb blit, USI Stylus */ + SKU_34_BLOOG = 34, /* kb blit, no USI Stylus */ + SKU_35_BLOOG = 35, /* kb blit, USI Stylus */ + SKU_36_BLOOG = 36, /* no kb blit, no USI Stylus */ + SKU_49_BLOOGUARD = 49, /* kb blit, no USI Stylus */ + SKU_50_BLOOGUARD = 50, /* kb blit, USI Stylus */ + SKU_51_BLOOGUARD = 51, /* no kb blit, no USI Stylus */ + SKU_52_BLOOGUARD = 52, /* no kb blit, USI Stylus */ +}; + const char *get_wifi_sar_cbfs_filename(void) { const char *filename = NULL; @@ -29,11 +41,26 @@ if (sku_id == SKU_UNKNOWN) return NULL;
- if (sku_id == 33 || sku_id == 34 || sku_id == 35 || sku_id == 36) + if (sku_id == SKU_33_BLOOG || sku_id == SKU_34_BLOOG || + sku_id == SKU_35_BLOOG || sku_id == SKU_36_BLOOG) filename = "wifi_sar-bloog.hex";
- if (sku_id == 49 || sku_id == 50 || sku_id == 51 || sku_id == 52) + if (sku_id == SKU_49_BLOOGUARD || sku_id == SKU_50_BLOOGUARD || + sku_id == SKU_51_BLOOGUARD || sku_id == SKU_52_BLOOGUARD) filename = "wifi_sar-blooguard.hex";
return filename; } + +const char *mainboard_vbt_filename(void) +{ + uint32_t sku_id; + + sku_id = get_board_sku(); + + if (sku_id == SKU_49_BLOOGUARD || sku_id == SKU_50_BLOOGUARD || + sku_id == SKU_51_BLOOGUARD || sku_id == SKU_52_BLOOGUARD) + return "vbt_blooguard.bin"; + + return "vbt.bin"; +}
-
build bot (Jenkins) (Code Review) -
Karthik Ramasubramanian (Code Review)
-
Marco Chen (Code Review)
-
Patrick Georgi (Code Review)
-
Tony Huang (Code Review)