2022-12-26 18:04:23

by Ilpo Järvinen

Subject: [PATCH v5 07/10] fpga: m10bmc-sec: Create helpers for rsu status/progress checks

RSU_STAT_* and RSU_PROG_* checks are done in more than one place in the sec
update code. Move the checks into new helper functions.

No function changes intended.

Co-developed-by: Tianfei zhang <[email protected]>
Signed-off-by: Tianfei zhang <[email protected]>
Co-developed-by: Russ Weight <[email protected]>
Signed-off-by: Russ Weight <[email protected]>
Signed-off-by: Ilpo Järvinen <[email protected]>
---
drivers/fpga/intel-m10-bmc-sec-update.c | 59 +++++++++++++------------
1 file changed, 31 insertions(+), 28 deletions(-)

diff --git a/drivers/fpga/intel-m10-bmc-sec-update.c b/drivers/fpga/intel-m10-bmc-sec-update.c
index 9922027856a4..6e58a463619c 100644
--- a/drivers/fpga/intel-m10-bmc-sec-update.c
+++ b/drivers/fpga/intel-m10-bmc-sec-update.c
@@ -257,6 +257,28 @@ static void log_error_regs(struct m10bmc_sec *sec, u32 doorbell)
dev_err(sec->dev, "RSU auth result: 0x%08x\n", auth_result);
}

