shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-05 18:41:58 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'e1d516524cf376f1a87f089b742793840587e4ec'

Browse Source 
* commit 'e1d516524cf376f1a87f089b742793840587e4ec':
  clk: rockchip: Add missing MODULE_LICENSE()
  firmware: rockchip_sip: add valid value check for map->bank_bit_first

Change-Id: I2971d6fd03d362c96a3ab051814990f661c1ad3c
This commit is contained in:
Tao Huang
2025-04-23 20:28:39 +08:00
parent f03fb7b7e5 e1d516524c
commit dc1c6044bb
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/clk/rockchip/clk.c
View File

@@ -836,4 +836,6 @@ void rockchip_clk_disable_unused(void)
}
}
EXPORT_SYMBOL_GPL(rockchip_clk_disable_unused);
MODULE_LICENSE("GPL");
#endif /* MODULE */

15
drivers/firmware/rockchip_sip.c
View File

@@ -211,28 +211,29 @@ struct dram_addrmap_info *sip_smc_get_dram_map(void)
{
struct arm_smccc_res res;
static struct dram_addrmap_info *map;
struct dram_addrmap_info *m;
if (map)
return map;
return map->bank_bit_first ? map : NULL;
/* Request share memory size 4KB */
res = sip_smc_request_share_mem(1, SHARE_PAGE_TYPE_DDR_ADDRMAP);
if (res.a0 != 0) {
pr_err("no ATF memory for init\n");
pr_err("%s: request share memory error!\n", __func__);
return NULL;
}
map = (struct dram_addrmap_info *)res.a1;
m = (struct dram_addrmap_info *)res.a1;
memset(m, 0x0, sizeof(*m));
res = sip_smc_dram(SHARE_PAGE_TYPE_DDR_ADDRMAP, 0,
ROCKCHIP_SIP_CONFIG_DRAM_ADDRMAP_GET);
if (res.a0) {
pr_err("rockchip_sip_config_dram_init error:%lx\n", res.a0);
map = NULL;
pr_err("rockchip_sip_config_dram_addrmap_get error:%lx\n", res.a0);
return NULL;
}
map = m;
return map;
return map->bank_bit_first ? map : NULL;
}
EXPORT_SYMBOL_GPL(sip_smc_get_dram_map);