Add support to read firmware configuration file from
/lib/firmware/cxgb4/ path in the filesystem.
Signed-off-by: Rahul Lakkireddy <rahul.lakkire...@chelsio.com>
---
drivers/net/cxgbe/base/t4fw_interface.h | 1 +
drivers/net/cxgbe/cxgbe_main.c | 329 ++++++++++++++++--------
2 files changed, 217 insertions(+), 113 deletions(-)
diff --git a/drivers/net/cxgbe/base/t4fw_interface.h
b/drivers/net/cxgbe/base/t4fw_interface.h
index a0a9292c0c..76f58d7c77 100644
--- a/drivers/net/cxgbe/base/t4fw_interface.h
+++ b/drivers/net/cxgbe/base/t4fw_interface.h
@@ -697,6 +697,7 @@ enum fw_params_param_dev {
*/
FW_PARAMS_PARAM_DEV_FWREV = 0x0B, /* fw version */
FW_PARAMS_PARAM_DEV_TPREV = 0x0C, /* tp version */
+ FW_PARAMS_PARAM_DEV_CF = 0x0D,
FW_PARAMS_PARAM_DEV_ULPTX_MEMWRITE_DSGL = 0x17,
FW_PARAMS_PARAM_DEV_FILTER2_WR = 0x1D,
FW_PARAMS_PARAM_DEV_OPAQUE_VIID_SMT_EXTN = 0x27,
diff --git a/drivers/net/cxgbe/cxgbe_main.c b/drivers/net/cxgbe/cxgbe_main.c
index e2a2ccb781..7b162af3e7 100644
--- a/drivers/net/cxgbe/cxgbe_main.c
+++ b/drivers/net/cxgbe/cxgbe_main.c
@@ -4,6 +4,7 @@
*/
#include <sys/queue.h>
+#include <sys/stat.h>
#include <stdio.h>
#include <errno.h>
#include <stdint.h>
@@ -11,6 +12,7 @@
#include <unistd.h>
#include <stdarg.h>
#include <inttypes.h>
+#include <fcntl.h>
#include <netinet/in.h>
#include <rte_byteorder.h>
@@ -1006,6 +1008,218 @@ static int configure_filter_mode_mask(struct adapter
*adap)
params, val);
}
+#define CXGBE_FW_CONFIG_PATH_T5 "/lib/firmware/cxgb4/t5-config.txt"
+#define CXGBE_FW_CONFIG_PATH_T6 "/lib/firmware/cxgb4/t6-config.txt"
+
+/*
+ * Load firmware configuration from file in /lib/firmware/cxgb4/ path,
+ * if it is present.
+ */
+static int cxgbe_load_fw_config_from_filesystem(struct adapter *adap,
+ const char **config_name,
+ u32 *mem_type, u32 *mem_addr)
+{
+ u32 param, val, mtype, maddr;
+ const char *fw_cfg_path;
+ char *fw_cfg = NULL;
+ struct stat st;
+ int ret, fd;
+
+ switch (CHELSIO_CHIP_VERSION(adap->params.chip)) {
+ case CHELSIO_T5:
+ fw_cfg_path = CXGBE_FW_CONFIG_PATH_T5;
+ break;
+ case CHELSIO_T6:
+ fw_cfg_path = CXGBE_FW_CONFIG_PATH_T6;
+ break;
+ default:
+ return -ENOENT;
+ }
+
+ ret = open(fw_cfg_path, O_RDONLY);
+ if (ret < 0) {
+ dev_debug(adap, "Couldn't open FW config file\n");
+ return ret;
+ }
+
+ fd = ret;
+
+ ret = fstat(fd, &st);
+ if (ret < 0) {
+ dev_debug(adap, "Couldn't get FW config file size\n");
+ goto out_err;
+ }
+
+ if (st.st_size >= FLASH_CFG_MAX_SIZE) {
+ dev_debug(adap, "FW config file size >= max(%u)\n",
+ FLASH_CFG_MAX_SIZE);
+ ret = -ENOMEM;
+ goto out_err;
+ }
+
+ fw_cfg = rte_zmalloc(NULL, st.st_size, 0);
+ if (fw_cfg == NULL) {
+ ret = -ENOMEM;
+ goto out_err;
+ }
+
+ if (read(fd, fw_cfg, st.st_size) != st.st_size) {
+ dev_debug(adap, "Couldn't read FW config file data\n");
+ ret = -EIO;
+ goto out_err;
+ }
+
+ close(fd);
+
+ /* Send it to FW to verify and update to new configuration */
+ param = V_FW_PARAMS_MNEM(FW_PARAMS_MNEM_DEV) |
+ V_FW_PARAMS_PARAM_X(FW_PARAMS_PARAM_DEV_CF);
+ ret = t4_query_params(adap, adap->mbox, adap->pf, 0, 1, ¶m, &val);
+ if (ret < 0) {
+ dev_debug(adap, "FW config param query failed: %d\n", ret);
+ goto out_free;
+ }
+
+ mtype = val >> 8;
+ maddr = (val & 0xff) << 16;
+
+ t4_os_lock(&adap->win0_lock);
+ ret = t4_memory_rw(adap, MEMWIN_NIC, mtype, maddr, st.st_size,
+ fw_cfg, T4_MEMORY_WRITE);
+ t4_os_unlock(&adap->win0_lock);
+ if (ret < 0) {
+ dev_debug(adap, "FW config file update failed: %d\n", ret);
+ goto out_free;
+ }
+
+ rte_free(fw_cfg);
+
+ *mem_type = mtype;
+ *mem_addr = maddr;
+ *config_name = fw_cfg_path;
+ return 0;
+
+out_err:
+ close(fd);
+out_free:
+ rte_free(fw_cfg);
+ return ret;
+}
+
+static int cxgbe_load_fw_config(struct adapter *adap)
+{
+ u32 finiver, finicsum, cfcsum, mtype, maddr, param, val;
+ struct fw_caps_config_cmd caps_cmd = { 0 };
+ const char *config_name = NULL;
+ int ret;
+
+ ret = cxgbe_load_fw_config_from_filesystem(adap, &config_name,
+ &mtype, &maddr);
+ if (ret < 0) {
+ config_name = "On Flash";
+
+ ret = t4_flash_cfg_addr(adap);
+ if (ret < 0) {
+ dev_warn(adap,
+ "Finding address for FW config file in flash
failed: %d\n",
+ ret);
+ goto out_default_config;
+ }
+
+ mtype = FW_MEMTYPE_CF_FLASH;
+ maddr = ret;
+ }
+
+ /* Enable HASH filter region when support is available. */
+ val = 1;
+ param = CXGBE_FW_PARAM_DEV(HASHFILTER_WITH_OFLD);
+ t4_set_params(adap, adap->mbox, adap->pf, 0, 1, ¶m, &val);
+
+ /*
+ * Issue a Capability Configuration command to the firmware to get it
+ * to parse the Configuration File.
+ */
+ caps_cmd.op_to_write = cpu_to_be32(V_FW_CMD_OP(FW_CAPS_CONFIG_CMD) |
+ F_FW_CMD_REQUEST | F_FW_CMD_READ);
+ caps_cmd.cfvalid_to_len16 =
+ cpu_to_be32(F_FW_CAPS_CONFIG_CMD_CFVALID |
+ V_FW_CAPS_CONFIG_CMD_MEMTYPE_CF(mtype) |
+ V_FW_CAPS_CONFIG_CMD_MEMADDR64K_CF(maddr >> 16) |
+ FW_LEN16(caps_cmd));
+ ret = t4_wr_mbox(adap, adap->mbox, &caps_cmd, sizeof(caps_cmd),
+ &caps_cmd);
+
+out_default_config:
+ /*
+ * If the CAPS_CONFIG failed with an ENOENT (for a Firmware
+ * Configuration File in filesystem or FLASH), our last gasp
+ * effort is to use the Firmware Configuration File which is
+ * embedded in the firmware.
+ */
+ if (ret == -ENOENT) {
+ config_name = "Firmware Default";
+
+ memset(&caps_cmd, 0, sizeof(caps_cmd));
+ caps_cmd.op_to_write =
+ cpu_to_be32(V_FW_CMD_OP(FW_CAPS_CONFIG_CMD) |
+ F_FW_CMD_REQUEST | F_FW_CMD_READ);
+ caps_cmd.cfvalid_to_len16 = cpu_to_be32(FW_LEN16(caps_cmd));
+ ret = t4_wr_mbox(adap, adap->mbox, &caps_cmd, sizeof(caps_cmd),
+ &caps_cmd);
+ }
+
+ if (ret < 0) {
+ dev_info(adap,
+ "Failed to configure using %s Firmware Configuration
file: %d\n",
+ config_name, ret);
+ return ret;
+ }
+
+ finiver = be32_to_cpu(caps_cmd.finiver);
+ finicsum = be32_to_cpu(caps_cmd.finicsum);
+ cfcsum = be32_to_cpu(caps_cmd.cfcsum);
+ if (finicsum != cfcsum)
+ dev_warn(adap,
+ "Configuration File checksum mismatch: [fini]
csum=0x%x, computed csum=0x%x\n",
+ finicsum, cfcsum);
+
+ /*
+ * If we're a pure NIC driver then disable all offloading facilities.
+ * This will allow the firmware to optimize aspects of the hardware
+ * configuration which will result in improved performance.
+ */
+ caps_cmd.niccaps &= cpu_to_be16(~FW_CAPS_CONFIG_NIC_ETHOFLD);
+ caps_cmd.toecaps = 0;
+ caps_cmd.iscsicaps = 0;
+ caps_cmd.rdmacaps = 0;
+ caps_cmd.fcoecaps = 0;
+ caps_cmd.cryptocaps = 0;
+
+ /*
+ * And now tell the firmware to use the configuration we just loaded.
+ */
+ caps_cmd.op_to_write = cpu_to_be32(V_FW_CMD_OP(FW_CAPS_CONFIG_CMD) |
+ F_FW_CMD_REQUEST | F_FW_CMD_WRITE);
+ caps_cmd.cfvalid_to_len16 = htonl(FW_LEN16(caps_cmd));
+ ret = t4_wr_mbox(adap, adap->mbox, &caps_cmd, sizeof(caps_cmd),
+ NULL);
+ if (ret < 0) {
+ dev_warn(adap, "Unable to finalize Firmware Capabilities %d\n",
+ ret);
+ return ret;
+ }
+
+ /*
+ * Return successfully and note that we're operating with parameters
+ * not supplied by the driver, rather than from hard-wired
+ * initialization constants buried in the driver.
+ */
+ dev_info(adap,
+ "Successfully configured using Firmware Configuration File
\"%s\", version: 0x%x, computed csum: 0x%x\n",
+ config_name, finiver, cfcsum);
+ return 0;
+}
+
static void configure_pcie_ext_tag(struct adapter *adapter)
{
u16 v;
@@ -1119,12 +1333,7 @@ static int adap_init0_tweaks(struct adapter *adapter)
*/
static int adap_init0_config(struct adapter *adapter, int reset)
{
- u32 finiver, finicsum, cfcsum, param, val;
- struct fw_caps_config_cmd caps_cmd;
- unsigned long mtype = 0, maddr = 0;
- u8 config_issued = 0;
- char config_name[20];
- int cfg_addr, ret;
+ int ret;
/*
* Reset device if necessary.
@@ -1139,98 +1348,10 @@ static int adap_init0_config(struct adapter *adapter,
int reset)
}
}
- cfg_addr = t4_flash_cfg_addr(adapter);
- if (cfg_addr < 0) {
- ret = cfg_addr;
- dev_warn(adapter, "Finding address for firmware config file in
flash failed, error %d\n",
- -ret);
- goto bye;
- }
-
- strcpy(config_name, "On Flash");
- mtype = FW_MEMTYPE_CF_FLASH;
- maddr = cfg_addr;
-
- /* Enable HASH filter region when support is available. */
- val = 1;
- param = CXGBE_FW_PARAM_DEV(HASHFILTER_WITH_OFLD);
- t4_set_params(adapter, adapter->mbox, adapter->pf, 0, 1,
- ¶m, &val);
-
- /*
- * Issue a Capability Configuration command to the firmware to get it
- * to parse the Configuration File. We don't use t4_fw_config_file()
- * because we want the ability to modify various features after we've
- * processed the configuration file ...
- */
- memset(&caps_cmd, 0, sizeof(caps_cmd));
- caps_cmd.op_to_write = cpu_to_be32(V_FW_CMD_OP(FW_CAPS_CONFIG_CMD) |
- F_FW_CMD_REQUEST | F_FW_CMD_READ);
- caps_cmd.cfvalid_to_len16 =
- cpu_to_be32(F_FW_CAPS_CONFIG_CMD_CFVALID |
- V_FW_CAPS_CONFIG_CMD_MEMTYPE_CF(mtype) |
- V_FW_CAPS_CONFIG_CMD_MEMADDR64K_CF(maddr >> 16) |
- FW_LEN16(caps_cmd));
- ret = t4_wr_mbox(adapter, adapter->mbox, &caps_cmd, sizeof(caps_cmd),
- &caps_cmd);
- /*
- * If the CAPS_CONFIG failed with an ENOENT (for a Firmware
- * Configuration File in FLASH), our last gasp effort is to use the
- * Firmware Configuration File which is embedded in the firmware. A
- * very few early versions of the firmware didn't have one embedded
- * but we can ignore those.
- */
- if (ret == -ENOENT) {
- dev_info(adapter, "%s: Going for embedded config in
firmware..\n",
- __func__);
-
- memset(&caps_cmd, 0, sizeof(caps_cmd));
- caps_cmd.op_to_write =
- cpu_to_be32(V_FW_CMD_OP(FW_CAPS_CONFIG_CMD) |
- F_FW_CMD_REQUEST | F_FW_CMD_READ);
- caps_cmd.cfvalid_to_len16 = cpu_to_be32(FW_LEN16(caps_cmd));
- ret = t4_wr_mbox(adapter, adapter->mbox, &caps_cmd,
- sizeof(caps_cmd), &caps_cmd);
- strcpy(config_name, "Firmware Default");
- }
-
- config_issued = 1;
+ ret = cxgbe_load_fw_config(adapter);
if (ret < 0)
goto bye;
- finiver = be32_to_cpu(caps_cmd.finiver);
- finicsum = be32_to_cpu(caps_cmd.finicsum);
- cfcsum = be32_to_cpu(caps_cmd.cfcsum);
- if (finicsum != cfcsum)
- dev_warn(adapter, "Configuration File checksum mismatch: [fini]
csum=%#x, computed csum=%#x\n",
- finicsum, cfcsum);
-
- /*
- * If we're a pure NIC driver then disable all offloading facilities.
- * This will allow the firmware to optimize aspects of the hardware
- * configuration which will result in improved performance.
- */
- caps_cmd.niccaps &= cpu_to_be16(~FW_CAPS_CONFIG_NIC_ETHOFLD);
- caps_cmd.toecaps = 0;
- caps_cmd.iscsicaps = 0;
- caps_cmd.rdmacaps = 0;
- caps_cmd.fcoecaps = 0;
- caps_cmd.cryptocaps = 0;
-
- /*
- * And now tell the firmware to use the configuration we just loaded.
- */
- caps_cmd.op_to_write = cpu_to_be32(V_FW_CMD_OP(FW_CAPS_CONFIG_CMD) |
- F_FW_CMD_REQUEST | F_FW_CMD_WRITE);
- caps_cmd.cfvalid_to_len16 = htonl(FW_LEN16(caps_cmd));
- ret = t4_wr_mbox(adapter, adapter->mbox, &caps_cmd, sizeof(caps_cmd),
- NULL);
- if (ret < 0) {
- dev_warn(adapter, "Unable to finalize Firmware Capabilities
%d\n",
- -ret);
- goto bye;
- }
-
/*
* Tweak configuration based on system architecture, etc.
*/
@@ -1251,27 +1372,9 @@ static int adap_init0_config(struct adapter *adapter,
int reset)
goto bye;
}
- /*
- * Return successfully and note that we're operating with parameters
- * not supplied by the driver, rather than from hard-wired
- * initialization constants buried in the driver.
- */
- dev_info(adapter,
- "Successfully configured using Firmware Configuration File
\"%s\", version %#x, computed checksum %#x\n",
- config_name, finiver, cfcsum);
-
return 0;
- /*
- * Something bad happened. Return the error ... (If the "error"
- * is that there's no Configuration File on the adapter we don't
- * want to issue a warning since this is fairly common.)
- */
bye:
- if (config_issued && ret != -ENOENT)
- dev_warn(adapter, "\"%s\" configuration file error %d\n",
- config_name, -ret);
-
dev_debug(adapter, "%s: returning ret = %d ..\n", __func__, ret);
return ret;
}
--
2.27.0
