Tony Huang has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/38716 )
Change subject: mb/google/octopus: Override VBT selection for Bipship ......................................................................
mb/google/octopus: Override VBT selection for Bipship
Share the same vbt_blooguard.bin to disalbe DRRS support.
BUG=b:148892903, b:147021309 BRANCH=octopus TEST=emerge-octopus coreboot chromeos-bootimage check i915_drrs_status shows DRRS supported NO when SKU ID is bipship.
Change-Id: I61f12d4ddea17a05255751fde2a5ce822dd2e782 Signed-off-by: Tony Huang tony-huang@quanta.corp-partner.google.com --- M src/mainboard/google/octopus/variants/bloog/variant.c 1 file changed, 3 insertions(+), 0 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/16/38716/1
diff --git a/src/mainboard/google/octopus/variants/bloog/variant.c b/src/mainboard/google/octopus/variants/bloog/variant.c index 18f44b9..99f967c 100644 --- a/src/mainboard/google/octopus/variants/bloog/variant.c +++ b/src/mainboard/google/octopus/variants/bloog/variant.c @@ -30,6 +30,8 @@ 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 */ + SKU_53_BIPSHIP = 53, /* no kb blit, TS, 360, no Stylus, no rare-cam */ + SKU_54_BIPSHIP = 54, /* kb blit, TS, 360, no Stylus, no rare-cam */ SKU_65_BLOOGLET = 65, /* TS, kb blit */ SKU_66_BLOOGLET = 66, /* TS, no kb blit */ SKU_67_BLOOGLET = 67, /* non-TS, kb blit */ @@ -64,6 +66,7 @@
if (sku_id == SKU_49_BLOOGUARD || sku_id == SKU_50_BLOOGUARD || sku_id == SKU_51_BLOOGUARD || sku_id == SKU_52_BLOOGUARD || + sku_id == SKU_53_BIPSHIP || sku_id == SKU_54_BIPSHIP || sku_id == SKU_65_BLOOGLET || sku_id == SKU_66_BLOOGLET || sku_id == SKU_67_BLOOGLET || sku_id == SKU_68_BLOOGLET) return "vbt_blooguard.bin";
Tony Huang has uploaded a new patch set (#2). ( https://review.coreboot.org/c/coreboot/+/38716 )
Change subject: mb/google/octopus: Override VBT selection for Bipship ......................................................................
mb/google/octopus: Override VBT selection for Bipship
Share the same vbt_blooguard.bin to disable DRRS support.
BUG=b:148892903, b:147021309 BRANCH=octopus TEST=emerge-octopus coreboot chromeos-bootimage check i915_drrs_status shows DRRS supported NO when SKU ID is bipship.
Change-Id: I61f12d4ddea17a05255751fde2a5ce822dd2e782 Signed-off-by: Tony Huang tony-huang@quanta.corp-partner.google.com --- M src/mainboard/google/octopus/variants/bloog/variant.c 1 file changed, 3 insertions(+), 0 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/16/38716/2
Karthik Ramasubramanian has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/38716 )
Change subject: mb/google/octopus: Override VBT selection for Bipship ......................................................................
Patch Set 2:
(1 comment)
https://review.coreboot.org/c/coreboot/+/38716/2/src/mainboard/google/octopu... File src/mainboard/google/octopus/variants/bloog/variant.c:
https://review.coreboot.org/c/coreboot/+/38716/2/src/mainboard/google/octopu... PS2, Line 69: sku_id == SKU_53_BIPSHIP || sku_id == SKU_54_BIPSHIP This check seems to be growing.
If more SKUs are going to use Blooguard VBT, then it is probably better to invert the check i.e. if Bloog SKUs then return vbt.bin. Return vbt-blooguard.bin for other SKUs.
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/+/38716
to look at the new patch set (#3).
Change subject: mb/google/octopus: Override VBT selection for Bloog ......................................................................
mb/google/octopus: Override VBT selection for Bloog
Since most of bloog series SKUs need to disable DRRS support, so change it to load vbt.bin on Bloog and Unprovisioned SKUs to enable DRRS support, others will load vbt_blooguard.bin to disable DRRS support.
Bipship follow blooguard to disable DRRS support.
BUG=b:148892903, b:147021309 BRANCH=octopus TEST=emerge-octopus coreboot chromeos-bootimage check i915_drrs_status shows DRRS supported NO when SKU ID is bipship.
Change-Id: I61f12d4ddea17a05255751fde2a5ce822dd2e782 Signed-off-by: Tony Huang tony-huang@quanta.corp-partner.google.com --- M src/mainboard/google/octopus/variants/bloog/variant.c 1 file changed, 8 insertions(+), 6 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/16/38716/3
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/+/38716
to look at the new patch set (#4).
Change subject: mb/google/octopus: Override VBT selection for Bloog ......................................................................
mb/google/octopus: Override VBT selection for Bloog
Since most of Bloog series SKUs need to disable DRRS support.
If Bloog and Unprovisioned SKUs then return vbt.bin to enable DRRS support, return vbt-blooguard.bin for other SKUs to disable DRRS support.
Bipship follow blooguard to disable DRRS support.
BUG=b:148892903, b:147021309 BRANCH=octopus TEST=emerge-octopus coreboot chromeos-bootimage check i915_drrs_status shows DRRS supported NO when SKU ID is bipship.
Change-Id: I61f12d4ddea17a05255751fde2a5ce822dd2e782 Signed-off-by: Tony Huang tony-huang@quanta.corp-partner.google.com --- M src/mainboard/google/octopus/variants/bloog/variant.c 1 file changed, 8 insertions(+), 6 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/16/38716/4
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/+/38716
to look at the new patch set (#5).
Change subject: mb/google/octopus: Override VBT selection for Bloog ......................................................................
mb/google/octopus: Override VBT selection for Bloog
Since most of Bloog series SKUs need to disable DRRS support.
If Bloog and Unprovisioned SKUs then return vbt.bin to enable DRRS support, return vbti_blooguard.bin for other SKUs to disable DRRS support.
Bipship follow blooguard to disable DRRS support.
BUG=b:148892903, b:147021309 BRANCH=octopus TEST=emerge-octopus coreboot chromeos-bootimage check i915_drrs_status shows DRRS supported NO when SKU ID is bipship.
Change-Id: I61f12d4ddea17a05255751fde2a5ce822dd2e782 Signed-off-by: Tony Huang tony-huang@quanta.corp-partner.google.com --- M src/mainboard/google/octopus/variants/bloog/variant.c 1 file changed, 8 insertions(+), 6 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/16/38716/5
Tony Huang has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/38716 )
Change subject: mb/google/octopus: Override VBT selection for Bloog ......................................................................
Patch Set 5:
(1 comment)
https://review.coreboot.org/c/coreboot/+/38716/2/src/mainboard/google/octopu... File src/mainboard/google/octopus/variants/bloog/variant.c:
https://review.coreboot.org/c/coreboot/+/38716/2/src/mainboard/google/octopu... PS2, Line 69: sku_id == SKU_53_BIPSHIP || sku_id == SKU_54_BIPSHIP
This check seems to be growing. […]
Hi Karthik, I've changed the check function. Please help review. Thanks
Marco Chen has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/38716 )
Change subject: mb/google/octopus: Override VBT selection for Bloog ......................................................................
Patch Set 5: Code-Review+2
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/+/38716
to look at the new patch set (#6).
Change subject: mb/google/octopus: Override VBT selection for Bloog ......................................................................
mb/google/octopus: Override VBT selection for Bloog
Since most of Bloog series SKUs need to disable DRRS support.
If Bloog and Unprovisioned SKUs then return vbt.bin to enable DRRS support, return vbt_blooguard.bin for other SKUs to disable DRRS support.
Bipship follow blooguard to disable DRRS support.
BUG=b:148892903, b:147021309 BRANCH=octopus TEST=emerge-octopus coreboot chromeos-bootimage check i915_drrs_status shows DRRS supported NO when SKU ID is bipship.
Change-Id: I61f12d4ddea17a05255751fde2a5ce822dd2e782 Signed-off-by: Tony Huang tony-huang@quanta.corp-partner.google.com --- M src/mainboard/google/octopus/variants/bloog/variant.c 1 file changed, 8 insertions(+), 6 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/16/38716/6
Karthik Ramasubramanian has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/38716 )
Change subject: mb/google/octopus: Override VBT selection for Bloog ......................................................................
Patch Set 6:
(1 comment)
https://review.coreboot.org/c/coreboot/+/38716/6/src/mainboard/google/octopu... File src/mainboard/google/octopus/variants/bloog/variant.c:
https://review.coreboot.org/c/coreboot/+/38716/6/src/mainboard/google/octopu... PS6, Line 69: Nit: Align this line with the sku_id in the previous line. That way return "vbt.bin"; statement has a different alignment and make it more readable.
Marco Chen has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/38716 )
Change subject: mb/google/octopus: Override VBT selection for Bloog ......................................................................
Patch Set 6: -Code-Review
redraw +2 for Karthik's feedback.
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/+/38716
to look at the new patch set (#7).
Change subject: mb/google/octopus: Override VBT selection for Bloog ......................................................................
mb/google/octopus: Override VBT selection for Bloog
Since most of Bloog series SKUs need to disable DRRS support.
If Bloog and Unprovisioned SKUs then return vbt.bin to enable DRRS support, return vbt_blooguard.bin for other SKUs to disable DRRS support.
Bipship follow blooguard to disable DRRS support.
BUG=b:148892903, b:147021309 BRANCH=octopus TEST=emerge-octopus coreboot chromeos-bootimage check i915_drrs_status shows DRRS supported NO when SKU ID is bipship.
Change-Id: I61f12d4ddea17a05255751fde2a5ce822dd2e782 Signed-off-by: Tony Huang tony-huang@quanta.corp-partner.google.com --- M src/mainboard/google/octopus/variants/bloog/variant.c 1 file changed, 8 insertions(+), 6 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/16/38716/7
build bot (Jenkins) has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/38716 )
Change subject: mb/google/octopus: Override VBT selection for Bloog ......................................................................
Patch Set 7:
(2 comments)
https://review.coreboot.org/c/coreboot/+/38716/7/src/mainboard/google/octopu... File src/mainboard/google/octopus/variants/bloog/variant.c:
https://review.coreboot.org/c/coreboot/+/38716/7/src/mainboard/google/octopu... PS7, Line 68: if (sku_id == SKU_33_BLOOG || sku_id == SKU_34_BLOOG || suspect code indent for conditional statements (8, 12)
https://review.coreboot.org/c/coreboot/+/38716/7/src/mainboard/google/octopu... PS7, Line 71: return "vbt.bin"; Statements should start on a tabstop
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/+/38716
to look at the new patch set (#8).
Change subject: mb/google/octopus: Override VBT selection for Bloog ......................................................................
mb/google/octopus: Override VBT selection for Bloog
Since most of Bloog series SKUs need to disable DRRS support.
If Bloog and Unprovisioned SKUs then return vbt.bin to enable DRRS support, return vbt_blooguard.bin for other SKUs to disable DRRS support.
Bipship follow blooguard to disable DRRS support.
BUG=b:148892903, b:147021309 BRANCH=octopus TEST=emerge-octopus coreboot chromeos-bootimage check i915_drrs_status shows DRRS supported NO when SKU ID is bipship.
Change-Id: I61f12d4ddea17a05255751fde2a5ce822dd2e782 Signed-off-by: Tony Huang tony-huang@quanta.corp-partner.google.com --- M src/mainboard/google/octopus/variants/bloog/variant.c 1 file changed, 8 insertions(+), 6 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/16/38716/8
build bot (Jenkins) has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/38716 )
Change subject: mb/google/octopus: Override VBT selection for Bloog ......................................................................
Patch Set 8:
(2 comments)
https://review.coreboot.org/c/coreboot/+/38716/8/src/mainboard/google/octopu... File src/mainboard/google/octopus/variants/bloog/variant.c:
https://review.coreboot.org/c/coreboot/+/38716/8/src/mainboard/google/octopu... PS8, Line 68: if (sku_id == SKU_33_BLOOG || sku_id == SKU_34_BLOOG || suspect code indent for conditional statements (8, 12)
https://review.coreboot.org/c/coreboot/+/38716/8/src/mainboard/google/octopu... PS8, Line 71: return "vbt.bin"; Statements should start on a tabstop
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/+/38716
to look at the new patch set (#9).
Change subject: mb/google/octopus: Override VBT selection for Bloog ......................................................................
mb/google/octopus: Override VBT selection for Bloog
Since most of Bloog series SKUs need to disable DRRS support.
If Bloog and Unprovisioned SKUs then return vbt.bin to enable DRRS support, return vbt_blooguard.bin for other SKUs to disable DRRS support.
Bipship follow blooguard to disable DRRS support.
BUG=b:148892903, b:147021309 BRANCH=octopus TEST=emerge-octopus coreboot chromeos-bootimage check i915_drrs_status shows DRRS supported NO when SKU ID is bipship.
Change-Id: I61f12d4ddea17a05255751fde2a5ce822dd2e782 Signed-off-by: Tony Huang tony-huang@quanta.corp-partner.google.com --- M src/mainboard/google/octopus/variants/bloog/variant.c 1 file changed, 25 insertions(+), 17 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/16/38716/9
Tony Huang has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/38716 )
Change subject: mb/google/octopus: Override VBT selection for Bloog ......................................................................
Patch Set 9:
(3 comments)
https://review.coreboot.org/c/coreboot/+/38716/6/src/mainboard/google/octopu... File src/mainboard/google/octopus/variants/bloog/variant.c:
https://review.coreboot.org/c/coreboot/+/38716/6/src/mainboard/google/octopu... PS6, Line 69:
Nit: Align this line with the sku_id in the previous line. That way return "vbt. […]
Done
https://review.coreboot.org/c/coreboot/+/38716/7/src/mainboard/google/octopu... File src/mainboard/google/octopus/variants/bloog/variant.c:
https://review.coreboot.org/c/coreboot/+/38716/7/src/mainboard/google/octopu... PS7, Line 68: if (sku_id == SKU_33_BLOOG || sku_id == SKU_34_BLOOG ||
suspect code indent for conditional statements (8, 12)
Done
https://review.coreboot.org/c/coreboot/+/38716/7/src/mainboard/google/octopu... PS7, Line 71: return "vbt.bin";
Statements should start on a tabstop
Done
Tony Huang has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/38716 )
Change subject: mb/google/octopus: Override VBT selection for Bloog ......................................................................
Patch Set 9:
(2 comments)
https://review.coreboot.org/c/coreboot/+/38716/8/src/mainboard/google/octopu... File src/mainboard/google/octopus/variants/bloog/variant.c:
https://review.coreboot.org/c/coreboot/+/38716/8/src/mainboard/google/octopu... PS8, Line 68: if (sku_id == SKU_33_BLOOG || sku_id == SKU_34_BLOOG ||
suspect code indent for conditional statements (8, 12)
Done
https://review.coreboot.org/c/coreboot/+/38716/8/src/mainboard/google/octopu... PS8, Line 71: return "vbt.bin";
Statements should start on a tabstop
Done
Tony Huang has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/38716 )
Change subject: mb/google/octopus: Override VBT selection for Bloog ......................................................................
Patch Set 9:
Use switch to make it more readable.
Please help review.
Thanks
Marco Chen has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/38716 )
Change subject: mb/google/octopus: Override VBT selection for Bloog ......................................................................
Patch Set 9: Code-Review+1
Karthik Ramasubramanian has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/38716 )
Change subject: mb/google/octopus: Override VBT selection for Bloog ......................................................................
Patch Set 9: Code-Review+2
Patrick Georgi has submitted this change. ( https://review.coreboot.org/c/coreboot/+/38716 )
Change subject: mb/google/octopus: Override VBT selection for Bloog ......................................................................
mb/google/octopus: Override VBT selection for Bloog
Since most of Bloog series SKUs need to disable DRRS support.
If Bloog and Unprovisioned SKUs then return vbt.bin to enable DRRS support, return vbt_blooguard.bin for other SKUs to disable DRRS support.
Bipship follow blooguard to disable DRRS support.
BUG=b:148892903, b:147021309 BRANCH=octopus TEST=emerge-octopus coreboot chromeos-bootimage check i915_drrs_status shows DRRS supported NO when SKU ID is bipship.
Change-Id: I61f12d4ddea17a05255751fde2a5ce822dd2e782 Signed-off-by: Tony Huang tony-huang@quanta.corp-partner.google.com Reviewed-on: https://review.coreboot.org/c/coreboot/+/38716 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Marco Chen marcochen@google.com Reviewed-by: Karthik Ramasubramanian kramasub@google.com --- M src/mainboard/google/octopus/variants/bloog/variant.c 1 file changed, 25 insertions(+), 17 deletions(-)
Approvals: build bot (Jenkins): Verified Marco Chen: 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/variant.c b/src/mainboard/google/octopus/variants/bloog/variant.c index 18f44b9..699385e 100644 --- a/src/mainboard/google/octopus/variants/bloog/variant.c +++ b/src/mainboard/google/octopus/variants/bloog/variant.c @@ -30,29 +30,34 @@ 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 */ + SKU_53_BIPSHIP = 53, /* no kb blit, TS, 360, no Stylus, no rare-cam */ + SKU_54_BIPSHIP = 54, /* kb blit, TS, 360, no Stylus, no rare-cam */ SKU_65_BLOOGLET = 65, /* TS, kb blit */ SKU_66_BLOOGLET = 66, /* TS, no kb blit */ SKU_67_BLOOGLET = 67, /* non-TS, kb blit */ SKU_68_BLOOGLET = 68, /* non-TS, no kb blit */ + SKU_255_UNPROVISIONED = 255, };
const char *get_wifi_sar_cbfs_filename(void) { const char *filename = NULL; - uint32_t sku_id; - sku_id = get_board_sku(); + uint32_t sku_id = get_board_sku();
- if (sku_id == SKU_UNKNOWN) - return NULL; - - if (sku_id == SKU_33_BLOOG || sku_id == SKU_34_BLOOG || - sku_id == SKU_35_BLOOG || sku_id == SKU_36_BLOOG) + switch (sku_id) { + case SKU_33_BLOOG: + case SKU_34_BLOOG: + case SKU_35_BLOOG: + case SKU_36_BLOOG: filename = "wifi_sar-bloog.hex"; - - if (sku_id == SKU_49_BLOOGUARD || sku_id == SKU_50_BLOOGUARD || - sku_id == SKU_51_BLOOGUARD || sku_id == SKU_52_BLOOGUARD) + break; + case SKU_49_BLOOGUARD: + case SKU_50_BLOOGUARD: + case SKU_51_BLOOGUARD: + case SKU_52_BLOOGUARD: filename = "wifi_sar-blooguard.hex"; - + break; + } return filename; }
@@ -62,11 +67,14 @@
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 || - sku_id == SKU_65_BLOOGLET || sku_id == SKU_66_BLOOGLET || - sku_id == SKU_67_BLOOGLET || sku_id == SKU_68_BLOOGLET) + switch (sku_id) { + case SKU_33_BLOOG: + case SKU_34_BLOOG: + case SKU_35_BLOOG: + case SKU_36_BLOOG: + case SKU_255_UNPROVISIONED: + return "vbt.bin"; + default: 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)