Commit 3da7a37a authored by Mintz, Yuval's avatar Mintz, Yuval Committed by David S. Miller

qed*: Handle-based L2-queues.

The driver needs to maintain several FW/HW-indices for each one of
its queues. Currently, that mapping is done by the QED where it uses
an rx/tx array of so-called hw-cids, populating them whenever a new
queue is opened and clearing them upon destruction of said queues.

This maintenance is far from ideal - there's no real reason why
QED needs to maintain such a data-structure. It becomes even worse
when considering the fact that the PF's queues and its child VFs' queues
are all mapped into the same data-structure.
As a by-product, the set of parameters an interface needs to supply for
queue APIs is non-trivial, and some of the variables in the API
structures have different meaning depending on their exact place
in the configuration flow.

This patch re-organizes the way L2 queues are configured and maintained.
In short:
  - Required parameters for queue init are now well-defined.
  - Qed would allocate a queue-cid based on parameters.
    Upon initialization success, it would return a handle to caller.
  - Queue-handle would be maintained by entity requesting queue-init,
    not necessarily qed.
  - All further queue-APIs [update, destroy] would use the opaque
    handle as reference for the queue instead of various indices.

The possible owners of such handles:
  - PF queues [qede] - complete handles based on provided configuration.
  - VF queues [qede] - fw-context-less handles, containing only relative
    information; Only the PF-side would need the absolute indices
    for configuration, so they're omitted here.
  - VF queues [qed, PF-side] - complete handles based on VF initialization.
