X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=drivers%2Fnet%2Fionic%2Fionic_dev.c;h=43e9ca3de356a60293b0b45dc7119732ca166927;hb=46c6714ffd4326cd9ea884a9812a459a444f464a;hp=aba388115ddd01470d00c3964958773f6c934cfe;hpb=eec10fb0ce6bbf1d00f87a491c7d89f995c911e4;p=dpdk.git diff --git a/drivers/net/ionic/ionic_dev.c b/drivers/net/ionic/ionic_dev.c index aba388115d..43e9ca3de3 100644 --- a/drivers/net/ionic/ionic_dev.c +++ b/drivers/net/ionic/ionic_dev.c @@ -2,6 +2,8 @@ * Copyright(c) 2018-2019 Pensando Systems, Inc. All rights reserved. */ +#include + #include #include "ionic_dev.h" @@ -63,7 +65,6 @@ ionic_dev_setup(struct ionic_adapter *adapter) } idev->db_pages = bar->vaddr; - idev->phy_db_pages = bar->bus_addr; return 0; } @@ -86,9 +87,8 @@ void ionic_dev_cmd_comp(struct ionic_dev *idev, void *mem) { union ionic_dev_cmd_comp *comp = mem; - unsigned int i; - uint32_t comp_size = sizeof(comp->words) / - sizeof(comp->words[0]); + uint32_t comp_size = RTE_DIM(comp->words); + uint32_t i; for (i = 0; i < comp_size; i++) comp->words[i] = ioread32(&idev->dev_cmd->comp.words[i]); @@ -97,9 +97,11 @@ ionic_dev_cmd_comp(struct ionic_dev *idev, void *mem) void ionic_dev_cmd_go(struct ionic_dev *idev, union ionic_dev_cmd *cmd) { - unsigned int i; - uint32_t cmd_size = sizeof(cmd->words) / - sizeof(cmd->words[0]); + uint32_t cmd_size = RTE_DIM(cmd->words); + uint32_t i; + + IONIC_PRINT(DEBUG, "Sending %s (%d) via dev_cmd", + ionic_opcode_to_str(cmd->cmd.opcode), cmd->cmd.opcode); for (i = 0; i < cmd_size; i++) iowrite32(cmd->words[i], &idev->dev_cmd->cmd.words[i]); @@ -161,7 +163,7 @@ ionic_dev_cmd_port_init(struct ionic_dev *idev) union ionic_dev_cmd cmd = { .port_init.opcode = IONIC_CMD_PORT_INIT, .port_init.index = 0, - .port_init.info_pa = idev->port_info_pa, + .port_init.info_pa = rte_cpu_to_le_64(idev->port_info_pa), }; ionic_dev_cmd_go(idev, &cmd); @@ -198,7 +200,7 @@ ionic_dev_cmd_port_speed(struct ionic_dev *idev, uint32_t speed) .port_setattr.opcode = IONIC_CMD_PORT_SETATTR, .port_setattr.index = 0, .port_setattr.attr = IONIC_PORT_ATTR_SPEED, - .port_setattr.speed = speed, + .port_setattr.speed = rte_cpu_to_le_32(speed), }; ionic_dev_cmd_go(idev, &cmd); @@ -211,7 +213,7 @@ ionic_dev_cmd_port_mtu(struct ionic_dev *idev, uint32_t mtu) .port_setattr.opcode = IONIC_CMD_PORT_SETATTR, .port_setattr.index = 0, .port_setattr.attr = IONIC_PORT_ATTR_MTU, - .port_setattr.mtu = mtu, + .port_setattr.mtu = rte_cpu_to_le_32(mtu), }; ionic_dev_cmd_go(idev, &cmd); @@ -271,6 +273,20 @@ ionic_dev_cmd_port_loopback(struct ionic_dev *idev, uint8_t loopback_mode) /* LIF commands */ +void +ionic_dev_cmd_queue_identify(struct ionic_dev *idev, + uint16_t lif_type, uint8_t qtype, uint8_t qver) +{ + union ionic_dev_cmd cmd = { + .q_identify.opcode = IONIC_CMD_Q_IDENTIFY, + .q_identify.lif_type = rte_cpu_to_le_16(lif_type), + .q_identify.type = qtype, + .q_identify.ver = qver, + }; + + ionic_dev_cmd_go(idev, &cmd); +} + void ionic_dev_cmd_lif_identify(struct ionic_dev *idev, uint8_t type, uint8_t ver) { @@ -284,24 +300,21 @@ ionic_dev_cmd_lif_identify(struct ionic_dev *idev, uint8_t type, uint8_t ver) } void -ionic_dev_cmd_lif_init(struct ionic_dev *idev, uint16_t lif_index, - rte_iova_t info_pa) +ionic_dev_cmd_lif_init(struct ionic_dev *idev, rte_iova_t info_pa) { union ionic_dev_cmd cmd = { .lif_init.opcode = IONIC_CMD_LIF_INIT, - .lif_init.index = lif_index, - .lif_init.info_pa = info_pa, + .lif_init.info_pa = rte_cpu_to_le_64(info_pa), }; ionic_dev_cmd_go(idev, &cmd); } void -ionic_dev_cmd_lif_reset(struct ionic_dev *idev, uint16_t lif_index) +ionic_dev_cmd_lif_reset(struct ionic_dev *idev) { union ionic_dev_cmd cmd = { .lif_init.opcode = IONIC_CMD_LIF_RESET, - .lif_init.index = lif_index, }; ionic_dev_cmd_go(idev, &cmd); @@ -313,12 +326,6 @@ ionic_db_map(struct ionic_lif *lif, struct ionic_queue *q) return lif->kern_dbpage + q->hw_type; } -int -ionic_db_page_num(struct ionic_lif *lif, int pid) -{ - return (lif->index * 0) + pid; -} - void ionic_intr_init(struct ionic_dev *idev, struct ionic_intr_info *intr, unsigned long index) @@ -328,39 +335,31 @@ ionic_intr_init(struct ionic_dev *idev, struct ionic_intr_info *intr, } void -ionic_dev_cmd_adminq_init(struct ionic_dev *idev, - struct ionic_qcq *qcq, - uint16_t lif_index, uint16_t intr_index) +ionic_dev_cmd_adminq_init(struct ionic_dev *idev, struct ionic_qcq *qcq) { struct ionic_queue *q = &qcq->q; struct ionic_cq *cq = &qcq->cq; union ionic_dev_cmd cmd = { .q_init.opcode = IONIC_CMD_Q_INIT, - .q_init.lif_index = lif_index, .q_init.type = q->type, - .q_init.index = q->index, - .q_init.flags = IONIC_QINIT_F_ENA, - .q_init.pid = q->pid, - .q_init.intr_index = intr_index, + .q_init.ver = qcq->lif->qtype_info[q->type].version, + .q_init.index = rte_cpu_to_le_32(q->index), + .q_init.flags = rte_cpu_to_le_16(IONIC_QINIT_F_ENA), + .q_init.intr_index = rte_cpu_to_le_16(IONIC_INTR_NONE), .q_init.ring_size = rte_log2_u32(q->num_descs), - .q_init.ring_base = q->base_pa, - .q_init.cq_ring_base = cq->base_pa, + .q_init.ring_base = rte_cpu_to_le_64(q->base_pa), + .q_init.cq_ring_base = rte_cpu_to_le_64(cq->base_pa), }; + IONIC_PRINT(DEBUG, "adminq.q_init.ver %u", cmd.q_init.ver); + ionic_dev_cmd_go(idev, &cmd); } int -ionic_cq_init(struct ionic_lif *lif, struct ionic_cq *cq, - struct ionic_intr_info *intr, - uint32_t num_descs, size_t desc_size) +ionic_cq_init(struct ionic_cq *cq, uint16_t num_descs) { - if (desc_size == 0) { - IONIC_PRINT(ERR, "Descriptor size is %zu", desc_size); - return -EINVAL; - } - if (!rte_is_power_of_2(num_descs) || num_descs < IONIC_MIN_RING_DESC || num_descs > IONIC_MAX_RING_DESC) { @@ -369,10 +368,8 @@ ionic_cq_init(struct ionic_lif *lif, struct ionic_cq *cq, return -EINVAL; } - cq->lif = lif; - cq->bound_intr = intr; cq->num_descs = num_descs; - cq->desc_size = desc_size; + cq->size_mask = num_descs - 1; cq->tail_idx = 0; cq->done_color = 1; @@ -386,13 +383,6 @@ ionic_cq_map(struct ionic_cq *cq, void *base, rte_iova_t base_pa) cq->base_pa = base_pa; } -void -ionic_cq_bind(struct ionic_cq *cq, struct ionic_queue *q) -{ - cq->bound_q = q; - q->bound_cq = cq; -} - uint32_t ionic_cq_service(struct ionic_cq *cq, uint32_t work_to_do, ionic_cq_cb cb, void *cb_arg) @@ -403,7 +393,7 @@ ionic_cq_service(struct ionic_cq *cq, uint32_t work_to_do, return 0; while (cb(cq, cq->tail_idx, cb_arg)) { - cq->tail_idx = (cq->tail_idx + 1) & (cq->num_descs - 1); + cq->tail_idx = Q_NEXT_TO_SRVC(cq, 1); if (cq->tail_idx == 0) cq->done_color = !cq->done_color; @@ -415,29 +405,22 @@ ionic_cq_service(struct ionic_cq *cq, uint32_t work_to_do, } int -ionic_q_init(struct ionic_lif *lif, struct ionic_dev *idev, - struct ionic_queue *q, uint32_t index, uint32_t num_descs, - size_t desc_size, size_t sg_desc_size, uint32_t pid) +ionic_q_init(struct ionic_queue *q, uint32_t index, uint16_t num_descs) { uint32_t ring_size; - if (desc_size == 0 || !rte_is_power_of_2(num_descs)) + if (!rte_is_power_of_2(num_descs)) return -EINVAL; ring_size = rte_log2_u32(num_descs); - if (ring_size < 2 || ring_size > 16) return -EINVAL; - q->lif = lif; - q->idev = idev; q->index = index; q->num_descs = num_descs; - q->desc_size = desc_size; - q->sg_desc_size = sg_desc_size; + q->size_mask = num_descs - 1; q->head_idx = 0; q->tail_idx = 0; - q->pid = pid; return 0; } @@ -455,123 +438,3 @@ ionic_q_sg_map(struct ionic_queue *q, void *base, rte_iova_t base_pa) q->sg_base = base; q->sg_base_pa = base_pa; } - -void -ionic_q_flush(struct ionic_queue *q) -{ - writeq(IONIC_DBELL_QID(q->hw_index) | q->head_idx, q->db); -} - -void -ionic_q_post(struct ionic_queue *q, bool ring_doorbell, desc_cb cb, - void *cb_arg) -{ - struct ionic_desc_info *head = &q->info[q->head_idx]; - - head->cb = cb; - head->cb_arg = cb_arg; - - q->head_idx = (q->head_idx + 1) & (q->num_descs - 1); - - if (ring_doorbell) - ionic_q_flush(q); -} - -uint32_t -ionic_q_space_avail(struct ionic_queue *q) -{ - uint32_t avail = q->tail_idx; - - if (q->head_idx >= avail) - avail += q->num_descs - q->head_idx - 1; - else - avail -= q->head_idx + 1; - - return avail; -} - -bool -ionic_q_has_space(struct ionic_queue *q, uint32_t want) -{ - return ionic_q_space_avail(q) >= want; -} - -void -ionic_q_service(struct ionic_queue *q, uint32_t cq_desc_index, - uint32_t stop_index, void *service_cb_arg) -{ - struct ionic_desc_info *desc_info; - uint32_t curr_q_tail_idx; - - do { - desc_info = &q->info[q->tail_idx]; - - if (desc_info->cb) - desc_info->cb(q, q->tail_idx, cq_desc_index, - desc_info->cb_arg, service_cb_arg); - - desc_info->cb = NULL; - desc_info->cb_arg = NULL; - - curr_q_tail_idx = q->tail_idx; - q->tail_idx = (q->tail_idx + 1) & (q->num_descs - 1); - - } while (curr_q_tail_idx != stop_index); -} - -static void -ionic_adminq_cb(struct ionic_queue *q, - uint32_t q_desc_index, uint32_t cq_desc_index, - void *cb_arg, void *service_cb_arg __rte_unused) -{ - struct ionic_admin_ctx *ctx = cb_arg; - struct ionic_admin_comp *cq_desc_base = q->bound_cq->base; - struct ionic_admin_comp *cq_desc = &cq_desc_base[cq_desc_index]; - - if (unlikely(cq_desc->comp_index != q_desc_index)) { - IONIC_WARN_ON(cq_desc->comp_index != q_desc_index); - return; - } - - memcpy(&ctx->comp, cq_desc, sizeof(*cq_desc)); - - ctx->pending_work = false; /* done */ -} - -/** ionic_adminq_post - Post an admin command. - * @lif: Handle to lif. - * @cmd_ctx: Api admin command context. - * - * Post the command to an admin queue in the ethernet driver. If this command - * succeeds, then the command has been posted, but that does not indicate a - * completion. If this command returns success, then the completion callback - * will eventually be called. - * - * Return: zero or negative error status. - */ -int -ionic_adminq_post(struct ionic_lif *lif, struct ionic_admin_ctx *ctx) -{ - struct ionic_queue *adminq = &lif->adminqcq->q; - struct ionic_admin_cmd *q_desc_base = adminq->base; - struct ionic_admin_cmd *q_desc; - int err = 0; - - rte_spinlock_lock(&lif->adminq_lock); - - if (!ionic_q_has_space(adminq, 1)) { - err = -ENOSPC; - goto err_out; - } - - q_desc = &q_desc_base[adminq->head_idx]; - - memcpy(q_desc, &ctx->cmd, sizeof(ctx->cmd)); - - ionic_q_post(adminq, true, ionic_adminq_cb, ctx); - -err_out: - rte_spinlock_unlock(&lif->adminq_lock); - - return err; -}