Commit a264228c authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'net-lan743x-pci11010-pci11414-devices-enhancements' 

Raju Lakkaraju says:

====================
net: lan743x: PCI11010 / PCI11414 devices Enhancements

This patch series continues with the addition of supported features for the
Ethernet function of the PCI11010 / PCI11414 devices to the LAN743x driver.
====================

Link: https://lore.kernel.org/r/20221024082516.661199-1-Raju.Lakkaraju@microchip.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents b5f0de6d b64e6a87

drivers/net/ethernet/microchip/lan743x_ethtool.c

+46 −0
Original line number Diff line number Diff line
@@ -1233,6 +1233,50 @@ static void lan743x_get_regs(struct net_device *dev, 
	lan743x_common_regs(dev, regs, p);

}



static void lan743x_get_pauseparam(struct net_device *dev,

				   struct ethtool_pauseparam *pause)

{

	struct lan743x_adapter *adapter = netdev_priv(dev);

	struct lan743x_phy *phy = &adapter->phy;



	if (phy->fc_request_control & FLOW_CTRL_TX)

		pause->tx_pause = 1;

	if (phy->fc_request_control & FLOW_CTRL_RX)

		pause->rx_pause = 1;

	pause->autoneg = phy->fc_autoneg;

}



static int lan743x_set_pauseparam(struct net_device *dev,

				  struct ethtool_pauseparam *pause)

{

	struct lan743x_adapter *adapter = netdev_priv(dev);

	struct phy_device *phydev = dev->phydev;

	struct lan743x_phy *phy = &adapter->phy;



	if (!phydev)

		return -ENODEV;



	if (!phy_validate_pause(phydev, pause))

		return -EINVAL;



	phy->fc_request_control = 0;

	if (pause->rx_pause)

		phy->fc_request_control |= FLOW_CTRL_RX;



	if (pause->tx_pause)

		phy->fc_request_control |= FLOW_CTRL_TX;



	phy->fc_autoneg = pause->autoneg;



	if (pause->autoneg == AUTONEG_DISABLE)

		lan743x_mac_flow_ctrl_set_enables(adapter, pause->tx_pause,

						  pause->rx_pause);

	else

		phy_set_asym_pause(phydev, pause->rx_pause,  pause->tx_pause);



	return 0;

}



const struct ethtool_ops lan743x_ethtool_ops = {

	.get_drvinfo = lan743x_ethtool_get_drvinfo,

	.get_msglevel = lan743x_ethtool_get_msglevel,
@@ -1259,6 +1303,8 @@ const struct ethtool_ops lan743x_ethtool_ops = { 
	.set_link_ksettings = phy_ethtool_set_link_ksettings,

	.get_regs_len = lan743x_get_regs_len,

	.get_regs = lan743x_get_regs,

	.get_pauseparam = lan743x_get_pauseparam,

	.set_pauseparam = lan743x_set_pauseparam,

#ifdef CONFIG_PM

	.get_wol = lan743x_ethtool_get_wol,

	.set_wol = lan743x_ethtool_set_wol,

drivers/net/ethernet/microchip/lan743x_main.c

+2 −2
Original line number Diff line number Diff line
@@ -1326,7 +1326,7 @@ static void lan743x_mac_close(struct lan743x_adapter *adapter) 
				 1, 1000, 20000, 100);

}



static void lan743x_mac_flow_ctrl_set_enables(struct lan743x_adapter *adapter,

void lan743x_mac_flow_ctrl_set_enables(struct lan743x_adapter *adapter,

				       bool tx_enable, bool rx_enable)

{

	u32 flow_setting = 0;

drivers/net/ethernet/microchip/lan743x_main.h

+2 −0
Original line number Diff line number Diff line
@@ -1159,5 +1159,7 @@ u32 lan743x_csr_read(struct lan743x_adapter *adapter, int offset); 
void lan743x_csr_write(struct lan743x_adapter *adapter, int offset, u32 data);

int lan743x_hs_syslock_acquire(struct lan743x_adapter *adapter, u16 timeout);

void lan743x_hs_syslock_release(struct lan743x_adapter *adapter);

void lan743x_mac_flow_ctrl_set_enables(struct lan743x_adapter *adapter,

				       bool tx_enable, bool rx_enable);



#endif /* _LAN743X_H */

drivers/net/phy/micrel.c

+77 −0
Original line number Diff line number Diff line
@@ -1295,6 +1295,81 @@ static int ksz9131_config_init(struct phy_device *phydev) 
	return 0;

}



#define MII_KSZ9131_AUTO_MDIX		0x1C

#define MII_KSZ9131_AUTO_MDI_SET	BIT(7)

#define MII_KSZ9131_AUTO_MDIX_SWAP_OFF	BIT(6)



static int ksz9131_mdix_update(struct phy_device *phydev)

{

	int ret;



	ret = phy_read(phydev, MII_KSZ9131_AUTO_MDIX);

	if (ret < 0)

		return ret;



	if (ret & MII_KSZ9131_AUTO_MDIX_SWAP_OFF) {

		if (ret & MII_KSZ9131_AUTO_MDI_SET)

			phydev->mdix_ctrl = ETH_TP_MDI;

		else

			phydev->mdix_ctrl = ETH_TP_MDI_X;

	} else {

		phydev->mdix_ctrl = ETH_TP_MDI_AUTO;

	}



	if (ret & MII_KSZ9131_AUTO_MDI_SET)

		phydev->mdix = ETH_TP_MDI;

	else

		phydev->mdix = ETH_TP_MDI_X;



	return 0;

}



static int ksz9131_config_mdix(struct phy_device *phydev, u8 ctrl)

{

	u16 val;



	switch (ctrl) {

	case ETH_TP_MDI:

		val = MII_KSZ9131_AUTO_MDIX_SWAP_OFF |

		      MII_KSZ9131_AUTO_MDI_SET;

		break;

	case ETH_TP_MDI_X:

		val = MII_KSZ9131_AUTO_MDIX_SWAP_OFF;

		break;

	case ETH_TP_MDI_AUTO:

		val = 0;

		break;

	default:

		return 0;

	}



	return phy_modify(phydev, MII_KSZ9131_AUTO_MDIX,

			  MII_KSZ9131_AUTO_MDIX_SWAP_OFF |

			  MII_KSZ9131_AUTO_MDI_SET, val);

}



static int ksz9131_read_status(struct phy_device *phydev)

{

	int ret;



	ret = ksz9131_mdix_update(phydev);

	if (ret < 0)

		return ret;



	return genphy_read_status(phydev);

}



static int ksz9131_config_aneg(struct phy_device *phydev)

{

	int ret;



	ret = ksz9131_config_mdix(phydev, phydev->mdix_ctrl);

	if (ret)

		return ret;



	return genphy_config_aneg(phydev);

}



#define KSZ8873MLL_GLOBAL_CONTROL_4	0x06

#define KSZ8873MLL_GLOBAL_CONTROL_4_DUPLEX	BIT(6)

#define KSZ8873MLL_GLOBAL_CONTROL_4_SPEED	BIT(4)
@@ -3304,6 +3379,8 @@ static struct phy_driver ksphy_driver[] = { 
	.probe		= kszphy_probe,

	.config_init	= ksz9131_config_init,

	.config_intr	= kszphy_config_intr,

	.config_aneg	= ksz9131_config_aneg,

	.read_status	= ksz9131_read_status,

	.handle_interrupt = kszphy_handle_interrupt,

	.get_sset_count = kszphy_get_sset_count,

	.get_strings	= kszphy_get_strings,