diff options
| author | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2019-09-05 18:17:56 +0300 |
|---|---|---|
| committer | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2019-09-11 05:12:53 +0000 |
| commit | 3de9d774b17891720c8cd4e43010d8c6820707ed (patch) | |
| tree | 3a51a8abdba3f2374f9872dcfb3acdb727dcb4fe /src/drivers/usb | |
| parent | 3dd23a5e72572dd164b3edfae210287b97235c56 (diff) | |
arch/x86: Move ehci_dbg_info outside _car_relocatable_data
As code already used CBMEM hooks to switch from CAR to CBMEM
it was never necessary to have the structure declared inside
_car_relocatable_data.
Switch to use car_[get|set]_ptr is mostly for consistency, but
should also enable use of usbdebug with FSP1.0 romstage.
Change-Id: I636251085d84e52a71a1d5d27d795bb94a07422d
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/35288
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-by: Furquan Shaikh <furquan@google.com>
Diffstat (limited to 'src/drivers/usb')
| -rw-r--r-- | src/drivers/usb/ehci_debug.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/drivers/usb/ehci_debug.c b/src/drivers/usb/ehci_debug.c index 638b7c7e58..059679590f 100644 --- a/src/drivers/usb/ehci_debug.c +++ b/src/drivers/usb/ehci_debug.c @@ -67,7 +67,7 @@ static struct ehci_debug_info * glob_dbg_info_p CAR_GLOBAL; static inline struct ehci_debug_info *dbgp_ehci_info(void) { - if (car_get_var(glob_dbg_info_p) == NULL) { + if (car_get_ptr(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. */ @@ -77,9 +77,9 @@ static inline struct ehci_debug_info *dbgp_ehci_info(void) } else { info = &glob_dbg_info; } - car_set_var(glob_dbg_info_p, info); + car_set_ptr(glob_dbg_info_p, info); } - return car_get_var(glob_dbg_info_p); + return car_get_ptr(glob_dbg_info_p); } static int dbgp_wait_until_complete(struct ehci_dbg_port *ehci_debug) @@ -716,7 +716,7 @@ static void migrate_ehci_debug(int is_recovery) if (dbg_info_cbmem == NULL) return; memcpy(dbg_info_cbmem, dbg_info, sizeof(*dbg_info)); - car_set_var(glob_dbg_info_p, dbg_info_cbmem); + car_set_ptr(glob_dbg_info_p, dbg_info_cbmem); return; } @@ -724,7 +724,7 @@ static void migrate_ehci_debug(int is_recovery) /* Use state in CBMEM. */ dbg_info_cbmem = cbmem_find(CBMEM_ID_EHCI_DEBUG); if (dbg_info_cbmem) - car_set_var(glob_dbg_info_p, dbg_info_cbmem); + car_set_ptr(glob_dbg_info_p, dbg_info_cbmem); } rv = usbdebug_hw_init(false); |