Chen Wisley has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/35807 )
Change subject: mb/google/hatch: set wifi sar for dragonair ......................................................................
mb/google/hatch: set wifi sar for dragonair
Enable wifi sar feature and set wifi sar name for dragonair sku.
BUG=b:142109545 TEST=emerge-hatch coreboot chromeos-bootimage
Change-Id: I0e08610b7c7d2d8da5a749d278bcde26af590e31 Signed-off-by: Wisley Chen wisley.chen@quantatw.com --- M src/mainboard/google/hatch/Kconfig M src/mainboard/google/hatch/variants/dratini/Makefile.inc A src/mainboard/google/hatch/variants/dratini/include/variant/sku.h A src/mainboard/google/hatch/variants/dratini/variant.c 4 files changed, 60 insertions(+), 0 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/07/35807/1
diff --git a/src/mainboard/google/hatch/Kconfig b/src/mainboard/google/hatch/Kconfig index 004cc28..63555f8 100644 --- a/src/mainboard/google/hatch/Kconfig +++ b/src/mainboard/google/hatch/Kconfig @@ -39,6 +39,7 @@
config CHROMEOS_WIFI_SAR bool "Enable SAR options for Chrome OS build" + default y if BOARD_GOOGLE_DRATINI depends on CHROMEOS select DSAR_ENABLE select GEO_SAR_ENABLE diff --git a/src/mainboard/google/hatch/variants/dratini/Makefile.inc b/src/mainboard/google/hatch/variants/dratini/Makefile.inc index d82d797..8b7e3d1 100644 --- a/src/mainboard/google/hatch/variants/dratini/Makefile.inc +++ b/src/mainboard/google/hatch/variants/dratini/Makefile.inc @@ -23,3 +23,4 @@
bootblock-y += gpio.c ramstage-y += gpio.c +ramstage-y += variant.c diff --git a/src/mainboard/google/hatch/variants/dratini/include/variant/sku.h b/src/mainboard/google/hatch/variants/dratini/include/variant/sku.h new file mode 100644 index 0000000..8ff2c79 --- /dev/null +++ b/src/mainboard/google/hatch/variants/dratini/include/variant/sku.h @@ -0,0 +1,24 @@ +/* + * 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. + */ + +#ifndef __MAINBOARD_SKU_H__ +#define __MAINBOARD_SKU_H__ + +enum { + SKU_21_DRAGONAIR = 21, /* TS + FPS + Stylus */ + SKU_22_DRAGONAIR = 22, /* TS + KB_BL + FPS + Stylus */ +}; + +#endif /* __MAINBOARD_SKU_H__ */ diff --git a/src/mainboard/google/hatch/variants/dratini/variant.c b/src/mainboard/google/hatch/variants/dratini/variant.c new file mode 100644 index 0000000..6b4184a --- /dev/null +++ b/src/mainboard/google/hatch/variants/dratini/variant.c @@ -0,0 +1,34 @@ +/* + * 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 <ec/google/chromeec/ec.h> +#include <baseboard/variants.h> +#include <variant/sku.h> +#include <sar.h> + +const char *get_wifi_sar_cbfs_filename(void) +{ + const char *filename = NULL; + uint32_t sku_id = get_board_sku(); + + switch (sku_id) { + case SKU_21_DRAGONAIR: + case SKU_22_DRAGONAIR: + filename = "wifi_sar-dragonair.hex"; + break; + } + return filename; +} +
Hello build bot (Jenkins), Patrick Georgi, Martin Roth,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/35807
to look at the new patch set (#2).
Change subject: mb/google/hatch: set wifi sar for dragonair ......................................................................
mb/google/hatch: set wifi sar for dragonair
Enable wifi sar feature and set wifi sar name for dragonair sku.
BUG=b:142109545 TEST=emerge-hatch coreboot chromeos-bootimage
Change-Id: I0e08610b7c7d2d8da5a749d278bcde26af590e31 Signed-off-by: Wisley Chen wisley.chen@quantatw.com --- M src/mainboard/google/hatch/Kconfig M src/mainboard/google/hatch/variants/dratini/Makefile.inc A src/mainboard/google/hatch/variants/dratini/include/variant/sku.h A src/mainboard/google/hatch/variants/dratini/variant.c 4 files changed, 59 insertions(+), 0 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/07/35807/2
Hello build bot (Jenkins), Patrick Georgi, Martin Roth,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/35807
to look at the new patch set (#3).
Change subject: mb/google/hatch: set wifi sar for dragonair ......................................................................
mb/google/hatch: set wifi sar for dragonair
Enable wifi sar feature and set wifi sar name for dragonair sku.
BUG=b:142109545 TEST=emerge-hatch coreboot chromeos-bootimage
Change-Id: I0e08610b7c7d2d8da5a749d278bcde26af590e31 Signed-off-by: Wisley Chen wisley.chen@quantatw.com --- M src/mainboard/google/hatch/Kconfig M src/mainboard/google/hatch/variants/dratini/Makefile.inc A src/mainboard/google/hatch/variants/dratini/include/variant/sku.h A src/mainboard/google/hatch/variants/dratini/variant.c 4 files changed, 59 insertions(+), 0 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/07/35807/3
Hello build bot (Jenkins), Patrick Georgi, Martin Roth,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/35807
to look at the new patch set (#4).
Change subject: mb/google/hatch: set wifi sar for dragonair ......................................................................
mb/google/hatch: set wifi sar for dragonair
Enable wifi sar feature and set wifi sar name for dragonair sku.
BUG=b:142109545 TEST=emerge-hatch coreboot chromeos-bootimage
Change-Id: I0e08610b7c7d2d8da5a749d278bcde26af590e31 Signed-off-by: Wisley Chen wisley.chen@quantatw.com --- M src/mainboard/google/hatch/Kconfig M src/mainboard/google/hatch/variants/dratini/Makefile.inc A src/mainboard/google/hatch/variants/dratini/include/variant/sku.h A src/mainboard/google/hatch/variants/dratini/variant.c 4 files changed, 59 insertions(+), 1 deletion(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/07/35807/4
Hello Paul Fagerburg, Tim Wawrzynczak, Philip Chen, Shelley Chen, build bot (Jenkins), Furquan Shaikh, Patrick Georgi, Martin Roth,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/35807
to look at the new patch set (#5).
Change subject: mb/google/hatch: set wifi sar for dragonair ......................................................................
mb/google/hatch: set wifi sar for dragonair
Enable wifi sar feature and set wifi sar name for dragonair sku.
BUG=b:142109545 TEST=emerge-hatch coreboot chromeos-bootimage
Change-Id: I0e08610b7c7d2d8da5a749d278bcde26af590e31 Signed-off-by: Wisley Chen wisley.chen@quantatw.com --- M src/mainboard/google/hatch/variants/dratini/Makefile.inc A src/mainboard/google/hatch/variants/dratini/include/variant/sku.h A src/mainboard/google/hatch/variants/dratini/variant.c 3 files changed, 58 insertions(+), 0 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/07/35807/5
Paul Fagerburg has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/35807 )
Change subject: mb/google/hatch: set wifi sar for dragonair ......................................................................
Patch Set 5: Code-Review+2
Furquan Shaikh has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/35807 )
Change subject: mb/google/hatch: set wifi sar for dragonair ......................................................................
Patch Set 5:
(1 comment)
https://review.coreboot.org/c/coreboot/+/35807/5//COMMIT_MSG Commit Message:
https://review.coreboot.org/c/coreboot/+/35807/5//COMMIT_MSG@12 PS5, Line 12: =emerge-hatch coreboot chromeos-bootimage Can you verify loading of the SAR table as well?
Hello Paul Fagerburg, Tim Wawrzynczak, Philip Chen, Shelley Chen, build bot (Jenkins), Furquan Shaikh, Patrick Georgi, Martin Roth,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/35807
to look at the new patch set (#6).
Change subject: mb/google/hatch: set wifi sar for dragonair ......................................................................
mb/google/hatch: set wifi sar for dragonair
Enable wifi sar feature and set wifi sar name for dragonair sku.
BUG=b:142109545 TEST=emerge-hatch coreboot chromeos-bootimage 1. Check wifi_sar-dragonair.hex in /cbfs-rw-raw/dratini 2. Add iwlwifi.debug into kernel params. 3. check SAR value from dmesg only when sku id is 21/22
Change-Id: I0e08610b7c7d2d8da5a749d278bcde26af590e31 Signed-off-by: Wisley Chen wisley.chen@quantatw.com --- M src/mainboard/google/hatch/variants/dratini/Makefile.inc A src/mainboard/google/hatch/variants/dratini/include/variant/sku.h A src/mainboard/google/hatch/variants/dratini/variant.c 3 files changed, 58 insertions(+), 0 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/07/35807/6
Chen Wisley has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/35807 )
Change subject: mb/google/hatch: set wifi sar for dragonair ......................................................................
Patch Set 6:
(1 comment)
https://review.coreboot.org/c/coreboot/+/35807/5//COMMIT_MSG Commit Message:
https://review.coreboot.org/c/coreboot/+/35807/5//COMMIT_MSG@12 PS5, Line 12: =emerge-hatch coreboot chromeos-bootimage
Can you verify loading of the SAR table as well?
Yes, I verified it and post log in https://chrome-internal-review.googlesource.com/c/chromeos/overlays/baseboar...
Tim Wawrzynczak has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/35807 )
Change subject: mb/google/hatch: set wifi sar for dragonair ......................................................................
Patch Set 6:
(1 comment)
https://review.coreboot.org/c/coreboot/+/35807/6/src/mainboard/google/hatch/... File src/mainboard/google/hatch/variants/dratini/variant.c:
https://review.coreboot.org/c/coreboot/+/35807/6/src/mainboard/google/hatch/... PS6, Line 16: #include <ec/google/chromeec/ec.h> Is this required?
Hello Paul Fagerburg, Tim Wawrzynczak, Philip Chen, Shelley Chen, build bot (Jenkins), Furquan Shaikh, Patrick Georgi, Martin Roth,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/35807
to look at the new patch set (#7).
Change subject: mb/google/hatch: set wifi sar for dragonair ......................................................................
mb/google/hatch: set wifi sar for dragonair
Enable wifi sar feature and set wifi sar name for dragonair sku.
BUG=b:142109545 TEST=emerge-hatch coreboot chromeos-bootimage 1. Check wifi_sar-dragonair.hex in /cbfs-rw-raw/dratini 2. Add iwlwifi.debug into kernel params. 3. check SAR value from dmesg only when sku id is 21/22
Change-Id: I0e08610b7c7d2d8da5a749d278bcde26af590e31 Signed-off-by: Wisley Chen wisley.chen@quantatw.com --- M src/mainboard/google/hatch/variants/dratini/Makefile.inc A src/mainboard/google/hatch/variants/dratini/include/variant/sku.h A src/mainboard/google/hatch/variants/dratini/variant.c 3 files changed, 57 insertions(+), 0 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/07/35807/7
Chen Wisley has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/35807 )
Change subject: mb/google/hatch: set wifi sar for dragonair ......................................................................
Patch Set 7:
(1 comment)
https://review.coreboot.org/c/coreboot/+/35807/6/src/mainboard/google/hatch/... File src/mainboard/google/hatch/variants/dratini/variant.c:
https://review.coreboot.org/c/coreboot/+/35807/6/src/mainboard/google/hatch/... PS6, Line 16: #include <ec/google/chromeec/ec.h>
Is this required?
Done
Paul Fagerburg has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/35807 )
Change subject: mb/google/hatch: set wifi sar for dragonair ......................................................................
Patch Set 7: Code-Review+1
+1 to give other reviewers a final look
Tim Wawrzynczak has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/35807 )
Change subject: mb/google/hatch: set wifi sar for dragonair ......................................................................
Patch Set 7: Code-Review+2
(1 comment)
https://review.coreboot.org/c/coreboot/+/35807/7/src/mainboard/google/hatch/... File src/mainboard/google/hatch/variants/dratini/variant.c:
https://review.coreboot.org/c/coreboot/+/35807/7/src/mainboard/google/hatch/... PS7, Line 31: filename Just be aware that if this function returns NULL, it will look for wifi_sar_defaults.hex instead
Wisley Chen has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/35807 )
Change subject: mb/google/hatch: set wifi sar for dragonair ......................................................................
Patch Set 7:
(1 comment)
Patch Set 7: Code-Review+2
(1 comment)
https://review.coreboot.org/c/coreboot/+/35807/7/src/mainboard/google/hatch/... File src/mainboard/google/hatch/variants/dratini/variant.c:
https://review.coreboot.org/c/coreboot/+/35807/7/src/mainboard/google/hatch/... PS7, Line 31: filename
Just be aware that if this function returns NULL, it will look for wifi_sar_defaults. […]
Ack
Wisley Chen has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/35807 )
Change subject: mb/google/hatch: set wifi sar for dragonair ......................................................................
Patch Set 7:
(1 comment)
https://review.coreboot.org/c/coreboot/+/35807/5//COMMIT_MSG Commit Message:
https://review.coreboot.org/c/coreboot/+/35807/5//COMMIT_MSG@12 PS5, Line 12: =emerge-hatch coreboot chromeos-bootimage
Yes, I verified it and post log in […]
Done
Chen Wisley has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/35807 )
Change subject: mb/google/hatch: set wifi sar for dragonair ......................................................................
Patch Set 7:
Please help to merge the patch thanks
Shelley Chen has submitted this change. ( https://review.coreboot.org/c/coreboot/+/35807 )
Change subject: mb/google/hatch: set wifi sar for dragonair ......................................................................
mb/google/hatch: set wifi sar for dragonair
Enable wifi sar feature and set wifi sar name for dragonair sku.
BUG=b:142109545 TEST=emerge-hatch coreboot chromeos-bootimage 1. Check wifi_sar-dragonair.hex in /cbfs-rw-raw/dratini 2. Add iwlwifi.debug into kernel params. 3. check SAR value from dmesg only when sku id is 21/22
Change-Id: I0e08610b7c7d2d8da5a749d278bcde26af590e31 Signed-off-by: Wisley Chen wisley.chen@quantatw.com Reviewed-on: https://review.coreboot.org/c/coreboot/+/35807 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Paul Fagerburg pfagerburg@chromium.org Reviewed-by: Tim Wawrzynczak twawrzynczak@chromium.org --- M src/mainboard/google/hatch/variants/dratini/Makefile.inc A src/mainboard/google/hatch/variants/dratini/include/variant/sku.h A src/mainboard/google/hatch/variants/dratini/variant.c 3 files changed, 57 insertions(+), 0 deletions(-)
Approvals: build bot (Jenkins): Verified Tim Wawrzynczak: Looks good to me, approved Paul Fagerburg: Looks good to me, but someone else must approve
diff --git a/src/mainboard/google/hatch/variants/dratini/Makefile.inc b/src/mainboard/google/hatch/variants/dratini/Makefile.inc index d82d797..8b7e3d1 100644 --- a/src/mainboard/google/hatch/variants/dratini/Makefile.inc +++ b/src/mainboard/google/hatch/variants/dratini/Makefile.inc @@ -23,3 +23,4 @@
bootblock-y += gpio.c ramstage-y += gpio.c +ramstage-y += variant.c diff --git a/src/mainboard/google/hatch/variants/dratini/include/variant/sku.h b/src/mainboard/google/hatch/variants/dratini/include/variant/sku.h new file mode 100644 index 0000000..8ff2c79 --- /dev/null +++ b/src/mainboard/google/hatch/variants/dratini/include/variant/sku.h @@ -0,0 +1,24 @@ +/* + * 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. + */ + +#ifndef __MAINBOARD_SKU_H__ +#define __MAINBOARD_SKU_H__ + +enum { + SKU_21_DRAGONAIR = 21, /* TS + FPS + Stylus */ + SKU_22_DRAGONAIR = 22, /* TS + KB_BL + FPS + Stylus */ +}; + +#endif /* __MAINBOARD_SKU_H__ */ diff --git a/src/mainboard/google/hatch/variants/dratini/variant.c b/src/mainboard/google/hatch/variants/dratini/variant.c new file mode 100644 index 0000000..da5db7f --- /dev/null +++ b/src/mainboard/google/hatch/variants/dratini/variant.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 <baseboard/variants.h> +#include <variant/sku.h> +#include <sar.h> + +const char *get_wifi_sar_cbfs_filename(void) +{ + const char *filename = NULL; + uint32_t sku_id = get_board_sku(); + + switch (sku_id) { + case SKU_21_DRAGONAIR: + case SKU_22_DRAGONAIR: + filename = "wifi_sar-dragonair.hex"; + break; + } + return filename; +}