Skip to content

Commit

Permalink
i40e: simplify aq head-tail-len setups
Browse files Browse the repository at this point in the history 
Use more virtual registers to simplify code flows.

Change-Id: I32cff3818c5ca3a3792487ba4fed8f1d0ea6145a
Signed-off-by: Shannon Nelson <shannon.nelson@intel.com>
Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Tested-by: Kavindya Deegala <kavindya.s.deegala@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
  • Loading branch information
Shannon Nelson authored and Jeff Kirsher committed Dec 6, 2013
1 parent 26d7178 commit 17e6a84
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 36 deletions.
50 changes: 14 additions & 36 deletions drivers/net/ethernet/intel/i40e/i40e_adminq.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,13 +43,17 @@ static void i40e_adminq_init_regs(struct i40e_hw *hw)
if (hw->mac.type == I40E_MAC_VF) {
hw->aq.asq.tail = I40E_VF_ATQT1;
hw->aq.asq.head = I40E_VF_ATQH1;
hw->aq.asq.len = I40E_VF_ATQLEN1;
hw->aq.arq.tail = I40E_VF_ARQT1;
hw->aq.arq.head = I40E_VF_ARQH1;
hw->aq.arq.len = I40E_VF_ARQLEN1;
} else {
hw->aq.asq.tail = I40E_PF_ATQT;
hw->aq.asq.head = I40E_PF_ATQH;
hw->aq.asq.len = I40E_PF_ATQLEN;
hw->aq.arq.tail = I40E_PF_ARQT;
hw->aq.arq.head = I40E_PF_ARQH;
hw->aq.arq.len = I40E_PF_ARQLEN;
}
}

Expand Down Expand Up @@ -466,15 +470,9 @@ static i40e_status i40e_shutdown_asq(struct i40e_hw *hw)
return I40E_ERR_NOT_READY;

/* Stop firmware AdminQ processing */
if (hw->mac.type == I40E_MAC_VF) {
wr32(hw, I40E_VF_ATQLEN1, 0);
wr32(hw, I40E_VF_ATQH1, 0);
wr32(hw, I40E_VF_ATQT1, 0);
} else {
wr32(hw, I40E_PF_ATQLEN, 0);
wr32(hw, I40E_PF_ATQH, 0);
wr32(hw, I40E_PF_ATQT, 0);
}
wr32(hw, hw->aq.asq.head, 0);
wr32(hw, hw->aq.asq.tail, 0);
wr32(hw, hw->aq.asq.len, 0);

/* make sure lock is available */
mutex_lock(&hw->aq.asq_mutex);
Expand Down Expand Up @@ -505,15 +503,9 @@ static i40e_status i40e_shutdown_arq(struct i40e_hw *hw)
return I40E_ERR_NOT_READY;

/* Stop firmware AdminQ processing */
if (hw->mac.type == I40E_MAC_VF) {
wr32(hw, I40E_VF_ARQLEN1, 0);
wr32(hw, I40E_VF_ARQH1, 0);
wr32(hw, I40E_VF_ARQT1, 0);
} else {
wr32(hw, I40E_PF_ARQLEN, 0);
wr32(hw, I40E_PF_ARQH, 0);
wr32(hw, I40E_PF_ARQT, 0);
}
wr32(hw, hw->aq.arq.head, 0);
wr32(hw, hw->aq.arq.tail, 0);
wr32(hw, hw->aq.arq.len, 0);

/* make sure lock is available */
mutex_lock(&hw->aq.arq_mutex);
Expand Down Expand Up @@ -966,27 +958,13 @@ void i40e_resume_aq(struct i40e_hw *hw)
hw->aq.asq.next_to_clean = 0;

i40e_config_asq_regs(hw);
reg = hw->aq.num_asq_entries;

if (hw->mac.type == I40E_MAC_VF) {
reg |= I40E_VF_ATQLEN_ATQENABLE_MASK;
wr32(hw, I40E_VF_ATQLEN1, reg);
} else {
reg |= I40E_PF_ATQLEN_ATQENABLE_MASK;
wr32(hw, I40E_PF_ATQLEN, reg);
}
reg = hw->aq.num_asq_entries | I40E_PF_ATQLEN_ATQENABLE_MASK;
wr32(hw, hw->aq.asq.len, reg);

hw->aq.arq.next_to_use = 0;
hw->aq.arq.next_to_clean = 0;

i40e_config_arq_regs(hw);
reg = hw->aq.num_arq_entries;

if (hw->mac.type == I40E_MAC_VF) {
reg |= I40E_VF_ATQLEN_ATQENABLE_MASK;
wr32(hw, I40E_VF_ARQLEN1, reg);
} else {
reg |= I40E_PF_ATQLEN_ATQENABLE_MASK;
wr32(hw, I40E_PF_ARQLEN, reg);
}
reg = hw->aq.num_arq_entries | I40E_PF_ATQLEN_ATQENABLE_MASK;
wr32(hw, hw->aq.arq.len, reg);
}
1 change: 1 addition & 0 deletions drivers/net/ethernet/intel/i40e/i40e_adminq.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ struct i40e_adminq_ring {
/* used for queue tracking */
u32 head;
u32 tail;
u32 len;
};

/* ASQ transaction details */
Expand Down

0 comments on commit 17e6a84

Please sign in to comment.