From: Tero Kristo <kristo@kernel.org>
To: u-boot@lists.denx.de
Subject: [PATCHv3 19/26] arm: mach-k3: do board config for PM and RM only if supported
Date: Mon, 10 May 2021 11:18:21 +0300 [thread overview]
Message-ID: <41324944-25ce-9598-93de-cf3202c60102@kernel.org> (raw)
In-Reply-To: <4aff135c-8037-67b0-6637-3f9fd3e82fe2@ti.com>
On 09/05/2021 08:54, Vignesh Raghavendra wrote:
>
>
> On 5/5/21 11:25 PM, Tero Kristo wrote:
>> From: Tero Kristo <t-kristo@ti.com>
>>
>> If the raw PM support is built in, we are operating in the split
>> firmware approach mode where RM and PM support is not available. In this
>> case, skip the board config for these two.
>>
>> Signed-off-by: Tero Kristo <t-kristo@ti.com>
>> Signed-off-by: Tero Kristo <kristo@kernel.org>
>> ---
>> arch/arm/mach-k3/sysfw-loader.c | 4 ++++
>> 1 file changed, 4 insertions(+)
>>
>> diff --git a/arch/arm/mach-k3/sysfw-loader.c b/arch/arm/mach-k3/sysfw-loader.c
>> index 0bacfc4d07..64472353c4 100644
>> --- a/arch/arm/mach-k3/sysfw-loader.c
>> +++ b/arch/arm/mach-k3/sysfw-loader.c
>> @@ -159,11 +159,13 @@ static void k3_sysfw_configure_using_fit(void *fit,
>> ret);
>>
>> /* Apply power/clock (PM) specific configuration to SYSFW */
>> +#ifndef CONFIG_K3_DM_FW
>> ret = board_ops->board_config_pm(ti_sci,
>> (u64)(u32)cfg_fragment_addr,
>> (u32)cfg_fragment_size);
>> if (ret)
>> panic("Failed to set board PM configuration (%d)\n", ret);
>> +#endif
>>
>> /* Extract resource management (RM) specific configuration from FIT */
>> ret = fit_get_data_by_name(fit, images, SYSFW_CFG_RM,
>> @@ -172,12 +174,14 @@ static void k3_sysfw_configure_using_fit(void *fit,
>> panic("Error accessing %s node in FIT (%d)\n", SYSFW_CFG_RM,
>> ret);
>>
>> +#ifndef CONFIG_K3_DM_FW
>> /* Apply resource management (RM) configuration to SYSFW */
>> ret = board_ops->board_config_rm(ti_sci,
>> (u64)(u32)cfg_fragment_addr,
>> (u32)cfg_fragment_size);
>> if (ret)
>> panic("Failed to set board RM configuration (%d)\n", ret);
>> +#endif
>>
>> /* Extract security specific configuration from FIT */
>> ret = fit_get_data_by_name(fit, images, SYSFW_CFG_SEC,
>>
>
>
> We still need to send RM CFG to TIFS in case of J721e in order for DMA
> to work at R5 SPL. TIFS needs RM CFG to disable firewalls when R5 SPL
> sends DMA channel cfg requests.
>
> Could you squash the following diff for next version:
Yes, I can squash that in. I believe you have tested this change and it
works? (I will obviously double check at my end though.)
-Tero
>
> diff --git a/arch/arm/mach-k3/sysfw-loader.c b/arch/arm/mach-k3/sysfw-loader.c
> index b95137fbdd..ac719cd46f 100644
> --- a/arch/arm/mach-k3/sysfw-loader.c
> +++ b/arch/arm/mach-k3/sysfw-loader.c
> @@ -263,14 +263,7 @@ static void k3_sysfw_configure_using_fit(void *fit,
> panic("Error accessing %s node in FIT (%d)\n", SYSFW_CFG_RM,
> ret);
>
> -#ifndef CONFIG_K3_DM_FW
> - /* Apply resource management (RM) configuration to SYSFW */
> - ret = board_ops->board_config_rm(ti_sci,
> - (u64)(u32)cfg_fragment_addr,
> - (u32)cfg_fragment_size);
> - if (ret)
> - panic("Failed to set board RM configuration (%d)\n", ret);
> -#else
> +#ifdef CONFIG_K3_DM_FW
> if (copy_bcfg) {
> desc = &bcfg_header->descs[1];
>
> @@ -284,6 +277,13 @@ static void k3_sysfw_configure_using_fit(void *fit,
> }
> #endif
>
> + /* Apply resource management (RM) configuration to SYSFW */
> + ret = board_ops->board_config_rm(ti_sci,
> + (u64)(u32)cfg_fragment_addr,
> + (u32)cfg_fragment_size);
> + if (ret)
> + panic("Failed to set board RM configuration (%d)\n", ret);
> +
> /* Extract security specific configuration from FIT */
> ret = fit_get_data_by_name(fit, images, SYSFW_CFG_SEC,
> &cfg_fragment_addr, &cfg_fragment_size);
>
>
> Regards
> Vignesh
>
next prev parent reply other threads:[~2021-05-10 8:18 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-05 17:55 [PATCHv3 00/26] J72xx: HSM rearch support series Tero Kristo
2021-05-05 17:55 ` [PATCHv3 01/26] lib: rational: copy the rational fraction lib routines from Linux Tero Kristo
2021-05-05 17:55 ` [PATCHv3 02/26] arm: mach-k3: introduce new config option for sysfw split Tero Kristo
2021-05-05 17:55 ` [PATCHv3 03/26] remoteproc: k3-r5: remove sysfw PM calls if not supported Tero Kristo
2021-05-05 17:55 ` [PATCHv3 04/26] common: fit: Update board_fit_image_post_process() to pass fit and node_offset Tero Kristo
2021-05-05 17:55 ` [PATCHv3 05/26] clk: fixed_rate: add API for directly registering fixed rate clocks Tero Kristo
2021-05-05 17:55 ` [PATCHv3 06/26] clk: fix clock tree dump to properly dump out every registered clock Tero Kristo
2021-05-05 17:55 ` [PATCHv3 07/26] clk: do not attempt to fetch clock pointer with null device Tero Kristo
2021-05-05 17:55 ` [PATCHv3 08/26] clk: add support for setting clk rate from cmdline Tero Kristo
2021-05-05 17:55 ` [PATCHv3 09/26] clk: sci-clk: fix return value of set_rate Tero Kristo
2021-05-05 17:55 ` [PATCHv3 10/26] clk: fix assigned-clocks to pass with deferring provider Tero Kristo
2021-05-05 17:55 ` [PATCHv3 11/26] clk: fix set_rate to clean up cached rates for the hierarchy Tero Kristo
2021-05-05 17:55 ` [PATCHv3 12/26] clk: add support for TI K3 SoC PLL Tero Kristo
2021-05-05 17:55 ` [PATCHv3 13/26] clk: add support for TI K3 SoC clocks Tero Kristo
2021-05-05 17:55 ` [PATCHv3 14/26] power: domain: Introduce driver for raw TI K3 PDs Tero Kristo
2021-05-07 0:03 ` Jaehoon Chung
2021-05-07 7:19 ` Tero Kristo
2021-05-05 17:55 ` [PATCHv3 15/26] cmd: ti: pd: Add debug command for K3 power domains Tero Kristo
2021-05-05 17:55 ` [PATCHv3 16/26] tools: k3_fit_atf: add DM binary to the FIT image Tero Kristo
2021-05-05 17:55 ` [PATCHv3 17/26] arm: mach-k3: Add platform data for j721e and j7200 Tero Kristo
2021-05-05 17:55 ` [PATCHv3 18/26] arm: mach-k3: add support for detecting firmware images from FIT Tero Kristo
2021-05-05 17:55 ` [PATCHv3 19/26] arm: mach-k3: do board config for PM and RM only if supported Tero Kristo
2021-05-09 5:54 ` Vignesh Raghavendra
2021-05-10 8:18 ` Tero Kristo [this message]
2021-05-10 8:25 ` Vignesh Raghavendra
2021-05-05 17:55 ` [PATCHv3 20/26] arm: mach-k3: common: Drop main r5 start Tero Kristo
2021-05-05 17:55 ` [PATCHv3 21/26] arm: mach-k3: sysfw-loader: pass boardcfg to sciserver Tero Kristo
2021-05-05 17:55 ` [PATCHv3 22/26] arm: mach-k3: j721e_init: Force early probe of clk-k3 driver Tero Kristo
2021-05-05 17:55 ` [PATCHv3 23/26] configs: j721e_evm_r5: Enable raw access power management features Tero Kristo
2021-05-05 17:55 ` [PATCHv3 24/26] configs: j7200_evm_r5: " Tero Kristo
2021-05-05 17:55 ` [PATCHv3 25/26] board: ti: j72xx: README: update build instructions and image formats Tero Kristo
2021-05-05 17:55 ` [PATCHv3 26/26] arm: dts: k3-j72xx: correct MCU timer1 frequency Tero Kristo
2021-05-05 18:00 ` [PATCHv3 00/26] J72xx: HSM rearch support series Tero Kristo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=41324944-25ce-9598-93de-cf3202c60102@kernel.org \
--to=kristo@kernel.org \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox