| Message ID | 20220705080058.92532-3-tianfei.zhang@intel.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | add Intel FPGA image loader support | expand |
On Tue, Jul 05, 2022 at 04:00:57AM -0400, Tianfei Zhang wrote: > From: Russ Weight <russell.h.weight@intel.com> > > Add the available_images and image_load sysfs files. The available_images > file returns a space separated list of key words that may be written > into the image_load file. These keywords describe an FPGA, BMC, or > firmware image in FLASH or EEPROM storage that may be loaded. > > The image_load sysfs file may be written with a key word to trigger a > reload of an FPGA, BMC, or firmware image from FLASH or EEPROM. > > Signed-off-by: Russ Weight <russell.h.weight@intel.com> > Signed-off-by: Tianfei Zhang <tianfei.zhang@intel.com> > --- > .../sysfs-driver-intel-m10-bmc-sec-update | 21 ++++ > drivers/fpga/intel-m10-bmc-sec-update.c | 104 ++++++++++++++++++ > 2 files changed, 125 insertions(+) > > diff --git a/Documentation/ABI/testing/sysfs-driver-intel-m10-bmc-sec-update b/Documentation/ABI/testing/sysfs-driver-intel-m10-bmc-sec-update > index 0a41afe0ab4c..8ded1a59d4db 100644 > --- a/Documentation/ABI/testing/sysfs-driver-intel-m10-bmc-sec-update > +++ b/Documentation/ABI/testing/sysfs-driver-intel-m10-bmc-sec-update > @@ -59,3 +59,24 @@ Contact: Russ Weight <russell.h.weight@intel.com> > Description: Read only. Returns number of times the secure update > staging area has been flashed. > Format: "%u". > + > +What: /sys/bus/platform/drivers/intel-m10bmc-sec-update/.../control/available_images > +Date: July 2022 > +KernelVersion: 5.20 > +Contact: Russ Weight <russell.h.weight@intel.com> > +Description: Read-only. This file returns a space separated list of > + key words that may be written into the image_load file > + described below. These keywords decribe an FPGA, BMC, > + or firmware image in FLASH or EEPROM storage that may > + be loaded. > + > +What: /sys/bus/platform/drivers/intel-m10bmc-sec-update/.../control/image_load > +Date: July 2022 > +KernelVersion: 5.20 > +Contact: Russ Weight <russell.h.weight@intel.com> > +Description: Write-only. A key word may be written to this file to > + trigger a reload of an FPGA, BMC, or firmware image from A FPGA reprogramming could be handled by FPGA manager, so we may not introduce a new API for the same purpose. Thanks, Yilun > + FLASH or EEPROM. Refer to the available_images file for a > + list of supported key words for the underlying device. > + Writing an unsupported string to this file will result in > + EINVAL being returned. > diff --git a/drivers/fpga/intel-m10-bmc-sec-update.c b/drivers/fpga/intel-m10-bmc-sec-update.c > index 72c677c910de..640690e6c131 100644 > --- a/drivers/fpga/intel-m10-bmc-sec-update.c > +++ b/drivers/fpga/intel-m10-bmc-sec-update.c > @@ -14,6 +14,8 @@ > #include <linux/platform_device.h> > #include <linux/slab.h> > > +struct image_load; > + > struct m10bmc_sec { > struct device *dev; > struct intel_m10bmc *m10bmc; > @@ -21,6 +23,12 @@ struct m10bmc_sec { > char *fw_name; > u32 fw_name_id; > bool cancel_request; > + struct image_load *image_load; /* terminated with { } member */ > +}; > + > +struct image_load { > + const char *name; > + int (*load_image)(struct m10bmc_sec *sec); > }; > > static DEFINE_XARRAY_ALLOC(fw_upload_xa); > @@ -137,6 +145,54 @@ DEVICE_ATTR_SEC_CSK_RO(pr, PR_PROG_ADDR + CSK_VEC_OFFSET); > > #define FLASH_COUNT_SIZE 4096 /* count stored as inverted bit vector */ > > +static ssize_t available_images_show(struct device *dev, > + struct device_attribute *attr, char *buf) > +{ > + struct m10bmc_sec *sec = dev_get_drvdata(dev); > + const struct image_load *hndlr; > + ssize_t count = 0; > + > + for (hndlr = sec->image_load; hndlr->name; hndlr++) { > + count += scnprintf(buf + count, PAGE_SIZE - count, > + "%s ", hndlr->name); > + } > + > + buf[count - 1] = '\n'; > + > + return count; > +} > +static DEVICE_ATTR_RO(available_images); > + > +static ssize_t image_load_store(struct device *dev, > + struct device_attribute *attr, > + const char *buf, size_t count) > +{ > + struct m10bmc_sec *sec = dev_get_drvdata(dev); > + const struct image_load *hndlr; > + int ret = -EINVAL; > + > + for (hndlr = sec->image_load; hndlr->name; hndlr++) { > + if (sysfs_streq(buf, hndlr->name)) { > + ret = hndlr->load_image(sec); > + break; > + } > + } > + > + return ret ? : count; > +} > +static DEVICE_ATTR_WO(image_load); > + > +static struct attribute *m10bmc_control_attrs[] = { > + &dev_attr_available_images.attr, > + &dev_attr_image_load.attr, > + NULL, > +}; > + > +static struct attribute_group m10bmc_control_attr_group = { > + .name = "control", > + .attrs = m10bmc_control_attrs, > +}; > + > static ssize_t flash_count_show(struct device *dev, > struct device_attribute *attr, char *buf) > { > @@ -195,6 +251,7 @@ static struct attribute_group m10bmc_security_attr_group = { > > static const struct attribute_group *m10bmc_sec_attr_groups[] = { > &m10bmc_security_attr_group, > + &m10bmc_control_attr_group, > NULL, > }; > > @@ -208,6 +265,52 @@ static void log_error_regs(struct m10bmc_sec *sec, u32 doorbell) > dev_err(sec->dev, "RSU auth result: 0x%08x\n", auth_result); > } > > +static int m10bmc_sec_bmc_image_load(struct m10bmc_sec *sec, > + unsigned int val) > +{ > + u32 doorbell; > + int ret; > + > + if (val > 1) { > + dev_err(sec->dev, "invalid reload val = %d\n", val); > + return -EINVAL; > + } > + > + ret = m10bmc_sys_read(sec->m10bmc, M10BMC_DOORBELL, &doorbell); > + if (ret) > + return ret; > + > + if (doorbell & DRBL_REBOOT_DISABLED) > + return -EBUSY; > + > + return m10bmc_sys_update_bits(sec->m10bmc, M10BMC_DOORBELL, > + DRBL_CONFIG_SEL | DRBL_REBOOT_REQ, > + FIELD_PREP(DRBL_CONFIG_SEL, val) | > + DRBL_REBOOT_REQ); > +} > + > +static int m10bmc_sec_bmc_image_load_0(struct m10bmc_sec *sec) > +{ > + return m10bmc_sec_bmc_image_load(sec, 0); > +} > + > +static int m10bmc_sec_bmc_image_load_1(struct m10bmc_sec *sec) > +{ > + return m10bmc_sec_bmc_image_load(sec, 1); > +} > + > +static struct image_load m10bmc_image_load_hndlrs[] = { > + { > + .name = "bmc_factory", > + .load_image = m10bmc_sec_bmc_image_load_1, > + }, > + { > + .name = "bmc_user", > + .load_image = m10bmc_sec_bmc_image_load_0, > + }, > + {} > +}; > + > static enum fw_upload_err rsu_check_idle(struct m10bmc_sec *sec) > { > u32 doorbell; > @@ -565,6 +668,7 @@ static int m10bmc_sec_probe(struct platform_device *pdev) > sec->dev = &pdev->dev; > sec->m10bmc = dev_get_drvdata(pdev->dev.parent); > dev_set_drvdata(&pdev->dev, sec); > + sec->image_load = m10bmc_image_load_hndlrs; > > ret = xa_alloc(&fw_upload_xa, &sec->fw_name_id, sec, > xa_limit_32b, GFP_KERNEL); > -- > 2.26.2
> -----Original Message----- > From: Xu, Yilun <yilun.xu@intel.com> > Sent: Thursday, July 7, 2022 10:00 AM > To: Zhang, Tianfei <tianfei.zhang@intel.com> > Cc: mdf@kernel.org; lee.jones@linaro.org; Weight, Russell H > <russell.h.weight@intel.com>; Wu, Hao <hao.wu@intel.com>; > trix@redhat.com; linux-fpga@vger.kernel.org > Subject: Re: [PATCH v1 2/3] fpga: m10bmc-sec: add sysfs to load bmc images > > On Tue, Jul 05, 2022 at 04:00:57AM -0400, Tianfei Zhang wrote: > > From: Russ Weight <russell.h.weight@intel.com> > > > > Add the available_images and image_load sysfs files. The > > available_images file returns a space separated list of key words that > > may be written into the image_load file. These keywords describe an > > FPGA, BMC, or firmware image in FLASH or EEPROM storage that may be > loaded. > > > > The image_load sysfs file may be written with a key word to trigger a > > reload of an FPGA, BMC, or firmware image from FLASH or EEPROM. > > > > Signed-off-by: Russ Weight <russell.h.weight@intel.com> > > Signed-off-by: Tianfei Zhang <tianfei.zhang@intel.com> > > --- > > .../sysfs-driver-intel-m10-bmc-sec-update | 21 ++++ > > drivers/fpga/intel-m10-bmc-sec-update.c | 104 ++++++++++++++++++ > > 2 files changed, 125 insertions(+) > > > > diff --git > > a/Documentation/ABI/testing/sysfs-driver-intel-m10-bmc-sec-update > > b/Documentation/ABI/testing/sysfs-driver-intel-m10-bmc-sec-update > > index 0a41afe0ab4c..8ded1a59d4db 100644 > > --- a/Documentation/ABI/testing/sysfs-driver-intel-m10-bmc-sec-update > > +++ b/Documentation/ABI/testing/sysfs-driver-intel-m10-bmc-sec-update > > @@ -59,3 +59,24 @@ Contact: Russ Weight > <russell.h.weight@intel.com> > > Description: Read only. Returns number of times the secure update > > staging area has been flashed. > > Format: "%u". > > + > > +What: /sys/bus/platform/drivers/intel-m10bmc-sec- > update/.../control/available_images > > +Date: July 2022 > > +KernelVersion: 5.20 > > +Contact: Russ Weight <russell.h.weight@intel.com> > > +Description: Read-only. This file returns a space separated list of > > + key words that may be written into the image_load file > > + described below. These keywords decribe an FPGA, BMC, > > + or firmware image in FLASH or EEPROM storage that may > > + be loaded. > > + > > +What: /sys/bus/platform/drivers/intel-m10bmc-sec- > update/.../control/image_load > > +Date: July 2022 > > +KernelVersion: 5.20 > > +Contact: Russ Weight <russell.h.weight@intel.com> > > +Description: Write-only. A key word may be written to this file to > > + trigger a reload of an FPGA, BMC, or firmware image from > > A FPGA reprogramming could be handled by FPGA manager, so we may not > introduce a new API for the same purpose. The FPGA reprogramming is in the MAX10 BMC Secure Update drive, which instantiates the new Firmware Upload functionality, like update the image into flash. Those functionalities have implemented by Russ's patchset. https://lore.kernel.org/linux-fpga/20220606160038.846236-1-russell.h.weight@intel.com/ This patch doesn't related to the FPGA reprogramming, it just do the FPGA/BMC image reload, and trigger the FPGA/BMC to reload a new image from different flash page. For example, on N3000 card, the FPGA image has 2 pages, page 0 for factory image, page 1 for user image. This patch was easy to select and trigger the FPGA to reload the image via sysfs file, like factory or user image. I will change the title of patch change in next version patch: fpga: m10bmc-sec: add sysfs files to reload fpga/bmc images > > Thanks, > Yilun > > > + FLASH or EEPROM. Refer to the available_images file for a > > + list of supported key words for the underlying device. > > + Writing an unsupported string to this file will result in > > + EINVAL being returned. > > diff --git a/drivers/fpga/intel-m10-bmc-sec-update.c > > b/drivers/fpga/intel-m10-bmc-sec-update.c > > index 72c677c910de..640690e6c131 100644 > > --- a/drivers/fpga/intel-m10-bmc-sec-update.c > > +++ b/drivers/fpga/intel-m10-bmc-sec-update.c > > @@ -14,6 +14,8 @@ > > #include <linux/platform_device.h> > > #include <linux/slab.h> > > > > +struct image_load; > > + > > struct m10bmc_sec { > > struct device *dev; > > struct intel_m10bmc *m10bmc; > > @@ -21,6 +23,12 @@ struct m10bmc_sec { > > char *fw_name; > > u32 fw_name_id; > > bool cancel_request; > > + struct image_load *image_load; /* terminated with { } member */ > > +}; > > + > > +struct image_load { > > + const char *name; > > + int (*load_image)(struct m10bmc_sec *sec); > > }; > > > > static DEFINE_XARRAY_ALLOC(fw_upload_xa); > > @@ -137,6 +145,54 @@ DEVICE_ATTR_SEC_CSK_RO(pr, PR_PROG_ADDR + > > CSK_VEC_OFFSET); > > > > #define FLASH_COUNT_SIZE 4096 /* count stored as inverted bit vector > */ > > > > +static ssize_t available_images_show(struct device *dev, > > + struct device_attribute *attr, char *buf) { > > + struct m10bmc_sec *sec = dev_get_drvdata(dev); > > + const struct image_load *hndlr; > > + ssize_t count = 0; > > + > > + for (hndlr = sec->image_load; hndlr->name; hndlr++) { > > + count += scnprintf(buf + count, PAGE_SIZE - count, > > + "%s ", hndlr->name); > > + } > > + > > + buf[count - 1] = '\n'; > > + > > + return count; > > +} > > +static DEVICE_ATTR_RO(available_images); > > + > > +static ssize_t image_load_store(struct device *dev, > > + struct device_attribute *attr, > > + const char *buf, size_t count) > > +{ > > + struct m10bmc_sec *sec = dev_get_drvdata(dev); > > + const struct image_load *hndlr; > > + int ret = -EINVAL; > > + > > + for (hndlr = sec->image_load; hndlr->name; hndlr++) { > > + if (sysfs_streq(buf, hndlr->name)) { > > + ret = hndlr->load_image(sec); > > + break; > > + } > > + } > > + > > + return ret ? : count; > > +} > > +static DEVICE_ATTR_WO(image_load); > > + > > +static struct attribute *m10bmc_control_attrs[] = { > > + &dev_attr_available_images.attr, > > + &dev_attr_image_load.attr, > > + NULL, > > +}; > > + > > +static struct attribute_group m10bmc_control_attr_group = { > > + .name = "control", > > + .attrs = m10bmc_control_attrs, > > +}; > > + > > static ssize_t flash_count_show(struct device *dev, > > struct device_attribute *attr, char *buf) { @@ > -195,6 +251,7 @@ > > static struct attribute_group m10bmc_security_attr_group = { > > > > static const struct attribute_group *m10bmc_sec_attr_groups[] = { > > &m10bmc_security_attr_group, > > + &m10bmc_control_attr_group, > > NULL, > > }; > > > > @@ -208,6 +265,52 @@ static void log_error_regs(struct m10bmc_sec *sec, > u32 doorbell) > > dev_err(sec->dev, "RSU auth result: 0x%08x\n", auth_result); } > > > > +static int m10bmc_sec_bmc_image_load(struct m10bmc_sec *sec, > > + unsigned int val) > > +{ > > + u32 doorbell; > > + int ret; > > + > > + if (val > 1) { > > + dev_err(sec->dev, "invalid reload val = %d\n", val); > > + return -EINVAL; > > + } > > + > > + ret = m10bmc_sys_read(sec->m10bmc, M10BMC_DOORBELL, > &doorbell); > > + if (ret) > > + return ret; > > + > > + if (doorbell & DRBL_REBOOT_DISABLED) > > + return -EBUSY; > > + > > + return m10bmc_sys_update_bits(sec->m10bmc, M10BMC_DOORBELL, > > + DRBL_CONFIG_SEL | DRBL_REBOOT_REQ, > > + FIELD_PREP(DRBL_CONFIG_SEL, val) | > > + DRBL_REBOOT_REQ); > > +} > > + > > +static int m10bmc_sec_bmc_image_load_0(struct m10bmc_sec *sec) { > > + return m10bmc_sec_bmc_image_load(sec, 0); } > > + > > +static int m10bmc_sec_bmc_image_load_1(struct m10bmc_sec *sec) { > > + return m10bmc_sec_bmc_image_load(sec, 1); } > > + > > +static struct image_load m10bmc_image_load_hndlrs[] = { > > + { > > + .name = "bmc_factory", > > + .load_image = m10bmc_sec_bmc_image_load_1, > > + }, > > + { > > + .name = "bmc_user", > > + .load_image = m10bmc_sec_bmc_image_load_0, > > + }, > > + {} > > +}; > > + > > static enum fw_upload_err rsu_check_idle(struct m10bmc_sec *sec) { > > u32 doorbell; > > @@ -565,6 +668,7 @@ static int m10bmc_sec_probe(struct platform_device > *pdev) > > sec->dev = &pdev->dev; > > sec->m10bmc = dev_get_drvdata(pdev->dev.parent); > > dev_set_drvdata(&pdev->dev, sec); > > + sec->image_load = m10bmc_image_load_hndlrs; > > > > ret = xa_alloc(&fw_upload_xa, &sec->fw_name_id, sec, > > xa_limit_32b, GFP_KERNEL); > > -- > > 2.26.2
On Mon, Jul 11, 2022 at 02:24:01PM +0800, Zhang, Tianfei wrote: > > > > -----Original Message----- > > From: Xu, Yilun <yilun.xu@intel.com> > > Sent: Thursday, July 7, 2022 10:00 AM > > To: Zhang, Tianfei <tianfei.zhang@intel.com> > > Cc: mdf@kernel.org; lee.jones@linaro.org; Weight, Russell H > > <russell.h.weight@intel.com>; Wu, Hao <hao.wu@intel.com>; > > trix@redhat.com; linux-fpga@vger.kernel.org > > Subject: Re: [PATCH v1 2/3] fpga: m10bmc-sec: add sysfs to load bmc images > > > > On Tue, Jul 05, 2022 at 04:00:57AM -0400, Tianfei Zhang wrote: > > > From: Russ Weight <russell.h.weight@intel.com> > > > > > > Add the available_images and image_load sysfs files. The > > > available_images file returns a space separated list of key words that > > > may be written into the image_load file. These keywords describe an > > > FPGA, BMC, or firmware image in FLASH or EEPROM storage that may be > > loaded. > > > > > > The image_load sysfs file may be written with a key word to trigger a > > > reload of an FPGA, BMC, or firmware image from FLASH or EEPROM. > > > > > > Signed-off-by: Russ Weight <russell.h.weight@intel.com> > > > Signed-off-by: Tianfei Zhang <tianfei.zhang@intel.com> > > > --- > > > .../sysfs-driver-intel-m10-bmc-sec-update | 21 ++++ > > > drivers/fpga/intel-m10-bmc-sec-update.c | 104 ++++++++++++++++++ > > > 2 files changed, 125 insertions(+) > > > > > > diff --git > > > a/Documentation/ABI/testing/sysfs-driver-intel-m10-bmc-sec-update > > > b/Documentation/ABI/testing/sysfs-driver-intel-m10-bmc-sec-update > > > index 0a41afe0ab4c..8ded1a59d4db 100644 > > > --- a/Documentation/ABI/testing/sysfs-driver-intel-m10-bmc-sec-update > > > +++ b/Documentation/ABI/testing/sysfs-driver-intel-m10-bmc-sec-update > > > @@ -59,3 +59,24 @@ Contact: Russ Weight > > <russell.h.weight@intel.com> > > > Description: Read only. Returns number of times the secure update > > > staging area has been flashed. > > > Format: "%u". > > > + > > > +What: /sys/bus/platform/drivers/intel-m10bmc-sec- > > update/.../control/available_images > > > +Date: July 2022 > > > +KernelVersion: 5.20 > > > +Contact: Russ Weight <russell.h.weight@intel.com> > > > +Description: Read-only. This file returns a space separated list of > > > + key words that may be written into the image_load file > > > + described below. These keywords decribe an FPGA, BMC, > > > + or firmware image in FLASH or EEPROM storage that may > > > + be loaded. > > > + > > > +What: /sys/bus/platform/drivers/intel-m10bmc-sec- > > update/.../control/image_load > > > +Date: July 2022 > > > +KernelVersion: 5.20 > > > +Contact: Russ Weight <russell.h.weight@intel.com> > > > +Description: Write-only. A key word may be written to this file to > > > + trigger a reload of an FPGA, BMC, or firmware image from > > > > A FPGA reprogramming could be handled by FPGA manager, so we may not > > introduce a new API for the same purpose. > > The FPGA reprogramming is in the MAX10 BMC Secure Update drive, which instantiates the new Firmware > Upload functionality, like update the image into flash. Those functionalities have implemented by Russ's patchset. As you can see, the firmware updating writes image to the backup flash, not the FPGA region. It is not the FPGA reprograming. That's why we introduced a separate interface for it. > https://lore.kernel.org/linux-fpga/20220606160038.846236-1-russell.h.weight@intel.com/ > > This patch doesn't related to the FPGA reprogramming, it just do the FPGA/BMC image reload, But this image reload interface does the FPGA reprogramming, as it affects the real FPGA region, as well as the devices in the FPGA region. Thanks, Yilun > and trigger the FPGA/BMC to reload a new image from different flash page. For example, on N3000 card, the > FPGA image has 2 pages, page 0 for factory image, page 1 for user image. This patch was easy to select and > trigger the FPGA to reload the image via sysfs file, like factory or user image. > > I will change the title of patch change in next version patch: > fpga: m10bmc-sec: add sysfs files to reload fpga/bmc images > > > > > Thanks, > > Yilun > > > > > + FLASH or EEPROM. Refer to the available_images file for a > > > + list of supported key words for the underlying device. > > > + Writing an unsupported string to this file will result in > > > + EINVAL being returned. > > > diff --git a/drivers/fpga/intel-m10-bmc-sec-update.c > > > b/drivers/fpga/intel-m10-bmc-sec-update.c > > > index 72c677c910de..640690e6c131 100644 > > > --- a/drivers/fpga/intel-m10-bmc-sec-update.c > > > +++ b/drivers/fpga/intel-m10-bmc-sec-update.c > > > @@ -14,6 +14,8 @@ > > > #include <linux/platform_device.h> > > > #include <linux/slab.h> > > > > > > +struct image_load; > > > + > > > struct m10bmc_sec { > > > struct device *dev; > > > struct intel_m10bmc *m10bmc; > > > @@ -21,6 +23,12 @@ struct m10bmc_sec { > > > char *fw_name; > > > u32 fw_name_id; > > > bool cancel_request; > > > + struct image_load *image_load; /* terminated with { } member */ > > > +}; > > > + > > > +struct image_load { > > > + const char *name; > > > + int (*load_image)(struct m10bmc_sec *sec); > > > }; > > > > > > static DEFINE_XARRAY_ALLOC(fw_upload_xa); > > > @@ -137,6 +145,54 @@ DEVICE_ATTR_SEC_CSK_RO(pr, PR_PROG_ADDR + > > > CSK_VEC_OFFSET); > > > > > > #define FLASH_COUNT_SIZE 4096 /* count stored as inverted bit vector > > */ > > > > > > +static ssize_t available_images_show(struct device *dev, > > > + struct device_attribute *attr, char *buf) { > > > + struct m10bmc_sec *sec = dev_get_drvdata(dev); > > > + const struct image_load *hndlr; > > > + ssize_t count = 0; > > > + > > > + for (hndlr = sec->image_load; hndlr->name; hndlr++) { > > > + count += scnprintf(buf + count, PAGE_SIZE - count, > > > + "%s ", hndlr->name); > > > + } > > > + > > > + buf[count - 1] = '\n'; > > > + > > > + return count; > > > +} > > > +static DEVICE_ATTR_RO(available_images); > > > + > > > +static ssize_t image_load_store(struct device *dev, > > > + struct device_attribute *attr, > > > + const char *buf, size_t count) > > > +{ > > > + struct m10bmc_sec *sec = dev_get_drvdata(dev); > > > + const struct image_load *hndlr; > > > + int ret = -EINVAL; > > > + > > > + for (hndlr = sec->image_load; hndlr->name; hndlr++) { > > > + if (sysfs_streq(buf, hndlr->name)) { > > > + ret = hndlr->load_image(sec); > > > + break; > > > + } > > > + } > > > + > > > + return ret ? : count; > > > +} > > > +static DEVICE_ATTR_WO(image_load); > > > + > > > +static struct attribute *m10bmc_control_attrs[] = { > > > + &dev_attr_available_images.attr, > > > + &dev_attr_image_load.attr, > > > + NULL, > > > +}; > > > + > > > +static struct attribute_group m10bmc_control_attr_group = { > > > + .name = "control", > > > + .attrs = m10bmc_control_attrs, > > > +}; > > > + > > > static ssize_t flash_count_show(struct device *dev, > > > struct device_attribute *attr, char *buf) { @@ > > -195,6 +251,7 @@ > > > static struct attribute_group m10bmc_security_attr_group = { > > > > > > static const struct attribute_group *m10bmc_sec_attr_groups[] = { > > > &m10bmc_security_attr_group, > > > + &m10bmc_control_attr_group, > > > NULL, > > > }; > > > > > > @@ -208,6 +265,52 @@ static void log_error_regs(struct m10bmc_sec *sec, > > u32 doorbell) > > > dev_err(sec->dev, "RSU auth result: 0x%08x\n", auth_result); } > > > > > > +static int m10bmc_sec_bmc_image_load(struct m10bmc_sec *sec, > > > + unsigned int val) > > > +{ > > > + u32 doorbell; > > > + int ret; > > > + > > > + if (val > 1) { > > > + dev_err(sec->dev, "invalid reload val = %d\n", val); > > > + return -EINVAL; > > > + } > > > + > > > + ret = m10bmc_sys_read(sec->m10bmc, M10BMC_DOORBELL, > > &doorbell); > > > + if (ret) > > > + return ret; > > > + > > > + if (doorbell & DRBL_REBOOT_DISABLED) > > > + return -EBUSY; > > > + > > > + return m10bmc_sys_update_bits(sec->m10bmc, M10BMC_DOORBELL, > > > + DRBL_CONFIG_SEL | DRBL_REBOOT_REQ, > > > + FIELD_PREP(DRBL_CONFIG_SEL, val) | > > > + DRBL_REBOOT_REQ); > > > +} > > > + > > > +static int m10bmc_sec_bmc_image_load_0(struct m10bmc_sec *sec) { > > > + return m10bmc_sec_bmc_image_load(sec, 0); } > > > + > > > +static int m10bmc_sec_bmc_image_load_1(struct m10bmc_sec *sec) { > > > + return m10bmc_sec_bmc_image_load(sec, 1); } > > > + > > > +static struct image_load m10bmc_image_load_hndlrs[] = { > > > + { > > > + .name = "bmc_factory", > > > + .load_image = m10bmc_sec_bmc_image_load_1, > > > + }, > > > + { > > > + .name = "bmc_user", > > > + .load_image = m10bmc_sec_bmc_image_load_0, > > > + }, > > > + {} > > > +}; > > > + > > > static enum fw_upload_err rsu_check_idle(struct m10bmc_sec *sec) { > > > u32 doorbell; > > > @@ -565,6 +668,7 @@ static int m10bmc_sec_probe(struct platform_device > > *pdev) > > > sec->dev = &pdev->dev; > > > sec->m10bmc = dev_get_drvdata(pdev->dev.parent); > > > dev_set_drvdata(&pdev->dev, sec); > > > + sec->image_load = m10bmc_image_load_hndlrs; > > > > > > ret = xa_alloc(&fw_upload_xa, &sec->fw_name_id, sec, > > > xa_limit_32b, GFP_KERNEL); > > > -- > > > 2.26.2
diff --git a/Documentation/ABI/testing/sysfs-driver-intel-m10-bmc-sec-update b/Documentation/ABI/testing/sysfs-driver-intel-m10-bmc-sec-update index 0a41afe0ab4c..8ded1a59d4db 100644 --- a/Documentation/ABI/testing/sysfs-driver-intel-m10-bmc-sec-update +++ b/Documentation/ABI/testing/sysfs-driver-intel-m10-bmc-sec-update @@ -59,3 +59,24 @@ Contact: Russ Weight <russell.h.weight@intel.com> Description: Read only. Returns number of times the secure update staging area has been flashed. Format: "%u". + +What: /sys/bus/platform/drivers/intel-m10bmc-sec-update/.../control/available_images +Date: July 2022 +KernelVersion: 5.20 +Contact: Russ Weight <russell.h.weight@intel.com> +Description: Read-only. This file returns a space separated list of + key words that may be written into the image_load file + described below. These keywords decribe an FPGA, BMC, + or firmware image in FLASH or EEPROM storage that may + be loaded. + +What: /sys/bus/platform/drivers/intel-m10bmc-sec-update/.../control/image_load +Date: July 2022 +KernelVersion: 5.20 +Contact: Russ Weight <russell.h.weight@intel.com> +Description: Write-only. A key word may be written to this file to + trigger a reload of an FPGA, BMC, or firmware image from + FLASH or EEPROM. Refer to the available_images file for a + list of supported key words for the underlying device. + Writing an unsupported string to this file will result in + EINVAL being returned. diff --git a/drivers/fpga/intel-m10-bmc-sec-update.c b/drivers/fpga/intel-m10-bmc-sec-update.c index 72c677c910de..640690e6c131 100644 --- a/drivers/fpga/intel-m10-bmc-sec-update.c +++ b/drivers/fpga/intel-m10-bmc-sec-update.c @@ -14,6 +14,8 @@ #include <linux/platform_device.h> #include <linux/slab.h> +struct image_load; + struct m10bmc_sec { struct device *dev; struct intel_m10bmc *m10bmc; @@ -21,6 +23,12 @@ struct m10bmc_sec { char *fw_name; u32 fw_name_id; bool cancel_request; + struct image_load *image_load; /* terminated with { } member */ +}; + +struct image_load { + const char *name; + int (*load_image)(struct m10bmc_sec *sec); }; static DEFINE_XARRAY_ALLOC(fw_upload_xa); @@ -137,6 +145,54 @@ DEVICE_ATTR_SEC_CSK_RO(pr, PR_PROG_ADDR + CSK_VEC_OFFSET); #define FLASH_COUNT_SIZE 4096 /* count stored as inverted bit vector */ +static ssize_t available_images_show(struct device *dev, + struct device_attribute *attr, char *buf) +{ + struct m10bmc_sec *sec = dev_get_drvdata(dev); + const struct image_load *hndlr; + ssize_t count = 0; + + for (hndlr = sec->image_load; hndlr->name; hndlr++) { + count += scnprintf(buf + count, PAGE_SIZE - count, + "%s ", hndlr->name); + } + + buf[count - 1] = '\n'; + + return count; +} +static DEVICE_ATTR_RO(available_images); + +static ssize_t image_load_store(struct device *dev, + struct device_attribute *attr, + const char *buf, size_t count) +{ + struct m10bmc_sec *sec = dev_get_drvdata(dev); + const struct image_load *hndlr; + int ret = -EINVAL; + + for (hndlr = sec->image_load; hndlr->name; hndlr++) { + if (sysfs_streq(buf, hndlr->name)) { + ret = hndlr->load_image(sec); + break; + } + } + + return ret ? : count; +} +static DEVICE_ATTR_WO(image_load); + +static struct attribute *m10bmc_control_attrs[] = { + &dev_attr_available_images.attr, + &dev_attr_image_load.attr, + NULL, +}; + +static struct attribute_group m10bmc_control_attr_group = { + .name = "control", + .attrs = m10bmc_control_attrs, +}; + static ssize_t flash_count_show(struct device *dev, struct device_attribute *attr, char *buf) { @@ -195,6 +251,7 @@ static struct attribute_group m10bmc_security_attr_group = { static const struct attribute_group *m10bmc_sec_attr_groups[] = { &m10bmc_security_attr_group, + &m10bmc_control_attr_group, NULL, }; @@ -208,6 +265,52 @@ static void log_error_regs(struct m10bmc_sec *sec, u32 doorbell) dev_err(sec->dev, "RSU auth result: 0x%08x\n", auth_result); } +static int m10bmc_sec_bmc_image_load(struct m10bmc_sec *sec, + unsigned int val) +{ + u32 doorbell; + int ret; + + if (val > 1) { + dev_err(sec->dev, "invalid reload val = %d\n", val); + return -EINVAL; + } + + ret = m10bmc_sys_read(sec->m10bmc, M10BMC_DOORBELL, &doorbell); + if (ret) + return ret; + + if (doorbell & DRBL_REBOOT_DISABLED) + return -EBUSY; + + return m10bmc_sys_update_bits(sec->m10bmc, M10BMC_DOORBELL, + DRBL_CONFIG_SEL | DRBL_REBOOT_REQ, + FIELD_PREP(DRBL_CONFIG_SEL, val) | + DRBL_REBOOT_REQ); +} + +static int m10bmc_sec_bmc_image_load_0(struct m10bmc_sec *sec) +{ + return m10bmc_sec_bmc_image_load(sec, 0); +} + +static int m10bmc_sec_bmc_image_load_1(struct m10bmc_sec *sec) +{ + return m10bmc_sec_bmc_image_load(sec, 1); +} + +static struct image_load m10bmc_image_load_hndlrs[] = { + { + .name = "bmc_factory", + .load_image = m10bmc_sec_bmc_image_load_1, + }, + { + .name = "bmc_user", + .load_image = m10bmc_sec_bmc_image_load_0, + }, + {} +}; + static enum fw_upload_err rsu_check_idle(struct m10bmc_sec *sec) { u32 doorbell; @@ -565,6 +668,7 @@ static int m10bmc_sec_probe(struct platform_device *pdev) sec->dev = &pdev->dev; sec->m10bmc = dev_get_drvdata(pdev->dev.parent); dev_set_drvdata(&pdev->dev, sec); + sec->image_load = m10bmc_image_load_hndlrs; ret = xa_alloc(&fw_upload_xa, &sec->fw_name_id, sec, xa_limit_32b, GFP_KERNEL);