Skip to content

Commit

Permalink
net: atlantic: A2: flow control support
Browse files Browse the repository at this point in the history
This patch adds flow control support on A2.

Co-developed-by: Dmitry Bogdanov <dbogdanov@marvell.com>
Signed-off-by: Dmitry Bogdanov <dbogdanov@marvell.com>
Signed-off-by: Igor Russkikh <irusskikh@marvell.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Igor Russkikh authored and David S. Miller committed Jun 23, 2020
1 parent ce6a690 commit 3e168de
Show file tree
Hide file tree
Showing 4 changed files with 42 additions and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ static int hw_atl_b0_hw_reset(struct aq_hw_s *self)
return err;
}

static int hw_atl_b0_set_fc(struct aq_hw_s *self, u32 fc, u32 tc)
int hw_atl_b0_set_fc(struct aq_hw_s *self, u32 fc, u32 tc)
{
hw_atl_rpb_rx_xoff_en_per_tc_set(self, !!(fc & AQ_NIC_FC_RX), tc);

Expand Down
2 changes: 2 additions & 0 deletions drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.h
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,8 @@ void hw_atl_b0_hw_init_rx_rss_ctrl1(struct aq_hw_s *self);

int hw_atl_b0_hw_mac_addr_set(struct aq_hw_s *self, u8 *mac_addr);

int hw_atl_b0_set_fc(struct aq_hw_s *self, u32 fc, u32 tc);

int hw_atl_b0_hw_start(struct aq_hw_s *self);

int hw_atl_b0_hw_irq_enable(struct aq_hw_s *self, u64 mask);
Expand Down
3 changes: 3 additions & 0 deletions drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2.c
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,8 @@ static int hw_atl2_hw_qos_set(struct aq_hw_s *self)

threshold = (rx_buff_size * (1024U / 32U) * 50U) / 100U;
hw_atl_rpb_rx_buff_lo_threshold_per_tc_set(self, threshold, tc);

hw_atl_b0_set_fc(self, self->aq_nic_cfg->fc.req, tc);
}

/* QoS 802.1p priority -> TC mapping */
Expand Down Expand Up @@ -841,4 +843,5 @@ const struct aq_hw_ops hw_atl2_ops = {
.hw_get_hw_stats = hw_atl2_utils_get_hw_stats,
.hw_get_fw_version = hw_atl2_utils_get_fw_version,
.hw_set_offload = hw_atl_b0_hw_offload_set,
.hw_set_fc = hw_atl_b0_set_fc,
};
36 changes: 36 additions & 0 deletions drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2_utils_fw.c
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,15 @@ static int aq_a2_fw_set_link_speed(struct aq_hw_s *self, u32 speed)
return hw_atl2_shared_buffer_finish_ack(self);
}

static void aq_a2_fw_set_mpi_flow_control(struct aq_hw_s *self,
struct link_options_s *link_options)
{
u32 flow_control = self->aq_nic_cfg->fc.req;

link_options->pause_rx = !!(flow_control & AQ_NIC_FC_RX);
link_options->pause_tx = !!(flow_control & AQ_NIC_FC_TX);
}

static void aq_a2_fw_upd_eee_rate_bits(struct aq_hw_s *self,
struct link_options_s *link_options,
u32 eee_speeds)
Expand All @@ -213,6 +222,7 @@ static int aq_a2_fw_set_state(struct aq_hw_s *self,
link_options.link_up = 1U;
aq_a2_fw_upd_eee_rate_bits(self, &link_options,
self->aq_nic_cfg->eee_speeds);
aq_a2_fw_set_mpi_flow_control(self, &link_options);
break;
case MPI_DEINIT:
link_options.link_up = 0U;
Expand Down Expand Up @@ -363,6 +373,30 @@ static int aq_a2_fw_renegotiate(struct aq_hw_s *self)
return err;
}

static int aq_a2_fw_set_flow_control(struct aq_hw_s *self)
{
struct link_options_s link_options;

hw_atl2_shared_buffer_get(self, link_options, link_options);

aq_a2_fw_set_mpi_flow_control(self, &link_options);

hw_atl2_shared_buffer_write(self, link_options, link_options);

return hw_atl2_shared_buffer_finish_ack(self);
}

static u32 aq_a2_fw_get_flow_control(struct aq_hw_s *self, u32 *fcmode)
{
struct link_status_s link_status;

hw_atl2_shared_buffer_read(self, link_status, link_status);

*fcmode = ((link_status.pause_rx) ? AQ_NIC_FC_RX : 0) |
((link_status.pause_tx) ? AQ_NIC_FC_TX : 0);
return 0;
}

u32 hw_atl2_utils_get_fw_version(struct aq_hw_s *self)
{
struct version_s version;
Expand Down Expand Up @@ -402,4 +436,6 @@ const struct aq_fw_ops aq_a2_fw_ops = {
.update_stats = aq_a2_fw_update_stats,
.set_eee_rate = aq_a2_fw_set_eee_rate,
.get_eee_rate = aq_a2_fw_get_eee_rate,
.set_flow_control = aq_a2_fw_set_flow_control,
.get_flow_control = aq_a2_fw_get_flow_control,
};

0 comments on commit 3e168de

Please sign in to comment.