Commit 43adc067 authored by Lisheng's avatar Lisheng Committed by David S. Miller

net: hns: fixed the setting and getting overtime bug

The overtime setting and getting REGs in HNS V2 is defferent from HNS V1.
It needs to be distinguished between them if getting or setting the REGs.
Signed-off-by: default avatarLisheng <lisheng011@huawei.com>
Signed-off-by: default avatarYisen Zhuang <Yisen.Zhuang@huawei.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ac71b46e
...@@ -159,11 +159,6 @@ struct hnae_handle *hns_ae_get_handle(struct hnae_ae_dev *dev, ...@@ -159,11 +159,6 @@ struct hnae_handle *hns_ae_get_handle(struct hnae_ae_dev *dev,
ae_handle->qs[i]->tx_ring.q = ae_handle->qs[i]; ae_handle->qs[i]->tx_ring.q = ae_handle->qs[i];
ring_pair_cb->used_by_vf = 1; ring_pair_cb->used_by_vf = 1;
if (port_idx < DSAF_SERVICE_PORT_NUM_PER_DSAF)
ring_pair_cb->port_id_in_dsa = port_idx;
else
ring_pair_cb->port_id_in_dsa = 0;
ring_pair_cb++; ring_pair_cb++;
} }
...@@ -453,59 +448,46 @@ static int hns_ae_set_pauseparam(struct hnae_handle *handle, ...@@ -453,59 +448,46 @@ static int hns_ae_set_pauseparam(struct hnae_handle *handle,
static void hns_ae_get_coalesce_usecs(struct hnae_handle *handle, static void hns_ae_get_coalesce_usecs(struct hnae_handle *handle,
u32 *tx_usecs, u32 *rx_usecs) u32 *tx_usecs, u32 *rx_usecs)
{ {
int port; struct ring_pair_cb *ring_pair =
container_of(handle->qs[0], struct ring_pair_cb, q);
port = hns_ae_map_eport_to_dport(handle->eport_id); *tx_usecs = hns_rcb_get_coalesce_usecs(ring_pair->rcb_common,
ring_pair->port_id_in_comm);
*tx_usecs = hns_rcb_get_coalesce_usecs( *rx_usecs = hns_rcb_get_coalesce_usecs(ring_pair->rcb_common,
hns_ae_get_dsaf_dev(handle->dev), ring_pair->port_id_in_comm);
hns_dsaf_get_comm_idx_by_port(port));
*rx_usecs = hns_rcb_get_coalesce_usecs(
hns_ae_get_dsaf_dev(handle->dev),
hns_dsaf_get_comm_idx_by_port(port));
} }
static void hns_ae_get_rx_max_coalesced_frames(struct hnae_handle *handle, static void hns_ae_get_rx_max_coalesced_frames(struct hnae_handle *handle,
u32 *tx_frames, u32 *rx_frames) u32 *tx_frames, u32 *rx_frames)
{ {
int port; struct ring_pair_cb *ring_pair =
container_of(handle->qs[0], struct ring_pair_cb, q);
assert(handle); *tx_frames = hns_rcb_get_coalesced_frames(ring_pair->rcb_common,
ring_pair->port_id_in_comm);
port = hns_ae_map_eport_to_dport(handle->eport_id); *rx_frames = hns_rcb_get_coalesced_frames(ring_pair->rcb_common,
ring_pair->port_id_in_comm);
*tx_frames = hns_rcb_get_coalesced_frames(
hns_ae_get_dsaf_dev(handle->dev), port);
*rx_frames = hns_rcb_get_coalesced_frames(
hns_ae_get_dsaf_dev(handle->dev), port);
} }
static void hns_ae_set_coalesce_usecs(struct hnae_handle *handle, static void hns_ae_set_coalesce_usecs(struct hnae_handle *handle,
u32 timeout) u32 timeout)
{ {
int port; struct ring_pair_cb *ring_pair =
container_of(handle->qs[0], struct ring_pair_cb, q);
assert(handle); (void)hns_rcb_set_coalesce_usecs(
ring_pair->rcb_common, ring_pair->port_id_in_comm, timeout);
port = hns_ae_map_eport_to_dport(handle->eport_id);
hns_rcb_set_coalesce_usecs(hns_ae_get_dsaf_dev(handle->dev),
port, timeout);
} }
static int hns_ae_set_coalesce_frames(struct hnae_handle *handle, static int hns_ae_set_coalesce_frames(struct hnae_handle *handle,
u32 coalesce_frames) u32 coalesce_frames)
{ {
int port; struct ring_pair_cb *ring_pair =
int ret; container_of(handle->qs[0], struct ring_pair_cb, q);
assert(handle); return hns_rcb_set_coalesced_frames(
ring_pair->rcb_common,
port = hns_ae_map_eport_to_dport(handle->eport_id); ring_pair->port_id_in_comm, coalesce_frames);
ret = hns_rcb_set_coalesced_frames(hns_ae_get_dsaf_dev(handle->dev),
port, coalesce_frames);
return ret;
} }
void hns_ae_update_stats(struct hnae_handle *handle, void hns_ae_update_stats(struct hnae_handle *handle,
......
...@@ -38,7 +38,9 @@ struct rcb_common_cb; ...@@ -38,7 +38,9 @@ struct rcb_common_cb;
#define HNS_RCB_MAX_COALESCED_FRAMES 1023 #define HNS_RCB_MAX_COALESCED_FRAMES 1023
#define HNS_RCB_MIN_COALESCED_FRAMES 1 #define HNS_RCB_MIN_COALESCED_FRAMES 1
#define HNS_RCB_DEF_COALESCED_FRAMES 50 #define HNS_RCB_DEF_COALESCED_FRAMES 50
#define HNS_RCB_MAX_TIME_OUT 0x500 #define HNS_RCB_CLK_FREQ_MHZ 350
#define HNS_RCB_MAX_COALESCED_USECS 0x3ff
#define HNS_RCB_DEF_COALESCED_USECS 3
#define HNS_RCB_COMMON_ENDIAN 1 #define HNS_RCB_COMMON_ENDIAN 1
...@@ -82,7 +84,7 @@ struct ring_pair_cb { ...@@ -82,7 +84,7 @@ struct ring_pair_cb {
int virq[HNS_RCB_IRQ_NUM_PER_QUEUE]; int virq[HNS_RCB_IRQ_NUM_PER_QUEUE];
u8 port_id_in_dsa; u8 port_id_in_comm;
u8 used_by_vf; u8 used_by_vf;
struct hns_ring_hw_stats hw_stats; struct hns_ring_hw_stats hw_stats;
...@@ -97,8 +99,6 @@ struct rcb_common_cb { ...@@ -97,8 +99,6 @@ struct rcb_common_cb {
u8 comm_index; u8 comm_index;
u32 ring_num; u32 ring_num;
u32 coalesced_frames; /* frames threshold of rx interrupt */
u32 timeout; /* time threshold of rx interrupt */
u32 desc_num; /* desc num per queue*/ u32 desc_num; /* desc num per queue*/
struct ring_pair_cb ring_pair_cb[0]; struct ring_pair_cb ring_pair_cb[0];
...@@ -125,13 +125,14 @@ void hns_rcbv2_int_clr_hw(struct hnae_queue *q, u32 flag); ...@@ -125,13 +125,14 @@ void hns_rcbv2_int_clr_hw(struct hnae_queue *q, u32 flag);
void hns_rcb_init_hw(struct ring_pair_cb *ring); void hns_rcb_init_hw(struct ring_pair_cb *ring);
void hns_rcb_reset_ring_hw(struct hnae_queue *q); void hns_rcb_reset_ring_hw(struct hnae_queue *q);
void hns_rcb_wait_fbd_clean(struct hnae_queue **qs, int q_num, u32 flag); void hns_rcb_wait_fbd_clean(struct hnae_queue **qs, int q_num, u32 flag);
u32 hns_rcb_get_coalesced_frames(
u32 hns_rcb_get_coalesced_frames(struct dsaf_device *dsaf_dev, int comm_index); struct rcb_common_cb *rcb_common, u32 port_idx);
u32 hns_rcb_get_coalesce_usecs(struct dsaf_device *dsaf_dev, int comm_index); u32 hns_rcb_get_coalesce_usecs(
void hns_rcb_set_coalesce_usecs(struct dsaf_device *dsaf_dev, struct rcb_common_cb *rcb_common, u32 port_idx);
int comm_index, u32 timeout); int hns_rcb_set_coalesce_usecs(
int hns_rcb_set_coalesced_frames(struct dsaf_device *dsaf_dev, struct rcb_common_cb *rcb_common, u32 port_idx, u32 timeout);
int comm_index, u32 coalesce_frames); int hns_rcb_set_coalesced_frames(
struct rcb_common_cb *rcb_common, u32 port_idx, u32 coalesced_frames);
void hns_rcb_update_stats(struct hnae_queue *queue); void hns_rcb_update_stats(struct hnae_queue *queue);
void hns_rcb_get_stats(struct hnae_queue *queue, u64 *data); void hns_rcb_get_stats(struct hnae_queue *queue, u64 *data);
......
...@@ -406,6 +406,7 @@ ...@@ -406,6 +406,7 @@
#define RCB_CFG_OVERTIME_REG 0x9300 #define RCB_CFG_OVERTIME_REG 0x9300
#define RCB_CFG_PKTLINE_INT_NUM_REG 0x9304 #define RCB_CFG_PKTLINE_INT_NUM_REG 0x9304
#define RCB_CFG_OVERTIME_INT_NUM_REG 0x9308 #define RCB_CFG_OVERTIME_INT_NUM_REG 0x9308
#define RCB_PORT_CFG_OVERTIME_REG 0x9430
#define RCB_RING_RX_RING_BASEADDR_L_REG 0x00000 #define RCB_RING_RX_RING_BASEADDR_L_REG 0x00000
#define RCB_RING_RX_RING_BASEADDR_H_REG 0x00004 #define RCB_RING_RX_RING_BASEADDR_H_REG 0x00004
......
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