android/android_kernel_samsung_sm8650
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

V_01-00-23

Browse Source 
1. Restricted MDIO access when no PHY found or MDIO registration fails
2. Added mdio lock for making mii bus of private member to null to avoid parallel accessing to MDIO bus
This commit is contained in:
TC956X 2021-11-24 16:53:04 +09:00 committed by jianzhou
parent eb3a5a9afc
commit 941a48f811
4 changed files with 56 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Readme.md
View File

@ -1,7 +1,7 @@
# Toshiba Electronic Devices & Storage Corporation TC956X PCIe Ethernet Host Driver
Release Date: 24 Nov 2021
Release Version: V_01-00-22 : Limited-tested version
Release Version: V_01-00-23 : Limited-tested version
TC956X PCIe EMAC driver is based on "Fedora 30, kernel-5.4.19".
@ -297,3 +297,8 @@ ethtool -s eth0 wol pg
## TC956X_Host_Driver_20211124_V_01-00-22:
1. Single port Suspend/Resume supported
## TC956X_Host_Driver_20211124_V_01-00-23:
1. Restricted MDIO access when no PHY found or MDIO registration fails
2. Added mdio lock for making mii bus of private member to null to avoid parallel accessing to MDIO bus

4
tc956x_pci.c
View File

@ -87,6 +87,8 @@
* 24 Nov 2021 : 1. Version update
2. Single Port Suspend/Resume supported
* VERSION : 01-00-22
* 24 Nov 2021 : 1. Version update
* VERSION : 01-00-23
*/
#include <linux/clk-provider.h>
@ -119,7 +121,7 @@ static unsigned int tc956x_port1_interface = ENABLE_SGMII_INTERFACE;
unsigned int tc956x_port0_filter_phy_pause_frames = DISABLE;
unsigned int tc956x_port1_filter_phy_pause_frames = DISABLE;
static const struct tc956x_version tc956x_drv_version = {0, 1, 0, 0, 2, 2};
static const struct tc956x_version tc956x_drv_version = {0, 1, 0, 0, 2, 3};
static int tc956xmac_pm_usage_counter; /* Device Usage Counter */
struct mutex tc956x_pm_suspend_lock; /* This mutex is shared between all available EMAC ports. */

4
tc956xmac.h
View File

@ -86,6 +86,8 @@
* 24 Nov 2021 : 1. Version update
2. Private member used instead of global for wol interrupt indication
* VERSION : 01-00-22
* 24 Nov 2021 : 1. Version update
* VERSION : 01-00-23
*/
#ifndef __TC956XMAC_H__
@ -138,7 +140,7 @@
#ifdef TC956X
#define TC956X_RESOURCE_NAME "tc956x_pci-eth"
#define DRV_MODULE_VERSION "V_01-00-22"
#define DRV_MODULE_VERSION "V_01-00-23"
#define TC956X_FW_MAX_SIZE (64*1024)
#define ATR_AXI4_SLV_BASE 0x0800

50
tc956xmac_mdio.c
View File

@ -36,6 +36,9 @@
* VERSION : 01-00-01
* 20 Jul 2021 : 1. MAX C22 address changed to 3. Print not corrected for C45 PHY selection
* VERSION : 01-00-03
* 24 Nov 2021 : 1. Restricted MDIO access when no PHY found or MDIO registration fails
* 2. Added mdio lock for making mii bus of private member to null to avoid parallel accessing to MDIO bus
* VERSION : 01-00-23
*/
#include <linux/gpio/consumer.h>
@ -108,7 +111,7 @@ static int tc956xmac_xgmac2_c22_format(struct tc956xmac_priv *priv, int phyaddr,
return 0;
}
static int tc956xmac_xgmac2_mdio_read(struct mii_bus *bus, int phyaddr, int phyreg)
static int __tc956xmac_xgmac2_mdio_read(struct mii_bus *bus, int phyaddr, int phyreg)
{
struct net_device *ndev = bus->priv;
struct tc956xmac_priv *priv = netdev_priv(ndev);
@ -179,8 +182,21 @@ static int tc956xmac_xgmac2_mdio_read(struct mii_bus *bus, int phyaddr, int phyr
/* Read the data from the MII data register */
return readl(priv->ioaddr + mii_data) & GENMASK(15, 0);
}
/**
* __tc956xmac_xgmac2_mdio_read
* @bus: points to the mii_bus structure
* @phyaddr: MII addr
* @phyreg: MII reg
* Description: Check whether MDIO bus is registered successfully or not
* if registered then access MDIO for Read operation
*/
static int tc956xmac_xgmac2_mdio_read(struct mii_bus *bus, int phyaddr, int phyreg)
{
return bus->priv ?
__tc956xmac_xgmac2_mdio_read(bus, phyaddr, phyreg) : -EIO;
}
static int tc956xmac_xgmac2_mdio_write(struct mii_bus *bus, int phyaddr,
static int __tc956xmac_xgmac2_mdio_write(struct mii_bus *bus, int phyaddr,
int phyreg, u16 phydata)
{
struct net_device *ndev = bus->priv;
@ -234,6 +250,21 @@ static int tc956xmac_xgmac2_mdio_write(struct mii_bus *bus, int phyaddr,
return readl_poll_timeout(priv->ioaddr + mii_data, tmp,
!(tmp & MII_XGMAC_BUSY), /*100*/10, 10000);
}
/**
* __tc956xmac_xgmac2_mdio_write
* @bus: points to the mii_bus structure
* @phyaddr: MII addr
* @phyreg: MII reg
* @phydata: data to write into PHY reg
* Description: Check whether MDIO bus is registered successfully or not
* if registered then access MDIO for write operation
*/
static int tc956xmac_xgmac2_mdio_write(struct mii_bus *bus, int phyaddr,
int phyreg, u16 phydata)
{
return bus->priv ?
__tc956xmac_xgmac2_mdio_write(bus, phyaddr, phyreg, phydata) : -EIO;
}
#ifdef TC956X_UNSUPPORTED_UNTESTED_FEATURE
/**
@ -606,9 +637,7 @@ int tc956xmac_mdio_register(struct net_device *ndev)
if (!found && !mdio_node) {
dev_warn(dev, "No PHY found\n");
mdiobus_unregister(new_bus);
mdiobus_free(new_bus);
return -ENODEV;
goto bus_no_phy_found;
}
#ifndef TC956X
bus_register_done:
@ -616,8 +645,15 @@ int tc956xmac_mdio_register(struct net_device *ndev)
priv->mii = new_bus;
return 0;
bus_no_phy_found:
err = -ENODEV;
mdiobus_unregister(new_bus);
bus_register_fail:
/* Set bus->priv to NULL, so that any future calls to bus read/write can avoid bus access.*/
mutex_lock(&new_bus->mdio_lock);
new_bus->priv = NULL;
mutex_unlock(&new_bus->mdio_lock);
mdiobus_free(new_bus);
return err;
}
@ -635,7 +671,9 @@ int tc956xmac_mdio_unregister(struct net_device *ndev)
return 0;
mdiobus_unregister(priv->mii);
mutex_lock(&priv->mii->mdio_lock);
priv->mii->priv = NULL;
mutex_unlock(&priv->mii->mdio_lock);
mdiobus_free(priv->mii);
priv->mii = NULL;