| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Date: Tue, 26 Jun 2018 17:06:10 -0700
From: Paul Burton <paul.burton@...s.com>
To: netdev@...r.kernel.org
Cc: "David S . Miller" <davem@...emloft.net>,
Andrew Lunn <andrew@...n.ch>, paul.burton@...s.com
Subject: [PATCH v7 09/11] net: pch_gbe: Convert to mdiobus and phylib
From: Andrew Lunn <andrew@...n.ch>
Convert this driver to use the mdio bus and phylib infrastructure. It
will then use the common AT803X PHY driver, rather than use its own
code. Have the shared code also handle the GPIO used to reset the PHY.
Over all, these changes should make it easier to use other PHYs with the
MAC chip, and reduces the lines of code.
[paul.burton@...s.com:
- Select CONFIG_PHYLIB.
- Drop selection of CONFIG_MII.
- Imply AT803X_PHY for X86_32, rather than selecting it for all.
- Add GPIOF_ACTIVE_LOW to the minnow PHY reset GPIO flags.
- Rebase atop changes in the rest of the series.
- Drop the AR8031 PHY hibernation disable fixup.]
Signed-off-by: Andrew Lunn <andrew@...n.ch>
Signed-off-by: Paul Burton <paul.burton@...s.com>
Cc: Andrew Lunn <andrew@...n.ch>
Cc: David S. Miller <davem@...emloft.net>
Cc: netdev@...r.kernel.org
---
Changes in v7:
- Heavy rebasing atop earlier patches.
Changes in v6:
- New patch
drivers/net/ethernet/oki-semi/pch_gbe/Kconfig | 3 +-
.../net/ethernet/oki-semi/pch_gbe/Makefile | 2 +-
.../net/ethernet/oki-semi/pch_gbe/pch_gbe.h | 7 +-
.../oki-semi/pch_gbe/pch_gbe_ethtool.c | 88 +----
.../ethernet/oki-semi/pch_gbe/pch_gbe_main.c | 239 ++++++-------
.../ethernet/oki-semi/pch_gbe/pch_gbe_param.c | 265 --------------
.../ethernet/oki-semi/pch_gbe/pch_gbe_phy.c | 335 ------------------
.../ethernet/oki-semi/pch_gbe/pch_gbe_phy.h | 34 --
8 files changed, 126 insertions(+), 847 deletions(-)
delete mode 100644 drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_phy.c
delete mode 100644 drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_phy.h
diff --git a/drivers/net/ethernet/oki-semi/pch_gbe/Kconfig b/drivers/net/ethernet/oki-semi/pch_gbe/Kconfig
index 5f7a35212796..5276f4ff3b63 100644
--- a/drivers/net/ethernet/oki-semi/pch_gbe/Kconfig
+++ b/drivers/net/ethernet/oki-semi/pch_gbe/Kconfig
@@ -5,7 +5,8 @@
config PCH_GBE
tristate "OKI SEMICONDUCTOR IOH(ML7223/ML7831) GbE"
depends on PCI && (X86_32 || COMPILE_TEST)
- select MII
+ select PHYLIB
+ imply AT803X_PHY if X86_32
select PTP_1588_CLOCK_PCH
select NET_PTP_CLASSIFY
---help---
diff --git a/drivers/net/ethernet/oki-semi/pch_gbe/Makefile b/drivers/net/ethernet/oki-semi/pch_gbe/Makefile
index 862de0f3bc41..133c89bc2933 100644
--- a/drivers/net/ethernet/oki-semi/pch_gbe/Makefile
+++ b/drivers/net/ethernet/oki-semi/pch_gbe/Makefile
@@ -1,4 +1,4 @@
obj-$(CONFIG_PCH_GBE) += pch_gbe.o
-pch_gbe-y := pch_gbe_phy.o pch_gbe_ethtool.o pch_gbe_param.o
+pch_gbe-y := pch_gbe_ethtool.o pch_gbe_param.o
pch_gbe-y += pch_gbe_main.o
diff --git a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe.h b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe.h
index f8acd8031951..e6a0bd053ae5 100644
--- a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe.h
+++ b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe.h
@@ -22,7 +22,8 @@
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-#include <linux/mii.h>
+#include <linux/mdio.h>
+#include <linux/phy.h>
#include <linux/delay.h>
#include <linux/pci.h>
#include <linux/netdevice.h>
@@ -578,8 +579,8 @@ struct pch_gbe_adapter {
struct pch_gbe_hw hw;
struct pch_gbe_hw_stats stats;
struct work_struct reset_task;
- struct mii_if_info mii;
- struct timer_list watchdog_timer;
+ struct mii_bus *mdiobus;
+ struct phy_device *phydev;
u32 wake_up_evt;
struct pch_gbe_tx_ring *tx_ring;
struct pch_gbe_rx_ring *rx_ring;
diff --git a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_ethtool.c b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_ethtool.c
index adaa0024adfe..5dc08eccb7e6 100644
--- a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_ethtool.c
+++ b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_ethtool.c
@@ -17,7 +17,6 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#include "pch_gbe.h"
-#include "pch_gbe_phy.h"
/**
* pch_gbe_stats - Stats item information
@@ -71,41 +70,8 @@ static const struct pch_gbe_stats pch_gbe_gstrings_stats[] = {
#define PCH_GBE_STATS_LEN (PCH_GBE_GLOBAL_STATS_LEN + PCH_GBE_QUEUE_STATS_LEN)
#define PCH_GBE_MAC_REGS_LEN (sizeof(struct pch_gbe_regs) / 4)
+#define PCH_GBE_PHY_REGS_LEN 32
#define PCH_GBE_REGS_LEN (PCH_GBE_MAC_REGS_LEN + PCH_GBE_PHY_REGS_LEN)
-/**
- * pch_gbe_get_link_ksettings - Get device-specific settings
- * @netdev: Network interface device structure
- * @ecmd: Ethtool command
- * Returns:
- * 0: Successful.
- * Negative value: Failed.
- */
-static int pch_gbe_get_link_ksettings(struct net_device *netdev,
- struct ethtool_link_ksettings *ecmd)
-{
- struct pch_gbe_adapter *adapter = netdev_priv(netdev);
- u32 supported, advertising;
-
- mii_ethtool_get_link_ksettings(&adapter->mii, ecmd);
-
- ethtool_convert_link_mode_to_legacy_u32(&supported,
- ecmd->link_modes.supported);
- ethtool_convert_link_mode_to_legacy_u32(&advertising,
- ecmd->link_modes.advertising);
-
- supported &= ~(SUPPORTED_TP | SUPPORTED_1000baseT_Half);
- advertising &= ~(ADVERTISED_TP | ADVERTISED_1000baseT_Half);
-
- ethtool_convert_legacy_u32_to_link_mode(ecmd->link_modes.supported,
- supported);
- ethtool_convert_legacy_u32_to_link_mode(ecmd->link_modes.advertising,
- advertising);
-
- if (!netif_carrier_ok(adapter->netdev))
- ecmd->base.speed = SPEED_UNKNOWN;
-
- return 0;
-}
/**
* pch_gbe_set_link_ksettings - Set device-specific settings
@@ -119,34 +85,22 @@ static int pch_gbe_set_link_ksettings(struct net_device *netdev,
const struct ethtool_link_ksettings *ecmd)
{
struct pch_gbe_adapter *adapter = netdev_priv(netdev);
+ struct phy_device *phydev = adapter->phydev;
struct pch_gbe_hw *hw = &adapter->hw;
- struct ethtool_link_ksettings copy_ecmd;
- u32 speed = ecmd->base.speed;
u32 advertising;
int ret;
- pch_gbe_phy_write_reg_miic(hw, MII_BMCR, BMCR_RESET);
-
- memcpy(©_ecmd, ecmd, sizeof(*ecmd));
-
- /* when set_settings() is called with a ethtool_cmd previously
- * filled by get_settings() on a down link, speed is -1: */
- if (speed == UINT_MAX) {
- speed = SPEED_1000;
- copy_ecmd.base.speed = speed;
- copy_ecmd.base.duplex = DUPLEX_FULL;
- }
- ret = mii_ethtool_set_link_ksettings(&adapter->mii, ©_ecmd);
+ ret = phy_ethtool_set_link_ksettings(netdev, ecmd);
if (ret) {
- netdev_err(netdev, "Error: mii_ethtool_set_link_ksettings\n");
+ netdev_err(netdev, "Error: phy_ethtool_set_link_ksettings\n");
return ret;
}
- hw->mac.link_speed = speed;
- hw->mac.link_duplex = copy_ecmd.base.duplex;
+ hw->mac.link_speed = phydev->speed;
+ hw->mac.link_duplex = phydev->duplex;
ethtool_convert_link_mode_to_legacy_u32(
- &advertising, copy_ecmd.link_modes.advertising);
+ &advertising, ecmd->link_modes.advertising);
hw->phy.autoneg_advertised = advertising;
- hw->mac.autoneg = copy_ecmd.base.autoneg;
+ hw->mac.autoneg = ecmd->base.autoneg;
/* reset the link */
if (netif_running(adapter->netdev)) {
@@ -197,16 +151,14 @@ static void pch_gbe_get_regs(struct net_device *netdev,
struct pch_gbe_hw *hw = &adapter->hw;
struct pci_dev *pdev = adapter->pdev;
u32 *regs_buff = p;
- u16 i, tmp;
+ u16 i;
regs->version = 0x1000000 | (__u32)pdev->revision << 16 | pdev->device;
for (i = 0; i < PCH_GBE_MAC_REGS_LEN; i++)
*regs_buff++ = ioread32(&hw->reg->INT_ST + i);
/* PHY register */
- for (i = 0; i < PCH_GBE_PHY_REGS_LEN; i++) {
- pch_gbe_phy_read_reg_miic(&adapter->hw, i, &tmp);
- *regs_buff++ = tmp;
- }
+ for (i = 0; i < PCH_GBE_PHY_REGS_LEN; i++)
+ *regs_buff++ = phy_read(adapter->phydev, i);
}
/**
@@ -261,20 +213,6 @@ static int pch_gbe_set_wol(struct net_device *netdev,
return 0;
}
-/**
- * pch_gbe_nway_reset - Restart autonegotiation
- * @netdev: Network interface device structure
- * Returns:
- * 0: Successful.
- * Negative value: Failed.
- */
-static int pch_gbe_nway_reset(struct net_device *netdev)
-{
- struct pch_gbe_adapter *adapter = netdev_priv(netdev);
-
- return mii_nway_restart(&adapter->mii);
-}
-
/**
* pch_gbe_get_ringparam - Report ring sizes
* @netdev: Network interface device structure
@@ -497,7 +435,7 @@ static const struct ethtool_ops pch_gbe_ethtool_ops = {
.get_regs = pch_gbe_get_regs,
.get_wol = pch_gbe_get_wol,
.set_wol = pch_gbe_set_wol,
- .nway_reset = pch_gbe_nway_reset,
+ .nway_reset = phy_ethtool_nway_reset,
.get_link = ethtool_op_get_link,
.get_ringparam = pch_gbe_get_ringparam,
.set_ringparam = pch_gbe_set_ringparam,
@@ -506,7 +444,7 @@ static const struct ethtool_ops pch_gbe_ethtool_ops = {
.get_strings = pch_gbe_get_strings,
.get_ethtool_stats = pch_gbe_get_ethtool_stats,
.get_sset_count = pch_gbe_get_sset_count,
- .get_link_ksettings = pch_gbe_get_link_ksettings,
+ .get_link_ksettings = phy_ethtool_get_link_ksettings,
.set_link_ksettings = pch_gbe_set_link_ksettings,
};
diff --git a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c
index 123c7818698d..7fd10550cc57 100644
--- a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c
+++ b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c
@@ -18,11 +18,11 @@
*/
#include "pch_gbe.h"
-#include "pch_gbe_phy.h"
#include <linux/module.h>
#include <linux/net_tstamp.h>
#include <linux/ptp_classify.h>
#include <linux/gpio.h>
+#include <linux/gpio/consumer.h>
#define DRV_VERSION "1.01"
const char pch_driver_version[] = DRV_VERSION;
@@ -33,7 +33,6 @@ const char pch_driver_version[] = DRV_VERSION;
#define DSC_INIT16 0xC000
#define PCH_GBE_DMA_ALIGN 0
#define PCH_GBE_DMA_PADDING 2
-#define PCH_GBE_WATCHDOG_PERIOD (5 * HZ) /* watchdog time */
#define PCH_GBE_PCI_BAR 1
#define PCH_GBE_RESERVE_MEMORY 0x200000 /* 2MB */
@@ -112,9 +111,8 @@ const char pch_driver_version[] = DRV_VERSION;
#define MINNOW_PHY_RESET_GPIO 13
-static int pch_gbe_mdio_read(struct net_device *netdev, int addr, int reg);
-static void pch_gbe_mdio_write(struct net_device *netdev, int addr, int reg,
- int data);
+#define PCH_GBE_PHY_RESET_DELAY_US 10
+
static void pch_gbe_set_multi(struct net_device *netdev);
static int pch_ptp_match(struct sk_buff *skb, u16 uid_hi, u32 uid_lo, u16 seqid)
@@ -569,66 +567,6 @@ static void pch_gbe_init_stats(struct pch_gbe_adapter *adapter)
return;
}
-/**
- * pch_gbe_init_phy - Initialize PHY
- * @adapter: Board private structure to initialize
- * Returns:
- * 0: Successfully
- * Negative value: Failed
- */
-static int pch_gbe_init_phy(struct pch_gbe_adapter *adapter)
-{
- struct net_device *netdev = adapter->netdev;
- struct pch_gbe_hw *hw = &adapter->hw;
- u32 addr;
- u16 bmcr, stat;
- s32 ret_val;
-
- /* Discover phy addr by searching addrs in order {1,0,2,..., 31} */
- for (addr = 0; addr < PCH_GBE_PHY_REGS_LEN; addr++) {
- adapter->mii.phy_id = (addr == 0) ? 1 : (addr == 1) ? 0 : addr;
- bmcr = pch_gbe_mdio_read(netdev, adapter->mii.phy_id, MII_BMCR);
- stat = pch_gbe_mdio_read(netdev, adapter->mii.phy_id, MII_BMSR);
- stat = pch_gbe_mdio_read(netdev, adapter->mii.phy_id, MII_BMSR);
- if (!((bmcr == 0xFFFF) || ((stat == 0) && (bmcr == 0))))
- break;
- }
- adapter->hw.phy.addr = adapter->mii.phy_id;
- netdev_dbg(netdev, "phy_addr = %d\n", adapter->mii.phy_id);
- if (addr == PCH_GBE_PHY_REGS_LEN)
- return -EAGAIN;
- /* Selected the phy and isolate the rest */
- for (addr = 0; addr < PCH_GBE_PHY_REGS_LEN; addr++) {
- if (addr != adapter->mii.phy_id) {
- pch_gbe_mdio_write(netdev, addr, MII_BMCR,
- BMCR_ISOLATE);
- } else {
- bmcr = pch_gbe_mdio_read(netdev, addr, MII_BMCR);
- pch_gbe_mdio_write(netdev, addr, MII_BMCR,
- bmcr & ~BMCR_ISOLATE);
- }
- }
-
- /* MII setup */
- adapter->mii.phy_id_mask = 0x1F;
- adapter->mii.reg_num_mask = 0x1F;
- adapter->mii.dev = adapter->netdev;
- adapter->mii.mdio_read = pch_gbe_mdio_read;
- adapter->mii.mdio_write = pch_gbe_mdio_write;
- adapter->mii.supports_gmii = mii_check_gmii_support(&adapter->mii);
-
- ret_val = pch_gbe_phy_get_id(hw);
- if (ret_val) {
- netdev_err(adapter->netdev, "pch_gbe_phy_get_id error\n");
- return -EIO;
- }
- pch_gbe_phy_init_setting(hw);
- /* Setup Mac interface option RGMII */
- pch_gbe_phy_set_rgmii(hw);
-
- return 0;
-}
-
/**
* pch_gbe_mdio_read - The read function for mii
* @netdev: Network interface device structure
@@ -638,13 +576,12 @@ static int pch_gbe_init_phy(struct pch_gbe_adapter *adapter)
* 0: Successfully
* Negative value: Failed
*/
-static int pch_gbe_mdio_read(struct net_device *netdev, int addr, int reg)
+static int pch_gbe_mdio_read(struct mii_bus *bus, int addr, int reg)
{
- struct pch_gbe_adapter *adapter = netdev_priv(netdev);
+ struct pch_gbe_adapter *adapter = bus->priv;
struct pch_gbe_hw *hw = &adapter->hw;
- return pch_gbe_mac_ctrl_miim(hw, addr, PCH_GBE_HAL_MIIM_READ, reg,
- (u16) 0);
+ return pch_gbe_mac_ctrl_miim(hw, addr, PCH_GBE_HAL_MIIM_READ, reg, 0);
}
/**
@@ -654,13 +591,34 @@ static int pch_gbe_mdio_read(struct net_device *netdev, int addr, int reg)
* @reg: Access location
* @data: Write data
*/
-static void pch_gbe_mdio_write(struct net_device *netdev,
- int addr, int reg, int data)
+static int pch_gbe_mdio_write(struct mii_bus *bus, int addr, int reg, u16 data)
{
- struct pch_gbe_adapter *adapter = netdev_priv(netdev);
+ struct pch_gbe_adapter *adapter = bus->priv;
struct pch_gbe_hw *hw = &adapter->hw;
- pch_gbe_mac_ctrl_miim(hw, addr, PCH_GBE_HAL_MIIM_WRITE, reg, data);
+ return pch_gbe_mac_ctrl_miim(hw, addr, PCH_GBE_HAL_MIIM_WRITE, reg,
+ data);
+}
+
+static int pch_gbe_init_mdio(struct pch_gbe_adapter *adapter)
+{
+ struct device *dev = &adapter->pdev->dev;
+ struct mii_bus *bus;
+
+ bus = devm_mdiobus_alloc(dev);
+ if (!bus)
+ return -ENOMEM;
+
+ bus->read = pch_gbe_mdio_read;
+ bus->write = pch_gbe_mdio_write;
+ bus->parent = dev;
+ bus->name = "pch_gbe";
+ snprintf(bus->id, MII_BUS_ID_SIZE, "%s-mii", dev_name(dev));
+ bus->priv = adapter;
+
+ adapter->mdiobus = bus;
+
+ return mdiobus_register(bus);
}
/**
@@ -1829,7 +1787,6 @@ int pch_gbe_up(struct pch_gbe_adapter *adapter)
}
adapter->tx_queue_len = netdev->tx_queue_len;
- mod_timer(&adapter->watchdog_timer, jiffies);
return 0;
freeirq:
@@ -1855,8 +1812,6 @@ void pch_gbe_down(struct pch_gbe_adapter *adapter)
pch_gbe_irq_disable(adapter);
pch_gbe_free_irq(adapter);
- del_timer_sync(&adapter->watchdog_timer);
-
netdev->tx_queue_len = adapter->tx_queue_len;
netif_carrier_off(netdev);
netif_stop_queue(netdev);
@@ -1877,32 +1832,22 @@ void pch_gbe_down(struct pch_gbe_adapter *adapter)
* pch_gbe_watchdog - Watchdog process
* @data: Board private structure
*/
-static void pch_gbe_watchdog(struct timer_list *t)
+static void pch_gbe_change_link(struct net_device *netdev)
{
- struct pch_gbe_adapter *adapter = from_timer(adapter, t,
- watchdog_timer);
+ struct pch_gbe_adapter *adapter = netdev_priv(netdev);
struct pch_gbe_rx_ring *rx_ring = adapter->rx_ring;
struct pch_gbe_tx_ring *tx_ring = adapter->tx_ring;
- struct net_device *netdev = adapter->netdev;
+ struct phy_device *phydev = adapter->phydev;
struct pch_gbe_hw *hw = &adapter->hw;
netdev_dbg(netdev, "right now = %ld\n", jiffies);
pch_gbe_update_stats(adapter);
- if ((mii_link_ok(&adapter->mii)) && (!netif_carrier_ok(netdev))) {
- struct ethtool_cmd cmd = { .cmd = ETHTOOL_GSET };
+ if (phydev->link) {
netdev->tx_queue_len = adapter->tx_queue_len;
- /* mii library handles link maintenance tasks */
- if (mii_ethtool_gset(&adapter->mii, &cmd)) {
- netdev_err(netdev, "ethtool get setting Error\n");
- mod_timer(&adapter->watchdog_timer,
- round_jiffies(jiffies +
- PCH_GBE_WATCHDOG_PERIOD));
- return;
- }
- hw->mac.link_speed = ethtool_cmd_speed(&cmd);
- hw->mac.link_duplex = cmd.duplex;
+ hw->mac.link_speed = phydev->speed;
+ hw->mac.link_duplex = phydev->duplex;
pch_gbe_reset(adapter);
@@ -1927,23 +1872,43 @@ static void pch_gbe_watchdog(struct timer_list *t)
napi_enable(&adapter->napi);
pch_gbe_irq_enable(adapter);
netif_start_queue(adapter->netdev);
-
- netdev_dbg(netdev,
- "Link is Up %d Mbps %s-Duplex\n",
- hw->mac.link_speed,
- cmd.duplex == DUPLEX_FULL ? "Full" : "Half");
- netif_carrier_on(netdev);
netif_wake_queue(netdev);
- } else if ((!mii_link_ok(&adapter->mii)) &&
- (netif_carrier_ok(netdev))) {
- netdev_dbg(netdev, "NIC Link is Down\n");
+ } else if (!phydev->link && netif_carrier_ok(netdev)) {
hw->mac.link_speed = SPEED_10;
hw->mac.link_duplex = DUPLEX_HALF;
- netif_carrier_off(netdev);
netif_stop_queue(netdev);
}
- mod_timer(&adapter->watchdog_timer,
- round_jiffies(jiffies + PCH_GBE_WATCHDOG_PERIOD));
+
+ phy_print_status(phydev);
+}
+
+/**
+ * pch_gbe_init_phy - Initialize PHY
+ * @adapter: Board private structure to initialize
+ * Returns:
+ * 0: Successfully
+ * Negative value: Failed
+ */
+static int pch_gbe_init_phy(struct pch_gbe_adapter *adapter)
+{
+ struct net_device *netdev = adapter->netdev;
+ int ret;
+
+ adapter->phydev = phy_find_first(adapter->mdiobus);
+ if (!adapter->phydev)
+ return -ENODEV;
+
+ if (adapter->pdata && adapter->pdata->platform_init)
+ adapter->pdata->platform_init(adapter->pdev);
+
+ ret = phy_connect_direct(netdev, adapter->phydev, pch_gbe_change_link,
+ PHY_INTERFACE_MODE_RGMII_TXID);
+ if (ret) {
+ netdev_err(netdev, "Could not attach to PHY\n");
+ return ret;
+ }
+
+ return 0;
}
/**
@@ -1990,7 +1955,6 @@ static int pch_gbe_sw_init(struct pch_gbe_adapter *adapter)
static int pch_gbe_open(struct net_device *netdev)
{
struct pch_gbe_adapter *adapter = netdev_priv(netdev);
- struct pch_gbe_hw *hw = &adapter->hw;
int err;
/* allocate transmit descriptors */
@@ -2001,7 +1965,7 @@ static int pch_gbe_open(struct net_device *netdev)
err = pch_gbe_setup_rx_resources(adapter, adapter->rx_ring);
if (err)
goto err_setup_rx;
- pch_gbe_phy_power_up(hw);
+ phy_start(adapter->phydev);
err = pch_gbe_up(adapter);
if (err)
goto err_up;
@@ -2010,7 +1974,7 @@ static int pch_gbe_open(struct net_device *netdev)
err_up:
if (!adapter->wake_up_evt)
- pch_gbe_phy_power_down(hw);
+ phy_stop(adapter->phydev);
pch_gbe_free_rx_resources(adapter, adapter->rx_ring);
err_setup_rx:
pch_gbe_free_tx_resources(adapter, adapter->tx_ring);
@@ -2029,11 +1993,10 @@ static int pch_gbe_open(struct net_device *netdev)
static int pch_gbe_stop(struct net_device *netdev)
{
struct pch_gbe_adapter *adapter = netdev_priv(netdev);
- struct pch_gbe_hw *hw = &adapter->hw;
pch_gbe_down(adapter);
if (!adapter->wake_up_evt)
- pch_gbe_phy_power_down(hw);
+ phy_stop(adapter->phydev);
pch_gbe_free_tx_resources(adapter, adapter->tx_ring);
pch_gbe_free_rx_resources(adapter, adapter->rx_ring);
return 0;
@@ -2245,7 +2208,7 @@ static int pch_gbe_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd)
if (cmd == SIOCSHWTSTAMP)
return hwtstamp_ioctl(netdev, ifr, cmd);
- return generic_mii_ioctl(&adapter->mii, if_mii(ifr), cmd, NULL);
+ return phy_mii_ioctl(adapter->phydev, ifr, cmd);
}
/**
@@ -2363,7 +2326,7 @@ static pci_ers_result_t pch_gbe_io_slot_reset(struct pci_dev *pdev)
}
pci_set_master(pdev);
pci_enable_wake(pdev, PCI_D0, 0);
- pch_gbe_phy_power_up(hw);
+ phy_start(adapter->phydev);
pch_gbe_reset(adapter);
/* Clear wake up status */
pch_gbe_mac_set_wol_event(hw, 0);
@@ -2408,7 +2371,7 @@ static int __pch_gbe_suspend(struct pci_dev *pdev)
pch_gbe_mac_set_wol_event(hw, wufc);
pci_disable_device(pdev);
} else {
- pch_gbe_phy_power_down(hw);
+ phy_stop(adapter->phydev);
pch_gbe_mac_set_wol_event(hw, wufc);
pci_disable_device(pdev);
}
@@ -2437,7 +2400,7 @@ static int pch_gbe_resume(struct device *device)
return err;
}
pci_set_master(pdev);
- pch_gbe_phy_power_up(hw);
+ phy_start(adapter->phydev);
pch_gbe_reset(adapter);
/* Clear wake on lan control and status */
pch_gbe_mac_set_wol_event(hw, 0);
@@ -2467,7 +2430,9 @@ static void pch_gbe_remove(struct pci_dev *pdev)
cancel_work_sync(&adapter->reset_task);
unregister_netdev(netdev);
- pch_gbe_phy_hw_reset(&adapter->hw);
+ phy_stop(adapter->phydev);
+ phy_detach(adapter->phydev);
+ mdiobus_unregister(adapter->mdiobus);
free_netdev(netdev);
}
@@ -2517,8 +2482,6 @@ static int pch_gbe_probe(struct pci_dev *pdev,
adapter->hw.back = adapter;
adapter->hw.reg = pcim_iomap_table(pdev)[PCH_GBE_PCI_BAR];
adapter->pdata = (struct pch_gbe_privdata *)pci_id->driver_data;
- if (adapter->pdata && adapter->pdata->platform_init)
- adapter->pdata->platform_init(pdev);
adapter->ptp_pdev =
pci_get_domain_bus_and_slot(pci_domain_nr(adapter->pdev->bus),
@@ -2526,7 +2489,6 @@ static int pch_gbe_probe(struct pci_dev *pdev,
PCI_DEVFN(12, 4));
netdev->netdev_ops = &pch_gbe_netdev_ops;
- netdev->watchdog_timeo = PCH_GBE_WATCHDOG_PERIOD;
netif_napi_add(netdev, &adapter->napi,
pch_gbe_napi_poll, PCH_GBE_RX_WEIGHT);
netdev->hw_features = NETIF_F_RXCSUM |
@@ -2548,18 +2510,24 @@ static int pch_gbe_probe(struct pci_dev *pdev,
pch_gbe_check_options(adapter);
+ ret = pch_gbe_init_mdio(adapter);
+ if (ret) {
+ dev_err(&pdev->dev, "MDIO initialize error\n");
+ goto err_free_netdev;
+ }
+
/* Initialize PHY */
ret = pch_gbe_init_phy(adapter);
if (ret) {
dev_err(&pdev->dev, "PHY initialize error\n");
- goto err_free_adapter;
+ goto err_free_mdiobus;
}
/* Read the MAC address. and store to the private data */
ret = pch_gbe_mac_read_mac_addr(&adapter->hw);
if (ret) {
dev_err(&pdev->dev, "MAC address Read Error\n");
- goto err_free_adapter;
+ goto err_free_phy;
}
memcpy(netdev->dev_addr, adapter->hw.mac.addr, netdev->addr_len);
@@ -2573,7 +2541,6 @@ static int pch_gbe_probe(struct pci_dev *pdev,
dev_err(&pdev->dev, "Invalid MAC address, "
"interface disabled.\n");
}
- timer_setup(&adapter->watchdog_timer, pch_gbe_watchdog, 0);
INIT_WORK(&adapter->reset_task, pch_gbe_reset_task);
@@ -2583,7 +2550,8 @@ static int pch_gbe_probe(struct pci_dev *pdev,
ret = register_netdev(netdev);
if (ret)
- goto err_free_adapter;
+ goto err_free_phy;
+
/* tell the stack to leave us alone until pch_gbe_open() is called */
netif_carrier_off(netdev);
netif_stop_queue(netdev);
@@ -2593,8 +2561,10 @@ static int pch_gbe_probe(struct pci_dev *pdev,
device_set_wakeup_enable(&pdev->dev, 1);
return 0;
-err_free_adapter:
- pch_gbe_phy_hw_reset(&adapter->hw);
+err_free_phy:
+ phy_disconnect(adapter->phydev);
+err_free_mdiobus:
+ mdiobus_unregister(adapter->mdiobus);
err_free_netdev:
free_netdev(netdev);
return ret;
@@ -2605,23 +2575,26 @@ static int pch_gbe_probe(struct pci_dev *pdev,
*/
static int pch_gbe_minnow_platform_init(struct pci_dev *pdev)
{
- unsigned long flags = GPIOF_DIR_OUT | GPIOF_INIT_HIGH | GPIOF_EXPORT;
+ unsigned long flags = GPIOF_DIR_OUT | GPIOF_INIT_HIGH |
+ GPIOF_EXPORT | GPIOF_ACTIVE_LOW;
+ struct net_device *netdev = pci_get_drvdata(pdev);
+ struct pch_gbe_adapter *adapter = netdev_priv(netdev);
+ struct phy_device *phydev = adapter->phydev;
+ struct device *dev = &adapter->pdev->dev;
unsigned gpio = MINNOW_PHY_RESET_GPIO;
int ret;
- ret = devm_gpio_request_one(&pdev->dev, gpio, flags,
- "minnow_phy_reset");
+ ret = devm_gpio_request_one(dev, gpio, flags, "minnow_phy_reset");
if (ret) {
- dev_err(&pdev->dev,
- "ERR: Can't request PHY reset GPIO line '%d'\n", gpio);
+ netdev_err(netdev,
+ "ERR: Can't request PHY reset GPIO line '%d'\n",
+ gpio);
return ret;
}
- gpio_set_value(gpio, 0);
- usleep_range(1250, 1500);
- gpio_set_value(gpio, 1);
- usleep_range(1250, 1500);
-
+ phydev->mdio.reset = gpio_to_desc(gpio);
+ phydev->mdio.reset_assert_delay = 1500;
+ phydev->mdio.reset_deassert_delay = 1500;
return ret;
}
diff --git a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_param.c b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_param.c
index e097e6baaac4..c1fd66cadc76 100644
--- a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_param.c
+++ b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_param.c
@@ -42,60 +42,6 @@ static int RxDescriptors = OPTION_UNSET;
module_param(RxDescriptors, int, 0);
MODULE_PARM_DESC(RxDescriptors, "Number of receive descriptors");
-/**
- * Speed - User Specified Speed Override
- * @Valid Range: 0, 10, 100, 1000
- * - 0: auto-negotiate at all supported speeds
- * - 10: only link at 10 Mbps
- * - 100: only link at 100 Mbps
- * - 1000: only link at 1000 Mbps
- * @Default Value: 0
- */
-static int Speed = OPTION_UNSET;
-module_param(Speed, int, 0);
-MODULE_PARM_DESC(Speed, "Speed setting");
-
-/**
- * Duplex - User Specified Duplex Override
- * @Valid Range: 0-2
- * - 0: auto-negotiate for duplex
- * - 1: only link at half duplex
- * - 2: only link at full duplex
- * @Default Value: 0
- */
-static int Duplex = OPTION_UNSET;
-module_param(Duplex, int, 0);
-MODULE_PARM_DESC(Duplex, "Duplex setting");
-
-#define HALF_DUPLEX 1
-#define FULL_DUPLEX 2
-
-/**
- * AutoNeg - Auto-negotiation Advertisement Override
- * @Valid Range: 0x01-0x0F, 0x20-0x2F
- *
- * The AutoNeg value is a bit mask describing which speed and duplex
- * combinations should be advertised during auto-negotiation.
- * The supported speed and duplex modes are listed below
- *
- * Bit 7 6 5 4 3 2 1 0
- * Speed (Mbps) N/A N/A 1000 N/A 100 100 10 10
- * Duplex Full Full Half Full Half
- *
- * @Default Value: 0x2F (copper)
- */
-static int AutoNeg = OPTION_UNSET;
-module_param(AutoNeg, int, 0);
-MODULE_PARM_DESC(AutoNeg, "Advertised auto-negotiation setting");
-
-#define PHY_ADVERTISE_10_HALF 0x0001
-#define PHY_ADVERTISE_10_FULL 0x0002
-#define PHY_ADVERTISE_100_HALF 0x0004
-#define PHY_ADVERTISE_100_FULL 0x0008
-#define PHY_ADVERTISE_1000_HALF 0x0010 /* Not used, just FYI */
-#define PHY_ADVERTISE_1000_FULL 0x0020
-#define PCH_AUTONEG_ADVERTISE_DEFAULT 0x2F
-
/**
* FlowControl - User Specified Flow Control Override
* @Valid Range: 0-3
@@ -159,54 +105,6 @@ struct pch_gbe_option {
} arg;
};
-static const struct pch_gbe_opt_list speed_list[] = {
- { 0, "" },
- { SPEED_10, "" },
- { SPEED_100, "" },
- { SPEED_1000, "" }
-};
-
-static const struct pch_gbe_opt_list dplx_list[] = {
- { 0, "" },
- { HALF_DUPLEX, "" },
- { FULL_DUPLEX, "" }
-};
-
-static const struct pch_gbe_opt_list an_list[] =
- #define AA "AutoNeg advertising "
- {{ 0x01, AA "10/HD" },
- { 0x02, AA "10/FD" },
- { 0x03, AA "10/FD, 10/HD" },
- { 0x04, AA "100/HD" },
- { 0x05, AA "100/HD, 10/HD" },
- { 0x06, AA "100/HD, 10/FD" },
- { 0x07, AA "100/HD, 10/FD, 10/HD" },
- { 0x08, AA "100/FD" },
- { 0x09, AA "100/FD, 10/HD" },
- { 0x0a, AA "100/FD, 10/FD" },
- { 0x0b, AA "100/FD, 10/FD, 10/HD" },
- { 0x0c, AA "100/FD, 100/HD" },
- { 0x0d, AA "100/FD, 100/HD, 10/HD" },
- { 0x0e, AA "100/FD, 100/HD, 10/FD" },
- { 0x0f, AA "100/FD, 100/HD, 10/FD, 10/HD" },
- { 0x20, AA "1000/FD" },
- { 0x21, AA "1000/FD, 10/HD" },
- { 0x22, AA "1000/FD, 10/FD" },
- { 0x23, AA "1000/FD, 10/FD, 10/HD" },
- { 0x24, AA "1000/FD, 100/HD" },
- { 0x25, AA "1000/FD, 100/HD, 10/HD" },
- { 0x26, AA "1000/FD, 100/HD, 10/FD" },
- { 0x27, AA "1000/FD, 100/HD, 10/FD, 10/HD" },
- { 0x28, AA "1000/FD, 100/FD" },
- { 0x29, AA "1000/FD, 100/FD, 10/HD" },
- { 0x2a, AA "1000/FD, 100/FD, 10/FD" },
- { 0x2b, AA "1000/FD, 100/FD, 10/FD, 10/HD" },
- { 0x2c, AA "1000/FD, 100/FD, 100/HD" },
- { 0x2d, AA "1000/FD, 100/FD, 100/HD, 10/HD" },
- { 0x2e, AA "1000/FD, 100/FD, 100/HD, 10/FD" },
- { 0x2f, AA "1000/FD, 100/FD, 100/HD, 10/FD, 10/HD" }
-};
-
static const struct pch_gbe_opt_list fc_list[] = {
{ PCH_GBE_FC_NONE, "Flow Control Disabled" },
{ PCH_GBE_FC_RX_PAUSE, "Flow Control Receive Only" },
@@ -275,167 +173,6 @@ static int pch_gbe_validate_option(int *value,
return -1;
}
-/**
- * pch_gbe_check_copper_options - Range Checking for Link Options, Copper Version
- * @adapter: Board private structure
- */
-static void pch_gbe_check_copper_options(struct pch_gbe_adapter *adapter)
-{
- struct pch_gbe_hw *hw = &adapter->hw;
- int speed, dplx;
-
- { /* Speed */
- static const struct pch_gbe_option opt = {
- .type = list_option,
- .name = "Speed",
- .err = "parameter ignored",
- .def = 0,
- .arg = { .l = { .nr = (int)ARRAY_SIZE(speed_list),
- .p = speed_list } }
- };
- speed = Speed;
- pch_gbe_validate_option(&speed, &opt, adapter);
- }
- { /* Duplex */
- static const struct pch_gbe_option opt = {
- .type = list_option,
- .name = "Duplex",
- .err = "parameter ignored",
- .def = 0,
- .arg = { .l = { .nr = (int)ARRAY_SIZE(dplx_list),
- .p = dplx_list } }
- };
- dplx = Duplex;
- pch_gbe_validate_option(&dplx, &opt, adapter);
- }
-
- { /* Autoneg */
- static const struct pch_gbe_option opt = {
- .type = list_option,
- .name = "AutoNeg",
- .err = "parameter ignored",
- .def = PCH_AUTONEG_ADVERTISE_DEFAULT,
- .arg = { .l = { .nr = (int)ARRAY_SIZE(an_list),
- .p = an_list} }
- };
- if (speed || dplx) {
- netdev_dbg(adapter->netdev,
- "AutoNeg specified along with Speed or Duplex, AutoNeg parameter ignored\n");
- hw->phy.autoneg_advertised = opt.def;
- } else {
- int tmp = AutoNeg;
-
- pch_gbe_validate_option(&tmp, &opt, adapter);
- hw->phy.autoneg_advertised = tmp;
- }
- }
-
- switch (speed + dplx) {
- case 0:
- hw->mac.autoneg = hw->mac.fc_autoneg = 1;
- if ((speed || dplx))
- netdev_dbg(adapter->netdev,
- "Speed and duplex autonegotiation enabled\n");
- hw->mac.link_speed = SPEED_10;
- hw->mac.link_duplex = DUPLEX_HALF;
- break;
- case HALF_DUPLEX:
- netdev_dbg(adapter->netdev,
- "Half Duplex specified without Speed\n");
- netdev_dbg(adapter->netdev,
- "Using Autonegotiation at Half Duplex only\n");
- hw->mac.autoneg = hw->mac.fc_autoneg = 1;
- hw->phy.autoneg_advertised = PHY_ADVERTISE_10_HALF |
- PHY_ADVERTISE_100_HALF;
- hw->mac.link_speed = SPEED_10;
- hw->mac.link_duplex = DUPLEX_HALF;
- break;
- case FULL_DUPLEX:
- netdev_dbg(adapter->netdev,
- "Full Duplex specified without Speed\n");
- netdev_dbg(adapter->netdev,
- "Using Autonegotiation at Full Duplex only\n");
- hw->mac.autoneg = hw->mac.fc_autoneg = 1;
- hw->phy.autoneg_advertised = PHY_ADVERTISE_10_FULL |
- PHY_ADVERTISE_100_FULL |
- PHY_ADVERTISE_1000_FULL;
- hw->mac.link_speed = SPEED_10;
- hw->mac.link_duplex = DUPLEX_FULL;
- break;
- case SPEED_10:
- netdev_dbg(adapter->netdev,
- "10 Mbps Speed specified without Duplex\n");
- netdev_dbg(adapter->netdev,
- "Using Autonegotiation at 10 Mbps only\n");
- hw->mac.autoneg = hw->mac.fc_autoneg = 1;
- hw->phy.autoneg_advertised = PHY_ADVERTISE_10_HALF |
- PHY_ADVERTISE_10_FULL;
- hw->mac.link_speed = SPEED_10;
- hw->mac.link_duplex = DUPLEX_HALF;
- break;
- case SPEED_10 + HALF_DUPLEX:
- netdev_dbg(adapter->netdev, "Forcing to 10 Mbps Half Duplex\n");
- hw->mac.autoneg = hw->mac.fc_autoneg = 0;
- hw->phy.autoneg_advertised = 0;
- hw->mac.link_speed = SPEED_10;
- hw->mac.link_duplex = DUPLEX_HALF;
- break;
- case SPEED_10 + FULL_DUPLEX:
- netdev_dbg(adapter->netdev, "Forcing to 10 Mbps Full Duplex\n");
- hw->mac.autoneg = hw->mac.fc_autoneg = 0;
- hw->phy.autoneg_advertised = 0;
- hw->mac.link_speed = SPEED_10;
- hw->mac.link_duplex = DUPLEX_FULL;
- break;
- case SPEED_100:
- netdev_dbg(adapter->netdev,
- "100 Mbps Speed specified without Duplex\n");
- netdev_dbg(adapter->netdev,
- "Using Autonegotiation at 100 Mbps only\n");
- hw->mac.autoneg = hw->mac.fc_autoneg = 1;
- hw->phy.autoneg_advertised = PHY_ADVERTISE_100_HALF |
- PHY_ADVERTISE_100_FULL;
- hw->mac.link_speed = SPEED_100;
- hw->mac.link_duplex = DUPLEX_HALF;
- break;
- case SPEED_100 + HALF_DUPLEX:
- netdev_dbg(adapter->netdev,
- "Forcing to 100 Mbps Half Duplex\n");
- hw->mac.autoneg = hw->mac.fc_autoneg = 0;
- hw->phy.autoneg_advertised = 0;
- hw->mac.link_speed = SPEED_100;
- hw->mac.link_duplex = DUPLEX_HALF;
- break;
- case SPEED_100 + FULL_DUPLEX:
- netdev_dbg(adapter->netdev,
- "Forcing to 100 Mbps Full Duplex\n");
- hw->mac.autoneg = hw->mac.fc_autoneg = 0;
- hw->phy.autoneg_advertised = 0;
- hw->mac.link_speed = SPEED_100;
- hw->mac.link_duplex = DUPLEX_FULL;
- break;
- case SPEED_1000:
- netdev_dbg(adapter->netdev,
- "1000 Mbps Speed specified without Duplex\n");
- goto full_duplex_only;
- case SPEED_1000 + HALF_DUPLEX:
- netdev_dbg(adapter->netdev,
- "Half Duplex is not supported at 1000 Mbps\n");
- /* fall through */
- case SPEED_1000 + FULL_DUPLEX:
-full_duplex_only:
- netdev_dbg(adapter->netdev,
- "Using Autonegotiation at 1000 Mbps Full Duplex only\n");
- hw->mac.autoneg = hw->mac.fc_autoneg = 1;
- hw->phy.autoneg_advertised = PHY_ADVERTISE_1000_FULL;
- hw->mac.link_speed = SPEED_1000;
- hw->mac.link_duplex = DUPLEX_FULL;
- break;
- default:
- BUG();
- }
-}
-
/**
* pch_gbe_check_options - Range Checking for Command Line Parameters
* @adapter: Board private structure
@@ -516,6 +253,4 @@ void pch_gbe_check_options(struct pch_gbe_adapter *adapter)
pch_gbe_validate_option(&tmp, &opt, adapter);
hw->mac.fc = tmp;
}
-
- pch_gbe_check_copper_options(adapter);
}
diff --git a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_phy.c b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_phy.c
deleted file mode 100644
index 561e71880c29..000000000000
--- a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_phy.c
+++ /dev/null
@@ -1,335 +0,0 @@
-/*
- * Copyright (C) 1999 - 2010 Intel Corporation.
- * Copyright (C) 2010 OKI SEMICONDUCTOR Co., LTD.
- *
- * This code was derived from the Intel e1000e Linux driver.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "pch_gbe.h"
-#include "pch_gbe_phy.h"
-
-#define PHY_MAX_REG_ADDRESS 0x1F /* 5 bit address bus (0-0x1F) */
-
-/* PHY 1000 MII Register/Bit Definitions */
-/* PHY Registers defined by IEEE */
-#define PHY_CONTROL 0x00 /* Control Register */
-#define PHY_STATUS 0x01 /* Status Regiser */
-#define PHY_ID1 0x02 /* Phy Id Register (word 1) */
-#define PHY_ID2 0x03 /* Phy Id Register (word 2) */
-#define PHY_AUTONEG_ADV 0x04 /* Autoneg Advertisement */
-#define PHY_LP_ABILITY 0x05 /* Link Partner Ability (Base Page) */
-#define PHY_AUTONEG_EXP 0x06 /* Autoneg Expansion Register */
-#define PHY_NEXT_PAGE_TX 0x07 /* Next Page TX */
-#define PHY_LP_NEXT_PAGE 0x08 /* Link Partner Next Page */
-#define PHY_1000T_CTRL 0x09 /* 1000Base-T Control Register */
-#define PHY_1000T_STATUS 0x0A /* 1000Base-T Status Register */
-#define PHY_EXT_STATUS 0x0F /* Extended Status Register */
-#define PHY_PHYSP_CONTROL 0x10 /* PHY Specific Control Register */
-#define PHY_EXT_PHYSP_CONTROL 0x14 /* Extended PHY Specific Control Register */
-#define PHY_LED_CONTROL 0x18 /* LED Control Register */
-#define PHY_EXT_PHYSP_STATUS 0x1B /* Extended PHY Specific Status Register */
-
-/* PHY Control Register */
-#define MII_CR_SPEED_SELECT_MSB 0x0040 /* bits 6,13: 10=1000, 01=100, 00=10 */
-#define MII_CR_COLL_TEST_ENABLE 0x0080 /* Collision test enable */
-#define MII_CR_FULL_DUPLEX 0x0100 /* FDX =1, half duplex =0 */
-#define MII_CR_RESTART_AUTO_NEG 0x0200 /* Restart auto negotiation */
-#define MII_CR_ISOLATE 0x0400 /* Isolate PHY from MII */
-#define MII_CR_POWER_DOWN 0x0800 /* Power down */
-#define MII_CR_AUTO_NEG_EN 0x1000 /* Auto Neg Enable */
-#define MII_CR_SPEED_SELECT_LSB 0x2000 /* bits 6,13: 10=1000, 01=100, 00=10 */
-#define MII_CR_LOOPBACK 0x4000 /* 0 = normal, 1 = loopback */
-#define MII_CR_RESET 0x8000 /* 0 = normal, 1 = PHY reset */
-#define MII_CR_SPEED_1000 0x0040
-#define MII_CR_SPEED_100 0x2000
-#define MII_CR_SPEED_10 0x0000
-
-/* PHY Status Register */
-#define MII_SR_EXTENDED_CAPS 0x0001 /* Extended register capabilities */
-#define MII_SR_JABBER_DETECT 0x0002 /* Jabber Detected */
-#define MII_SR_LINK_STATUS 0x0004 /* Link Status 1 = link */
-#define MII_SR_AUTONEG_CAPS 0x0008 /* Auto Neg Capable */
-#define MII_SR_REMOTE_FAULT 0x0010 /* Remote Fault Detect */
-#define MII_SR_AUTONEG_COMPLETE 0x0020 /* Auto Neg Complete */
-#define MII_SR_PREAMBLE_SUPPRESS 0x0040 /* Preamble may be suppressed */
-#define MII_SR_EXTENDED_STATUS 0x0100 /* Ext. status info in Reg 0x0F */
-#define MII_SR_100T2_HD_CAPS 0x0200 /* 100T2 Half Duplex Capable */
-#define MII_SR_100T2_FD_CAPS 0x0400 /* 100T2 Full Duplex Capable */
-#define MII_SR_10T_HD_CAPS 0x0800 /* 10T Half Duplex Capable */
-#define MII_SR_10T_FD_CAPS 0x1000 /* 10T Full Duplex Capable */
-#define MII_SR_100X_HD_CAPS 0x2000 /* 100X Half Duplex Capable */
-#define MII_SR_100X_FD_CAPS 0x4000 /* 100X Full Duplex Capable */
-#define MII_SR_100T4_CAPS 0x8000 /* 100T4 Capable */
-
-/* AR8031 PHY Debug Registers */
-#define PHY_AR803X_ID 0x00001374
-#define PHY_AR8031_DBG_OFF 0x1D
-#define PHY_AR8031_DBG_DAT 0x1E
-#define PHY_AR8031_SERDES 0x05
-#define PHY_AR8031_SERDES_TX_CLK_DLY 0x0100 /* TX clock delay of 2.0ns */
-
-/* Phy Id Register (word 2) */
-#define PHY_REVISION_MASK 0x000F
-
-/* PHY Specific Control Register */
-#define PHYSP_CTRL_ASSERT_CRS_TX 0x0800
-
-
-/* Default value of PHY register */
-#define PHY_CONTROL_DEFAULT 0x1140 /* Control Register */
-#define PHY_AUTONEG_ADV_DEFAULT 0x01e0 /* Autoneg Advertisement */
-#define PHY_NEXT_PAGE_TX_DEFAULT 0x2001 /* Next Page TX */
-#define PHY_1000T_CTRL_DEFAULT 0x0300 /* 1000Base-T Control Register */
-#define PHY_PHYSP_CONTROL_DEFAULT 0x01EE /* PHY Specific Control Register */
-
-/**
- * pch_gbe_phy_get_id - Retrieve the PHY ID and revision
- * @hw: Pointer to the HW structure
- * Returns
- * 0: Successful.
- * Negative value: Failed.
- */
-s32 pch_gbe_phy_get_id(struct pch_gbe_hw *hw)
-{
- struct pch_gbe_adapter *adapter = pch_gbe_hw_to_adapter(hw);
- struct pch_gbe_phy_info *phy = &hw->phy;
- s32 ret;
- u16 phy_id1;
- u16 phy_id2;
-
- ret = pch_gbe_phy_read_reg_miic(hw, PHY_ID1, &phy_id1);
- if (ret)
- return ret;
- ret = pch_gbe_phy_read_reg_miic(hw, PHY_ID2, &phy_id2);
- if (ret)
- return ret;
- /*
- * PHY_ID1: [bit15-0:ID(21-6)]
- * PHY_ID2: [bit15-10:ID(5-0)][bit9-4:Model][bit3-0:revision]
- */
- phy->id = (u32)phy_id1;
- phy->id = ((phy->id << 6) | ((phy_id2 & 0xFC00) >> 10));
- phy->revision = (u32) (phy_id2 & 0x000F);
- netdev_dbg(adapter->netdev,
- "phy->id : 0x%08x phy->revision : 0x%08x\n",
- phy->id, phy->revision);
- return 0;
-}
-
-/**
- * pch_gbe_phy_read_reg_miic - Read MII control register
- * @hw: Pointer to the HW structure
- * @offset: Register offset to be read
- * @data: Pointer to the read data
- * Returns
- * 0: Successful.
- * -EINVAL: Invalid argument.
- */
-s32 pch_gbe_phy_read_reg_miic(struct pch_gbe_hw *hw, u32 offset, u16 *data)
-{
- struct pch_gbe_phy_info *phy = &hw->phy;
-
- if (offset > PHY_MAX_REG_ADDRESS) {
- struct pch_gbe_adapter *adapter = pch_gbe_hw_to_adapter(hw);
-
- netdev_err(adapter->netdev, "PHY Address %d is out of range\n",
- offset);
- return -EINVAL;
- }
- *data = pch_gbe_mac_ctrl_miim(hw, phy->addr, PCH_GBE_HAL_MIIM_READ,
- offset, (u16)0);
- return 0;
-}
-
-/**
- * pch_gbe_phy_write_reg_miic - Write MII control register
- * @hw: Pointer to the HW structure
- * @offset: Register offset to be read
- * @data: data to write to register at offset
- * Returns
- * 0: Successful.
- * -EINVAL: Invalid argument.
- */
-s32 pch_gbe_phy_write_reg_miic(struct pch_gbe_hw *hw, u32 offset, u16 data)
-{
- struct pch_gbe_phy_info *phy = &hw->phy;
-
- if (offset > PHY_MAX_REG_ADDRESS) {
- struct pch_gbe_adapter *adapter = pch_gbe_hw_to_adapter(hw);
-
- netdev_err(adapter->netdev, "PHY Address %d is out of range\n",
- offset);
- return -EINVAL;
- }
- pch_gbe_mac_ctrl_miim(hw, phy->addr, PCH_GBE_HAL_MIIM_WRITE,
- offset, data);
- return 0;
-}
-
-/**
- * pch_gbe_phy_sw_reset - PHY software reset
- * @hw: Pointer to the HW structure
- */
-static void pch_gbe_phy_sw_reset(struct pch_gbe_hw *hw)
-{
- u16 phy_ctrl;
-
- pch_gbe_phy_read_reg_miic(hw, PHY_CONTROL, &phy_ctrl);
- phy_ctrl |= MII_CR_RESET;
- pch_gbe_phy_write_reg_miic(hw, PHY_CONTROL, phy_ctrl);
- udelay(1);
-}
-
-/**
- * pch_gbe_phy_hw_reset - PHY hardware reset
- * @hw: Pointer to the HW structure
- */
-void pch_gbe_phy_hw_reset(struct pch_gbe_hw *hw)
-{
- pch_gbe_phy_write_reg_miic(hw, PHY_CONTROL, PHY_CONTROL_DEFAULT);
- pch_gbe_phy_write_reg_miic(hw, PHY_AUTONEG_ADV,
- PHY_AUTONEG_ADV_DEFAULT);
- pch_gbe_phy_write_reg_miic(hw, PHY_NEXT_PAGE_TX,
- PHY_NEXT_PAGE_TX_DEFAULT);
- pch_gbe_phy_write_reg_miic(hw, PHY_1000T_CTRL, PHY_1000T_CTRL_DEFAULT);
- pch_gbe_phy_write_reg_miic(hw, PHY_PHYSP_CONTROL,
- PHY_PHYSP_CONTROL_DEFAULT);
-}
-
-/**
- * pch_gbe_phy_power_up - restore link in case the phy was powered down
- * @hw: Pointer to the HW structure
- */
-void pch_gbe_phy_power_up(struct pch_gbe_hw *hw)
-{
- u16 mii_reg;
-
- mii_reg = 0;
- /* Just clear the power down bit to wake the phy back up */
- /* according to the manual, the phy will retain its
- * settings across a power-down/up cycle */
- pch_gbe_phy_read_reg_miic(hw, PHY_CONTROL, &mii_reg);
- mii_reg &= ~MII_CR_POWER_DOWN;
- pch_gbe_phy_write_reg_miic(hw, PHY_CONTROL, mii_reg);
-}
-
-/**
- * pch_gbe_phy_power_down - Power down PHY
- * @hw: Pointer to the HW structure
- */
-void pch_gbe_phy_power_down(struct pch_gbe_hw *hw)
-{
- u16 mii_reg;
-
- mii_reg = 0;
- /* Power down the PHY so no link is implied when interface is down *
- * The PHY cannot be powered down if any of the following is TRUE *
- * (a) WoL is enabled
- * (b) AMT is active
- */
- pch_gbe_phy_read_reg_miic(hw, PHY_CONTROL, &mii_reg);
- mii_reg |= MII_CR_POWER_DOWN;
- pch_gbe_phy_write_reg_miic(hw, PHY_CONTROL, mii_reg);
- mdelay(1);
-}
-
-/**
- * pch_gbe_phy_set_rgmii - RGMII interface setting
- * @hw: Pointer to the HW structure
- */
-void pch_gbe_phy_set_rgmii(struct pch_gbe_hw *hw)
-{
- pch_gbe_phy_sw_reset(hw);
-}
-
-/**
- * pch_gbe_phy_tx_clk_delay - Setup TX clock delay via the PHY
- * @hw: Pointer to the HW structure
- * Returns
- * 0: Successful.
- * -EINVAL: Invalid argument.
- */
-static int pch_gbe_phy_tx_clk_delay(struct pch_gbe_hw *hw)
-{
- /* The RGMII interface requires a ~2ns TX clock delay. This is typically
- * done in layout with a longer trace or via PHY strapping, but can also
- * be done via PHY configuration registers.
- */
- struct pch_gbe_adapter *adapter = pch_gbe_hw_to_adapter(hw);
- u16 mii_reg;
- int ret = 0;
-
- switch (hw->phy.id) {
- case PHY_AR803X_ID:
- netdev_dbg(adapter->netdev,
- "Configuring AR803X PHY for 2ns TX clock delay\n");
- pch_gbe_phy_read_reg_miic(hw, PHY_AR8031_DBG_OFF, &mii_reg);
- ret = pch_gbe_phy_write_reg_miic(hw, PHY_AR8031_DBG_OFF,
- PHY_AR8031_SERDES);
- if (ret)
- break;
-
- pch_gbe_phy_read_reg_miic(hw, PHY_AR8031_DBG_DAT, &mii_reg);
- mii_reg |= PHY_AR8031_SERDES_TX_CLK_DLY;
- ret = pch_gbe_phy_write_reg_miic(hw, PHY_AR8031_DBG_DAT,
- mii_reg);
- break;
- default:
- netdev_err(adapter->netdev,
- "Unknown PHY (%x), could not set TX clock delay\n",
- hw->phy.id);
- return -EINVAL;
- }
-
- if (ret)
- netdev_err(adapter->netdev,
- "Could not configure tx clock delay for PHY\n");
- return ret;
-}
-
-/**
- * pch_gbe_phy_init_setting - PHY initial setting
- * @hw: Pointer to the HW structure
- */
-void pch_gbe_phy_init_setting(struct pch_gbe_hw *hw)
-{
- struct pch_gbe_adapter *adapter = pch_gbe_hw_to_adapter(hw);
- struct ethtool_cmd cmd = { .cmd = ETHTOOL_GSET };
- int ret;
- u16 mii_reg;
-
- ret = mii_ethtool_gset(&adapter->mii, &cmd);
- if (ret)
- netdev_err(adapter->netdev, "Error: mii_ethtool_gset\n");
-
- ethtool_cmd_speed_set(&cmd, hw->mac.link_speed);
- cmd.duplex = hw->mac.link_duplex;
- cmd.advertising = hw->phy.autoneg_advertised;
- cmd.autoneg = hw->mac.autoneg;
- pch_gbe_phy_write_reg_miic(hw, MII_BMCR, BMCR_RESET);
- ret = mii_ethtool_sset(&adapter->mii, &cmd);
- if (ret)
- netdev_err(adapter->netdev, "Error: mii_ethtool_sset\n");
-
- pch_gbe_phy_sw_reset(hw);
-
- pch_gbe_phy_read_reg_miic(hw, PHY_PHYSP_CONTROL, &mii_reg);
- mii_reg |= PHYSP_CTRL_ASSERT_CRS_TX;
- pch_gbe_phy_write_reg_miic(hw, PHY_PHYSP_CONTROL, mii_reg);
-
- /* Setup a TX clock delay on certain platforms */
- if (adapter->pdata && adapter->pdata->phy_tx_clk_delay)
- pch_gbe_phy_tx_clk_delay(hw);
-}
diff --git a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_phy.h b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_phy.h
deleted file mode 100644
index a80644b4fce8..000000000000
--- a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_phy.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (C) 1999 - 2010 Intel Corporation.
- * Copyright (C) 2010 OKI SEMICONDUCTOR Co., LTD.
- *
- * This code was derived from the Intel e1000e Linux driver.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, see <http://www.gnu.org/licenses/>.
- */
-#ifndef _PCH_GBE_PHY_H_
-#define _PCH_GBE_PHY_H_
-
-#define PCH_GBE_PHY_REGS_LEN 32
-#define PCH_GBE_PHY_RESET_DELAY_US 10
-
-s32 pch_gbe_phy_get_id(struct pch_gbe_hw *hw);
-s32 pch_gbe_phy_read_reg_miic(struct pch_gbe_hw *hw, u32 offset, u16 *data);
-s32 pch_gbe_phy_write_reg_miic(struct pch_gbe_hw *hw, u32 offset, u16 data);
-void pch_gbe_phy_hw_reset(struct pch_gbe_hw *hw);
-void pch_gbe_phy_power_up(struct pch_gbe_hw *hw);
-void pch_gbe_phy_power_down(struct pch_gbe_hw *hw);
-void pch_gbe_phy_set_rgmii(struct pch_gbe_hw *hw);
-void pch_gbe_phy_init_setting(struct pch_gbe_hw *hw);
-
-#endif /* _PCH_GBE_PHY_H_ */
--
2.18.0
Powered by blists - more mailing lists