Commit 9b9dda5d authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'net-atlantic-phy-tunables-from-mac-driver' 



Igor Russkikh says:

====================
net: atlantic: phy tunables from mac driver

This series implements phy tunables settings via MAC driver callbacks.

AQC 10G devices use integrated MAC+PHY solution, where PHY is fully controlled
by MAC firmware. Therefore, it is not possible to implement separate phy driver
for these.

We use ethtool ops callbacks to implement downshift and EDPC tunables.

v3: fixed flaw in EDPD logic, from Andrew
v2: comments from Andrew
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 302af7c6 60db5e40

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

+53 −0
Original line number Diff line number Diff line
@@ -917,6 +917,57 @@ static int aq_ethtool_set_priv_flags(struct net_device *ndev, u32 flags) 
	return ret;

}



static int aq_ethtool_get_phy_tunable(struct net_device *ndev,

				      const struct ethtool_tunable *tuna, void *data)

{

	struct aq_nic_s *aq_nic = netdev_priv(ndev);



	switch (tuna->id) {

	case ETHTOOL_PHY_EDPD: {

		u16 *val = data;



		*val = aq_nic->aq_nic_cfg.is_media_detect ? AQ_HW_MEDIA_DETECT_CNT : 0;

		break;

	}

	case ETHTOOL_PHY_DOWNSHIFT: {

		u8 *val = data;



		*val = (u8)aq_nic->aq_nic_cfg.downshift_counter;

		break;

	}

	default:

		return -EOPNOTSUPP;

	}



	return 0;

}



static int aq_ethtool_set_phy_tunable(struct net_device *ndev,

				      const struct ethtool_tunable *tuna, const void *data)

{

	int err = -EOPNOTSUPP;

	struct aq_nic_s *aq_nic = netdev_priv(ndev);



	switch (tuna->id) {

	case ETHTOOL_PHY_EDPD: {

		const u16 *val = data;



		err = aq_nic_set_media_detect(aq_nic, *val);

		break;

	}

	case ETHTOOL_PHY_DOWNSHIFT: {

		const u8 *val = data;



		err = aq_nic_set_downshift(aq_nic, *val);

		break;

	}

	default:

		break;

	}



	return err;

}



