From: Xu Yilun <yilun.xu@intel.com>
To: "Ilpo Järvinen" <ilpo.jarvinen@linux.intel.com>
Cc: linux-fpga@vger.kernel.org, Wu Hao <hao.wu@intel.com>,
Tom Rix <trix@redhat.com>, Moritz Fischer <mdf@kernel.org>,
Lee Jones <lee@kernel.org>,
Matthew Gerlach <matthew.gerlach@linux.intel.com>,
Russ Weight <russell.h.weight@intel.com>,
Tianfei zhang <tianfei.zhang@intel.com>,
Mark Brown <broonie@kernel.org>,
Marco Pagani <marpagan@redhat.com>,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH v5 07/10] fpga: m10bmc-sec: Create helpers for rsu status/progress checks
Date: Fri, 30 Dec 2022 11:16:25 +0800 [thread overview]
Message-ID: <Y65YCV19NSyhUx2D@yilunxu-OptiPlex-7050> (raw)
In-Reply-To: <20221226175849.13056-8-ilpo.jarvinen@linux.intel.com>
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 <tianfei.zhang@intel.com>
> Signed-off-by: Tianfei zhang <tianfei.zhang@intel.com>
> Co-developed-by: Russ Weight <russell.h.weight@intel.com>
> Signed-off-by: Russ Weight <russell.h.weight@intel.com>
> Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Acked-by: Xu Yilun <yilun.xu@intel.com>
> ---
> 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
>
next prev parent reply other threads:[~2022-12-30 3:26 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-26 17:58 [PATCH v5 00/10] intel-m10-bmc: Split BMC to core and SPI parts & add PMCI+N6000 support Ilpo Järvinen
2022-12-26 17:58 ` [PATCH v5 01/10] mfd: intel-m10-bmc: Create m10bmc_platform_info for type specific info Ilpo Järvinen
2023-01-09 17:43 ` Lee Jones
2023-01-09 18:04 ` Ilpo Järvinen
2023-01-10 10:05 ` Lee Jones
2022-12-26 17:58 ` [PATCH v5 02/10] mfd: intel-m10-bmc: Rename the local variables Ilpo Järvinen
2023-01-09 18:07 ` Lee Jones
2023-01-09 18:17 ` Ilpo Järvinen
2023-01-10 10:13 ` Lee Jones
2022-12-26 17:58 ` [PATCH v5 03/10] mfd: intel-m10-bmc: Split into core and spi specific parts Ilpo Järvinen
2023-01-13 14:42 ` Lee Jones
2022-12-26 17:58 ` [PATCH v5 04/10] mfd: intel-m10-bmc: Support multiple CSR register layouts Ilpo Järvinen
2023-01-13 14:44 ` Lee Jones
2022-12-26 17:58 ` [PATCH v5 05/10] fpga: intel-m10-bmc: Rework flash read/write Ilpo Järvinen
2022-12-26 17:58 ` [PATCH v5 06/10] mfd: intel-m10-bmc: Downscope SPI defines & prefix with M10BMC_N3000 Ilpo Järvinen
2023-01-10 17:05 ` Lee Jones
2022-12-26 17:58 ` [PATCH v5 07/10] fpga: m10bmc-sec: Create helpers for rsu status/progress checks Ilpo Järvinen
2022-12-30 3:16 ` Xu Yilun [this message]
2022-12-26 17:58 ` [PATCH v5 08/10] fpga: m10bmc-sec: Differentiate rsu status from doorbell in csr map Ilpo Järvinen
2022-12-30 4:32 ` Xu Yilun
2022-12-30 10:23 ` Ilpo Järvinen
2023-01-03 9:34 ` Xu Yilun
2023-01-03 12:12 ` Ilpo Järvinen
2022-12-26 17:58 ` [PATCH v5 09/10] mfd: intel-m10-bmc: Add PMCI driver Ilpo Järvinen
2023-01-13 14:40 ` Lee Jones
2023-01-13 15:08 ` Ilpo Järvinen
2022-12-26 17:58 ` [PATCH v5 10/10] fpga: m10bmc-sec: Add support for N6000 Ilpo Järvinen
2022-12-30 6:10 ` Xu Yilun
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=Y65YCV19NSyhUx2D@yilunxu-OptiPlex-7050 \
--to=yilun.xu@intel.com \
--cc=broonie@kernel.org \
--cc=hao.wu@intel.com \
--cc=ilpo.jarvinen@linux.intel.com \
--cc=lee@kernel.org \
--cc=linux-fpga@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=marpagan@redhat.com \
--cc=matthew.gerlach@linux.intel.com \
--cc=mdf@kernel.org \
--cc=russell.h.weight@intel.com \
--cc=tianfei.zhang@intel.com \
--cc=trix@redhat.com \
/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
all inboxes | Powered by JetHome®