X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=drivers%2Fnet%2Fqede%2Fqede_main.c;h=2d1f70693a3d615311efb45a509bbebb16f930b8;hb=cc46bab5968aa5b42ca6d65d6170f852018f2db5;hp=02f70beb36dc9e5f18411914b2d4c4dd74ee9f80;hpb=5018f1fc5f18d517c672559d4cc74784a579e037;p=dpdk.git diff --git a/drivers/net/qede/qede_main.c b/drivers/net/qede/qede_main.c index 02f70beb36..2d1f70693a 100644 --- a/drivers/net/qede/qede_main.c +++ b/drivers/net/qede/qede_main.c @@ -5,11 +5,15 @@ */ #include -#include + #include #include +#include "eal_firmware.h" + #include "qede_ethdev.h" +/* ######### DEBUG ###########*/ +#include "qede_debug.h" /* Alarm timeout. */ #define QEDE_ALARM_TIMEOUT_US 100000 @@ -36,6 +40,7 @@ static void qed_init_pci(struct ecore_dev *edev, struct rte_pci_device *pci_dev) edev->regview = pci_dev->mem_resource[0].addr; edev->doorbells = pci_dev->mem_resource[2].addr; edev->db_size = pci_dev->mem_resource[2].len; + edev->pci_dev = pci_dev; } static int @@ -66,7 +71,7 @@ qed_probe(struct ecore_dev *edev, struct rte_pci_device *pci_dev, hw_prepare_params.initiate_pf_flr = true; hw_prepare_params.allow_mdump = false; hw_prepare_params.b_en_pacing = false; - hw_prepare_params.epoch = (u32)time(NULL); + hw_prepare_params.epoch = OSAL_GET_EPOCH(ECORE_LEADING_HWFN(edev)); rc = ecore_hw_prepare(edev, &hw_prepare_params); if (rc) { DP_ERR(edev, "hw prepare failed\n"); @@ -125,51 +130,40 @@ static void qed_free_stream_mem(struct ecore_dev *edev) #ifdef CONFIG_ECORE_BINARY_FW static int qed_load_firmware_data(struct ecore_dev *edev) { - int fd; - struct stat st; const char *fw = RTE_LIBRTE_QEDE_FW; + void *buf; + size_t bufsz; + int ret; if (strcmp(fw, "") == 0) strcpy(qede_fw_file, QEDE_DEFAULT_FIRMWARE); else strcpy(qede_fw_file, fw); - fd = open(qede_fw_file, O_RDONLY); - if (fd < 0) { - DP_ERR(edev, "Can't open firmware file\n"); - return -ENOENT; - } - - if (fstat(fd, &st) < 0) { - DP_ERR(edev, "Can't stat firmware file\n"); - close(fd); + if (rte_firmware_read(qede_fw_file, &buf, &bufsz) < 0) { + DP_ERR(edev, "Can't read firmware data: %s\n", qede_fw_file); return -1; } - edev->firmware = rte_zmalloc("qede_fw", st.st_size, - RTE_CACHE_LINE_SIZE); + edev->firmware = rte_zmalloc("qede_fw", bufsz, RTE_CACHE_LINE_SIZE); if (!edev->firmware) { DP_ERR(edev, "Can't allocate memory for firmware\n"); - close(fd); - return -ENOMEM; + ret = -ENOMEM; + goto out; } - if (read(fd, edev->firmware, st.st_size) != st.st_size) { - DP_ERR(edev, "Can't read firmware data\n"); - close(fd); - return -1; - } - - edev->fw_len = st.st_size; + memcpy(edev->firmware, buf, bufsz); + edev->fw_len = bufsz; if (edev->fw_len < 104) { DP_ERR(edev, "Invalid fw size: %" PRIu64 "\n", edev->fw_len); - close(fd); - return -EINVAL; + ret = -EINVAL; + goto out; } - - close(fd); - return 0; + ret = 0; +out: + free(buf); + return ret; } #endif @@ -219,7 +213,9 @@ static void qed_stop_iov_task(struct ecore_dev *edev) for_each_hwfn(edev, i) { p_hwfn = &edev->hwfns[i]; - if (!IS_PF(edev)) + if (IS_PF(edev)) + rte_eal_alarm_cancel(qed_iov_pf_task, p_hwfn); + else rte_eal_alarm_cancel(qede_vf_task, p_hwfn); } } @@ -277,10 +273,15 @@ static int qed_slowpath_start(struct ecore_dev *edev, qed_start_iov_task(edev); #ifdef CONFIG_ECORE_BINARY_FW - if (IS_PF(edev)) + if (IS_PF(edev)) { data = (const uint8_t *)edev->firmware + sizeof(u32); + + /* ############### DEBUG ################## */ + qed_dbg_pf_init(edev); + } #endif + /* Start the slowpath */ memset(&hw_init_params, 0, sizeof(hw_init_params)); hw_init_params.b_hw_start = true; @@ -578,13 +579,12 @@ qed_get_current_link(struct ecore_dev *edev, struct qed_link_output *if_link) hwfn = &edev->hwfns[0]; if (IS_PF(edev)) { ptt = ecore_ptt_acquire(hwfn); - if (!ptt) - DP_NOTICE(hwfn, true, "Failed to fill link; No PTT\n"); - + if (ptt) { qed_fill_link(hwfn, ptt, if_link); - - if (ptt) ecore_ptt_release(hwfn, ptt); + } else { + DP_NOTICE(hwfn, true, "Failed to fill link; No PTT\n"); + } } else { qed_fill_link(hwfn, NULL, if_link); } @@ -642,10 +642,13 @@ void qed_link_update(struct ecore_hwfn *hwfn) struct ecore_dev *edev = hwfn->p_dev; struct qede_dev *qdev = (struct qede_dev *)edev; struct rte_eth_dev *dev = (struct rte_eth_dev *)qdev->ethdev; + int rc; - if (!qede_link_update(dev, 0)) - _rte_eth_dev_callback_process(dev, - RTE_ETH_EVENT_INTR_LSC, NULL); + rc = qede_link_update(dev, 0); + qed_inform_vf_link_state(hwfn); + + if (!rc) + rte_eth_dev_callback_process(dev, RTE_ETH_EVENT_INTR_LSC, NULL); } static int qed_drain(struct ecore_dev *edev) @@ -780,11 +783,42 @@ const struct qed_common_ops qed_common_ops_pass = { INIT_STRUCT_FIELD(slowpath_stop, &qed_slowpath_stop), INIT_STRUCT_FIELD(remove, &qed_remove), INIT_STRUCT_FIELD(send_drv_state, &qed_send_drv_state), + /* ############### DEBUG ####################*/ + + INIT_STRUCT_FIELD(dbg_get_debug_engine, &qed_get_debug_engine), + INIT_STRUCT_FIELD(dbg_set_debug_engine, &qed_set_debug_engine), + + INIT_STRUCT_FIELD(dbg_protection_override, + &qed_dbg_protection_override), + INIT_STRUCT_FIELD(dbg_protection_override_size, + &qed_dbg_protection_override_size), + + INIT_STRUCT_FIELD(dbg_grc, &qed_dbg_grc), + INIT_STRUCT_FIELD(dbg_grc_size, &qed_dbg_grc_size), + + INIT_STRUCT_FIELD(dbg_idle_chk, &qed_dbg_idle_chk), + INIT_STRUCT_FIELD(dbg_idle_chk_size, &qed_dbg_idle_chk_size), + + INIT_STRUCT_FIELD(dbg_mcp_trace, &qed_dbg_mcp_trace), + INIT_STRUCT_FIELD(dbg_mcp_trace_size, &qed_dbg_mcp_trace_size), + + INIT_STRUCT_FIELD(dbg_fw_asserts, &qed_dbg_fw_asserts), + INIT_STRUCT_FIELD(dbg_fw_asserts_size, &qed_dbg_fw_asserts_size), + + INIT_STRUCT_FIELD(dbg_ilt, &qed_dbg_ilt), + INIT_STRUCT_FIELD(dbg_ilt_size, &qed_dbg_ilt_size), + + INIT_STRUCT_FIELD(dbg_reg_fifo_size, &qed_dbg_reg_fifo_size), + INIT_STRUCT_FIELD(dbg_reg_fifo, &qed_dbg_reg_fifo), + + INIT_STRUCT_FIELD(dbg_igu_fifo_size, &qed_dbg_igu_fifo_size), + INIT_STRUCT_FIELD(dbg_igu_fifo, &qed_dbg_igu_fifo), }; const struct qed_eth_ops qed_eth_ops_pass = { INIT_STRUCT_FIELD(common, &qed_common_ops_pass), INIT_STRUCT_FIELD(fill_dev_info, &qed_fill_eth_dev_info), + INIT_STRUCT_FIELD(sriov_configure, &qed_sriov_configure), }; const struct qed_eth_ops *qed_get_eth_ops(void)