diff options
| author | Tom Rini <trini@konsulko.com> | 2019-02-18 22:12:59 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-02-18 22:12:59 -0500 |
| commit | b78a9e2212d4d15fd16af41ae33d05a5c33954de (patch) | |
| tree | 994b373c7178adb852da72c2f5ef91d521ffda4b /drivers/fpga/stratix10.c | |
| parent | f14de0014c56093feecf42ca38b8ae5b3878f176 (diff) | |
| parent | 5097ba6177bad8c7e09b50149cacd6fd5020f0c8 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-socfpga
- Misc Gen5 fixes
- stratix10 bugfix
- dwmmc bugfix
Diffstat (limited to 'drivers/fpga/stratix10.c')
| -rw-r--r-- | drivers/fpga/stratix10.c | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/drivers/fpga/stratix10.c b/drivers/fpga/stratix10.c index aae052130e0..d8e32508d48 100644 --- a/drivers/fpga/stratix10.c +++ b/drivers/fpga/stratix10.c @@ -172,7 +172,7 @@ static int send_reconfig_data(const void *rbf_data, size_t rbf_size, u32 resp_windex = 0; u32 resp_count = 0; u32 xfer_count = 0; - u8 resp_err = 0; + int resp_err = 0; u8 cmd_id = 1; u32 args[3]; int ret; @@ -195,11 +195,9 @@ static int send_reconfig_data(const void *rbf_data, size_t rbf_size, rbf_size = 0; } - ret = mbox_send_cmd_only(cmd_id, MBOX_RECONFIG_DATA, + resp_err = mbox_send_cmd_only(cmd_id, MBOX_RECONFIG_DATA, MBOX_CMD_INDIRECT, 3, args); - if (ret) { - resp_err = 1; - } else { + if (!resp_err) { xfer_count++; cmd_id = add_transfer(xfer_pending, MBOX_RESP_BUFFER_SIZE, @@ -222,11 +220,8 @@ static int send_reconfig_data(const void *rbf_data, size_t rbf_size, /* Check for response's status */ if (!resp_err) { - ret = MBOX_RESP_ERR_GET(resp_hdr); - debug("Response error code: %08x\n", ret); - /* Error in response */ - if (ret) - resp_err = 1; + resp_err = MBOX_RESP_ERR_GET(resp_hdr); + debug("Response error code: %08x\n", resp_err); } ret = get_and_clr_transfer(xfer_pending, @@ -239,7 +234,7 @@ static int send_reconfig_data(const void *rbf_data, size_t rbf_size, } if (resp_err && !xfer_count) - return ret; + return resp_err; } } |