Arthur Heymans has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/37040 )
Change subject: drivers/usb/ehci_debug.c: Drop CAR_GLOBAL_MIGRATION support ......................................................................
drivers/usb/ehci_debug.c: Drop CAR_GLOBAL_MIGRATION support
Change-Id: Ib0cd32893ad9540ae55e61e85fb03d194ee55894 Signed-off-by: Arthur Heymans arthur@aheymans.xyz --- M src/drivers/usb/ehci_debug.c 1 file changed, 7 insertions(+), 8 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/40/37040/1
diff --git a/src/drivers/usb/ehci_debug.c b/src/drivers/usb/ehci_debug.c index 398f5db..4851791 100644 --- a/src/drivers/usb/ehci_debug.c +++ b/src/drivers/usb/ehci_debug.c @@ -17,7 +17,6 @@ #include <arch/io.h> #include <device/mmio.h> #include <arch/symbols.h> -#include <arch/early_variables.h> #include <string.h> #include <cbmem.h>
@@ -59,12 +58,12 @@ static int dbgp_enabled(void); static void dbgp_print_data(struct ehci_dbg_port *ehci_debug);
-static struct ehci_debug_info glob_dbg_info CAR_GLOBAL; -static struct ehci_debug_info * glob_dbg_info_p CAR_GLOBAL; +static struct ehci_debug_info glob_dbg_info; +static struct ehci_debug_info * glob_dbg_info_p;
static inline struct ehci_debug_info *dbgp_ehci_info(void) { - if (car_get_ptr(glob_dbg_info_p) == NULL) { + if (glob_dbg_info_p == NULL) { struct ehci_debug_info *info; if (ENV_BOOTBLOCK || ENV_VERSTAGE || ENV_ROMSTAGE) { /* The message likely does not show if we hit this. */ @@ -74,9 +73,9 @@ } else { info = &glob_dbg_info; } - car_set_ptr(glob_dbg_info_p, info); + glob_dbg_info_p = info; } - return car_get_ptr(glob_dbg_info_p); + return glob_dbg_info_p; }
static int dbgp_wait_until_complete(struct ehci_dbg_port *ehci_debug) @@ -713,7 +712,7 @@ if (dbg_info_cbmem == NULL) return; memcpy(dbg_info_cbmem, dbg_info, sizeof(*dbg_info)); - car_set_ptr(glob_dbg_info_p, dbg_info_cbmem); + glob_dbg_info_p = dbg_info_cbmem; return; }
@@ -721,7 +720,7 @@ /* Use state in CBMEM. */ dbg_info_cbmem = cbmem_find(CBMEM_ID_EHCI_DEBUG); if (dbg_info_cbmem) - car_set_ptr(glob_dbg_info_p, dbg_info_cbmem); + glob_dbg_info_p = dbg_info_cbmem; }
rv = usbdebug_hw_init(false);
build bot (Jenkins) has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37040 )
Change subject: drivers/usb/ehci_debug.c: Drop CAR_GLOBAL_MIGRATION support ......................................................................
Patch Set 1:
(2 comments)
https://review.coreboot.org/c/coreboot/+/37040/1/src/drivers/usb/ehci_debug.... File src/drivers/usb/ehci_debug.c:
https://review.coreboot.org/c/coreboot/+/37040/1/src/drivers/usb/ehci_debug.... PS1, Line 62: static struct ehci_debug_info * glob_dbg_info_p; "foo * bar" should be "foo *bar"
https://review.coreboot.org/c/coreboot/+/37040/1/src/drivers/usb/ehci_debug.... PS1, Line 76: glob_dbg_info_p = info; code indent should use tabs where possible
build bot (Jenkins) has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37040 )
Change subject: drivers/usb/ehci_debug.c: Drop CAR_GLOBAL_MIGRATION support ......................................................................
Patch Set 2:
(2 comments)
https://review.coreboot.org/c/coreboot/+/37040/2/src/drivers/usb/ehci_debug.... File src/drivers/usb/ehci_debug.c:
https://review.coreboot.org/c/coreboot/+/37040/2/src/drivers/usb/ehci_debug.... PS2, Line 62: static struct ehci_debug_info * glob_dbg_info_p; "foo * bar" should be "foo *bar"
https://review.coreboot.org/c/coreboot/+/37040/2/src/drivers/usb/ehci_debug.... PS2, Line 76: glob_dbg_info_p = info; code indent should use tabs where possible
build bot (Jenkins) has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37040 )
Change subject: drivers/usb/ehci_debug.c: Drop CAR_GLOBAL_MIGRATION support ......................................................................
Patch Set 3:
(2 comments)
https://review.coreboot.org/c/coreboot/+/37040/3/src/drivers/usb/ehci_debug.... File src/drivers/usb/ehci_debug.c:
https://review.coreboot.org/c/coreboot/+/37040/3/src/drivers/usb/ehci_debug.... PS3, Line 62: static struct ehci_debug_info * glob_dbg_info_p; "foo * bar" should be "foo *bar"
https://review.coreboot.org/c/coreboot/+/37040/3/src/drivers/usb/ehci_debug.... PS3, Line 76: glob_dbg_info_p = info; code indent should use tabs where possible
build bot (Jenkins) has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37040 )
Change subject: drivers/usb/ehci_debug.c: Drop CAR_GLOBAL_MIGRATION support ......................................................................
Patch Set 4:
(2 comments)
https://review.coreboot.org/c/coreboot/+/37040/4/src/drivers/usb/ehci_debug.... File src/drivers/usb/ehci_debug.c:
https://review.coreboot.org/c/coreboot/+/37040/4/src/drivers/usb/ehci_debug.... PS4, Line 62: static struct ehci_debug_info * glob_dbg_info_p; "foo * bar" should be "foo *bar"
https://review.coreboot.org/c/coreboot/+/37040/4/src/drivers/usb/ehci_debug.... PS4, Line 76: glob_dbg_info_p = info; code indent should use tabs where possible
Hello build bot (Jenkins),
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/37040
to look at the new patch set (#5).
Change subject: drivers/usb/ehci_debug.c: Drop CAR_GLOBAL_MIGRATION support ......................................................................
drivers/usb/ehci_debug.c: Drop CAR_GLOBAL_MIGRATION support
Change-Id: Ib0cd32893ad9540ae55e61e85fb03d194ee55894 Signed-off-by: Arthur Heymans arthur@aheymans.xyz --- M src/drivers/usb/ehci_debug.c 1 file changed, 7 insertions(+), 8 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/40/37040/5
build bot (Jenkins) has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37040 )
Change subject: drivers/usb/ehci_debug.c: Drop CAR_GLOBAL_MIGRATION support ......................................................................
Patch Set 5:
(1 comment)
https://review.coreboot.org/c/coreboot/+/37040/5/src/drivers/usb/ehci_debug.... File src/drivers/usb/ehci_debug.c:
https://review.coreboot.org/c/coreboot/+/37040/5/src/drivers/usb/ehci_debug.... PS5, Line 62: static struct ehci_debug_info * glob_dbg_info_p; "foo * bar" should be "foo *bar"
build bot (Jenkins) has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37040 )
Change subject: drivers/usb/ehci_debug.c: Drop CAR_GLOBAL_MIGRATION support ......................................................................
Patch Set 6:
(1 comment)
https://review.coreboot.org/c/coreboot/+/37040/6/src/drivers/usb/ehci_debug.... File src/drivers/usb/ehci_debug.c:
https://review.coreboot.org/c/coreboot/+/37040/6/src/drivers/usb/ehci_debug.... PS6, Line 62: static struct ehci_debug_info * glob_dbg_info_p; "foo * bar" should be "foo *bar"
build bot (Jenkins) has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37040 )
Change subject: drivers/usb/ehci_debug.c: Drop CAR_GLOBAL_MIGRATION support ......................................................................
Patch Set 7:
(1 comment)
https://review.coreboot.org/c/coreboot/+/37040/7/src/drivers/usb/ehci_debug.... File src/drivers/usb/ehci_debug.c:
https://review.coreboot.org/c/coreboot/+/37040/7/src/drivers/usb/ehci_debug.... PS7, Line 62: static struct ehci_debug_info * glob_dbg_info_p; "foo * bar" should be "foo *bar"
HAOUAS Elyes has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37040 )
Change subject: drivers/usb/ehci_debug.c: Drop CAR_GLOBAL_MIGRATION support ......................................................................
Patch Set 7: Code-Review+1
Kyösti Mälkki has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37040 )
Change subject: drivers/usb/ehci_debug.c: Drop CAR_GLOBAL_MIGRATION support ......................................................................
Patch Set 7: Code-Review+2
(1 comment)
https://review.coreboot.org/c/coreboot/+/37040/7/src/drivers/usb/ehci_debug.... File src/drivers/usb/ehci_debug.c:
https://review.coreboot.org/c/coreboot/+/37040/7/src/drivers/usb/ehci_debug.... PS7, Line 68: if (ENV_BOOTBLOCK || ENV_VERSTAGE || ENV_ROMSTAGE) { OT: verstage after romstage probably faila to build
Patrick Georgi has submitted this change. ( https://review.coreboot.org/c/coreboot/+/37040 )
Change subject: drivers/usb/ehci_debug.c: Drop CAR_GLOBAL_MIGRATION support ......................................................................
drivers/usb/ehci_debug.c: Drop CAR_GLOBAL_MIGRATION support
Change-Id: Ib0cd32893ad9540ae55e61e85fb03d194ee55894 Signed-off-by: Arthur Heymans arthur@aheymans.xyz Reviewed-on: https://review.coreboot.org/c/coreboot/+/37040 Reviewed-by: HAOUAS Elyes ehaouas@noos.fr Reviewed-by: Kyösti Mälkki kyosti.malkki@gmail.com Tested-by: build bot (Jenkins) no-reply@coreboot.org --- M src/drivers/usb/ehci_debug.c 1 file changed, 7 insertions(+), 8 deletions(-)
Approvals: build bot (Jenkins): Verified Kyösti Mälkki: Looks good to me, approved HAOUAS Elyes: Looks good to me, but someone else must approve
diff --git a/src/drivers/usb/ehci_debug.c b/src/drivers/usb/ehci_debug.c index 398f5db..e77cd85 100644 --- a/src/drivers/usb/ehci_debug.c +++ b/src/drivers/usb/ehci_debug.c @@ -17,7 +17,6 @@ #include <arch/io.h> #include <device/mmio.h> #include <arch/symbols.h> -#include <arch/early_variables.h> #include <string.h> #include <cbmem.h>
@@ -59,12 +58,12 @@ static int dbgp_enabled(void); static void dbgp_print_data(struct ehci_dbg_port *ehci_debug);
-static struct ehci_debug_info glob_dbg_info CAR_GLOBAL; -static struct ehci_debug_info * glob_dbg_info_p CAR_GLOBAL; +static struct ehci_debug_info glob_dbg_info; +static struct ehci_debug_info * glob_dbg_info_p;
static inline struct ehci_debug_info *dbgp_ehci_info(void) { - if (car_get_ptr(glob_dbg_info_p) == NULL) { + if (glob_dbg_info_p == NULL) { struct ehci_debug_info *info; if (ENV_BOOTBLOCK || ENV_VERSTAGE || ENV_ROMSTAGE) { /* The message likely does not show if we hit this. */ @@ -74,9 +73,9 @@ } else { info = &glob_dbg_info; } - car_set_ptr(glob_dbg_info_p, info); + glob_dbg_info_p = info; } - return car_get_ptr(glob_dbg_info_p); + return glob_dbg_info_p; }
static int dbgp_wait_until_complete(struct ehci_dbg_port *ehci_debug) @@ -713,7 +712,7 @@ if (dbg_info_cbmem == NULL) return; memcpy(dbg_info_cbmem, dbg_info, sizeof(*dbg_info)); - car_set_ptr(glob_dbg_info_p, dbg_info_cbmem); + glob_dbg_info_p = dbg_info_cbmem; return; }
@@ -721,7 +720,7 @@ /* Use state in CBMEM. */ dbg_info_cbmem = cbmem_find(CBMEM_ID_EHCI_DEBUG); if (dbg_info_cbmem) - car_set_ptr(glob_dbg_info_p, dbg_info_cbmem); + glob_dbg_info_p = dbg_info_cbmem; }
rv = usbdebug_hw_init(false);