Maulik V Vaghela has uploaded this change for review. ( https://review.coreboot.org/26972
Change subject: sconfig/main.c: Fix number of arguments in fprintf
......................................................................
sconfig/main.c: Fix number of arguments in fprintf
During compilation sconfig/main.c gives an error regarding number of
arguments passed in fprintf.
BUG=none
BRANCH=none
TEST=check if compilation warning has been fixed
Change-Id: Ia769cc606a1e3f7e1188cd82235442493d37f664
Signed-off-by: Maulik V Vaghela <maulik.v.vaghela(a)intel.com>
---
M util/sconfig/main.c
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/72/26972/1
diff --git a/util/sconfig/main.c b/util/sconfig/main.c
index 7c838bf..e4c940e 100644
--- a/util/sconfig/main.c
+++ b/util/sconfig/main.c
@@ -74,7 +74,7 @@
{
void *data = calloc(1, s);
if (!data) {
- fprintf(stderr, "%s: Failed to alloc mem!\n", f, s);
+ fprintf(stderr, "%s: Failed to alloc mem!\n", f);
exit(1);
}
return data;
--
To view, visit https://review.coreboot.org/26972
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia769cc606a1e3f7e1188cd82235442493d37f664
Gerrit-Change-Number: 26972
Gerrit-PatchSet: 1
Gerrit-Owner: Maulik V Vaghela <maulik.v.vaghela(a)intel.com>
Furquan Shaikh has uploaded a new patch set (#2). ( https://review.coreboot.org/26971 )
Change subject: mb/google/octopus: Fix GPIO to GPE mappings in devicetree
......................................................................
mb/google/octopus: Fix GPIO to GPE mappings in devicetree
Change b41ae2 (mb/google/octopus: Enable wake-over-wifi for octopus
variants) changed the GPE mappings to accomodate for WiFi wake
pin. However, this resulted in TPM interrupt pin being removed from
the GPIO to GPE mapping. Since we do not support true interrupts in
coreboot, GPE_STS registers are used to identify if an interrupt has
triggered. Change in GPE mapping resulted in this information to be
lost when talking to TPM thus resulting in "Timeout wait for tpm
irq".
This change fixes the above issue by assigning GPIO block for TPM
interrupt back to DW1 and moving GPIO block for wake-over-wifi pin to
DW3. DW3 was mapped to NW_31_0 which only has debug header pins and
CNVI pins (none of them are used for reading GPE_STS or as wake
sources).
BUG=b:109824918
TEST=Verified that there are no "Timeout wait for tpm irq" messages
when talking to TPM.
Change-Id: I30768177a838a684948f7485d760c8b83c3190f7
Signed-off-by: Furquan Shaikh <furquan(a)google.com>
---
M src/mainboard/google/octopus/variants/baseboard/devicetree.cb
M src/mainboard/google/octopus/variants/bip/devicetree.cb
2 files changed, 23 insertions(+), 6 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/71/26971/2
--
To view, visit https://review.coreboot.org/26971
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-MessageType: newpatchset
Gerrit-Change-Id: I30768177a838a684948f7485d760c8b83c3190f7
Gerrit-Change-Number: 26971
Gerrit-PatchSet: 2
Gerrit-Owner: Furquan Shaikh <furquan(a)google.com>
Furquan Shaikh has uploaded this change for review. ( https://review.coreboot.org/26971
Change subject: mb/google/octopus: Fix GPIO to GPE mappings in devicetree
......................................................................
mb/google/octopus: Fix GPIO to GPE mappings in devicetree
Change b41ae2 (mb/google/octopus: Enable wake-over-wifi for octopus
variants) changed the GPE mappings to accomodate for WiFi wake
pin. However, this resulted in TPM interrupt pin being removed from
the GPIO to GPE mapping. Since we do not support true interrupts in
coreboot, GPE_STS registers are used to identify if an interrupt has
triggered. Change in GPE mapping resulted in this information to be
lost when talking to TPM thus resulting in "Timeout wait for tpm
irq".
This change fixes the above issue by assigning GPIO block for TPM
interrupt back to DW1 and moving GPIO block for wake-over-wifi pin to
DW3. DW3 was mapping to NW_31_0 which only has debug header pins and
CNVI pins (none of them are used for reading GPE_STS or as wake
sources).
BUG=b:109824918
TEST=Verified that there are no "Timeout wait for tpm irq" messages
when talking to TPM.
Change-Id: I30768177a838a684948f7485d760c8b83c3190f7
Signed-off-by: Furquan Shaikh <furquan(a)google.com>
---
M src/mainboard/google/octopus/variants/baseboard/devicetree.cb
M src/mainboard/google/octopus/variants/bip/devicetree.cb
2 files changed, 23 insertions(+), 6 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/71/26971/1
diff --git a/src/mainboard/google/octopus/variants/baseboard/devicetree.cb b/src/mainboard/google/octopus/variants/baseboard/devicetree.cb
index 9bd51ca..d6f0829 100644
--- a/src/mainboard/google/octopus/variants/baseboard/devicetree.cb
+++ b/src/mainboard/google/octopus/variants/baseboard/devicetree.cb
@@ -29,9 +29,18 @@
# route, i.e., if this route changes then the affected GPE
# offset bits also need to be changed. This sets the PMC register
# GPE_CFG fields.
- register "gpe0_dw1" = "PMC_GPE_N_63_32"
+ # DW1 is used by:
+ # - GPIO_63 - H1_PCH_INT_ODL
+ # DW2 is used by:
+ # - GPIO_141 - EC_PCH_WAKE_ODL
+ # - GPIO_142 - TRACKPAD_INT2_1V8_ODL
+ # - GPIO_144 - PEN_EJECT_ODL
+ # DW3 is used by:
+ # - GPIO_117 - LTE_WAKE_ODL
+ # - GPIO_119 - WLAN_PCIE_WAKE_ODL
+ register "gpe0_dw1" = "PMC_GPE_NW_63_32"
register "gpe0_dw2" = "PMC_GPE_N_95_64"
- register "gpe0_dw3" = "PMC_GPE_NW_31_0"
+ register "gpe0_dw3" = "PMC_GPE_N_63_32"
# PL1 override 8000 mW: Due to error in the energy calculation for
# current VR solution. Experiments show that SoC TDP max (6W) can
@@ -122,7 +131,7 @@
device pci 12.0 off end # - SATA
device pci 13.0 on
chip drivers/intel/wifi
- register "wake" = "GPE0_DW1_11"
+ register "wake" = "GPE0_DW3_11"
device pci 00.0 on end
end
end # - PCIe-A 0 Onboard M2 Slot(Wifi)
diff --git a/src/mainboard/google/octopus/variants/bip/devicetree.cb b/src/mainboard/google/octopus/variants/bip/devicetree.cb
index 339b5bf..8f2992b 100644
--- a/src/mainboard/google/octopus/variants/bip/devicetree.cb
+++ b/src/mainboard/google/octopus/variants/bip/devicetree.cb
@@ -29,9 +29,17 @@
# route, i.e., if this route changes then the affected GPE
# offset bits also need to be changed. This sets the PMC register
# GPE_CFG fields.
- register "gpe0_dw1" = "PMC_GPE_N_63_32"
+ # DW1 is used by:
+ # - GPIO_63 - H1_PCH_INT_ODL
+ # DW2 is used by:
+ # - GPIO_141 - EC_PCH_WAKE_ODL
+ # - GPIO_142 - TRACKPAD_INT2_1V8_ODL
+ # DW3 is used by:
+ # - GPIO_117 - LTE_WAKE_ODL
+ # - GPIO_119 - WLAN_PCIE_WAKE_ODL
+ register "gpe0_dw1" = "PMC_GPE_NW_63_32"
register "gpe0_dw2" = "PMC_GPE_N_95_64"
- register "gpe0_dw3" = "PMC_GPE_NW_31_0"
+ register "gpe0_dw3" = "PMC_GPE_N_63_32"
# PL1 override 8000 mW: Due to error in the energy calculation for
# current VR solution. Experiments show that SoC TDP max (6W) can
@@ -122,7 +130,7 @@
device pci 12.0 off end # - SATA
device pci 13.0 on
chip drivers/intel/wifi
- register "wake" = "GPE0_DW1_11"
+ register "wake" = "GPE0_DW3_11"
device pci 00.0 on end
end
end # - PCIe-A 0 Onboard M2 Slot(Wifi)
--
To view, visit https://review.coreboot.org/26971
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I30768177a838a684948f7485d760c8b83c3190f7
Gerrit-Change-Number: 26971
Gerrit-PatchSet: 1
Gerrit-Owner: Furquan Shaikh <furquan(a)google.com>