Commit e54dcf4b authored by Igor Russkikh's avatar Igor Russkikh Committed by David S. Miller
Browse files

net: atlantic: basic A2 init/deinit hw_ops 



This patch adds basic A2 HW initialization / deinitialization.

Signed-off-by: default avatarIgor Russkikh <irusskikh@marvell.com>
Co-developed-by: default avatarDmitry Bogdanov <dbogdanov@marvell.com>
Signed-off-by: default avatarDmitry Bogdanov <dbogdanov@marvell.com>
Signed-off-by: default avatarMark Starovoytov <mstarovoitov@marvell.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c1be0bf0

drivers/net/ethernet/aquantia/atlantic/aq_nic.c

+2 −1
Original line number Diff line number Diff line
@@ -378,7 +378,8 @@ int aq_nic_init(struct aq_nic_s *self) 
	if (err < 0)

		goto err_exit;



	if (self->aq_nic_cfg.aq_hw_caps->media_type == AQ_HW_MEDIA_TYPE_TP) {

	if (ATL_HW_IS_CHIP_FEATURE(self->aq_hw, ATLANTIC) &&

	    self->aq_nic_cfg.aq_hw_caps->media_type == AQ_HW_MEDIA_TYPE_TP) {

		self->aq_hw->phy_id = HW_ATL_PHY_ID_MAX;

		err = aq_phy_init(self->aq_hw);

	}

drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c

+12 −12
Original line number Diff line number Diff line
@@ -187,7 +187,7 @@ static int hw_atl_b0_hw_qos_set(struct aq_hw_s *self) 
	return aq_hw_err_from_flags(self);

}



