mirror of
https://github.com/brain-hackers/u-boot-brain
synced 2024-06-09 15:26:03 +09:00
xilinx: zynqmp: synchronize firmware call return payload
Removes duplicated definition of PAYLOAD_ARG_CNT and define it in the firmware driver. Additionally fixes payload buffer declarations without macro usage Signed-off-by: Ibai Erkiaga <ibai.erkiaga-elorza@xilinx.com> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
This commit is contained in:
parent
e8deb22185
commit
f6cccbb5f2
|
@ -8,7 +8,5 @@ enum {
|
||||||
TCM_SPLIT,
|
TCM_SPLIT,
|
||||||
};
|
};
|
||||||
|
|
||||||
#define PAYLOAD_ARG_CNT 5U
|
|
||||||
|
|
||||||
void tcm_init(u8 mode);
|
void tcm_init(u8 mode);
|
||||||
void mem_map_fill(void);
|
void mem_map_fill(void);
|
||||||
|
|
|
@ -7,8 +7,6 @@
|
||||||
#ifndef _ASM_ARCH_SYS_PROTO_H
|
#ifndef _ASM_ARCH_SYS_PROTO_H
|
||||||
#define _ASM_ARCH_SYS_PROTO_H
|
#define _ASM_ARCH_SYS_PROTO_H
|
||||||
|
|
||||||
#define PAYLOAD_ARG_CNT 5
|
|
||||||
|
|
||||||
#define ZYNQMP_CSU_SILICON_VER_MASK 0xF
|
#define ZYNQMP_CSU_SILICON_VER_MASK 0xF
|
||||||
#define KEY_PTR_LEN 32
|
#define KEY_PTR_LEN 32
|
||||||
|
|
||||||
|
|
|
@ -16,7 +16,7 @@ static int do_versal_load_pdi(struct cmd_tbl *cmdtp, int flag, int argc,
|
||||||
char * const argv[])
|
char * const argv[])
|
||||||
{
|
{
|
||||||
u32 buf_lo, buf_hi;
|
u32 buf_lo, buf_hi;
|
||||||
u32 ret_payload[5];
|
u32 ret_payload[PAYLOAD_ARG_CNT];
|
||||||
ulong addr, *pdi_buf;
|
ulong addr, *pdi_buf;
|
||||||
size_t len;
|
size_t len;
|
||||||
int ret;
|
int ret;
|
||||||
|
|
|
@ -32,7 +32,7 @@ static int versal_load(xilinx_desc *desc, const void *buf, size_t bsize,
|
||||||
ulong bin_buf;
|
ulong bin_buf;
|
||||||
int ret;
|
int ret;
|
||||||
u32 buf_lo, buf_hi;
|
u32 buf_lo, buf_hi;
|
||||||
u32 ret_payload[5];
|
u32 ret_payload[PAYLOAD_ARG_CNT];
|
||||||
|
|
||||||
bin_buf = versal_align_dma_buffer((ulong *)buf, bsize);
|
bin_buf = versal_align_dma_buffer((ulong *)buf, bsize);
|
||||||
|
|
||||||
|
|
|
@ -77,6 +77,15 @@ enum pm_api_id {
|
||||||
|
|
||||||
#define PMUFW_V1_0 ((1 << ZYNQMP_PM_VERSION_MAJOR_SHIFT) | 0)
|
#define PMUFW_V1_0 ((1 << ZYNQMP_PM_VERSION_MAJOR_SHIFT) | 0)
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Return payload size
|
||||||
|
* Not every firmware call expects the same amount of return bytes, however the
|
||||||
|
* firmware driver always copies 5 bytes from RX buffer to the ret_payload
|
||||||
|
* buffer. Therefore allocating with this defined value is recommended to avoid
|
||||||
|
* overflows.
|
||||||
|
*/
|
||||||
|
#define PAYLOAD_ARG_CNT 5U
|
||||||
|
|
||||||
unsigned int zynqmp_firmware_version(void);
|
unsigned int zynqmp_firmware_version(void);
|
||||||
void zynqmp_pmufw_load_config_object(const void *cfg_obj, size_t size);
|
void zynqmp_pmufw_load_config_object(const void *cfg_obj, size_t size);
|
||||||
int xilinx_pm_request(u32 api_id, u32 arg0, u32 arg1, u32 arg2,
|
int xilinx_pm_request(u32 api_id, u32 arg0, u32 arg1, u32 arg2,
|
||||||
|
|
Loading…
Reference in New Issue
Block a user