Commit 099d074e authored by Mark Starovoytov's avatar Mark Starovoytov Committed by David S. Miller
Browse files

net: atlantic: add hw_soft_reset, hw_prepare to hw_ops 



A2 will have a different implementation of these 2 APIs, so
this patch moves them to hw_ops in preparation for A2.

Signed-off-by: default avatarMark Starovoytov <mstarovoitov@marvell.com>
Co-developed-by: default avatarDmitry Bezrukov <dbezrukov@marvell.com>
Signed-off-by: default avatarDmitry Bezrukov <dbezrukov@marvell.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3d464aad

drivers/net/ethernet/aquantia/atlantic/aq_hw.h

+5 −0
Original line number Diff line number Diff line
@@ -182,6 +182,11 @@ struct aq_hw_ops { 


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



	int (*hw_soft_reset)(struct aq_hw_s *self);



	int (*hw_prepare)(struct aq_hw_s *self,

			  const struct aq_fw_ops **fw_ops);



	int (*hw_reset)(struct aq_hw_s *self);



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

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

+15 −1
Original line number Diff line number Diff line
@@ -257,6 +257,20 @@ static void aq_nic_polling_timer_cb(struct timer_list *t) 
		  AQ_CFG_POLLING_TIMER_INTERVAL);

}



static int aq_nic_hw_prepare(struct aq_nic_s *self)

{

	int err = 0;



	err = self->aq_hw_ops->hw_soft_reset(self->aq_hw);

	if (err)

		goto exit;



	err = self->aq_hw_ops->hw_prepare(self->aq_hw, &self->aq_fw_ops);



exit:

	return err;

}



int aq_nic_ndev_register(struct aq_nic_s *self)

{

	int err = 0;
@@ -266,7 +280,7 @@ int aq_nic_ndev_register(struct aq_nic_s *self) 
		goto err_exit;

	}



	err = hw_atl_utils_initfw(self->aq_hw, &self->aq_fw_ops);

	err = aq_nic_hw_prepare(self);

	if (err)

		goto err_exit;

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

+2 −0
Original line number Diff line number Diff line
@@ -886,6 +886,8 @@ static int hw_atl_a0_hw_ring_rx_stop(struct aq_hw_s *self, 
}



const struct aq_hw_ops hw_atl_ops_a0 = {

	.hw_soft_reset        = hw_atl_utils_soft_reset,

	.hw_prepare           = hw_atl_utils_initfw,

	.hw_set_mac_address   = hw_atl_a0_hw_mac_addr_set,

	.hw_init              = hw_atl_a0_hw_init,

	.hw_reset             = hw_atl_a0_hw_reset,

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

+2 −0
Original line number Diff line number Diff line
@@ -1478,6 +1478,8 @@ static int hw_atl_b0_set_loopback(struct aq_hw_s *self, u32 mode, bool enable) 
}



const struct aq_hw_ops hw_atl_ops_b0 = {

	.hw_soft_reset        = hw_atl_utils_soft_reset,

	.hw_prepare           = hw_atl_utils_initfw,

	.hw_set_mac_address   = hw_atl_b0_hw_mac_addr_set,

	.hw_init              = hw_atl_b0_hw_init,

	.hw_reset             = hw_atl_b0_hw_reset,

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

+0 −4
Original line number Diff line number Diff line
@@ -67,10 +67,6 @@ int hw_atl_utils_initfw(struct aq_hw_s *self, const struct aq_fw_ops **fw_ops) 
{

	int err = 0;



	err = hw_atl_utils_soft_reset(self);

	if (err)

		return err;



	hw_atl_utils_hw_chip_features_init(self,

					   &self->chip_features);

CRA Git | Maintained and supported by SUSTech CRA and CCSE