Signed-off-by: default avatarYuval Mintz <Yuval.Mintz@cavium.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 567b3c12
...@@ -241,15 +241,6 @@ struct qed_hw_info { ...@@ -241,15 +241,6 @@ struct qed_hw_info {
enum qed_wol_support b_wol_support; enum qed_wol_support b_wol_support;
}; };
struct qed_hw_cid_data {
u32 cid;
bool b_cid_allocated;
/* Additional identifiers */
u16 opaque_fid;
u8 vport_id;
};
/* maximun size of read/write commands (HW limit) */ /* maximun size of read/write commands (HW limit) */
#define DMAE_MAX_RW_SIZE 0x2000 #define DMAE_MAX_RW_SIZE 0x2000
...@@ -416,9 +407,6 @@ struct qed_hwfn { ...@@ -416,9 +407,6 @@ struct qed_hwfn {
struct qed_dcbx_info *p_dcbx_info; struct qed_dcbx_info *p_dcbx_info;
struct qed_hw_cid_data *p_tx_cids;
struct qed_hw_cid_data *p_rx_cids;
struct qed_dmae_info dmae_info; struct qed_dmae_info dmae_info;
/* QM init */ /* QM init */
......
...@@ -134,15 +134,6 @@ void qed_resc_free(struct qed_dev *cdev) ...@@ -134,15 +134,6 @@ void qed_resc_free(struct qed_dev *cdev)
kfree(cdev->reset_stats); kfree(cdev->reset_stats);
for_each_hwfn(cdev, i) {
struct qed_hwfn *p_hwfn = &cdev->hwfns[i];
kfree(p_hwfn->p_tx_cids);
p_hwfn->p_tx_cids = NULL;
kfree(p_hwfn->p_rx_cids);
p_hwfn->p_rx_cids = NULL;
}
for_each_hwfn(cdev, i) { for_each_hwfn(cdev, i) {
struct qed_hwfn *p_hwfn = &cdev->hwfns[i]; struct qed_hwfn *p_hwfn = &cdev->hwfns[i];
...@@ -425,23 +416,6 @@ int qed_resc_alloc(struct qed_dev *cdev) ...@@ -425,23 +416,6 @@ int qed_resc_alloc(struct qed_dev *cdev)
if (!cdev->fw_data) if (!cdev->fw_data)
return -ENOMEM; return -ENOMEM;
/* Allocate Memory for the Queue->CID mapping */
for_each_hwfn(cdev, i) {
struct qed_hwfn *p_hwfn = &cdev->hwfns[i];
int tx_size = sizeof(struct qed_hw_cid_data) *
RESC_NUM(p_hwfn, QED_L2_QUEUE);
int rx_size = sizeof(struct qed_hw_cid_data) *
RESC_NUM(p_hwfn, QED_L2_QUEUE);
p_hwfn->p_tx_cids = kzalloc(tx_size, GFP_KERNEL);
if (!p_hwfn->p_tx_cids)
goto alloc_no_mem;
p_hwfn->p_rx_cids = kzalloc(rx_size, GFP_KERNEL);
if (!p_hwfn->p_rx_cids)
goto alloc_no_mem;
}
for_each_hwfn(cdev, i) { for_each_hwfn(cdev, i) {
struct qed_hwfn *p_hwfn = &cdev->hwfns[i]; struct qed_hwfn *p_hwfn = &cdev->hwfns[i];
u32 n_eqes, num_cons; u32 n_eqes, num_cons;
......
This diff is collapsed.
...@@ -78,11 +78,34 @@ struct qed_filter_mcast { ...@@ -78,11 +78,34 @@ struct qed_filter_mcast {
unsigned char mac[QED_MAX_MC_ADDRS][ETH_ALEN]; unsigned char mac[QED_MAX_MC_ADDRS][ETH_ALEN];
}; };
int qed_sp_eth_rx_queue_stop(struct qed_hwfn *p_hwfn, /**
u16 rx_queue_id, * @brief qed_eth_rx_queue_stop - This ramrod closes an Rx queue
bool eq_completion_only, bool cqe_completion); *
* @param p_hwfn
* @param p_rxq Handler of queue to close
* @param eq_completion_only If True completion will be on
* EQe, if False completion will be
* on EQe if p_hwfn opaque
* different from the RXQ opaque
* otherwise on CQe.
* @param cqe_completion If True completion will be
* receive on CQe.
* @return int
*/
int
qed_eth_rx_queue_stop(struct qed_hwfn *p_hwfn,
void *p_rxq,
bool eq_completion_only, bool cqe_completion);
int qed_sp_eth_tx_queue_stop(struct qed_hwfn *p_hwfn, u16 tx_queue_id); /**
* @brief qed_eth_tx_queue_stop - closes a Tx queue
*
* @param p_hwfn
* @param p_txq - handle to Tx queue needed to be closed
*
* @return int
*/
int qed_eth_tx_queue_stop(struct qed_hwfn *p_hwfn, void *p_txq);
enum qed_tpa_mode { enum qed_tpa_mode {
QED_TPA_MODE_NONE, QED_TPA_MODE_NONE,
...@@ -196,19 +219,19 @@ int qed_sp_eth_filter_ucast(struct qed_hwfn *p_hwfn, ...@@ -196,19 +219,19 @@ int qed_sp_eth_filter_ucast(struct qed_hwfn *p_hwfn,
* @note At the moment - only used by non-linux VFs. * @note At the moment - only used by non-linux VFs.
* *
* @param p_hwfn * @param p_hwfn
* @param rx_queue_id RX Queue ID * @param pp_rxq_handlers An array of queue handlers to be updated.
* @param num_rxqs Allow to update multiple rx * @param num_rxqs number of queues to update.
* queues, from rx_queue_id to
* (rx_queue_id + num_rxqs)
* @param complete_cqe_flg Post completion to the CQE Ring if set * @param complete_cqe_flg Post completion to the CQE Ring if set
* @param complete_event_flg Post completion to the Event Ring if set * @param complete_event_flg Post completion to the Event Ring if set
* @param comp_mode
* @param p_comp_data
* *
* @return int * @return int
*/ */
int int
qed_sp_eth_rx_queues_update(struct qed_hwfn *p_hwfn, qed_sp_eth_rx_queues_update(struct qed_hwfn *p_hwfn,
u16 rx_queue_id, void **pp_rxq_handlers,
u8 num_rxqs, u8 num_rxqs,
u8 complete_cqe_flg, u8 complete_cqe_flg,
u8 complete_event_flg, u8 complete_event_flg,
...@@ -217,27 +240,79 @@ qed_sp_eth_rx_queues_update(struct qed_hwfn *p_hwfn, ...@@ -217,27 +240,79 @@ qed_sp_eth_rx_queues_update(struct qed_hwfn *p_hwfn,
void qed_get_vport_stats(struct qed_dev *cdev, struct qed_eth_stats *stats); void qed_get_vport_stats(struct qed_dev *cdev, struct qed_eth_stats *stats);
int qed_sp_eth_vport_start(struct qed_hwfn *p_hwfn, void qed_reset_vport_stats(struct qed_dev *cdev);
struct qed_sp_vport_start_params *p_params);
struct qed_queue_cid {
/* 'Relative' is a relative term ;-). Usually the indices [not counting
* SBs] would be PF-relative, but there are some cases where that isn't
* the case - specifically for a PF configuring its VF indices it's
* possible some fields [E.g., stats-id] in 'rel' would already be abs.
*/
struct qed_queue_start_common_params rel;
struct qed_queue_start_common_params abs;
u32 cid;
u16 opaque_fid;
/* VFs queues are mapped differently, so we need to know the
* relative queue associated with them [0-based].
* Notice this is relevant on the *PF* queue-cid of its VF's queues,
* and not on the VF itself.
*/
bool is_vf;
u8 vf_qid;
/* Legacy VFs might have Rx producer located elsewhere */
bool b_legacy_vf;
};
int qed_sp_eth_rxq_start_ramrod(struct qed_hwfn *p_hwfn, void qed_eth_queue_cid_release(struct qed_hwfn *p_hwfn,
u16 opaque_fid, struct qed_queue_cid *p_cid);
u32 cid,
struct qed_queue_start_common_params *params, struct qed_queue_cid *_qed_eth_queue_to_cid(struct qed_hwfn *p_hwfn,
u8 stats_id, u16 opaque_fid,
u16 bd_max_bytes, u32 cid,
dma_addr_t bd_chain_phys_addr, u8 vf_qid,
dma_addr_t cqe_pbl_addr, struct qed_queue_start_common_params
u16 cqe_pbl_size, bool b_use_zone_a_prod); *p_params);
int qed_sp_eth_txq_start_ramrod(struct qed_hwfn *p_hwfn, int
u16 opaque_fid, qed_sp_eth_vport_start(struct qed_hwfn *p_hwfn,
u32 cid, struct qed_sp_vport_start_params *p_params);
struct qed_queue_start_common_params *p_params,
u8 stats_id, /**
dma_addr_t pbl_addr, * @brief - Starts an Rx queue, when queue_cid is already prepared
u16 pbl_size, *
union qed_qm_pq_params *p_pq_params); * @param p_hwfn
* @param p_cid
* @param bd_max_bytes
* @param bd_chain_phys_addr
* @param cqe_pbl_addr
* @param cqe_pbl_size
*
* @return int
*/
int
qed_eth_rxq_start_ramrod(struct qed_hwfn *p_hwfn,
struct qed_queue_cid *p_cid,
u16 bd_max_bytes,
dma_addr_t bd_chain_phys_addr,
dma_addr_t cqe_pbl_addr, u16 cqe_pbl_size);
/**
* @brief - Starts a Tx queue, where queue_cid is already prepared
*
* @param p_hwfn
* @param p_cid
* @param pbl_addr
* @param pbl_size
* @param p_pq_params - parameters for choosing the PQ for this Tx queue
*
* @return int
*/
int
qed_eth_txq_start_ramrod(struct qed_hwfn *p_hwfn,
struct qed_queue_cid *p_cid,
dma_addr_t pbl_addr, u16 pbl_size, u16 pq_id);
u8 qed_mcast_bin_from_mac(u8 *mac); u8 qed_mcast_bin_from_mac(u8 *mac);
......
This diff is collapsed.
...@@ -58,6 +58,23 @@ struct qed_public_vf_info { ...@@ -58,6 +58,23 @@ struct qed_public_vf_info {
int tx_rate; int tx_rate;
}; };
struct qed_iov_vf_init_params {
u16 rel_vf_id;
/* Number of requested Queues; Currently, don't support different
* number of Rx/Tx queues.
*/
u16 num_queues;
/* Allow the client to choose which qzones to use for Rx/Tx,
* and which queue_base to use for Tx queues on a per-queue basis.
* Notice values should be relative to the PF resources.
*/
u16 req_rx_queue[QED_MAX_VF_CHAINS_PER_PF];
u16 req_tx_queue[QED_MAX_VF_CHAINS_PER_PF];
};
/* This struct is part of qed_dev and contains data relevant to all hwfns; /* This struct is part of qed_dev and contains data relevant to all hwfns;
* Initialized only if SR-IOV cpabability is exposed in PCIe config space. * Initialized only if SR-IOV cpabability is exposed in PCIe config space.
*/ */
...@@ -99,10 +116,10 @@ struct qed_iov_vf_mbx { ...@@ -99,10 +116,10 @@ struct qed_iov_vf_mbx {
struct qed_vf_q_info { struct qed_vf_q_info {
u16 fw_rx_qid; u16 fw_rx_qid;
struct qed_queue_cid *p_rx_cid;
u16 fw_tx_qid; u16 fw_tx_qid;
struct qed_queue_cid *p_tx_cid;
u8 fw_cid; u8 fw_cid;
u8 rxq_active;
u8 txq_active;
}; };
enum vf_state { enum vf_state {
......
...@@ -388,18 +388,18 @@ int qed_vf_hw_prepare(struct qed_hwfn *p_hwfn) ...@@ -388,18 +388,18 @@ int qed_vf_hw_prepare(struct qed_hwfn *p_hwfn)
#define MSTORM_QZONE_START(dev) (TSTORM_QZONE_START + \ #define MSTORM_QZONE_START(dev) (TSTORM_QZONE_START + \
(TSTORM_QZONE_SIZE * NUM_OF_L2_QUEUES(dev))) (TSTORM_QZONE_SIZE * NUM_OF_L2_QUEUES(dev)))
int qed_vf_pf_rxq_start(struct qed_hwfn *p_hwfn, int
u8 rx_qid, qed_vf_pf_rxq_start(struct qed_hwfn *p_hwfn,
u16 sb, struct qed_queue_cid *p_cid,
u8 sb_index, u16 bd_max_bytes,
u16 bd_max_bytes, dma_addr_t bd_chain_phys_addr,
dma_addr_t bd_chain_phys_addr, dma_addr_t cqe_pbl_addr,
dma_addr_t cqe_pbl_addr, u16 cqe_pbl_size, void __iomem **pp_prod)
u16 cqe_pbl_size, void __iomem **pp_prod)
{ {
struct qed_vf_iov *p_iov = p_hwfn->vf_iov_info; struct qed_vf_iov *p_iov = p_hwfn->vf_iov_info;
struct pfvf_start_queue_resp_tlv *resp; struct pfvf_start_queue_resp_tlv *resp;
struct vfpf_start_rxq_tlv *req; struct vfpf_start_rxq_tlv *req;
u8 rx_qid = p_cid->rel.queue_id;
int rc; int rc;
/* clear mailbox and prep first tlv */ /* clear mailbox and prep first tlv */
...@@ -409,21 +409,22 @@ int qed_vf_pf_rxq_start(struct qed_hwfn *p_hwfn, ...@@ -409,21 +409,22 @@ int qed_vf_pf_rxq_start(struct qed_hwfn *p_hwfn,
req->cqe_pbl_addr = cqe_pbl_addr; req->cqe_pbl_addr = cqe_pbl_addr;
req->cqe_pbl_size = cqe_pbl_size; req->cqe_pbl_size = cqe_pbl_size;
req->rxq_addr = bd_chain_phys_addr; req->rxq_addr = bd_chain_phys_addr;
req->hw_sb = sb; req->hw_sb = p_cid->rel.sb;
req->sb_index = sb_index; req->sb_index = p_cid->rel.sb_idx;
req->bd_max_bytes = bd_max_bytes; req->bd_max_bytes = bd_max_bytes;
req->stat_id = -1; req->stat_id = -1;
/* If PF is legacy, we'll need to calculate producers ourselves /* If PF is legacy, we'll need to calculate producers ourselves
* as well as clean them. * as well as clean them.
*/ */
if (pp_prod && p_iov->b_pre_fp_hsi) { if (p_iov->b_pre_fp_hsi) {
u8 hw_qid = p_iov->acquire_resp.resc.hw_qid[rx_qid]; u8 hw_qid = p_iov->acquire_resp.resc.hw_qid[rx_qid];
u32 init_prod_val = 0; u32 init_prod_val = 0;
*pp_prod = (u8 __iomem *)p_hwfn->regview + *pp_prod = (u8 __iomem *)
MSTORM_QZONE_START(p_hwfn->cdev) + p_hwfn->regview +
hw_qid * MSTORM_QZONE_SIZE; MSTORM_QZONE_START(p_hwfn->cdev) +
hw_qid * MSTORM_QZONE_SIZE;
/* Init the rcq, rx bd and rx sge (if valid) producers to 0 */ /* Init the rcq, rx bd and rx sge (if valid) producers to 0 */
__internal_ram_wr(p_hwfn, *pp_prod, sizeof(u32), __internal_ram_wr(p_hwfn, *pp_prod, sizeof(u32),
...@@ -444,7 +445,7 @@ int qed_vf_pf_rxq_start(struct qed_hwfn *p_hwfn, ...@@ -444,7 +445,7 @@ int qed_vf_pf_rxq_start(struct qed_hwfn *p_hwfn,
} }
/* Learn the address of the producer from the response */ /* Learn the address of the producer from the response */
if (pp_prod && !p_iov->b_pre_fp_hsi) { if (!p_iov->b_pre_fp_hsi) {
u32 init_prod_val = 0; u32 init_prod_val = 0;
*pp_prod = (u8 __iomem *)p_hwfn->regview + resp->offset; *pp_prod = (u8 __iomem *)p_hwfn->regview + resp->offset;
...@@ -462,7 +463,8 @@ int qed_vf_pf_rxq_start(struct qed_hwfn *p_hwfn, ...@@ -462,7 +463,8 @@ int qed_vf_pf_rxq_start(struct qed_hwfn *p_hwfn,
return rc; return rc;
} }
int qed_vf_pf_rxq_stop(struct qed_hwfn *p_hwfn, u16 rx_qid, bool cqe_completion) int qed_vf_pf_rxq_stop(struct qed_hwfn *p_hwfn,
struct qed_queue_cid *p_cid, bool cqe_completion)
{ {
struct qed_vf_iov *p_iov = p_hwfn->vf_iov_info; struct qed_vf_iov *p_iov = p_hwfn->vf_iov_info;
struct vfpf_stop_rxqs_tlv *req; struct vfpf_stop_rxqs_tlv *req;
...@@ -472,7 +474,7 @@ int qed_vf_pf_rxq_stop(struct qed_hwfn *p_hwfn, u16 rx_qid, bool cqe_completion) ...@@ -472,7 +474,7 @@ int qed_vf_pf_rxq_stop(struct qed_hwfn *p_hwfn, u16 rx_qid, bool cqe_completion)
/* clear mailbox and prep first tlv */ /* clear mailbox and prep first tlv */
req = qed_vf_pf_prep(p_hwfn, CHANNEL_TLV_STOP_RXQS, sizeof(*req)); req = qed_vf_pf_prep(p_hwfn, CHANNEL_TLV_STOP_RXQS, sizeof(*req));
req->rx_qid = rx_qid; req->rx_qid = p_cid->rel.queue_id;
req->num_rxqs = 1; req->num_rxqs = 1;
req->cqe_completion = cqe_completion; req->cqe_completion = cqe_completion;
...@@ -496,28 +498,28 @@ int qed_vf_pf_rxq_stop(struct qed_hwfn *p_hwfn, u16 rx_qid, bool cqe_completion) ...@@ -496,28 +498,28 @@ int qed_vf_pf_rxq_stop(struct qed_hwfn *p_hwfn, u16 rx_qid, bool cqe_completion)
return rc; return rc;
} }
int qed_vf_pf_txq_start(struct qed_hwfn *p_hwfn, int
u16 tx_queue_id, qed_vf_pf_txq_start(struct qed_hwfn *p_hwfn,
u16 sb, struct qed_queue_cid *p_cid,
u8 sb_index, dma_addr_t pbl_addr,
dma_addr_t pbl_addr, u16 pbl_size, void __iomem **pp_doorbell)
u16 pbl_size, void __iomem **pp_doorbell)
{ {
struct qed_vf_iov *p_iov = p_hwfn->vf_iov_info; struct qed_vf_iov *p_iov = p_hwfn->vf_iov_info;
struct pfvf_start_queue_resp_tlv *resp; struct pfvf_start_queue_resp_tlv *resp;
struct vfpf_start_txq_tlv *req; struct vfpf_start_txq_tlv *req;
u16 qid = p_cid->rel.queue_id;
int rc; int rc;
/* clear mailbox and prep first tlv */ /* clear mailbox and prep first tlv */
req = qed_vf_pf_prep(p_hwfn, CHANNEL_TLV_START_TXQ, sizeof(*req)); req = qed_vf_pf_prep(p_hwfn, CHANNEL_TLV_START_TXQ, sizeof(*req));
req->tx_qid = tx_queue_id; req->tx_qid = qid;
/* Tx */ /* Tx */
req->pbl_addr = pbl_addr; req->pbl_addr = pbl_addr;
req->pbl_size = pbl_size; req->pbl_size = pbl_size;
req->hw_sb = sb; req->hw_sb = p_cid->rel.sb;
req->sb_index = sb_index; req->sb_index = p_cid->rel.sb_idx;
/* add list termination tlv */ /* add list termination tlv */
qed_add_tlv(p_hwfn, &p_iov->offset, qed_add_tlv(p_hwfn, &p_iov->offset,
...@@ -533,33 +535,29 @@ int qed_vf_pf_txq_start(struct qed_hwfn *p_hwfn, ...@@ -533,33 +535,29 @@ int qed_vf_pf_txq_start(struct qed_hwfn *p_hwfn,
goto exit; goto exit;
} }
if (pp_doorbell) { /* Modern PFs provide the actual offsets, while legacy
/* Modern PFs provide the actual offsets, while legacy * provided only the queue id.
* provided only the queue id. */
*/ if (!p_iov->b_pre_fp_hsi) {
if (!p_iov->b_pre_fp_hsi) { *pp_doorbell = (u8 __iomem *)p_hwfn->doorbells + resp->offset;
*pp_doorbell = (u8 __iomem *)p_hwfn->doorbells + } else {
resp->offset; u8 cid = p_iov->acquire_resp.resc.cid[qid];
} else {
u8 cid = p_iov->acquire_resp.resc.cid[tx_queue_id];
u32 db_addr;
db_addr = qed_db_addr_vf(cid, DQ_DEMS_LEGACY);
*pp_doorbell = (u8 __iomem *)p_hwfn->doorbells +
db_addr;
}
DP_VERBOSE(p_hwfn, QED_MSG_IOV, *pp_doorbell = (u8 __iomem *)p_hwfn->doorbells +
"Txq[0x%02x]: doorbell at %p [offset 0x%08x]\n", qed_db_addr_vf(cid,
tx_queue_id, *pp_doorbell, resp->offset); DQ_DEMS_LEGACY);
} }
DP_VERBOSE(p_hwfn, QED_MSG_IOV,
"Txq[0x%02x]: doorbell at %p [offset 0x%08x]\n",
qid, *pp_doorbell, resp->offset);
exit: exit:
qed_vf_pf_req_end(p_hwfn, rc); qed_vf_pf_req_end(p_hwfn, rc);
return rc; return rc;
} }
int qed_vf_pf_txq_stop(struct qed_hwfn *p_hwfn, u16 tx_qid) int qed_vf_pf_txq_stop(struct qed_hwfn *p_hwfn, struct qed_queue_cid *p_cid)
{ {
struct qed_vf_iov *p_iov = p_hwfn->vf_iov_info; struct qed_vf_iov *p_iov = p_hwfn->vf_iov_info;
struct vfpf_stop_txqs_tlv *req; struct vfpf_stop_txqs_tlv *req;
...@@ -569,7 +567,7 @@ int qed_vf_pf_txq_stop(struct qed_hwfn *p_hwfn, u16 tx_qid) ...@@ -569,7 +567,7 @@ int qed_vf_pf_txq_stop(struct qed_hwfn *p_hwfn, u16 tx_qid)
/* clear mailbox and prep first tlv */ /* clear mailbox and prep first tlv */
req = qed_vf_pf_prep(p_hwfn, CHANNEL_TLV_STOP_TXQS, sizeof(*req)); req = qed_vf_pf_prep(p_hwfn, CHANNEL_TLV_STOP_TXQS, sizeof(*req));
req->tx_qid = tx_qid; req->tx_qid = p_cid->rel.queue_id;
req->num_txqs = 1; req->num_txqs = 1;
/* add list termination tlv */ /* add list termination tlv */
......
...@@ -666,10 +666,7 @@ int qed_vf_hw_prepare(struct qed_hwfn *p_hwfn); ...@@ -666,10 +666,7 @@ int qed_vf_hw_prepare(struct qed_hwfn *p_hwfn);
/** /**
* @brief VF - start the RX Queue by sending a message to the PF * @brief VF - start the RX Queue by sending a message to the PF
* @param p_hwfn * @param p_hwfn
* @param cid - zero based within the VF * @param p_cid - Only relative fields are relevant
* @param rx_queue_id - zero based within the VF
* @param sb - VF status block for this queue
* @param sb_index - Index within the status block
* @param bd_max_bytes - maximum number of bytes per bd * @param bd_max_bytes - maximum number of bytes per bd
* @param bd_chain_phys_addr - physical address of bd chain * @param bd_chain_phys_addr - physical address of bd chain
* @param cqe_pbl_addr - physical address of pbl * @param cqe_pbl_addr - physical address of pbl
...@@ -680,9 +677,7 @@ int qed_vf_hw_prepare(struct qed_hwfn *p_hwfn); ...@@ -680,9 +677,7 @@ int qed_vf_hw_prepare(struct qed_hwfn *p_hwfn);
* @return int * @return int
*/ */
int qed_vf_pf_rxq_start(struct qed_hwfn *p_hwfn, int qed_vf_pf_rxq_start(struct qed_hwfn *p_hwfn,
u8 rx_queue_id, struct qed_queue_cid *p_cid,
u16 sb,
u8 sb_index,
u16 bd_max_bytes, u16 bd_max_bytes,
dma_addr_t bd_chain_phys_addr, dma_addr_t bd_chain_phys_addr,
dma_addr_t cqe_pbl_addr, dma_addr_t cqe_pbl_addr,
...@@ -702,24 +697,23 @@ int qed_vf_pf_rxq_start(struct qed_hwfn *p_hwfn, ...@@ -702,24 +697,23 @@ int qed_vf_pf_rxq_start(struct qed_hwfn *p_hwfn,
* *
* @return int * @return int
*/ */
int qed_vf_pf_txq_start(struct qed_hwfn *p_hwfn, int
u16 tx_queue_id, qed_vf_pf_txq_start(struct qed_hwfn *p_hwfn,
u16 sb, struct qed_queue_cid *p_cid,
u8 sb_index, dma_addr_t pbl_addr,
dma_addr_t pbl_addr, u16 pbl_size, void __iomem **pp_doorbell);
u16 pbl_size, void __iomem **pp_doorbell);
/** /**
* @brief VF - stop the RX queue by sending a message to the PF * @brief VF - stop the RX queue by sending a message to the PF
* *
* @param p_hwfn * @param p_hwfn
* @param rx_qid * @param p_cid
* @param cqe_completion * @param cqe_completion
* *
* @return int * @return int
*/ */
int qed_vf_pf_rxq_stop(struct qed_hwfn *p_hwfn, int qed_vf_pf_rxq_stop(struct qed_hwfn *p_hwfn,
u16 rx_qid, bool cqe_completion); struct qed_queue_cid *p_cid, bool cqe_completion);
/** /**
* @brief VF - stop the TX queue by sending a message to the PF * @brief VF - stop the TX queue by sending a message to the PF
...@@ -729,7 +723,7 @@ int qed_vf_pf_rxq_stop(struct qed_hwfn *p_hwfn, ...@@ -729,7 +723,7 @@ int qed_vf_pf_rxq_stop(struct qed_hwfn *p_hwfn,
* *
* @return int * @return int
*/ */
int qed_vf_pf_txq_stop(struct qed_hwfn *p_hwfn, u16 tx_qid); int qed_vf_pf_txq_stop(struct qed_hwfn *p_hwfn, struct qed_queue_cid *p_cid);
/** /**
* @brief VF - send a vport update command * @brief VF - send a vport update command
...@@ -902,9 +896,7 @@ static inline int qed_vf_hw_prepare(struct qed_hwfn *p_hwfn) ...@@ -902,9 +896,7 @@ static inline int qed_vf_hw_prepare(struct qed_hwfn *p_hwfn)
} }
static inline int qed_vf_pf_rxq_start(struct qed_hwfn *p_hwfn, static inline int qed_vf_pf_rxq_start(struct qed_hwfn *p_hwfn,
u8 rx_queue_id, struct qed_queue_cid *p_cid,
u16 sb,
u8 sb_index,
u16 bd_max_bytes, u16 bd_max_bytes,
dma_addr_t bd_chain_phys_adr, dma_addr_t bd_chain_phys_adr,
dma_addr_t cqe_pbl_addr, dma_addr_t cqe_pbl_addr,
...@@ -914,9 +906,7 @@ static inline int qed_vf_pf_rxq_start(struct qed_hwfn *p_hwfn, ...@@ -914,9 +906,7 @@ static inline int qed_vf_pf_rxq_start(struct qed_hwfn *p_hwfn,
} }
static inline int qed_vf_pf_txq_start(struct qed_hwfn *p_hwfn, static inline int qed_vf_pf_txq_start(struct qed_hwfn *p_hwfn,
u16 tx_queue_id, struct qed_queue_cid *p_cid,
u16 sb,
u8 sb_index,
dma_addr_t pbl_addr, dma_addr_t pbl_addr,
u16 pbl_size, void __iomem **pp_doorbell) u16 pbl_size, void __iomem **pp_doorbell)
{ {
...@@ -924,12 +914,14 @@ static inline int qed_vf_pf_txq_start(struct qed_hwfn *p_hwfn, ...@@ -924,12 +914,14 @@ static inline int qed_vf_pf_txq_start(struct qed_hwfn *p_hwfn,
} }
static inline int qed_vf_pf_rxq_stop(struct qed_hwfn *p_hwfn, static inline int qed_vf_pf_rxq_stop(struct qed_hwfn *p_hwfn,
u16 rx_qid, bool cqe_completion) struct qed_queue_cid *p_cid,
bool cqe_completion)
{ {
return -EINVAL; return -EINVAL;
} }
static inline int qed_vf_pf_txq_stop(struct qed_hwfn *p_hwfn, u16 tx_qid) static inline int qed_vf_pf_txq_stop(struct qed_hwfn *p_hwfn,
struct qed_queue_cid *p_cid)
{ {
return -EINVAL; return -EINVAL;
} }
......
...@@ -264,6 +264,8 @@ struct qede_rx_queue { ...@@ -264,6 +264,8 @@ struct qede_rx_queue {
u64 rx_hw_errors; u64 rx_hw_errors;
u64 rx_alloc_errors; u64 rx_alloc_errors;
u64 rx_ip_frags; u64 rx_ip_frags;
void *handle;
}; };
union db_prod { union db_prod {
...@@ -293,6 +295,8 @@ struct qede_tx_queue { ...@@ -293,6 +295,8 @@ struct qede_tx_queue {
u64 stopped_cnt; u64 stopped_cnt;
bool is_legacy; bool is_legacy;
void *handle;
}; };
#define BD_UNMAP_ADDR(bd) HILO_U64(le32_to_cpu((bd)->addr.hi), \ #define BD_UNMAP_ADDR(bd) HILO_U64(le32_to_cpu((bd)->addr.hi), \
......
...@@ -3334,6 +3334,12 @@ static int qede_drain_txq(struct qede_dev *edev, ...@@ -3334,6 +3334,12 @@ static int qede_drain_txq(struct qede_dev *edev,
return 0; return 0;
} }
static int qede_stop_txq(struct qede_dev *edev,
struct qede_tx_queue *txq, int rss_id)
{
return edev->ops->q_tx_stop(edev->cdev, rss_id, txq->handle);
}
static int qede_stop_queues(struct qede_dev *edev) static int qede_stop_queues(struct qede_dev *edev)
{ {
struct qed_update_vport_params vport_update_params; struct qed_update_vport_params vport_update_params;
...@@ -3367,28 +3373,18 @@ static int qede_stop_queues(struct qede_dev *edev) ...@@ -3367,28 +3373,18 @@ static int qede_stop_queues(struct qede_dev *edev)
/* Stop all Queues in reverse order */ /* Stop all Queues in reverse order */
for (i = QEDE_QUEUE_CNT(edev) - 1; i >= 0; i--) { for (i = QEDE_QUEUE_CNT(edev) - 1; i >= 0; i--) {
struct qed_stop_rxq_params rx_params;
fp = &edev->fp_array[i]; fp = &edev->fp_array[i];
/* Stop the Tx Queue(s) */ /* Stop the Tx Queue(s) */
if (fp->type & QEDE_FASTPATH_TX) { if (fp->type & QEDE_FASTPATH_TX) {
struct qed_stop_txq_params tx_params; rc = qede_stop_txq(edev, fp->txq, i);
if (rc)
tx_params.rss_id = i; return rc;
tx_params.tx_queue_id = fp->txq->index;
rc = edev->ops->q_tx_stop(cdev, &tx_params);
if (rc)
return rc;
} }
/* Stop the Rx Queue */ /* Stop the Rx Queue */
if (fp->type & QEDE_FASTPATH_RX) { if (fp->type & QEDE_FASTPATH_RX) {
memset(&rx_params, 0, sizeof(rx_params)); rc = edev->ops->q_rx_stop(cdev, i, fp->rxq->handle);
rx_params.rss_id = i;
rx_params.rx_queue_id = fp->rxq->rxq_id;
rc = edev->ops->q_rx_stop(cdev, &rx_params);
if (rc) { if (rc) {
DP_ERR(edev, "Failed to stop RXQ #%d\n", i); DP_ERR(edev, "Failed to stop RXQ #%d\n", i);
return rc; return rc;
...@@ -3404,6 +3400,46 @@ static int qede_stop_queues(struct qede_dev *edev) ...@@ -3404,6 +3400,46 @@ static int qede_stop_queues(struct qede_dev *edev)
return rc; return rc;
} }
static int qede_start_txq(struct qede_dev *edev,
struct qede_fastpath *fp,
struct qede_tx_queue *txq, u8 rss_id, u16 sb_idx)
{
dma_addr_t phys_table = qed_chain_get_pbl_phys(&txq->tx_pbl);
u32 page_cnt = qed_chain_get_page_cnt(&txq->tx_pbl);
struct qed_queue_start_common_params params;
struct qed_txq_start_ret_params ret_params;
int rc;
memset(&params, 0, sizeof(params));
memset(&ret_params, 0, sizeof(ret_params));
params.queue_id = txq->index;
params.sb = fp->sb_info->igu_sb_id;
params.sb_idx = sb_idx;
rc = edev->ops->q_tx_start(edev->cdev, rss_id, &params, phys_table,
page_cnt, &ret_params);
if (rc) {
DP_ERR(edev, "Start TXQ #%d failed %d\n", txq->index, rc);
return rc;
}
txq->doorbell_addr = ret_params.p_doorbell;
txq->handle = ret_params.p_handle;
/* Determine the FW consumer address associated */
txq->hw_cons_ptr = &fp->sb_info->sb_virt->pi_array[sb_idx];
/* Prepare the doorbell parameters */
SET_FIELD(txq->tx_db.data.params, ETH_DB_DATA_DEST, DB_DEST_XCM);
SET_FIELD(txq->tx_db.data.params, ETH_DB_DATA_AGG_CMD, DB_AGG_CMD_SET);
SET_FIELD(txq->tx_db.data.params, ETH_DB_DATA_AGG_VAL_SEL,
DQ_XCM_ETH_TX_BD_PROD_CMD);
txq->tx_db.data.agg_flags = DQ_XCM_ETH_DQ_CF_CMD;
return rc;
}
static int qede_start_queues(struct qede_dev *edev, bool clear_stats) static int qede_start_queues(struct qede_dev *edev, bool clear_stats)
{ {
int vlan_removal_en = 1; int vlan_removal_en = 1;
...@@ -3445,11 +3481,12 @@ static int qede_start_queues(struct qede_dev *edev, bool clear_stats) ...@@ -3445,11 +3481,12 @@ static int qede_start_queues(struct qede_dev *edev, bool clear_stats)
u32 page_cnt; u32 page_cnt;
if (fp->type & QEDE_FASTPATH_RX) { if (fp->type & QEDE_FASTPATH_RX) {
struct qed_rxq_start_ret_params ret_params;
struct qede_rx_queue *rxq = fp->rxq; struct qede_rx_queue *rxq = fp->rxq;
__le16 *val; __le16 *val;
memset(&ret_params, 0, sizeof(ret_params));
memset(&q_params, 0, sizeof(q_params)); memset(&q_params, 0, sizeof(q_params));
q_params.rss_id = i;
q_params.queue_id = rxq->rxq_id; q_params.queue_id = rxq->rxq_id;
q_params.vport_id = 0; q_params.vport_id = 0;
q_params.sb = fp->sb_info->igu_sb_id; q_params.sb = fp->sb_info->igu_sb_id;
...@@ -3459,18 +3496,21 @@ static int qede_start_queues(struct qede_dev *edev, bool clear_stats) ...@@ -3459,18 +3496,21 @@ static int qede_start_queues(struct qede_dev *edev, bool clear_stats)
qed_chain_get_pbl_phys(&rxq->rx_comp_ring); qed_chain_get_pbl_phys(&rxq->rx_comp_ring);
page_cnt = qed_chain_get_page_cnt(&rxq->rx_comp_ring); page_cnt = qed_chain_get_page_cnt(&rxq->rx_comp_ring);
rc = edev->ops->q_rx_start(cdev, &q_params, rc = edev->ops->q_rx_start(cdev, i, &q_params,
rxq->rx_buf_size, rxq->rx_buf_size,
rxq->rx_bd_ring.p_phys_addr, rxq->rx_bd_ring.p_phys_addr,
p_phys_table, p_phys_table,
page_cnt, page_cnt, &ret_params);
&rxq->hw_rxq_prod_addr);
if (rc) { if (rc) {
DP_ERR(edev, "Start RXQ #%d failed %d\n", i, DP_ERR(edev, "Start RXQ #%d failed %d\n", i,
rc); rc);
return rc; return rc;
} }
/* Use the return parameters */
rxq->hw_rxq_prod_addr = ret_params.p_prod;
rxq->handle = ret_params.p_handle;
val = &fp->sb_info->sb_virt->pi_array[RX_PI]; val = &fp->sb_info->sb_virt->pi_array[RX_PI];
rxq->hw_cons_ptr = val; rxq->hw_cons_ptr = val;
...@@ -3478,38 +3518,9 @@ static int qede_start_queues(struct qede_dev *edev, bool clear_stats) ...@@ -3478,38 +3518,9 @@ static int qede_start_queues(struct qede_dev *edev, bool clear_stats)
} }
if (fp->type & QEDE_FASTPATH_TX) { if (fp->type & QEDE_FASTPATH_TX) {
struct qede_tx_queue *txq = fp->txq; rc = qede_start_txq(edev, fp, fp->txq, i, TX_PI(0));
if (rc)
p_phys_table = qed_chain_get_pbl_phys(&txq->tx_pbl);
page_cnt = qed_chain_get_page_cnt(&txq->tx_pbl);
memset(&q_params, 0, sizeof(q_params));
q_params.rss_id = i;
q_params.queue_id = txq->index;
q_params.vport_id = 0;
q_params.sb = fp->sb_info->igu_sb_id;
q_params.sb_idx = TX_PI(0);
rc = edev->ops->q_tx_start(cdev, &q_params,
p_phys_table, page_cnt,
&txq->doorbell_addr);
if (rc) {
DP_ERR(edev, "Start TXQ #%d failed %d\n",
txq->index, rc);
return rc; return rc;
}
txq->hw_cons_ptr =
&fp->sb_info->sb_virt->pi_array[TX_PI(0)];
SET_FIELD(txq->tx_db.data.params,
ETH_DB_DATA_DEST, DB_DEST_XCM);
SET_FIELD(txq->tx_db.data.params, ETH_DB_DATA_AGG_CMD,
DB_AGG_CMD_SET);
SET_FIELD(txq->tx_db.data.params,
ETH_DB_DATA_AGG_VAL_SEL,
DQ_XCM_ETH_TX_BD_PROD_CMD);
txq->tx_db.data.agg_flags = DQ_XCM_ETH_DQ_CF_CMD;
} }
} }
......
...@@ -15,6 +15,29 @@ ...@@ -15,6 +15,29 @@
#include <linux/qed/qed_if.h> #include <linux/qed/qed_if.h>
#include <linux/qed/qed_iov_if.h> #include <linux/qed/qed_iov_if.h>
struct qed_queue_start_common_params {
/* Should always be relative to entity sending this. */
u8 vport_id;
u16 queue_id;
/* Relative, but relevant only for PFs */
u8 stats_id;
/* These are always absolute */
u16 sb;
u8 sb_idx;
};
struct qed_rxq_start_ret_params {
void __iomem *p_prod;
void *p_handle;
};
struct qed_txq_start_ret_params {
void __iomem *p_doorbell;
void *p_handle;
};
struct qed_dev_eth_info { struct qed_dev_eth_info {
struct qed_dev_info common; struct qed_dev_info common;
...@@ -56,18 +79,6 @@ struct qed_start_vport_params { ...@@ -56,18 +79,6 @@ struct qed_start_vport_params {
bool clear_stats; bool clear_stats;
}; };
struct qed_stop_rxq_params {
u8 rss_id;
u8 rx_queue_id;
u8 vport_id;
bool eq_completion_only;
};
struct qed_stop_txq_params {
u8 rss_id;
u8 tx_queue_id;
};
enum qed_filter_rx_mode_type { enum qed_filter_rx_mode_type {
QED_FILTER_RX_MODE_TYPE_REGULAR, QED_FILTER_RX_MODE_TYPE_REGULAR,
QED_FILTER_RX_MODE_TYPE_MULTI_PROMISC, QED_FILTER_RX_MODE_TYPE_MULTI_PROMISC,
...@@ -112,15 +123,6 @@ struct qed_filter_params { ...@@ -112,15 +123,6 @@ struct qed_filter_params {
union qed_filter_type_params filter; union qed_filter_type_params filter;
}; };
struct qed_queue_start_common_params {
u8 rss_id;
u8 queue_id;
u8 vport_id;
u16 sb;
u16 sb_idx;
u16 vf_qid;
};
struct qed_tunn_params { struct qed_tunn_params {
u16 vxlan_port; u16 vxlan_port;
u8 update_vxlan_port; u8 update_vxlan_port;
...@@ -220,24 +222,24 @@ struct qed_eth_ops { ...@@ -220,24 +222,24 @@ struct qed_eth_ops {
struct qed_update_vport_params *params); struct qed_update_vport_params *params);
int (*q_rx_start)(struct qed_dev *cdev, int (*q_rx_start)(struct qed_dev *cdev,
u8 rss_num,
struct qed_queue_start_common_params *params, struct qed_queue_start_common_params *params,
u16 bd_max_bytes, u16 bd_max_bytes,
dma_addr_t bd_chain_phys_addr, dma_addr_t bd_chain_phys_addr,
dma_addr_t cqe_pbl_addr, dma_addr_t cqe_pbl_addr,
u16 cqe_pbl_size, u16 cqe_pbl_size,
void __iomem **pp_prod); struct qed_rxq_start_ret_params *ret_params);
int (*q_rx_stop)(struct qed_dev *cdev, int (*q_rx_stop)(struct qed_dev *cdev, u8 rss_id, void *handle);
struct qed_stop_rxq_params *params);
int (*q_tx_start)(struct qed_dev *cdev, int (*q_tx_start)(struct qed_dev *cdev,
u8 rss_num,
struct qed_queue_start_common_params *params, struct qed_queue_start_common_params *params,
dma_addr_t pbl_addr, dma_addr_t pbl_addr,
u16 pbl_size, u16 pbl_size,
void __iomem **pp_doorbell); struct qed_txq_start_ret_params *ret_params);
int (*q_tx_stop)(struct qed_dev *cdev, int (*q_tx_stop)(struct qed_dev *cdev, u8 rss_id, void *handle);
struct qed_stop_txq_params *params);
int (*filter_config)(struct qed_dev *cdev, int (*filter_config)(struct qed_dev *cdev,
struct qed_filter_params *params); struct qed_filter_params *params);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment