Peichao Li has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/37458 )
Change subject: mb/google/kahlee/treeya: Tune VIH meet spec ......................................................................
mb/google/kahlee/treeya: Tune VIH meet spec
According to vendor Bayhub requirement need tune VIH meet spec
BUG=None TEST=build firmware and measure VIH whether meet spec
Signed-off-by: Peichao Wang peichao.wang@bitland.corp-partner.google.com Change-Id: I4de9e6cfb37e3b76f7afc206cbe3396b8da2d6dd --- M src/mainboard/google/kahlee/variants/treeya/Makefile.inc A src/mainboard/google/kahlee/variants/treeya/mainboard.c 2 files changed, 126 insertions(+), 1 deletion(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/58/37458/1
diff --git a/src/mainboard/google/kahlee/variants/treeya/Makefile.inc b/src/mainboard/google/kahlee/variants/treeya/Makefile.inc index 17ea78e..a8ef4ba 100644 --- a/src/mainboard/google/kahlee/variants/treeya/Makefile.inc +++ b/src/mainboard/google/kahlee/variants/treeya/Makefile.inc @@ -17,4 +17,4 @@
romstage-y += ../baseboard/romstage.c
-ramstage-y += ../baseboard/mainboard.c +ramstage-y += mainboard.c diff --git a/src/mainboard/google/kahlee/variants/treeya/mainboard.c b/src/mainboard/google/kahlee/variants/treeya/mainboard.c new file mode 100644 index 0000000..ed33461 --- /dev/null +++ b/src/mainboard/google/kahlee/variants/treeya/mainboard.c @@ -0,0 +1,125 @@ +/* + * This file is part of the coreboot project. + * + * Copyright 2018 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 <boardid.h> +#include <cbfs.h> +#include <gpio.h> +#include <smbios.h> +#include <variant/gpio.h> +#include <device/pci.h> +#include <drivers/generic/bayhub/bh720.h> + +uint32_t sku_id(void) +{ + static int sku = -1; + + if (sku == -1) + sku = google_chromeec_get_sku_id(); + + return sku; +} + +uint8_t variant_board_sku(void) +{ + return sku_id(); +} + +#if IS_ENABLED(CONFIG_HAVE_ACPI_RESUME) +void variant_mainboard_suspend_resume(void) +{ + /* Enable backlight - GPIO 133 active low */ + gpio_set(GPIO_133, 0); +} +#endif + +void board_bh720(struct device *dev) +{ + u32 sdbar; + u32 bh720_pcr_data; + + sdbar = pci_read_config32(dev, PCI_BASE_ADDRESS_1); + + /* Enable Memory Access Function */ + write32((void *)(sdbar + BH720_MEM_ACCESS_EN), 0x40000000); + write32((void *)(sdbar + BH720_MEM_RW_DATA), 0x80000000); + write32((void *)(sdbar + BH720_MEM_RW_ADR), 0x800000D0); + + /* Set EMMC VCCQ 1.8V PCR 0x308[4] */ + write32((void *)(sdbar + BH720_MEM_RW_ADR), + BH720_MEM_RW_READ | BH720_PCR_EMMC_SETTING); + bh720_pcr_data = read32((void *)(sdbar + BH720_MEM_RW_DATA)); + write32((void *)(sdbar + BH720_MEM_RW_DATA), + bh720_pcr_data | BH720_PCR_EMMC_SETTING_1_8V); + write32((void *)(sdbar + BH720_MEM_RW_ADR), + BH720_MEM_RW_WRITE | BH720_PCR_EMMC_SETTING); + + /* Set Base clock to 200MHz(PCR 0x304[31:16] = 0x2510) */ + write32((void *)(sdbar + BH720_MEM_RW_ADR), + BH720_MEM_RW_READ | BH720_PCR_DrvStrength_PLL); + bh720_pcr_data = read32((void *)(sdbar + BH720_MEM_RW_DATA)); + bh720_pcr_data &= 0x0000FFFF; + bh720_pcr_data |= 0x2510 << 16; + write32((void *)(sdbar + BH720_MEM_RW_DATA), bh720_pcr_data); + write32((void *)(sdbar + BH720_MEM_RW_ADR), + BH720_MEM_RW_WRITE | BH720_PCR_DrvStrength_PLL); + + /* Tune VIH make sure meet spec */ + write32((void *)(sdbar + BH720_MEM_RW_ADR), + BH720_MEM_RW_READ | BH720_PCR_DrvStrength_PLL); + bh720_pcr_data = read32((void *)(sdbar + BH720_MEM_RW_DATA)); + bh720_pcr_data &= 0xFFFFFF00; + bh720_pcr_data |= 48; + write32((void *)(sdbar + BH720_MEM_RW_DATA), bh720_pcr_data); + write32((void *)(sdbar + BH720_MEM_RW_ADR), + BH720_MEM_RW_WRITE | BH720_PCR_DrvStrength_PLL); + + /* Use PLL Base clock PCR 0x3E4[22] = 1 */ + write32((void *)(sdbar + BH720_MEM_RW_ADR), + BH720_MEM_RW_READ | BH720_PCR_CSR); + bh720_pcr_data = read32((void *)(sdbar + BH720_MEM_RW_DATA)); + write32((void *)(sdbar + BH720_MEM_RW_DATA), + bh720_pcr_data | BH720_PCR_CSR_EMMC_MODE_SEL); + write32((void *)(sdbar + BH720_MEM_RW_ADR), + BH720_MEM_RW_WRITE | BH720_PCR_CSR); + + /* Disable Memory Access */ + write32((void *)(sdbar + BH720_MEM_RW_DATA), 0x80000001); + write32((void *)(sdbar + BH720_MEM_RW_ADR), 0x800000D0); + write32((void *)(sdbar + BH720_MEM_ACCESS_EN), 0x80000000); +} + + +const char *smbios_mainboard_manufacturer(void) +{ + static char oem_bin_data[11]; + static const char *manuf; + + if (!IS_ENABLED(CONFIG_USE_OEM_BIN)) + return CONFIG_MAINBOARD_SMBIOS_MANUFACTURER; + + if (manuf) + return manuf; + + if (cbfs_boot_load_file("oem.bin", oem_bin_data, + sizeof(oem_bin_data) - 1, + CBFS_TYPE_RAW)) + manuf = &oem_bin_data[0]; + else + manuf = CONFIG_MAINBOARD_SMBIOS_MANUFACTURER; + + return manuf; +}
chris wang has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37458 )
Change subject: mb/google/kahlee/treeya: Tune VIH meet spec ......................................................................
Patch Set 1:
Hi PeiChao,
Does it change to meet the bayhub spec? If so, I think it also can apply to other grunt followers.so you can do the change under the baseboard/mainboard.c without creating the other one.
Peichao Li has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37458 )
Change subject: mb/google/kahlee/treeya: Tune VIH meet spec ......................................................................
Patch Set 1:
Patch Set 1:
Hi PeiChao,
Does it change to meet the bayhub spec? If so, I think it also can apply to other grunt followers.so you can do the change under the baseboard/mainboard.c without creating the other one.
Dear Chris, yes we follow vendor's request and this modification could be able to pass the test and meet spec. Thanks!
Hello build bot (Jenkins), Patrick Georgi, Martin Roth,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/37458
to look at the new patch set (#2).
Change subject: mb/google/kahlee/treeya: Tune VIH meet spec ......................................................................
mb/google/kahlee/treeya: Tune VIH meet spec
According to vendor Bayhub requirement need tune VIH meet spec
BUG=None TEST=build firmware and measure VIH whether meet spec
Signed-off-by: Peichao Wang peichao.wang@bitland.corp-partner.google.com Change-Id: I4de9e6cfb37e3b76f7afc206cbe3396b8da2d6dd --- M src/mainboard/google/kahlee/variants/treeya/Makefile.inc A src/mainboard/google/kahlee/variants/treeya/mainboard.c 2 files changed, 126 insertions(+), 1 deletion(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/58/37458/2
chris wang has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37458 )
Change subject: mb/google/kahlee/treeya: Tune VIH meet spec ......................................................................
Patch Set 2:
Patch Set 1:
Patch Set 1:
Hi PeiChao,
Does it change to meet the bayhub spec? If so, I think it also can apply to other grunt followers.so you can do the change under the baseboard/mainboard.c without creating the other one.
Dear Chris, yes we follow vendor's request and this modification could be able to pass the test and meet spec. Thanks!
Hi PeiChao,
If that is bayhub's requirement, I think it should add to all grunt followers. Would you help to apply to baseboard instead of only for treeya?
Peichao Li has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37458 )
Change subject: mb/google/kahlee/treeya: Tune VIH meet spec ......................................................................
Patch Set 2:
Patch Set 2:
Patch Set 1:
Patch Set 1:
Hi PeiChao,
Does it change to meet the bayhub spec? If so, I think it also can apply to other grunt followers.so you can do the change under the baseboard/mainboard.c without creating the other one.
Dear Chris, yes we follow vendor's request and this modification could be able to pass the test and meet spec. Thanks!
Hi PeiChao,
If that is bayhub's requirement, I think it should add to all grunt followers. Would you help to apply to baseboard instead of only for treeya?
Hi Chris, at this moment, this CL just do test in our internal team, I will modify the title and avoid misunderstanding. Thanks.
Hello build bot (Jenkins), Patrick Georgi, Martin Roth,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/37458
to look at the new patch set (#3).
Change subject: [TEST-ONLY]:mb/google/kahlee/treeya: Tune VIH meet spec ......................................................................
[TEST-ONLY]:mb/google/kahlee/treeya: Tune VIH meet spec
According to vendor Bayhub requirement need tune VIH meet spec
BUG=None TEST=build firmware and measure VIH whether meet spec
Signed-off-by: Peichao Wang peichao.wang@bitland.corp-partner.google.com Change-Id: I4de9e6cfb37e3b76f7afc206cbe3396b8da2d6dd --- M src/mainboard/google/kahlee/variants/treeya/Makefile.inc A src/mainboard/google/kahlee/variants/treeya/mainboard.c 2 files changed, 126 insertions(+), 1 deletion(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/58/37458/3
Peichao Li has removed Patrick Georgi from this change. ( https://review.coreboot.org/c/coreboot/+/37458 )
Change subject: [TEST-ONLY]:mb/google/kahlee/treeya: Tune VIH meet spec ......................................................................
Removed reviewer Patrick Georgi.
Peichao Li has removed Martin Roth from this change. ( https://review.coreboot.org/c/coreboot/+/37458 )
Change subject: [TEST-ONLY]:mb/google/kahlee/treeya: Tune VIH meet spec ......................................................................
Removed reviewer Martin Roth.
Peichao Li has removed chris wang from this change. ( https://review.coreboot.org/c/coreboot/+/37458 )
Change subject: [TEST-ONLY]:mb/google/kahlee/treeya: Tune VIH meet spec ......................................................................
Removed reviewer chris wang.
Peichao Li has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37458 )
Change subject: [TEST-ONLY]:mb/google/kahlee/treeya: Tune VIH meet spec ......................................................................
Patch Set 3: Code-Review-1
Peichao Li has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37458 )
Change subject: [TEST-ONLY]:mb/google/kahlee/treeya: Tune VIH meet spec ......................................................................
Patch Set 3: -Code-Review
This change is ready for review.
Hello build bot (Jenkins), Patrick Georgi, Martin Roth,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/37458
to look at the new patch set (#4).
Change subject: [TEST-ONLY]:mb/google/kahlee/treeya: Tune VIH meet spec ......................................................................
[TEST-ONLY]:mb/google/kahlee/treeya: Tune VIH meet spec
According to vendor Bayhub requirement need tune VIH meet spec
BUG=None TEST=build firmware and measure VIH whether meet spec
Signed-off-by: Peichao Wang peichao.wang@bitland.corp-partner.google.com Change-Id: I4de9e6cfb37e3b76f7afc206cbe3396b8da2d6dd --- M src/mainboard/google/kahlee/variants/treeya/Makefile.inc A src/mainboard/google/kahlee/variants/treeya/mainboard.c 2 files changed, 127 insertions(+), 1 deletion(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/58/37458/4
Paul Menzel has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37458 )
Change subject: [TEST-ONLY]:mb/google/kahlee/treeya: Tune VIH meet spec ......................................................................
Patch Set 4:
(2 comments)
https://review.coreboot.org/c/coreboot/+/37458/4//COMMIT_MSG Commit Message:
https://review.coreboot.org/c/coreboot/+/37458/4//COMMIT_MSG@10 PS4, Line 10: meet spec Fits on line above.
https://review.coreboot.org/c/coreboot/+/37458/4//COMMIT_MSG@13 PS4, Line 13: meet it meets the
Hello build bot (Jenkins), Patrick Georgi, Martin Roth,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/37458
to look at the new patch set (#5).
Change subject: [TEST-ONLY]:mb/google/kahlee/treeya: Tune VIH meet spec ......................................................................
[TEST-ONLY]:mb/google/kahlee/treeya: Tune VIH meet spec
According to vendor Bayhub requirement need tune VIH meets spec
BUG=None TEST=build firmware and measure VIH whether meets spec
Signed-off-by: Peichao Wang peichao.wang@bitland.corp-partner.google.com Change-Id: I4de9e6cfb37e3b76f7afc206cbe3396b8da2d6dd --- M src/mainboard/google/kahlee/variants/treeya/Makefile.inc A src/mainboard/google/kahlee/variants/treeya/mainboard.c 2 files changed, 127 insertions(+), 1 deletion(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/58/37458/5
Peichao Li has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37458 )
Change subject: [TEST-ONLY]:mb/google/kahlee/treeya: Tune VIH meet spec ......................................................................
Patch Set 5:
(2 comments)
https://review.coreboot.org/c/coreboot/+/37458/4//COMMIT_MSG Commit Message:
https://review.coreboot.org/c/coreboot/+/37458/4//COMMIT_MSG@10 PS4, Line 10: meet spec
Fits on line above.
Done
https://review.coreboot.org/c/coreboot/+/37458/4//COMMIT_MSG@13 PS4, Line 13: meet
it meets the
Done
Peichao Li has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37458 )
Change subject: [TEST-ONLY]:mb/google/kahlee/treeya: Tune VIH meet spec ......................................................................
Patch Set 5:
Patch Set 2:
Patch Set 1:
Patch Set 1:
Hi PeiChao,
Does it change to meet the bayhub spec? If so, I think it also can apply to other grunt followers.so you can do the change under the baseboard/mainboard.c without creating the other one.
Dear Chris, yes we follow vendor's request and this modification could be able to pass the test and meet spec. Thanks!
Hi PeiChao,
If that is bayhub's requirement, I think it should add to all grunt followers. Would you help to apply to baseboard instead of only for treeya?
Dear Chris,
I think it is not a common issue, after all, the layout of ODMs are different. So I think we need independent mainboard for Treeya.
Raul Rangel has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37458 )
Change subject: [TEST-ONLY]:mb/google/kahlee/treeya: Tune VIH meet spec ......................................................................
Patch Set 5:
(4 comments)
https://review.coreboot.org/c/coreboot/+/37458/5/src/mainboard/google/kahlee... File src/mainboard/google/kahlee/variants/treeya/mainboard.c:
https://review.coreboot.org/c/coreboot/+/37458/5/src/mainboard/google/kahlee... PS5, Line 28: uint32_t sku_id(void) : { : static int sku = -1; : : if (sku == -1) : sku = google_chromeec_get_sku_id(); : : return sku; : } : : uint8_t variant_board_sku(void) : { : return sku_id(); : } : : void variant_mainboard_suspend_resume(void) : { : /* Enable backlight - GPIO 133 active low */ : gpio_set(GPIO_133, 0); : } Do you need to copy this as well?
https://review.coreboot.org/c/coreboot/+/37458/5/src/mainboard/google/kahlee... PS5, Line 97: 0x304 Can you #define this constant
https://review.coreboot.org/c/coreboot/+/37458/5/src/mainboard/google/kahlee... PS5, Line 100: 0x30 #define as well.
https://review.coreboot.org/c/coreboot/+/37458/5/src/mainboard/google/kahlee... PS5, Line 107: const char *smbios_mainboard_manufacturer(void) : { : static char oem_bin_data[11]; : static const char *manuf; : : if (!CONFIG(USE_OEM_BIN)) : return CONFIG_MAINBOARD_SMBIOS_MANUFACTURER; : : if (manuf) : return manuf; : : if (cbfs_boot_load_file("oem.bin", oem_bin_data, : sizeof(oem_bin_data) - 1, : CBFS_TYPE_RAW)) : manuf = &oem_bin_data[0]; : else : manuf = CONFIG_MAINBOARD_SMBIOS_MANUFACTURER; : : return manuf; : } Do you also need this?
Peichao Li has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37458 )
Change subject: [TEST-ONLY]:mb/google/kahlee/treeya: Tune VIH meet spec ......................................................................
Patch Set 5:
(4 comments)
https://review.coreboot.org/c/coreboot/+/37458/5/src/mainboard/google/kahlee... File src/mainboard/google/kahlee/variants/treeya/mainboard.c:
https://review.coreboot.org/c/coreboot/+/37458/5/src/mainboard/google/kahlee... PS5, Line 28: uint32_t sku_id(void) : { : static int sku = -1; : : if (sku == -1) : sku = google_chromeec_get_sku_id(); : : return sku; : } : : uint8_t variant_board_sku(void) : { : return sku_id(); : } : : void variant_mainboard_suspend_resume(void) : { : /* Enable backlight - GPIO 133 active low */ : gpio_set(GPIO_133, 0); : }
Do you need to copy this as well?
Dear Raul,
Yeah, our Treeya board leverage to grunt, just layout is different and other sections all same.
https://review.coreboot.org/c/coreboot/+/37458/5/src/mainboard/google/kahlee... PS5, Line 97: 0x304
Can you #define this constant
Copy that, since this stage just do verification.
https://review.coreboot.org/c/coreboot/+/37458/5/src/mainboard/google/kahlee... PS5, Line 100: 0x30
#define as well.
Copy that, since this stage just do verification.
https://review.coreboot.org/c/coreboot/+/37458/5/src/mainboard/google/kahlee... PS5, Line 107: const char *smbios_mainboard_manufacturer(void) : { : static char oem_bin_data[11]; : static const char *manuf; : : if (!CONFIG(USE_OEM_BIN)) : return CONFIG_MAINBOARD_SMBIOS_MANUFACTURER; : : if (manuf) : return manuf; : : if (cbfs_boot_load_file("oem.bin", oem_bin_data, : sizeof(oem_bin_data) - 1, : CBFS_TYPE_RAW)) : manuf = &oem_bin_data[0]; : else : manuf = CONFIG_MAINBOARD_SMBIOS_MANUFACTURER; : : return manuf; : }
Do you also need this?
Yeah, our Treeya board leverage to grunt, just layout is different and other sections all same.
Hello chris wang, build bot (Jenkins), Patrick Georgi, Martin Roth,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/37458
to look at the new patch set (#6).
Change subject: mb/google/kahlee/treeya: Tune VIH and meet spec ......................................................................
mb/google/kahlee/treeya: Tune VIH and meet spec
According to vendor Bayhub requirement need tune VIH make it meets spec
BUG=None TEST=build firmware and measure VIH whether meets spec
Signed-off-by: Peichao Wang peichao.wang@bitland.corp-partner.google.com Change-Id: I4de9e6cfb37e3b76f7afc206cbe3396b8da2d6dd --- M src/mainboard/google/kahlee/variants/treeya/Makefile.inc A src/mainboard/google/kahlee/variants/treeya/mainboard.c 2 files changed, 127 insertions(+), 1 deletion(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/58/37458/6
Peichao Li has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37458 )
Change subject: mb/google/kahlee/treeya: Tune VIH and meet spec ......................................................................
Patch Set 6:
(3 comments)
https://review.coreboot.org/c/coreboot/+/37458/5/src/mainboard/google/kahlee... File src/mainboard/google/kahlee/variants/treeya/mainboard.c:
https://review.coreboot.org/c/coreboot/+/37458/5/src/mainboard/google/kahlee... PS5, Line 28: uint32_t sku_id(void) : { : static int sku = -1; : : if (sku == -1) : sku = google_chromeec_get_sku_id(); : : return sku; : } : : uint8_t variant_board_sku(void) : { : return sku_id(); : } : : void variant_mainboard_suspend_resume(void) : { : /* Enable backlight - GPIO 133 active low */ : gpio_set(GPIO_133, 0); : }
Dear Raul, […]
Done
https://review.coreboot.org/c/coreboot/+/37458/5/src/mainboard/google/kahlee... PS5, Line 97: 0x304
Copy that, since this stage just do verification.
Done
https://review.coreboot.org/c/coreboot/+/37458/5/src/mainboard/google/kahlee... PS5, Line 100: 0x30
Copy that, since this stage just do verification.
Done
Hello chris wang, build bot (Jenkins), Patrick Georgi, Martin Roth,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/37458
to look at the new patch set (#7).
Change subject: mb/google/kahlee/treeya: Tune VIH and meet spec ......................................................................
mb/google/kahlee/treeya: Tune VIH and meet spec
According to vendor Bayhub requirement need tune VIH make it meets spec --0x304(6:4) CLK = 3 --0x304(3:0) DAT = 5
BUG=None TEST=build firmware and measure VIH whether meets spec
Signed-off-by: Peichao Wang peichao.wang@bitland.corp-partner.google.com Change-Id: I4de9e6cfb37e3b76f7afc206cbe3396b8da2d6dd --- M src/mainboard/google/kahlee/variants/treeya/Makefile.inc A src/mainboard/google/kahlee/variants/treeya/mainboard.c 2 files changed, 127 insertions(+), 1 deletion(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/58/37458/7
Raul Rangel has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37458 )
Change subject: mb/google/kahlee/treeya: Tune VIH and meet spec ......................................................................
Patch Set 7: Code-Review+2
Martin Roth has submitted this change. ( https://review.coreboot.org/c/coreboot/+/37458 )
Change subject: mb/google/kahlee/treeya: Tune VIH and meet spec ......................................................................
mb/google/kahlee/treeya: Tune VIH and meet spec
According to vendor Bayhub requirement need tune VIH make it meets spec --0x304(6:4) CLK = 3 --0x304(3:0) DAT = 5
BUG=None TEST=build firmware and measure VIH whether meets spec
Signed-off-by: Peichao Wang peichao.wang@bitland.corp-partner.google.com Change-Id: I4de9e6cfb37e3b76f7afc206cbe3396b8da2d6dd Reviewed-on: https://review.coreboot.org/c/coreboot/+/37458 Reviewed-by: Raul Rangel rrangel@chromium.org Tested-by: build bot (Jenkins) no-reply@coreboot.org --- M src/mainboard/google/kahlee/variants/treeya/Makefile.inc A src/mainboard/google/kahlee/variants/treeya/mainboard.c 2 files changed, 127 insertions(+), 1 deletion(-)
Approvals: build bot (Jenkins): Verified Raul Rangel: Looks good to me, approved
diff --git a/src/mainboard/google/kahlee/variants/treeya/Makefile.inc b/src/mainboard/google/kahlee/variants/treeya/Makefile.inc index 17ea78e..a8ef4ba 100644 --- a/src/mainboard/google/kahlee/variants/treeya/Makefile.inc +++ b/src/mainboard/google/kahlee/variants/treeya/Makefile.inc @@ -17,4 +17,4 @@
romstage-y += ../baseboard/romstage.c
-ramstage-y += ../baseboard/mainboard.c +ramstage-y += mainboard.c diff --git a/src/mainboard/google/kahlee/variants/treeya/mainboard.c b/src/mainboard/google/kahlee/variants/treeya/mainboard.c new file mode 100644 index 0000000..cd42b56 --- /dev/null +++ b/src/mainboard/google/kahlee/variants/treeya/mainboard.c @@ -0,0 +1,126 @@ +/* + * This file is part of the coreboot project. + * + * Copyright 2018 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 <boardid.h> +#include <cbfs.h> +#include <gpio.h> +#include <smbios.h> +#include <variant/gpio.h> +#include <device/mmio.h> +#include <device/pci.h> +#include <device/pci_ops.h> +#include <drivers/generic/bayhub/bh720.h> + +uint32_t sku_id(void) +{ + static int sku = -1; + + if (sku == -1) + sku = google_chromeec_get_sku_id(); + + return sku; +} + +uint8_t variant_board_sku(void) +{ + return sku_id(); +} + +void variant_mainboard_suspend_resume(void) +{ + /* Enable backlight - GPIO 133 active low */ + gpio_set(GPIO_133, 0); +} + +void board_bh720(struct device *dev) +{ + u32 sdbar; + u32 bh720_pcr_data; + + sdbar = pci_read_config32(dev, PCI_BASE_ADDRESS_1); + + /* Enable Memory Access Function */ + write32((void *)(sdbar + BH720_MEM_ACCESS_EN), 0x40000000); + write32((void *)(sdbar + BH720_MEM_RW_DATA), 0x80000000); + write32((void *)(sdbar + BH720_MEM_RW_ADR), 0x800000D0); + + /* Set EMMC VCCQ 1.8V PCR 0x308[4] */ + write32((void *)(sdbar + BH720_MEM_RW_ADR), + BH720_MEM_RW_READ | BH720_PCR_EMMC_SETTING); + bh720_pcr_data = read32((void *)(sdbar + BH720_MEM_RW_DATA)); + write32((void *)(sdbar + BH720_MEM_RW_DATA), + bh720_pcr_data | BH720_PCR_EMMC_SETTING_1_8V); + write32((void *)(sdbar + BH720_MEM_RW_ADR), + BH720_MEM_RW_WRITE | BH720_PCR_EMMC_SETTING); + + /* Set Base clock to 200MHz(PCR 0x304[31:16] = 0x2510) */ + write32((void *)(sdbar + BH720_MEM_RW_ADR), + BH720_MEM_RW_READ | BH720_PCR_DrvStrength_PLL); + bh720_pcr_data = read32((void *)(sdbar + BH720_MEM_RW_DATA)); + bh720_pcr_data &= 0x0000FFFF; + bh720_pcr_data |= 0x2510 << 16; + write32((void *)(sdbar + BH720_MEM_RW_DATA), bh720_pcr_data); + write32((void *)(sdbar + BH720_MEM_RW_ADR), + BH720_MEM_RW_WRITE | BH720_PCR_DrvStrength_PLL); + + /* Use PLL Base clock PCR 0x3E4[22] = 1 */ + write32((void *)(sdbar + BH720_MEM_RW_ADR), + BH720_MEM_RW_READ | BH720_PCR_CSR); + bh720_pcr_data = read32((void *)(sdbar + BH720_MEM_RW_DATA)); + write32((void *)(sdbar + BH720_MEM_RW_DATA), + bh720_pcr_data | BH720_PCR_CSR_EMMC_MODE_SEL); + write32((void *)(sdbar + BH720_MEM_RW_ADR), + BH720_MEM_RW_WRITE | BH720_PCR_CSR); + + /* Disable Memory Access */ + write32((void *)(sdbar + BH720_MEM_RW_DATA), 0x80000001); + write32((void *)(sdbar + BH720_MEM_RW_ADR), 0x800000D0); + write32((void *)(sdbar + BH720_MEM_ACCESS_EN), 0x80000000); + + /* Tune VIH */ + pci_write_config32(dev, BH720_PROTECT, + BH720_PROTECT_OFF | BH720_PROTECT_LOCK_OFF); + bh720_pcr_data = pci_read_config32(dev, BH720_PCR_DrvStrength_PLL); + bh720_pcr_data &= 0xFFFFFF00; + /* CLK = 3 and DAT = 2 */ + bh720_pcr_data |= 0x35; + pci_write_config32(dev, BH720_PCR_DrvStrength_PLL, bh720_pcr_data); + pci_write_config32(dev, BH720_PROTECT, + BH720_PROTECT_ON | BH720_PROTECT_LOCK_ON); +} + + +const char *smbios_mainboard_manufacturer(void) +{ + static char oem_bin_data[11]; + static const char *manuf; + + if (!CONFIG(USE_OEM_BIN)) + return CONFIG_MAINBOARD_SMBIOS_MANUFACTURER; + + if (manuf) + return manuf; + + if (cbfs_boot_load_file("oem.bin", oem_bin_data, + sizeof(oem_bin_data) - 1, + CBFS_TYPE_RAW)) + manuf = &oem_bin_data[0]; + else + manuf = CONFIG_MAINBOARD_SMBIOS_MANUFACTURER; + + return manuf; +}
-
chris wang (Code Review) -
Martin Roth (Code Review)
-
Paul Menzel (Code Review)
-
Peichao Li (Code Review)
-
Raul Rangel (Code Review)