diff options
author | Kah Jing Lee <kah.jing.lee@intel.com> | 2024-02-01 17:32:22 +0800 |
---|---|---|
committer | Dinh Nguyen <dinguyen@kernel.org> | 2024-02-01 07:35:31 -0600 |
commit | 7dc2077fe6e1e18f7d874e9a0a9eaae081b8d32c (patch) | |
tree | e26c2ec438364e4fe07898f35673bd025d4ac572 | |
parent | 2c373e75155bcc9c81060cdc07ee1b59e113bd2b (diff) | |
download | linux-socfpga_dts_for_v6.9.tar.gz |
drivers: firmware: stratix10-rsu: Query device infosocfpga_dts_for_v6.9
Extend Intel Remote System Update (RSU) driver to get device info table
using SMC call. Device info table contains size and erasesize for multiple
flashes. Empty flash will return 0 for size and erasesize.
Signed-off-by: Kah Jing Lee <kah.jing.lee@intel.com>
Signed-off-by: Dinh Nguyen <dinguyen@kernel.org>
-rw-r--r-- | drivers/firmware/stratix10-rsu.c | 204 | ||||
-rw-r--r-- | drivers/firmware/stratix10-svc.c | 11 | ||||
-rw-r--r-- | include/linux/firmware/intel/stratix10-smc.h | 23 | ||||
-rw-r--r-- | include/linux/firmware/intel/stratix10-svc-client.h | 4 |
4 files changed, 242 insertions, 0 deletions
diff --git a/drivers/firmware/stratix10-rsu.c b/drivers/firmware/stratix10-rsu.c index e20cee9c2d320..614121b248429 100644 --- a/drivers/firmware/stratix10-rsu.c +++ b/drivers/firmware/stratix10-rsu.c @@ -19,6 +19,7 @@ #define RSU_VERSION_MASK GENMASK_ULL(63, 32) #define RSU_ERROR_LOCATION_MASK GENMASK_ULL(31, 0) #define RSU_ERROR_DETAIL_MASK GENMASK_ULL(63, 32) +#define RSU_ERASE_SIZE_MASK GENMASK_ULL(63, 32) #define RSU_DCMF0_MASK GENMASK_ULL(31, 0) #define RSU_DCMF1_MASK GENMASK_ULL(63, 32) #define RSU_DCMF2_MASK GENMASK_ULL(31, 0) @@ -34,10 +35,17 @@ #define INVALID_DCMF_VERSION 0xFF #define INVALID_DCMF_STATUS 0xFFFFFFFF #define INVALID_SPT_ADDRESS 0x0 +#define INVALID_DEVICE_INFO 0x0 #define RSU_GET_SPT_CMD 0x5A +#define RSU_GET_DEVICE_INFO_CMD 0x74 #define RSU_GET_SPT_RESP_LEN (4 * sizeof(unsigned int)) +struct flash_device_info { + unsigned int size; + unsigned int erase_size; +}; + typedef void (*rsu_callback)(struct stratix10_svc_client *client, struct stratix10_svc_cb_data *data); /** @@ -60,6 +68,8 @@ typedef void (*rsu_callback)(struct stratix10_svc_client *client, * @dcmf_status.dcmf1: dcmf1 status * @dcmf_status.dcmf2: dcmf2 status * @dcmf_status.dcmf3: dcmf3 status + * @device_info.size: flash size + * @device_info.erase_size: flash erase size * @retry_counter: the current image's retry counter * @max_retry: the preset max retry value * @spt0_address: address of spt0 @@ -94,6 +104,8 @@ struct stratix10_rsu_priv { unsigned int dcmf3; } dcmf_status; + struct flash_device_info device_info[4]; + unsigned int retry_counter; unsigned int max_retry; @@ -270,6 +282,50 @@ static void rsu_dcmf_status_callback(struct stratix10_svc_client *client, complete(&priv->completion); } +/** + * rsu_get_device_info_callback() - Callback from Intel service layer for getting + * the QSPI device info + * @client: pointer to client + * @data: pointer to callback data structure + * + * Callback from Intel service layer for QSPI device info + */ +static void rsu_get_device_info_callback(struct stratix10_svc_client *client, + struct stratix10_svc_cb_data *data) +{ + struct stratix10_rsu_priv *priv = client->priv; + struct arm_smccc_1_2_regs *res = (struct arm_smccc_1_2_regs *)data->kaddr1; + + if (data->status == BIT(SVC_STATUS_OK)) { + priv->device_info[0].size = res->a1; + priv->device_info[0].erase_size = + FIELD_GET(RSU_ERASE_SIZE_MASK, res->a1); + priv->device_info[1].size = res->a2; + priv->device_info[1].erase_size = + FIELD_GET(RSU_ERASE_SIZE_MASK, res->a2); + priv->device_info[2].size = res->a3; + priv->device_info[2].erase_size = + FIELD_GET(RSU_ERASE_SIZE_MASK, res->a3); + priv->device_info[3].size = res->a4; + priv->device_info[3].erase_size = + FIELD_GET(RSU_ERASE_SIZE_MASK, res->a4); + + } else { + dev_err(client->dev, "COMMAND_RSU_GET_DEVICE_INFO returned 0x%lX\n", + res->a0); + priv->device_info[0].size = INVALID_DEVICE_INFO; + priv->device_info[1].size = INVALID_DEVICE_INFO; + priv->device_info[2].size = INVALID_DEVICE_INFO; + priv->device_info[3].size = INVALID_DEVICE_INFO; + priv->device_info[0].erase_size = INVALID_DEVICE_INFO; + priv->device_info[1].erase_size = INVALID_DEVICE_INFO; + priv->device_info[2].erase_size = INVALID_DEVICE_INFO; + priv->device_info[3].erase_size = INVALID_DEVICE_INFO; + } + + complete(&priv->completion); +} + static void rsu_get_spt_callback(struct stratix10_svc_client *client, struct stratix10_svc_cb_data *data) { @@ -621,6 +677,122 @@ static ssize_t notify_store(struct device *dev, return count; } +static ssize_t size0_show(struct device *dev, + struct device_attribute *attr, char *buf) +{ + struct stratix10_rsu_priv *priv = dev_get_drvdata(dev); + + if (!priv) + return -ENODEV; + + if (priv->device_info[0].size == INVALID_DEVICE_INFO) + return -EIO; + + return scnprintf(buf, PAGE_SIZE, "0x%08x\n", priv->device_info[0].size); +} + +static ssize_t size1_show(struct device *dev, + struct device_attribute *attr, char *buf) +{ + struct stratix10_rsu_priv *priv = dev_get_drvdata(dev); + + if (!priv) + return -ENODEV; + + if (priv->device_info[1].size == INVALID_DEVICE_INFO) + return -EIO; + + return scnprintf(buf, PAGE_SIZE, "0x%08x\n", priv->device_info[1].size); +} + +static ssize_t size2_show(struct device *dev, + struct device_attribute *attr, char *buf) +{ + struct stratix10_rsu_priv *priv = dev_get_drvdata(dev); + + if (!priv) + return -ENODEV; + + if (priv->device_info[2].size == INVALID_DEVICE_INFO) + return -EIO; + + return scnprintf(buf, PAGE_SIZE, "0x%08x\n", priv->device_info[2].size); +} + +static ssize_t size3_show(struct device *dev, + struct device_attribute *attr, char *buf) +{ + struct stratix10_rsu_priv *priv = dev_get_drvdata(dev); + + if (!priv) + return -ENODEV; + + if (priv->device_info[3].size == INVALID_DEVICE_INFO) + return -EIO; + + return scnprintf(buf, PAGE_SIZE, "0x%08x\n", priv->device_info[3].size); +} + +static ssize_t erase_size0_show(struct device *dev, + struct device_attribute *attr, char *buf) +{ + struct stratix10_rsu_priv *priv = dev_get_drvdata(dev); + + if (!priv) + return -ENODEV; + + if (priv->device_info[0].erase_size == INVALID_DEVICE_INFO) + return -EIO; + + return scnprintf(buf, PAGE_SIZE, "0x%08x\n", + priv->device_info[0].erase_size); +} + +static ssize_t erase_size1_show(struct device *dev, + struct device_attribute *attr, char *buf) +{ + struct stratix10_rsu_priv *priv = dev_get_drvdata(dev); + + if (!priv) + return -ENODEV; + + if (priv->device_info[1].erase_size == INVALID_DEVICE_INFO) + return -EIO; + + return scnprintf(buf, PAGE_SIZE, "0x%08x\n", + priv->device_info[1].erase_size); +} + +static ssize_t erase_size2_show(struct device *dev, + struct device_attribute *attr, char *buf) +{ + struct stratix10_rsu_priv *priv = dev_get_drvdata(dev); + + if (!priv) + return -ENODEV; + + if (priv->device_info[2].erase_size == INVALID_DEVICE_INFO) + return -EIO; + + return scnprintf(buf, PAGE_SIZE, "0x%08x\n", + priv->device_info[2].erase_size); +} + +static ssize_t erase_size3_show(struct device *dev, + struct device_attribute *attr, char *buf) +{ + struct stratix10_rsu_priv *priv = dev_get_drvdata(dev); + + if (!priv) + return -ENODEV; + + if (priv->device_info[3].erase_size == INVALID_DEVICE_INFO) + return -EIO; + + return scnprintf(buf, PAGE_SIZE, "0x%08x\n", + priv->device_info[3].erase_size); +} + static ssize_t spt0_address_show(struct device *dev, struct device_attribute *attr, char *buf) { @@ -665,6 +837,14 @@ static DEVICE_ATTR_RO(dcmf0_status); static DEVICE_ATTR_RO(dcmf1_status); static DEVICE_ATTR_RO(dcmf2_status); static DEVICE_ATTR_RO(dcmf3_status); +static DEVICE_ATTR_RO(size0); +static DEVICE_ATTR_RO(size1); +static DEVICE_ATTR_RO(size2); +static DEVICE_ATTR_RO(size3); +static DEVICE_ATTR_RO(erase_size0); +static DEVICE_ATTR_RO(erase_size1); +static DEVICE_ATTR_RO(erase_size2); +static DEVICE_ATTR_RO(erase_size3); static DEVICE_ATTR_WO(reboot_image); static DEVICE_ATTR_WO(notify); static DEVICE_ATTR_RO(spt0_address); @@ -687,6 +867,14 @@ static struct attribute *rsu_attrs[] = { &dev_attr_dcmf1_status.attr, &dev_attr_dcmf2_status.attr, &dev_attr_dcmf3_status.attr, + &dev_attr_size0.attr, + &dev_attr_size1.attr, + &dev_attr_size2.attr, + &dev_attr_size3.attr, + &dev_attr_erase_size0.attr, + &dev_attr_erase_size1.attr, + &dev_attr_erase_size2.attr, + &dev_attr_erase_size3.attr, &dev_attr_reboot_image.attr, &dev_attr_notify.attr, &dev_attr_spt0_address.attr, @@ -727,6 +915,14 @@ static int stratix10_rsu_probe(struct platform_device *pdev) priv->max_retry = INVALID_RETRY_COUNTER; priv->spt0_address = INVALID_SPT_ADDRESS; priv->spt1_address = INVALID_SPT_ADDRESS; + priv->device_info[0].size = INVALID_DEVICE_INFO; + priv->device_info[1].size = INVALID_DEVICE_INFO; + priv->device_info[2].size = INVALID_DEVICE_INFO; + priv->device_info[3].size = INVALID_DEVICE_INFO; + priv->device_info[0].erase_size = INVALID_DEVICE_INFO; + priv->device_info[1].erase_size = INVALID_DEVICE_INFO; + priv->device_info[2].erase_size = INVALID_DEVICE_INFO; + priv->device_info[3].erase_size = INVALID_DEVICE_INFO; mutex_init(&priv->lock); priv->chan = stratix10_svc_request_channel_byname(&priv->client, @@ -776,6 +972,14 @@ static int stratix10_rsu_probe(struct platform_device *pdev) stratix10_svc_free_channel(priv->chan); } + /* get QSPI device info from firmware */ + ret = rsu_send_msg(priv, COMMAND_RSU_GET_DEVICE_INFO, + 0, rsu_get_device_info_callback); + if (ret) { + dev_err(dev, "Error, getting QSPI Device Info %i\n", ret); + stratix10_svc_free_channel(priv->chan); + } + priv->get_spt_response_buf = stratix10_svc_allocate_memory(priv->chan, RSU_GET_SPT_RESP_LEN); diff --git a/drivers/firmware/stratix10-svc.c b/drivers/firmware/stratix10-svc.c index 528f37417aea4..218b9e31198b5 100644 --- a/drivers/firmware/stratix10-svc.c +++ b/drivers/firmware/stratix10-svc.c @@ -369,6 +369,12 @@ static void svc_thread_recv_status_ok(struct stratix10_svc_data *p_data, res.a2 = res.a2 * BYTE_TO_WORD_SIZE; cb_data->kaddr2 = &res.a2; break; + case COMMAND_RSU_GET_DEVICE_INFO: + cb_data->status = BIT(SVC_STATUS_OK); + cb_data->kaddr1 = &res; + cb_data->kaddr2 = NULL; + cb_data->kaddr3 = NULL; + break; default: pr_warn("it shouldn't happen\n"); break; @@ -487,6 +493,11 @@ static int svc_normal_to_secure_thread(void *data) a1 = 0; a2 = 0; break; + case COMMAND_RSU_GET_DEVICE_INFO: + a0 = INTEL_SIP_SMC_RSU_GET_DEVICE_INFO; + a1 = 0; + a2 = 0; + break; /* for FCS */ case COMMAND_FCS_DATA_ENCRYPTION: diff --git a/include/linux/firmware/intel/stratix10-smc.h b/include/linux/firmware/intel/stratix10-smc.h index ee80ca4bb0d0c..7d9dce61da552 100644 --- a/include/linux/firmware/intel/stratix10-smc.h +++ b/include/linux/firmware/intel/stratix10-smc.h @@ -425,6 +425,29 @@ INTEL_SIP_SMC_FAST_CALL_VAL(INTEL_SIP_SMC_FUNCID_FPGA_CONFIG_COMPLETED_WRITE) INTEL_SIP_SMC_FAST_CALL_VAL(INTEL_SIP_SMC_FUNCID_RSU_DCMF_STATUS) /** + * Request INTEL_SIP_SMC_RSU_GET_DEVICE_INFO + * + * Sync call used by service driver at EL1 to query QSPI device info from FW + * + * Call register usage: + * a0 INTEL_SIP_SMC_RSU_GET_DEVICE_INFO + * a1-7 not used + * + * Return status + * a0 INTEL_SIP_SMC_STATUS_OK + * a1 erasesize0 | size0 + * a2 erasesize1 | size1 + * a3 erasesize2 | size2 + * a4 erasesize3 | size3 + * Or + * + * a0 INTEL_SIP_SMC_RSU_ERROR + */ +#define INTEL_SIP_SMC_FUNCID_RSU_GET_DEVICE_INFO 22 +#define INTEL_SIP_SMC_RSU_GET_DEVICE_INFO \ + INTEL_SIP_SMC_FAST_CALL_VAL(INTEL_SIP_SMC_FUNCID_RSU_GET_DEVICE_INFO) + +/** * Request INTEL_SIP_SMC_SERVICE_COMPLETED * Sync call to check if the secure world have completed service request * or not. diff --git a/include/linux/firmware/intel/stratix10-svc-client.h b/include/linux/firmware/intel/stratix10-svc-client.h index 60ed82112680e..2a141c7ba2a1b 100644 --- a/include/linux/firmware/intel/stratix10-svc-client.h +++ b/include/linux/firmware/intel/stratix10-svc-client.h @@ -124,6 +124,9 @@ struct stratix10_svc_chan; * @COMMAND_RSU_DCMF_STATUS: query firmware for the DCMF status * return status is SVC_STATUS_OK or SVC_STATUS_ERROR * + * @COMMAND_RSU_GET_DEVICE_INFO: query firmware for QSPI device info + * return status is SVC_STATUS_OK or SVC_STATUS_ERROR + * * @COMMAND_FCS_REQUEST_SERVICE: request validation of image from firmware, * return status is SVC_STATUS_OK, SVC_STATUS_INVALID_PARAM * @@ -158,6 +161,7 @@ enum stratix10_svc_command_code { COMMAND_RSU_DCMF_VERSION, COMMAND_RSU_DCMF_STATUS, COMMAND_FIRMWARE_VERSION, + COMMAND_RSU_GET_DEVICE_INFO, /* for FCS */ COMMAND_FCS_REQUEST_SERVICE = 20, COMMAND_FCS_SEND_CERTIFICATE, |