| commit | 615c3a846f70c1a36fff9db8aa3e71152b36cbc0 | [log] [tgz] |
|---|---|---|
| author | Redick_Lin <redicklin@google.com> | Mon Sep 11 16:49:22 2023 +0800 |
| committer | Redick_Lin <redicklin@google.com> | Thu Apr 11 16:14:02 2024 +0800 |
| tree | 5056c29e5b21173b4e21d646304959f22c74f699 | |
| parent | 1c7999138f4ddd95542c7ee49bbc3b8017e95cb1 [diff] |
RESTRICT AUTOMERGE: acpm: get the fvmap address from initdata dynamically Bug: 328734858 Change-Id: I124779f03d8cdb0a98e473d5110e82000738aef6 Signed-off-by: Redick_Lin <redicklin@google.com>
diff --git a/drivers/soc/google/acpm/acpm_ipc.c b/drivers/soc/google/acpm/acpm_ipc.c index 4d1ca74..1ada74b 100644 --- a/drivers/soc/google/acpm/acpm_ipc.c +++ b/drivers/soc/google/acpm/acpm_ipc.c
@@ -156,6 +156,12 @@ base_addr += offset; } + if (acpm_ipc->initdata->fvmap) { + base_addr = acpm_srambase; + offset = acpm_ipc->initdata->fvmap; + base_addr += offset; + } + fvmap_base_address = base_addr; } }
diff --git a/drivers/soc/google/acpm/fw_header/framework.h b/drivers/soc/google/acpm/fw_header/framework.h index 682d897..c142395 100644 --- a/drivers/soc/google/acpm/fw_header/framework.h +++ b/drivers/soc/google/acpm/fw_header/framework.h
@@ -76,7 +76,8 @@ u32 preempt_log_buf_front; u32 preempt_log_data; u32 preempt_log_entry_len; - u32 reserved[63]; + u32 fvmap; + u32 reserved[62]; u32 err_log_async_channel; };