static int hw_atl_b0_hw_rss_hash_set(struct aq_hw_s *self,

int hw_atl_b0_hw_rss_hash_set(struct aq_hw_s *self,

			      struct aq_rss_parameters *rss_params)

{

	struct aq_nic_cfg_s *cfg = self->aq_nic_cfg;
@@ -215,7 +215,7 @@ err_exit: 
	return err;

}



static int hw_atl_b0_hw_rss_set(struct aq_hw_s *self,

int hw_atl_b0_hw_rss_set(struct aq_hw_s *self,

			 struct aq_rss_parameters *rss_params)

{

	u32 num_rss_queues = max(1U, self->aq_nic_cfg->num_rss_queues);
@@ -314,7 +314,7 @@ static int hw_atl_b0_hw_offload_set(struct aq_hw_s *self, 
static int hw_atl_b0_hw_init_tx_path(struct aq_hw_s *self)

{

	/* Tx TC/Queue number config */

	hw_atl_rpb_tps_tx_tc_mode_set(self, 1U);

	hw_atl_tpb_tps_tx_tc_mode_set(self, 1U);



	hw_atl_thm_lso_tcp_flag_of_first_pkt_set(self, 0x0FF6U);

	hw_atl_thm_lso_tcp_flag_of_middle_pkt_set(self, 0x0FF6U);
@@ -495,7 +495,7 @@ static int hw_atl_b0_hw_ring_rx_start(struct aq_hw_s *self, 
	return aq_hw_err_from_flags(self);

}



static int hw_atl_b0_hw_start(struct aq_hw_s *self)

int hw_atl_b0_hw_start(struct aq_hw_s *self)

{

	hw_atl_tpb_tx_buff_en_set(self, 1);

	hw_atl_rpb_rx_buff_en_set(self, 1);
@@ -854,14 +854,14 @@ static int hw_atl_b0_hw_ring_rx_receive(struct aq_hw_s *self, 
	return aq_hw_err_from_flags(self);

}



static int hw_atl_b0_hw_irq_enable(struct aq_hw_s *self, u64 mask)

int hw_atl_b0_hw_irq_enable(struct aq_hw_s *self, u64 mask)

{

	hw_atl_itr_irq_msk_setlsw_set(self, LODWORD(mask));



	return aq_hw_err_from_flags(self);

}



static int hw_atl_b0_hw_irq_disable(struct aq_hw_s *self, u64 mask)

int hw_atl_b0_hw_irq_disable(struct aq_hw_s *self, u64 mask)

{

	hw_atl_itr_irq_msk_clearlsw_set(self, LODWORD(mask));

	hw_atl_itr_irq_status_clearlsw_set(self, LODWORD(mask));
@@ -871,7 +871,7 @@ static int hw_atl_b0_hw_irq_disable(struct aq_hw_s *self, u64 mask) 
	return aq_hw_err_from_flags(self);

}



static int hw_atl_b0_hw_irq_read(struct aq_hw_s *self, u64 *mask)

int hw_atl_b0_hw_irq_read(struct aq_hw_s *self, u64 *mask)

{

	*mask = hw_atl_itr_irq_statuslsw_get(self);
@@ -880,7 +880,7 @@ static int hw_atl_b0_hw_irq_read(struct aq_hw_s *self, u64 *mask) 


#define IS_FILTER_ENABLED(_F_) ((packet_filter & (_F_)) ? 1U : 0U)



static int hw_atl_b0_hw_packet_filter_set(struct aq_hw_s *self,

int hw_atl_b0_hw_packet_filter_set(struct aq_hw_s *self,

				   unsigned int packet_filter)

{

	struct aq_nic_cfg_s *cfg = self->aq_nic_cfg;
@@ -1089,7 +1089,7 @@ static int hw_atl_b0_hw_ring_rx_stop(struct aq_hw_s *self, 


static int hw_atl_b0_tx_tc_mode_get(struct aq_hw_s *self, u32 *tc_mode)

{

	*tc_mode = hw_atl_rpb_tps_tx_tc_mode_get(self);

	*tc_mode = hw_atl_tpb_tps_tx_tc_mode_get(self);

	return aq_hw_err_from_flags(self);

}

drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.h

+14 −0
Original line number Diff line number Diff line
@@ -33,4 +33,18 @@ extern const struct aq_hw_ops hw_atl_ops_b0; 


#define hw_atl_ops_b1 hw_atl_ops_b0



int hw_atl_b0_hw_rss_hash_set(struct aq_hw_s *self,

			      struct aq_rss_parameters *rss_params);

int hw_atl_b0_hw_rss_set(struct aq_hw_s *self,

			 struct aq_rss_parameters *rss_params);



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);

int hw_atl_b0_hw_irq_disable(struct aq_hw_s *self, u64 mask);

int hw_atl_b0_hw_irq_read(struct aq_hw_s *self, u64 *mask);



int hw_atl_b0_hw_packet_filter_set(struct aq_hw_s *self,

				   unsigned int packet_filter);



#endif /* HW_ATL_B0_H */

drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_llh.c

+2 −2
Original line number Diff line number Diff line
@@ -1318,14 +1318,14 @@ void hw_atl_tpb_tx_buff_en_set(struct aq_hw_s *aq_hw, u32 tx_buff_en) 
			    HW_ATL_TPB_TX_BUF_EN_SHIFT, tx_buff_en);

}



u32 hw_atl_rpb_tps_tx_tc_mode_get(struct aq_hw_s *aq_hw)

u32 hw_atl_tpb_tps_tx_tc_mode_get(struct aq_hw_s *aq_hw)

{

	return aq_hw_read_reg_bit(aq_hw, HW_ATL_TPB_TX_TC_MODE_ADDR,

			HW_ATL_TPB_TX_TC_MODE_MSK,

			HW_ATL_TPB_TX_TC_MODE_SHIFT);

}



void hw_atl_rpb_tps_tx_tc_mode_set(struct aq_hw_s *aq_hw,

void hw_atl_tpb_tps_tx_tc_mode_set(struct aq_hw_s *aq_hw,

				   u32 tx_traf_class_mode)

{

	aq_hw_write_reg_bit(aq_hw, HW_ATL_TPB_TX_TC_MODE_ADDR,

drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_llh.h

+2 −2
Original line number Diff line number Diff line
@@ -616,11 +616,11 @@ void hw_atl_thm_lso_tcp_flag_of_middle_pkt_set(struct aq_hw_s *aq_hw, 
/* tpb */



/* set TX Traffic Class Mode */

void hw_atl_rpb_tps_tx_tc_mode_set(struct aq_hw_s *aq_hw,

void hw_atl_tpb_tps_tx_tc_mode_set(struct aq_hw_s *aq_hw,

				   u32 tx_traf_class_mode);



/* get TX Traffic Class Mode */

u32 hw_atl_rpb_tps_tx_tc_mode_get(struct aq_hw_s *aq_hw);

u32 hw_atl_tpb_tps_tx_tc_mode_get(struct aq_hw_s *aq_hw);



/* set tx buffer enable */

void hw_atl_tpb_tx_buff_en_set(struct aq_hw_s *aq_hw, u32 tx_buff_en);

CRA Git | Maintained and supported by SUSTech CRA and CCSE