mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Xu Yilun <yilun.xu@intel.com>
To: "Ilpo Järvinen" <ilpo.jarvinen@linux.intel.com>
Cc: Wu Hao <hao.wu@intel.com>, Tom Rix <trix@redhat.com>,
	Moritz Fischer <mdf@kernel.org>,
	linux-fpga@vger.kernel.org, Lee Jones <lee@kernel.org>,
	Jean Delvare <jdelvare@suse.com>,
	Guenter Roeck <linux@roeck-us.net>,
	Russ Weight <russell.h.weight@intel.com>,
	linux-kernel@vger.kernel.org, linux-hwmon@vger.kernel.org
Subject: Re: [PATCH v3 2/4] mfd: intel-m10-bmc: Create m10bmc_sys_update_bits()
Date: Fri, 21 Apr 2023 17:52:54 +0800	[thread overview]
Message-ID: <ZEJc9n5p38eYziDX@yilunxu-OptiPlex-7050> (raw)
In-Reply-To: <20230417092653.16487-3-ilpo.jarvinen@linux.intel.com>

On 2023-04-17 at 12:26:51 +0300, Ilpo Järvinen wrote:
> Wrap regmap_update_bits() with m10bmc_sys_update_bits() in order to be
> able to add additional checks into it.
> 
> 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 | 30 ++++++++++++-------------
>  drivers/mfd/intel-m10-bmc-core.c        |  9 ++++++++
>  include/linux/mfd/intel-m10-bmc.h       |  4 ++++
>  3 files changed, 27 insertions(+), 16 deletions(-)
> 
> diff --git a/drivers/fpga/intel-m10-bmc-sec-update.c b/drivers/fpga/intel-m10-bmc-sec-update.c
> index d7e2f9f461bc..fe0127a58eff 100644
> --- a/drivers/fpga/intel-m10-bmc-sec-update.c
> +++ b/drivers/fpga/intel-m10-bmc-sec-update.c
> @@ -376,12 +376,11 @@ static enum fw_upload_err rsu_update_init(struct m10bmc_sec *sec)
>  	u32 doorbell_reg, progress, status;
>  	int ret, err;
>  
> -	ret = regmap_update_bits(sec->m10bmc->regmap,
> -				 csr_map->base + csr_map->doorbell,
> -				 DRBL_RSU_REQUEST | DRBL_HOST_STATUS,
> -				 DRBL_RSU_REQUEST |
> -				 FIELD_PREP(DRBL_HOST_STATUS,
> -					    HOST_STATUS_IDLE));
> +	ret = m10bmc_sys_update_bits(sec->m10bmc, csr_map->doorbell,
> +				     DRBL_RSU_REQUEST | DRBL_HOST_STATUS,
> +				     DRBL_RSU_REQUEST |
> +				     FIELD_PREP(DRBL_HOST_STATUS,
> +						HOST_STATUS_IDLE));
>  	if (ret)
>  		return FW_UPLOAD_ERR_RW_ERROR;
>  
> @@ -450,11 +449,10 @@ static enum fw_upload_err rsu_send_data(struct m10bmc_sec *sec)
>  	u32 doorbell_reg, status;
>  	int ret;
>  
> -	ret = regmap_update_bits(sec->m10bmc->regmap,
> -				 csr_map->base + csr_map->doorbell,
> -				 DRBL_HOST_STATUS,
> -				 FIELD_PREP(DRBL_HOST_STATUS,
> -					    HOST_STATUS_WRITE_DONE));
> +	ret = m10bmc_sys_update_bits(sec->m10bmc, csr_map->doorbell,
> +				     DRBL_HOST_STATUS,
> +				     FIELD_PREP(DRBL_HOST_STATUS,
> +						HOST_STATUS_WRITE_DONE));
>  	if (ret)
>  		return FW_UPLOAD_ERR_RW_ERROR;
>  
> @@ -517,11 +515,10 @@ static enum fw_upload_err rsu_cancel(struct m10bmc_sec *sec)
>  	if (rsu_prog(doorbell) != RSU_PROG_READY)
>  		return FW_UPLOAD_ERR_BUSY;
>  
> -	ret = regmap_update_bits(sec->m10bmc->regmap,
> -				 csr_map->base + csr_map->doorbell,
> -				 DRBL_HOST_STATUS,
> -				 FIELD_PREP(DRBL_HOST_STATUS,
> -					    HOST_STATUS_ABORT_RSU));
> +	ret = m10bmc_sys_update_bits(sec->m10bmc, csr_map->doorbell,
> +				     DRBL_HOST_STATUS,
> +				     FIELD_PREP(DRBL_HOST_STATUS,
> +						HOST_STATUS_ABORT_RSU));
>  	if (ret)
>  		return FW_UPLOAD_ERR_RW_ERROR;
>  
> @@ -764,3 +761,4 @@ module_platform_driver(intel_m10bmc_sec_driver);
>  MODULE_AUTHOR("Intel Corporation");
>  MODULE_DESCRIPTION("Intel MAX10 BMC Secure Update");
>  MODULE_LICENSE("GPL");
> +MODULE_IMPORT_NS(INTEL_M10_BMC_CORE);
> diff --git a/drivers/mfd/intel-m10-bmc-core.c b/drivers/mfd/intel-m10-bmc-core.c
> index c0b8209fd842..dab1bb152fd6 100644
> --- a/drivers/mfd/intel-m10-bmc-core.c
> +++ b/drivers/mfd/intel-m10-bmc-core.c
> @@ -12,6 +12,15 @@
>  #include <linux/mfd/intel-m10-bmc.h>
>  #include <linux/module.h>
>  
> +int m10bmc_sys_update_bits(struct intel_m10bmc *m10bmc, unsigned int offset,
> +			   unsigned int msk, unsigned int val)
> +{
> +	const struct m10bmc_csr_map *csr_map = m10bmc->info->csr_map;
> +
> +	return regmap_update_bits(m10bmc->regmap, csr_map->base + offset, msk, val);
> +}
> +EXPORT_SYMBOL_NS_GPL(m10bmc_sys_update_bits, INTEL_M10_BMC_CORE);
> +
>  static ssize_t bmc_version_show(struct device *dev,
>  				struct device_attribute *attr, char *buf)
>  {
> diff --git a/include/linux/mfd/intel-m10-bmc.h b/include/linux/mfd/intel-m10-bmc.h
> index 1812ebfa11a8..5418f7279ed0 100644
> --- a/include/linux/mfd/intel-m10-bmc.h
> +++ b/include/linux/mfd/intel-m10-bmc.h
> @@ -251,6 +251,7 @@ struct intel_m10bmc {
>   *
>   * m10bmc_raw_read - read m10bmc register per addr
>   * m10bmc_sys_read - read m10bmc system register per offset
> + * m10bmc_sys_update_bits - update m10bmc system register per offset
>   */
>  static inline int
>  m10bmc_raw_read(struct intel_m10bmc *m10bmc, unsigned int addr,
> @@ -282,6 +283,9 @@ static inline int m10bmc_sys_read(struct intel_m10bmc *m10bmc, unsigned int offs
>  	return m10bmc_raw_read(m10bmc, csr_map->base + offset, val);
>  }
>  
> +int m10bmc_sys_update_bits(struct intel_m10bmc *m10bmc, unsigned int offset,
> +			   unsigned int msk, unsigned int val);
> +
>  /*
>   * MAX10 BMC Core support
>   */
> -- 
> 2.30.2
> 

  parent reply	other threads:[~2023-04-21  1:53 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-04-17  9:26 [PATCH v3 0/4] intel-m10-bmc: Manage register access to control delay during sec update Ilpo Järvinen
2023-04-17  9:26 ` [PATCH v3 1/4] mfd: intel-m10-bmc: Move core symbols to own namespace Ilpo Järvinen
2023-04-20 16:08   ` Xu Yilun
2023-04-27 15:05   ` Lee Jones
2023-04-17  9:26 ` [PATCH v3 2/4] mfd: intel-m10-bmc: Create m10bmc_sys_update_bits() Ilpo Järvinen
2023-04-20 16:09   ` Xu Yilun
2023-04-21  9:52   ` Xu Yilun [this message]
2023-04-27 15:05   ` Lee Jones
2023-04-17  9:26 ` [PATCH v3 3/4] mfd: intel-m10-bmc: Move m10bmc_sys_read() away from header Ilpo Järvinen
2023-04-20 16:10   ` Xu Yilun
2023-04-27 15:06   ` Lee Jones
2023-04-17  9:26 ` [PATCH v3 4/4] mfd: intel-m10-bmc: Manage access to MAX 10 fw handshake registers Ilpo Järvinen
2023-04-20 16:07   ` Xu Yilun
2023-04-20 11:13     ` Lee Jones
2023-04-21  9:52       ` Xu Yilun
2023-04-27 15:07   ` Lee Jones
2023-05-10 11:51     ` Ilpo Järvinen
2023-05-15 10:06       ` Lee Jones

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=ZEJc9n5p38eYziDX@yilunxu-OptiPlex-7050 \
    --to=yilun.xu@intel.com \
    --cc=hao.wu@intel.com \
    --cc=ilpo.jarvinen@linux.intel.com \
    --cc=jdelvare@suse.com \
    --cc=lee@kernel.org \
    --cc=linux-fpga@vger.kernel.org \
    --cc=linux-hwmon@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux@roeck-us.net \
    --cc=mdf@kernel.org \
    --cc=russell.h.weight@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®