+static bool rsu_status_ok(u32 status)
+{
+ return (status == RSU_STAT_NORMAL ||
+ status == RSU_STAT_NIOS_OK ||
+ status == RSU_STAT_USER_OK ||
+ status == RSU_STAT_FACTORY_OK);
+}
+
+static bool rsu_progress_done(u32 progress)
+{
+ return (progress == RSU_PROG_IDLE ||
+ progress == RSU_PROG_RSU_DONE);
+}
+
+static bool rsu_progress_busy(u32 progress)
+{
+ return (progress == RSU_PROG_AUTHENTICATING ||
+ progress == RSU_PROG_COPYING ||
+ progress == RSU_PROG_UPDATE_CANCEL ||
+ progress == RSU_PROG_PROGRAM_KEY_HASH);
+}
+
static enum fw_upload_err rsu_check_idle(struct m10bmc_sec *sec)
{
const struct m10bmc_csr_map *csr_map = sec->m10bmc->info->csr_map;
@@ -267,8 +289,7 @@ static enum fw_upload_err rsu_check_idle(struct m10bmc_sec *sec)
if (ret)
return FW_UPLOAD_ERR_RW_ERROR;

- if (rsu_prog(doorbell) != RSU_PROG_IDLE &&
- rsu_prog(doorbell) != RSU_PROG_RSU_DONE) {
+ if (!rsu_progress_done(rsu_prog(doorbell))) {
log_error_regs(sec, doorbell);
return FW_UPLOAD_ERR_BUSY;
}
@@ -288,7 +309,7 @@ static inline bool rsu_start_done(u32 doorbell)
return true;

progress = rsu_prog(doorbell);
- if (progress != RSU_PROG_IDLE && progress != RSU_PROG_RSU_DONE)
+ if (!rsu_progress_done(progress))
return true;

return false;
@@ -397,13 +418,7 @@ static enum fw_upload_err rsu_send_data(struct m10bmc_sec *sec)
return FW_UPLOAD_ERR_RW_ERROR;
}

- switch (rsu_stat(doorbell)) {
- case RSU_STAT_NORMAL:
- case RSU_STAT_NIOS_OK:
- case RSU_STAT_USER_OK:
- case RSU_STAT_FACTORY_OK:
- break;
- default:
+ if (!rsu_status_ok(rsu_stat(doorbell))) {
log_error_regs(sec, doorbell);
return FW_UPLOAD_ERR_HW_ERROR;
}
@@ -418,28 +433,16 @@ static int rsu_check_complete(struct m10bmc_sec *sec, u32 *doorbell)
if (m10bmc_sys_read(sec->m10bmc, csr_map->doorbell, doorbell))
return -EIO;

- switch (rsu_stat(*doorbell)) {
- case RSU_STAT_NORMAL:
- case RSU_STAT_NIOS_OK:
- case RSU_STAT_USER_OK:
- case RSU_STAT_FACTORY_OK:
- break;
- default:
+ if (!rsu_status_ok(rsu_stat(*doorbell)))
return -EINVAL;
- }

- switch (rsu_prog(*doorbell)) {
- case RSU_PROG_IDLE:
- case RSU_PROG_RSU_DONE:
+ if (rsu_progress_done(rsu_prog(*doorbell)))
return 0;
- case RSU_PROG_AUTHENTICATING:
- case RSU_PROG_COPYING:
- case RSU_PROG_UPDATE_CANCEL:
- case RSU_PROG_PROGRAM_KEY_HASH:
+
+ if (rsu_progress_busy(rsu_prog(*doorbell)))
return -EAGAIN;
- default:
- return -EINVAL;
- }
+
+ return -EINVAL;
}

static enum fw_upload_err rsu_cancel(struct m10bmc_sec *sec)
--
2.30.2

2022-12-30 03:57:43

by Xu Yilun

Subject: Re: [PATCH v5 07/10] fpga: m10bmc-sec: Create helpers for rsu status/progress checks

On 2022-12-26 at 19:58:46 +0200, Ilpo J?rvinen wrote:
> RSU_STAT_* and RSU_PROG_* checks are done in more than one place in the sec
> update code. Move the checks into new helper functions.
>
> No function changes intended.
>
> Co-developed-by: Tianfei zhang <[email protected]>
> Signed-off-by: Tianfei zhang <[email protected]>
> Co-developed-by: Russ Weight <[email protected]>
> Signed-off-by: Russ Weight <[email protected]>
> Signed-off-by: Ilpo J?rvinen <[email protected]>

Acked-by: Xu Yilun <[email protected]>

> ---
> drivers/fpga/intel-m10-bmc-sec-update.c | 59 +++++++++++++------------
> 1 file changed, 31 insertions(+), 28 deletions(-)
>
> diff --git a/drivers/fpga/intel-m10-bmc-sec-update.c b/drivers/fpga/intel-m10-bmc-sec-update.c
> index 9922027856a4..6e58a463619c 100644
> --- a/drivers/fpga/intel-m10-bmc-sec-update.c
> +++ b/drivers/fpga/intel-m10-bmc-sec-update.c
> @@ -257,6 +257,28 @@ static void log_error_regs(struct m10bmc_sec *sec, u32 doorbell)
> dev_err(sec->dev, "RSU auth result: 0x%08x\n", auth_result);
> }
>
> +static bool rsu_status_ok(u32 status)
> +{
> + return (status == RSU_STAT_NORMAL ||
> + status == RSU_STAT_NIOS_OK ||
> + status == RSU_STAT_USER_OK ||
> + status == RSU_STAT_FACTORY_OK);
> +}
> +
> +static bool rsu_progress_done(u32 progress)
> +{
> + return (progress == RSU_PROG_IDLE ||
> + progress == RSU_PROG_RSU_DONE);
> +}
> +
> +static bool rsu_progress_busy(u32 progress)
> +{
> + return (progress == RSU_PROG_AUTHENTICATING ||
> + progress == RSU_PROG_COPYING ||
> + progress == RSU_PROG_UPDATE_CANCEL ||
> + progress == RSU_PROG_PROGRAM_KEY_HASH);
> +}
> +
> static enum fw_upload_err rsu_check_idle(struct m10bmc_sec *sec)
> {
> const struct m10bmc_csr_map *csr_map = sec->m10bmc->info->csr_map;
> @@ -267,8 +289,7 @@ static enum fw_upload_err rsu_check_idle(struct m10bmc_sec *sec)
> if (ret)
> return FW_UPLOAD_ERR_RW_ERROR;
>
> - if (rsu_prog(doorbell) != RSU_PROG_IDLE &&
> - rsu_prog(doorbell) != RSU_PROG_RSU_DONE) {
> + if (!rsu_progress_done(rsu_prog(doorbell))) {
> log_error_regs(sec, doorbell);
> return FW_UPLOAD_ERR_BUSY;
> }
> @@ -288,7 +309,7 @@ static inline bool rsu_start_done(u32 doorbell)
> return true;
>
> progress = rsu_prog(doorbell);
> - if (progress != RSU_PROG_IDLE && progress != RSU_PROG_RSU_DONE)
> + if (!rsu_progress_done(progress))
> return true;
>
> return false;
> @@ -397,13 +418,7 @@ static enum fw_upload_err rsu_send_data(struct m10bmc_sec *sec)
> return FW_UPLOAD_ERR_RW_ERROR;
> }
>
> - switch (rsu_stat(doorbell)) {
> - case RSU_STAT_NORMAL:
> - case RSU_STAT_NIOS_OK:
> - case RSU_STAT_USER_OK:
> - case RSU_STAT_FACTORY_OK:
> - break;
> - default:
> + if (!rsu_status_ok(rsu_stat(doorbell))) {
> log_error_regs(sec, doorbell);
> return FW_UPLOAD_ERR_HW_ERROR;
> }
> @@ -418,28 +433,16 @@ static int rsu_check_complete(struct m10bmc_sec *sec, u32 *doorbell)
> if (m10bmc_sys_read(sec->m10bmc, csr_map->doorbell, doorbell))
> return -EIO;
>
> - switch (rsu_stat(*doorbell)) {
> - case RSU_STAT_NORMAL:
> - case RSU_STAT_NIOS_OK:
> - case RSU_STAT_USER_OK:
> - case RSU_STAT_FACTORY_OK:
> - break;
> - default:
> + if (!rsu_status_ok(rsu_stat(*doorbell)))
> return -EINVAL;
> - }
>
> - switch (rsu_prog(*doorbell)) {
> - case RSU_PROG_IDLE:
> - case RSU_PROG_RSU_DONE:
> + if (rsu_progress_done(rsu_prog(*doorbell)))
> return 0;
> - case RSU_PROG_AUTHENTICATING:
> - case RSU_PROG_COPYING:
> - case RSU_PROG_UPDATE_CANCEL:
> - case RSU_PROG_PROGRAM_KEY_HASH:
> +
> + if (rsu_progress_busy(rsu_prog(*doorbell)))
> return -EAGAIN;
> - default:
> - return -EINVAL;
> - }
> +
> + return -EINVAL;
> }
>
> static enum fw_upload_err rsu_cancel(struct m10bmc_sec *sec)
> --
> 2.30.2
>