Commit b45ceb40 authored by Yury Norov's avatar Yury Norov Committed by David S. Miller

net: thunderx: nicvf_queues: nivc_*_intr: remove duplication

The same switch-case repeates for nivc_*_intr functions.
In this patch it is moved to a helper nicvf_int_type_to_mask().

By the way:
 - Unneeded write to NICVF register dropped if int_type is unknown.
 - netdev_dbg() is used instead of netdev_err().
Signed-off-by: default avatarYury Norov <yury.norov@auriga.com>
Signed-off-by: default avatarAleksey Makarov <aleksey.makarov@caviumnetworks.com>
Acked-by: default avatarVadim Lomovtsev <Vadim.Lomovtsev@caiumnetworks.com>
Signed-off-by: default avatarSunil Goutham <sgoutham@cavium.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 64874280
...@@ -1234,153 +1234,93 @@ struct sk_buff *nicvf_get_rcv_skb(struct nicvf *nic, struct cqe_rx_t *cqe_rx) ...@@ -1234,153 +1234,93 @@ struct sk_buff *nicvf_get_rcv_skb(struct nicvf *nic, struct cqe_rx_t *cqe_rx)
return skb; return skb;
} }
/* Enable interrupt */ static u64 nicvf_int_type_to_mask(int int_type, int q_idx)
void nicvf_enable_intr(struct nicvf *nic, int int_type, int q_idx)
{ {
u64 reg_val; u64 reg_val;
reg_val = nicvf_reg_read(nic, NIC_VF_ENA_W1S);
switch (int_type) { switch (int_type) {
case NICVF_INTR_CQ: case NICVF_INTR_CQ:
reg_val |= ((1ULL << q_idx) << NICVF_INTR_CQ_SHIFT); reg_val = ((1ULL << q_idx) << NICVF_INTR_CQ_SHIFT);
break; break;
case NICVF_INTR_SQ: case NICVF_INTR_SQ:
reg_val |= ((1ULL << q_idx) << NICVF_INTR_SQ_SHIFT); reg_val = ((1ULL << q_idx) << NICVF_INTR_SQ_SHIFT);
break; break;
case NICVF_INTR_RBDR: case NICVF_INTR_RBDR:
reg_val |= ((1ULL << q_idx) << NICVF_INTR_RBDR_SHIFT); reg_val = ((1ULL << q_idx) << NICVF_INTR_RBDR_SHIFT);
break; break;
case NICVF_INTR_PKT_DROP: case NICVF_INTR_PKT_DROP:
reg_val |= (1ULL << NICVF_INTR_PKT_DROP_SHIFT); reg_val = (1ULL << NICVF_INTR_PKT_DROP_SHIFT);
break; break;
case NICVF_INTR_TCP_TIMER: case NICVF_INTR_TCP_TIMER:
reg_val |= (1ULL << NICVF_INTR_TCP_TIMER_SHIFT); reg_val = (1ULL << NICVF_INTR_TCP_TIMER_SHIFT);
break; break;
case NICVF_INTR_MBOX: case NICVF_INTR_MBOX:
reg_val |= (1ULL << NICVF_INTR_MBOX_SHIFT); reg_val = (1ULL << NICVF_INTR_MBOX_SHIFT);
break; break;
case NICVF_INTR_QS_ERR: case NICVF_INTR_QS_ERR:
reg_val |= (1ULL << NICVF_INTR_QS_ERR_SHIFT); reg_val = (1ULL << NICVF_INTR_QS_ERR_SHIFT);
break; break;
default: default:
netdev_err(nic->netdev, reg_val = 0;
"Failed to enable interrupt: unknown type\n");
break;
} }
nicvf_reg_write(nic, NIC_VF_ENA_W1S, reg_val); return reg_val;
}
/* Enable interrupt */
void nicvf_enable_intr(struct nicvf *nic, int int_type, int q_idx)
{
u64 mask = nicvf_int_type_to_mask(int_type, q_idx);
if (!mask) {
netdev_dbg(nic->netdev,
"Failed to enable interrupt: unknown type\n");
return;
}
nicvf_reg_write(nic, NIC_VF_ENA_W1S,
nicvf_reg_read(nic, NIC_VF_ENA_W1S) | mask);
} }
/* Disable interrupt */ /* Disable interrupt */
void nicvf_disable_intr(struct nicvf *nic, int int_type, int q_idx) void nicvf_disable_intr(struct nicvf *nic, int int_type, int q_idx)
{ {
u64 reg_val = 0; u64 mask = nicvf_int_type_to_mask(int_type, q_idx);
switch (int_type) { if (!mask) {
case NICVF_INTR_CQ: netdev_dbg(nic->netdev,
reg_val |= ((1ULL << q_idx) << NICVF_INTR_CQ_SHIFT);
break;
case NICVF_INTR_SQ:
reg_val |= ((1ULL << q_idx) << NICVF_INTR_SQ_SHIFT);
break;
case NICVF_INTR_RBDR:
reg_val |= ((1ULL << q_idx) << NICVF_INTR_RBDR_SHIFT);
break;
case NICVF_INTR_PKT_DROP:
reg_val |= (1ULL << NICVF_INTR_PKT_DROP_SHIFT);
break;
case NICVF_INTR_TCP_TIMER:
reg_val |= (1ULL << NICVF_INTR_TCP_TIMER_SHIFT);
break;
case NICVF_INTR_MBOX:
reg_val |= (1ULL << NICVF_INTR_MBOX_SHIFT);
break;
case NICVF_INTR_QS_ERR:
reg_val |= (1ULL << NICVF_INTR_QS_ERR_SHIFT);
break;
default:
netdev_err(nic->netdev,
"Failed to disable interrupt: unknown type\n"); "Failed to disable interrupt: unknown type\n");
break; return;
} }
nicvf_reg_write(nic, NIC_VF_ENA_W1C, reg_val); nicvf_reg_write(nic, NIC_VF_ENA_W1C, mask);
} }
/* Clear interrupt */ /* Clear interrupt */
void nicvf_clear_intr(struct nicvf *nic, int int_type, int q_idx) void nicvf_clear_intr(struct nicvf *nic, int int_type, int q_idx)
{ {
u64 reg_val = 0; u64 mask = nicvf_int_type_to_mask(int_type, q_idx);
switch (int_type) { if (!mask) {
case NICVF_INTR_CQ: netdev_dbg(nic->netdev,
reg_val = ((1ULL << q_idx) << NICVF_INTR_CQ_SHIFT);
break;
case NICVF_INTR_SQ:
reg_val = ((1ULL << q_idx) << NICVF_INTR_SQ_SHIFT);
break;
case NICVF_INTR_RBDR:
reg_val = ((1ULL << q_idx) << NICVF_INTR_RBDR_SHIFT);
break;
case NICVF_INTR_PKT_DROP:
reg_val = (1ULL << NICVF_INTR_PKT_DROP_SHIFT);
break;
case NICVF_INTR_TCP_TIMER:
reg_val = (1ULL << NICVF_INTR_TCP_TIMER_SHIFT);
break;
case NICVF_INTR_MBOX:
reg_val = (1ULL << NICVF_INTR_MBOX_SHIFT);
break;
case NICVF_INTR_QS_ERR:
reg_val |= (1ULL << NICVF_INTR_QS_ERR_SHIFT);
break;
default:
netdev_err(nic->netdev,
"Failed to clear interrupt: unknown type\n"); "Failed to clear interrupt: unknown type\n");
break; return;
} }
nicvf_reg_write(nic, NIC_VF_INT, reg_val); nicvf_reg_write(nic, NIC_VF_INT, mask);
} }
/* Check if interrupt is enabled */ /* Check if interrupt is enabled */
int nicvf_is_intr_enabled(struct nicvf *nic, int int_type, int q_idx) int nicvf_is_intr_enabled(struct nicvf *nic, int int_type, int q_idx)
{ {
u64 reg_val; u64 mask = nicvf_int_type_to_mask(int_type, q_idx);
u64 mask = 0xff; /* If interrupt type is unknown, we treat it disabled. */
if (!mask) {
reg_val = nicvf_reg_read(nic, NIC_VF_ENA_W1S); netdev_dbg(nic->netdev,
switch (int_type) {
case NICVF_INTR_CQ:
mask = ((1ULL << q_idx) << NICVF_INTR_CQ_SHIFT);
break;
case NICVF_INTR_SQ:
mask = ((1ULL << q_idx) << NICVF_INTR_SQ_SHIFT);
break;
case NICVF_INTR_RBDR:
mask = ((1ULL << q_idx) << NICVF_INTR_RBDR_SHIFT);
break;
case NICVF_INTR_PKT_DROP:
mask = NICVF_INTR_PKT_DROP_MASK;
break;
case NICVF_INTR_TCP_TIMER:
mask = NICVF_INTR_TCP_TIMER_MASK;
break;
case NICVF_INTR_MBOX:
mask = NICVF_INTR_MBOX_MASK;
break;
case NICVF_INTR_QS_ERR:
mask = NICVF_INTR_QS_ERR_MASK;
break;
default:
netdev_err(nic->netdev,
"Failed to check interrupt enable: unknown type\n"); "Failed to check interrupt enable: unknown type\n");
break; return 0;
} }
return (reg_val & mask); return mask & nicvf_reg_read(nic, NIC_VF_ENA_W1S);
} }
void nicvf_update_rq_stats(struct nicvf *nic, int rq_idx) void nicvf_update_rq_stats(struct nicvf *nic, int rq_idx)
......
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