const struct ethtool_ops aq_ethtool_ops = {

	.supported_coalesce_params = ETHTOOL_COALESCE_USECS |

				     ETHTOOL_COALESCE_MAX_FRAMES,
@@ -952,4 +1003,6 @@ const struct ethtool_ops aq_ethtool_ops = { 
	.get_coalesce	     = aq_ethtool_get_coalesce,

	.set_coalesce	     = aq_ethtool_set_coalesce,

	.get_ts_info         = aq_ethtool_get_ts_info,

	.get_phy_tunable     = aq_ethtool_get_phy_tunable,

	.set_phy_tunable     = aq_ethtool_set_phy_tunable,

};

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

+6 −0
Original line number Diff line number Diff line
@@ -143,6 +143,8 @@ struct aq_stats_s { 
#define AQ_HW_LED_BLINK    0x2U

#define AQ_HW_LED_DEFAULT  0x0U



#define AQ_HW_MEDIA_DETECT_CNT 6000



enum aq_priv_flags {

	AQ_HW_LOOPBACK_DMA_SYS,

	AQ_HW_LOOPBACK_PKT_SYS,
@@ -386,6 +388,10 @@ struct aq_fw_ops { 
	int (*get_eee_rate)(struct aq_hw_s *self, u32 *rate,

			    u32 *supported_rates);



	int (*set_downshift)(struct aq_hw_s *self, u32 counter);



	int (*set_media_detect)(struct aq_hw_s *self, bool enable);



	u32 (*get_link_capabilities)(struct aq_hw_s *self);



	int (*send_macsec_req)(struct aq_hw_s *self,

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

+50 −0
Original line number Diff line number Diff line
@@ -405,6 +405,10 @@ int aq_nic_init(struct aq_nic_s *self) 
	mutex_unlock(&self->fwreq_mutex);

	if (err < 0)

		goto err_exit;

	/* Restore default settings */

	aq_nic_set_downshift(self, self->aq_nic_cfg.downshift_counter);

	aq_nic_set_media_detect(self, self->aq_nic_cfg.is_media_detect ?

				AQ_HW_MEDIA_DETECT_CNT : 0);



	err = self->aq_hw_ops->hw_init(self->aq_hw,

				       aq_nic_get_ndev(self)->dev_addr);
@@ -1398,6 +1402,52 @@ void aq_nic_release_filter(struct aq_nic_s *self, enum aq_rx_filter_type type, 
	}

}



int aq_nic_set_downshift(struct aq_nic_s *self, int val)

{

	int err = 0;

	struct aq_nic_cfg_s *cfg = &self->aq_nic_cfg;



	if (!self->aq_fw_ops->set_downshift)

		return -EOPNOTSUPP;



	if (val > 15) {

		netdev_err(self->ndev, "downshift counter should be <= 15\n");

		return -EINVAL;

	}

	cfg->downshift_counter = val;



	mutex_lock(&self->fwreq_mutex);

	err = self->aq_fw_ops->set_downshift(self->aq_hw, cfg->downshift_counter);

	mutex_unlock(&self->fwreq_mutex);



	return err;

}



int aq_nic_set_media_detect(struct aq_nic_s *self, int val)

{

	struct aq_nic_cfg_s *cfg = &self->aq_nic_cfg;

	int err = 0;



	if (!self->aq_fw_ops->set_media_detect)

		return -EOPNOTSUPP;



	if (val > 0 && val != AQ_HW_MEDIA_DETECT_CNT) {

		netdev_err(self->ndev, "EDPD on this device could have only fixed value of %d\n",

			   AQ_HW_MEDIA_DETECT_CNT);

		return -EINVAL;

	}



	mutex_lock(&self->fwreq_mutex);

	err = self->aq_fw_ops->set_media_detect(self->aq_hw, !!val);

	mutex_unlock(&self->fwreq_mutex);



	/* msecs plays no role - configuration is always fixed in PHY */

	if (!err)

		cfg->is_media_detect = !!val;



	return err;

}



int aq_nic_setup_tc_mqprio(struct aq_nic_s *self, u32 tcs, u8 *prio_tc_map)

{

	struct aq_nic_cfg_s *cfg = &self->aq_nic_cfg;

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

+4 −0
Original line number Diff line number Diff line
@@ -62,6 +62,8 @@ struct aq_nic_cfg_s { 
	bool is_lro;

	bool is_qos;

	bool is_ptp;

	bool is_media_detect;

	int downshift_counter;

	enum aq_tc_mode tc_mode;

	u32 priv_flags;

	u8  tcs;
@@ -195,6 +197,8 @@ int aq_nic_set_link_ksettings(struct aq_nic_s *self, 
struct aq_nic_cfg_s *aq_nic_get_cfg(struct aq_nic_s *self);

u32 aq_nic_get_fw_version(struct aq_nic_s *self);

int aq_nic_set_loopback(struct aq_nic_s *self);

int aq_nic_set_downshift(struct aq_nic_s *self, int val);

int aq_nic_set_media_detect(struct aq_nic_s *self, int val);

int aq_nic_update_interrupt_moderation_settings(struct aq_nic_s *self);

void aq_nic_shutdown(struct aq_nic_s *self);

u8 aq_nic_reserve_filter(struct aq_nic_s *self, enum aq_rx_filter_type type);

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

+37 −0
Original line number Diff line number Diff line
@@ -612,6 +612,41 @@ static u32 aq_fw2x_state2_get(struct aq_hw_s *self) 
	return aq_hw_read_reg(self, HW_ATL_FW2X_MPI_STATE2_ADDR);

}



static int aq_fw2x_set_downshift(struct aq_hw_s *self, u32 counter)

{

	int err = 0;

	u32 mpi_opts;

	u32 offset;



	offset = offsetof(struct hw_atl_utils_settings, downshift_retry_count);

	err = hw_atl_write_fwsettings_dwords(self, offset, &counter, 1);

	if (err)

		return err;



	mpi_opts = aq_hw_read_reg(self, HW_ATL_FW2X_MPI_CONTROL2_ADDR);

	if (counter)

		mpi_opts |= HW_ATL_FW2X_CTRL_DOWNSHIFT;

	else

		mpi_opts &= ~HW_ATL_FW2X_CTRL_DOWNSHIFT;

	aq_hw_write_reg(self, HW_ATL_FW2X_MPI_CONTROL2_ADDR, mpi_opts);



	return err;

}



static int aq_fw2x_set_media_detect(struct aq_hw_s *self, bool on)

{

	u32 enable;

	u32 offset;



	if (self->fw_ver_actual < HW_ATL_FW_VER_MEDIA_CONTROL)

		return -EOPNOTSUPP;



	offset = offsetof(struct hw_atl_utils_settings, media_detect);

	enable = on;



	return hw_atl_write_fwsettings_dwords(self, offset, &enable, 1);

}



static u32 aq_fw2x_get_link_capabilities(struct aq_hw_s *self)

{

	int err = 0;
@@ -692,6 +727,8 @@ const struct aq_fw_ops aq_fw_2x_ops = { 
	.enable_ptp         = aq_fw3x_enable_ptp,

	.led_control        = aq_fw2x_led_control,

	.set_phyloopback    = aq_fw2x_set_phyloopback,

	.set_downshift      = aq_fw2x_set_downshift,

	.set_media_detect   = aq_fw2x_set_media_detect,

	.adjust_ptp         = aq_fw3x_adjust_ptp,

	.get_link_capabilities = aq_fw2x_get_link_capabilities,

	.send_macsec_req    = aq_fw2x_send_macsec_req,

CRA Git | Maintained and supported by SUSTech CRA and CCSE