Richard Spiegel has uploaded this change for review. ( https://review.coreboot.org/28340
Change subject: soc/amd/stoneyridge/enable_usbdebug.c: Update pci_ehci_dbg_set_port()
......................................................................
soc/amd/stoneyridge/enable_usbdebug.c: Update pci_ehci_dbg_set_port()
Function pci_ehci_dbg_set_port() used NDA register DEBUGPORT_MISC_CONTROL,
which was deprecated in favor of a public PCI register (though only the
bits to enable debug port became public) 0x90. Therefor code needs to be
updated.
BUG=b:69231009
TEST=Build and boot grunt.
Change-Id: Ic10c43cb6e5a9e8fe3bccf79a8ed69a6a0b49fce
Signed-off-by: Richard Spiegel <richard.spiegel(a)silverbackltd.com>
---
M src/soc/amd/stoneyridge/enable_usbdebug.c
M src/soc/amd/stoneyridge/include/soc/southbridge.h
2 files changed, 20 insertions(+), 10 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/40/28340/1
diff --git a/src/soc/amd/stoneyridge/enable_usbdebug.c b/src/soc/amd/stoneyridge/enable_usbdebug.c
index efe34e5..a2b5dd5 100644
--- a/src/soc/amd/stoneyridge/enable_usbdebug.c
+++ b/src/soc/amd/stoneyridge/enable_usbdebug.c
@@ -22,8 +22,6 @@
#include <device/pci_def.h>
#include <soc/southbridge.h>
-#define DEBUGPORT_MISC_CONTROL 0x80
-
pci_devfn_t pci_ehci_dbg_dev(unsigned int hcd_idx)
{
/* Enable all of the USB controllers */
@@ -38,15 +36,22 @@
return PCI_DEV(0, 0x12, 0);
}
+/*
+ * Stoneyridge selects port 1 as the debug port by default, and coreboot
+ * function usbdebug_init_() also selects port 1 if USBDEBUG_DEFAULT_PORT
+ * is not selected or set to 0. So if port 1 is used, no change is needed.
+ * For ports 2 and 3, value of USBDEBUG_DEFAULT_PORT is the port itself,
+ * but to work around usbdebug_init_(), if port 0 is desired set
+ * USBDEBUG_DEFAULT_PORT to 4.
+ */
void pci_ehci_dbg_set_port(pci_devfn_t dev, unsigned int port)
{
- u8 *base_regs = pci_ehci_base_regs(dev);
- u32 reg32;
+ u32 reg32, value;
- /* Write the port number to DEBUGPORT_MISC_CONTROL[31:28]. */
- reg32 = read32(base_regs + DEBUGPORT_MISC_CONTROL);
- reg32 &= ~(0xf << 28);
- reg32 |= (port << 28);
- reg32 |= (1 << 27); /* Enable Debug Port port number remapping. */
- write32(base_regs + DEBUGPORT_MISC_CONTROL, reg32);
+ value = (port & 0x00000003) << DEBUG_PORT_SELECT_SHIFT;
+ value |= DEBUG_PORT_ENABLE;
+ reg32 = pci_read_config32(SOC_EHCI1_DEV, EHCI_HUB_CONFIG4);
+ reg32 &= ~DEBUG_PORT_MASK;
+ reg32 |= value;
+ pci_write_config32(SOC_EHCI1_DEV, EHCI_HUB_CONFIG4, reg32);
}
diff --git a/src/soc/amd/stoneyridge/include/soc/southbridge.h b/src/soc/amd/stoneyridge/include/soc/southbridge.h
index 530b93a..f054b3b 100644
--- a/src/soc/amd/stoneyridge/include/soc/southbridge.h
+++ b/src/soc/amd/stoneyridge/include/soc/southbridge.h
@@ -305,6 +305,11 @@
#define OC_PORT2_SHIFT 8
#define OC_PORT3_SHIFT 12
+#define EHCI_HUB_CONFIG4 0x90
+#define DEBUG_PORT_SELECT_SHIFT 16
+#define DEBUG_PORT_ENABLE BIT(18)
+#define DEBUG_PORT_MASK (BIT(16) | BIT(17) | (BIT(18))
+
#define WIDEIO_RANGE_ERROR -1
#define TOTAL_WIDEIO_PORTS 3
--
To view, visit https://review.coreboot.org/28340
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: Ic10c43cb6e5a9e8fe3bccf79a8ed69a6a0b49fce
Gerrit-Change-Number: 28340
Gerrit-PatchSet: 1
Gerrit-Owner: Richard Spiegel <richard.spiegel(a)silverbackltd.com>
Krzysztof M Sywula has posted comments on this change. ( https://review.coreboot.org/28339 )
Change subject: util: Add script to download FSP headers
......................................................................
Patch Set 1:
Patrick, please review first revision of the script. I saw your comment asking for such utility.
Take a note that currently script doesn't support some families:
1. coreboot.org denverton_ns doesn't match github DenvertonNSFspBinPkg
2. coreboot.org skykabylake doesn't match github KabylakeFspBinPkg
3. coreboot.org glk doesn't exist on github
4. coreboot.org quark doesn't exist on github
(1) and (2) I would recommend renaming to denvertonns and kabylake accordingly as currently they don't follow naming convention.
--
To view, visit https://review.coreboot.org/28339
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I2cda87a4cbfa7ce102b10b555f83cdf163c80e5f
Gerrit-Change-Number: 28339
Gerrit-PatchSet: 1
Gerrit-Owner: Krzysztof M Sywula <krzysztof.m.sywula(a)intel.com>
Gerrit-Reviewer: Krzysztof M Sywula <krzysztof.m.sywula(a)intel.com>
Gerrit-Reviewer: Lijian Zhao <lijian.zhao(a)intel.com>
Gerrit-Reviewer: Patrick Georgi <pgeorgi(a)google.com>
Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>
Gerrit-Comment-Date: Fri, 24 Aug 2018 23:34:33 +0000
Gerrit-HasComments: No
Gerrit-HasLabels: No
Lijian Zhao has posted comments on this change. ( https://review.coreboot.org/28331 )
Change subject: mb/intel/coffeelake_rvp: Remove superfluous header file
......................................................................
Patch Set 2: Code-Review+2
Okay, then I can move all the GPIO programming in gpio.c under baseboard.
--
To view, visit https://review.coreboot.org/28331
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: Icf3368bcf1351f0e7cd4041c3792d76362aec9e5
Gerrit-Change-Number: 28331
Gerrit-PatchSet: 2
Gerrit-Owner: Arthur Heymans <arthur(a)aheymans.xyz>
Gerrit-Reviewer: Lijian Zhao <lijian.zhao(a)intel.com>
Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>
Gerrit-Comment-Date: Fri, 24 Aug 2018 16:37:23 +0000
Gerrit-HasComments: No
Gerrit-HasLabels: Yes
Subrata Banik has uploaded this change for review. ( https://review.coreboot.org/28337
Change subject: soc/intel/common: Don't clear GPE status register
......................................................................
soc/intel/common: Don't clear GPE status register
As per EDS definition for GPE Status register is RW/1C/V, hence
writting mask bit into GPE status will force clear GPE status bit.
This will lead into device side "IRQ timeout" problem as soc code
might relying on GPE status read to know the interrupt status.
TEST=Don't see IRQ timeout issue for TPM.
Change-Id: I27fabb3612251fd8d04f58c05ff9fb2a42ad64b3
Signed-off-by: Subrata Banik <subrata.banik(a)intel.com>
---
M src/soc/intel/common/block/pmc/pmclib.c
1 file changed, 3 insertions(+), 5 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/37/28337/1
diff --git a/src/soc/intel/common/block/pmc/pmclib.c b/src/soc/intel/common/block/pmc/pmclib.c
index 339e674..7f106f4 100644
--- a/src/soc/intel/common/block/pmc/pmclib.c
+++ b/src/soc/intel/common/block/pmc/pmclib.c
@@ -460,7 +460,7 @@
return acpi_sleep_from_pm1(pmc_read_pm1_control()) == ACPI_S3;
}
-/* Read and clear GPE status (defined in arch/acpi.h) */
+/* Read GPE status (defined in arch/acpi.h) */
int acpi_get_gpe(int gpe)
{
int bank;
@@ -474,17 +474,15 @@
bank = gpe / 32;
mask = 1 << (gpe % 32);
- /* Wait up to 1ms for GPE status to clear */
+ /* Wait up to 1ms for GPE status to trigger */
stopwatch_init_msecs_expire(&sw, 1);
do {
if (stopwatch_expired(&sw))
return rc;
sts = inl(ACPI_BASE_ADDRESS + GPE0_STS(bank));
- if (sts & mask) {
- outl(mask, ACPI_BASE_ADDRESS + GPE0_STS(bank));
+ if (sts & mask)
rc = 1;
- }
} while (sts & mask);
return rc;
--
To view, visit https://review.coreboot.org/28337
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: I27fabb3612251fd8d04f58c05ff9fb2a42ad64b3
Gerrit-Change-Number: 28337
Gerrit-PatchSet: 1
Gerrit-Owner: Subrata Banik <subrata.banik(a)intel.com>
Patrick Rudolph has posted comments on this change. ( https://review.coreboot.org/28336 )
Change subject: soc/cavium: Add dynamic dtb support
......................................................................
Patch Set 2:
(4 comments)
also set the default devicetree in payloads linux and linuxboot to $(obj)/fit.dtb if FIT_DEVICETREE_NAME != "" ?
https://review.coreboot.org/#/c/28336/2/Makefile.inc
File Makefile.inc:
https://review.coreboot.org/#/c/28336/2/Makefile.inc@574
PS2, Line 574: FIT_DEVICETREE_FILE := $(src)/mainboard/$(MAINBOARDDIR)/$(FIT_DEVICETREE_NAME)
$(src)/mainboard/$(MAINBOARDDIR)/$(VARIANT_DIR)/$(FIT_DEVICETREE_NAME)
https://review.coreboot.org/#/c/28336/2/Makefile.inc@582
PS2, Line 582: dtc -I dts -O dtb -o $@ -i $(src)/mainboard/$(MAINBOARDDIR) -i $(src)/mainboard/$(VARIANT_DIR) $<
$(src)/mainboard/$(MAINBOARDDIR)/$(VARIANT_DIR)/
https://review.coreboot.org/#/c/28336/2/Makefile.inc@584
PS2, Line 584: cbfs-files-y += $(FIT_DEVICETREE_NAME)
has nothing to do with FIT. Should be placed in soc/cavium/cn81xx and marked deprecated
https://review.coreboot.org/#/c/28336/2/src/mainboard/Kconfig
File src/mainboard/Kconfig:
https://review.coreboot.org/#/c/28336/2/src/mainboard/Kconfig@186
PS2, Line 186: default ""
Overwrite the default in src/mainboard/cavium/cn81xx_sff_evb
--
To view, visit https://review.coreboot.org/28336
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: Ie470092e424b86e04141b8e2bd2b080a5aadcf58
Gerrit-Change-Number: 28336
Gerrit-PatchSet: 2
Gerrit-Owner: Philipp Deppenwiese <zaolin.daisuki(a)gmail.com>
Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>
Gerrit-CC: Patrick Rudolph <siro(a)das-labor.org>
Gerrit-Comment-Date: Fri, 24 Aug 2018 15:20:52 +0000
Gerrit-HasComments: Yes
Gerrit-HasLabels: No