Re: [PATCH 03/12] be2iscsi: Remove redundant MCC processing code
On Mon, Feb 01, 2016 at 03:42:42PM +0530, Jitendra Bhivare wrote:
> be_mcc_compl_process_isr is removed.
> MCC CQ processing is done only in beiscsi_process_mcc_cq and MCC CQE
> processing is done only in beiscsi_process_mcc_compl.
>
> Signed-off-by: Jitendra Bhivare
> ---
> drivers/scsi/be2iscsi/be_cmds.c | 164
> ++--
> drivers/scsi/be2iscsi/be_cmds.h | 7 +-
> drivers/scsi/be2iscsi/be_main.c | 8 +-
> drivers/scsi/be2iscsi/be_main.h | 1 +
> drivers/scsi/be2iscsi/be_mgmt.c | 3 +-
> 5 files changed, 68 insertions(+), 115 deletions(-)
>
> diff --git a/drivers/scsi/be2iscsi/be_cmds.c b/drivers/scsi/be2iscsi/be_cmds.c
> index c5e7739..fa010ac 100644
> --- a/drivers/scsi/be2iscsi/be_cmds.c
> +++ b/drivers/scsi/be2iscsi/be_cmds.c
> @@ -328,76 +328,6 @@ static int be_mcc_compl_process(struct be_ctrl_info
> *ctrl,
> return 0;
> }
>
> -int be_mcc_compl_process_isr(struct be_ctrl_info *ctrl,
> - struct be_mcc_compl *compl)
> -{
> - struct beiscsi_hba *phba = pci_get_drvdata(ctrl->pdev);
> - u16 compl_status, extd_status;
> - struct be_dma_mem *tag_mem;
> - unsigned int tag, wrb_idx;
> -
> - be_dws_le_to_cpu(compl, 4);
> - tag = (compl->tag0 & MCC_Q_CMD_TAG_MASK);
> - wrb_idx = (compl->tag0 & CQE_STATUS_WRB_MASK) >> CQE_STATUS_WRB_SHIFT;
> -
> - if (!test_bit(MCC_TAG_STATE_RUNNING,
> - &ctrl->ptag_state[tag].tag_state)) {
> - beiscsi_log(phba, KERN_ERR, BEISCSI_LOG_MBOX |
> - BEISCSI_LOG_INIT | BEISCSI_LOG_CONFIG,
> - "BC_%d : MBX cmd completed but not posted\n");
> - return 0;
> - }
> -
> - if (test_bit(MCC_TAG_STATE_TIMEOUT,
> - &ctrl->ptag_state[tag].tag_state)) {
> - beiscsi_log(phba, KERN_WARNING,
> - BEISCSI_LOG_MBOX | BEISCSI_LOG_INIT |
> - BEISCSI_LOG_CONFIG,
> - "BC_%d : MBX Completion for timeout Command from
> FW\n");
> - /**
> - * Check for the size before freeing resource.
> - * Only for non-embedded cmd, PCI resource is allocated.
> - **/
> - tag_mem = &ctrl->ptag_state[tag].tag_mem_state;
> - if (tag_mem->size)
> - pci_free_consistent(ctrl->pdev, tag_mem->size,
> - tag_mem->va, tag_mem->dma);
> - free_mcc_tag(ctrl, tag);
> - return 0;
> - }
> -
> - compl_status = (compl->status >> CQE_STATUS_COMPL_SHIFT) &
> -CQE_STATUS_COMPL_MASK;
> - extd_status = (compl->status >> CQE_STATUS_EXTD_SHIFT) &
> - CQE_STATUS_EXTD_MASK;
> - /* The ctrl.mcc_tag_status[tag] is filled with
> - * [31] = valid, [30:24] = Rsvd, [23:16] = wrb, [15:8] = extd_status,
> - * [7:0] = compl_status
> - */
> - ctrl->mcc_tag_status[tag] = CQE_VALID_MASK;
> - ctrl->mcc_tag_status[tag] |= (wrb_idx << CQE_STATUS_WRB_SHIFT);
> - ctrl->mcc_tag_status[tag] |= (extd_status << CQE_STATUS_ADDL_SHIFT) &
> - CQE_STATUS_ADDL_MASK;
> - ctrl->mcc_tag_status[tag] |= (compl_status & CQE_STATUS_MASK);
> -
> - /* write ordering implied in wake_up_interruptible */
> - clear_bit(MCC_TAG_STATE_RUNNING, &ctrl->ptag_state[tag].tag_state);
> - wake_up_interruptible(&ctrl->mcc_wait[tag]);
> - return 0;
> -}
> -
> -static struct be_mcc_compl *be_mcc_compl_get(struct beiscsi_hba *phba)
> -{
> - struct be_queue_info *mcc_cq = &phba->ctrl.mcc_obj.cq;
> - struct be_mcc_compl *compl = queue_tail_node(mcc_cq);
> -
> - if (be_mcc_compl_is_new(compl)) {
> - queue_tail_inc(mcc_cq);
> - return compl;
> - }
> - return NULL;
> -}
> -
> /**
> * beiscsi_fail_session(): Closing session with appropriate error
> * @cls_session: ptr to session
> @@ -528,27 +458,65 @@ void beiscsi_process_async_event(struct beiscsi_hba
> *phba,
> evt_code, compl->status, compl->flags);
> }
>
> -int beiscsi_process_mcc(struct beiscsi_hba *phba)
> +int beiscsi_process_mcc_compl(struct be_ctrl_info *ctrl,
> + struct be_mcc_compl *compl)
> {
> - struct be_mcc_compl *compl;
> - int num = 0, status = 0;
> - struct be_ctrl_info *ctrl = &phba->ctrl;
> + struct beiscsi_hba *phba = pci_get_drvdata(ctrl->pdev);
> + u16 compl_status, extd_status;
> + struct be_dma_mem *tag_mem;
> + unsigned int tag, wrb_idx;
>
> - while ((compl = be_mcc_compl_get(phba))) {
> - if (compl->flags & CQE_FLAGS_ASYNC_MASK) {
> - beiscsi_process_async_event(phba, compl);
> - } else if (compl->flags & CQE_FLAGS_COMPLETED_MASK) {
> - status = be_mcc_compl_process(ctrl, compl);
> - atomic_dec(&phba->ctrl.mcc_obj.q.used);
[PATCH 03/12] be2iscsi: Remove redundant MCC processing code
be_mcc_compl_process_isr is removed.
MCC CQ processing is done only in beiscsi_process_mcc_cq and MCC CQE
processing is done only in beiscsi_process_mcc_compl.
Signed-off-by: Jitendra Bhivare
---
drivers/scsi/be2iscsi/be_cmds.c | 164 ++--
drivers/scsi/be2iscsi/be_cmds.h | 7 +-
drivers/scsi/be2iscsi/be_main.c | 8 +-
drivers/scsi/be2iscsi/be_main.h | 1 +
drivers/scsi/be2iscsi/be_mgmt.c | 3 +-
5 files changed, 68 insertions(+), 115 deletions(-)
diff --git a/drivers/scsi/be2iscsi/be_cmds.c b/drivers/scsi/be2iscsi/be_cmds.c
index c5e7739..fa010ac 100644
--- a/drivers/scsi/be2iscsi/be_cmds.c
+++ b/drivers/scsi/be2iscsi/be_cmds.c
@@ -328,76 +328,6 @@ static int be_mcc_compl_process(struct be_ctrl_info *ctrl,
return 0;
}
-int be_mcc_compl_process_isr(struct be_ctrl_info *ctrl,
- struct be_mcc_compl *compl)
-{
- struct beiscsi_hba *phba = pci_get_drvdata(ctrl->pdev);
- u16 compl_status, extd_status;
- struct be_dma_mem *tag_mem;
- unsigned int tag, wrb_idx;
-
- be_dws_le_to_cpu(compl, 4);
- tag = (compl->tag0 & MCC_Q_CMD_TAG_MASK);
- wrb_idx = (compl->tag0 & CQE_STATUS_WRB_MASK) >> CQE_STATUS_WRB_SHIFT;
-
- if (!test_bit(MCC_TAG_STATE_RUNNING,
- &ctrl->ptag_state[tag].tag_state)) {
- beiscsi_log(phba, KERN_ERR, BEISCSI_LOG_MBOX |
- BEISCSI_LOG_INIT | BEISCSI_LOG_CONFIG,
- "BC_%d : MBX cmd completed but not posted\n");
- return 0;
- }
-
- if (test_bit(MCC_TAG_STATE_TIMEOUT,
-&ctrl->ptag_state[tag].tag_state)) {
- beiscsi_log(phba, KERN_WARNING,
- BEISCSI_LOG_MBOX | BEISCSI_LOG_INIT |
- BEISCSI_LOG_CONFIG,
- "BC_%d : MBX Completion for timeout Command from
FW\n");
- /**
-* Check for the size before freeing resource.
-* Only for non-embedded cmd, PCI resource is allocated.
-**/
- tag_mem = &ctrl->ptag_state[tag].tag_mem_state;
- if (tag_mem->size)
- pci_free_consistent(ctrl->pdev, tag_mem->size,
- tag_mem->va, tag_mem->dma);
- free_mcc_tag(ctrl, tag);
- return 0;
- }
-
- compl_status = (compl->status >> CQE_STATUS_COMPL_SHIFT) &
- CQE_STATUS_COMPL_MASK;
- extd_status = (compl->status >> CQE_STATUS_EXTD_SHIFT) &
- CQE_STATUS_EXTD_MASK;
- /* The ctrl.mcc_tag_status[tag] is filled with
-* [31] = valid, [30:24] = Rsvd, [23:16] = wrb, [15:8] = extd_status,
-* [7:0] = compl_status
-*/
- ctrl->mcc_tag_status[tag] = CQE_VALID_MASK;
- ctrl->mcc_tag_status[tag] |= (wrb_idx << CQE_STATUS_WRB_SHIFT);
- ctrl->mcc_tag_status[tag] |= (extd_status << CQE_STATUS_ADDL_SHIFT) &
-CQE_STATUS_ADDL_MASK;
- ctrl->mcc_tag_status[tag] |= (compl_status & CQE_STATUS_MASK);
-
- /* write ordering implied in wake_up_interruptible */
- clear_bit(MCC_TAG_STATE_RUNNING, &ctrl->ptag_state[tag].tag_state);
- wake_up_interruptible(&ctrl->mcc_wait[tag]);
- return 0;
-}
-
-static struct be_mcc_compl *be_mcc_compl_get(struct beiscsi_hba *phba)
-{
- struct be_queue_info *mcc_cq = &phba->ctrl.mcc_obj.cq;
- struct be_mcc_compl *compl = queue_tail_node(mcc_cq);
-
- if (be_mcc_compl_is_new(compl)) {
- queue_tail_inc(mcc_cq);
- return compl;
- }
- return NULL;
-}
-
/**
* beiscsi_fail_session(): Closing session with appropriate error
* @cls_session: ptr to session
@@ -528,27 +458,65 @@ void beiscsi_process_async_event(struct beiscsi_hba *phba,
evt_code, compl->status, compl->flags);
}
-int beiscsi_process_mcc(struct beiscsi_hba *phba)
+int beiscsi_process_mcc_compl(struct be_ctrl_info *ctrl,
+ struct be_mcc_compl *compl)
{
- struct be_mcc_compl *compl;
- int num = 0, status = 0;
- struct be_ctrl_info *ctrl = &phba->ctrl;
+ struct beiscsi_hba *phba = pci_get_drvdata(ctrl->pdev);
+ u16 compl_status, extd_status;
+ struct be_dma_mem *tag_mem;
+ unsigned int tag, wrb_idx;
- while ((compl = be_mcc_compl_get(phba))) {
- if (compl->flags & CQE_FLAGS_ASYNC_MASK) {
- beiscsi_process_async_event(phba, compl);
- } else if (compl->flags & CQE_FLAGS_COMPLETED_MASK) {
- status = be_mcc_compl_process(ctrl, compl);
- atomic_dec(&phba->ctrl.mcc_obj.q.used);
- }
- be_mcc_compl_use(compl);
- num++;
+ /**
+* Just swap the status to host endian; mcc tag is opaquely co
