2005-07-31 06:31:23 +07:00
|
|
|
/*
|
|
|
|
* drivers/net/phy/marvell.c
|
|
|
|
*
|
|
|
|
* Driver for Marvell PHYs
|
|
|
|
*
|
|
|
|
* Author: Andy Fleming
|
|
|
|
*
|
|
|
|
* Copyright (c) 2004 Freescale Semiconductor, Inc.
|
|
|
|
*
|
2013-03-11 20:56:45 +07:00
|
|
|
* Copyright (c) 2013 Michael Stapelberg <michael@stapelberg.de>
|
|
|
|
*
|
2005-07-31 06:31:23 +07:00
|
|
|
* 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; either version 2 of the License, or (at your
|
|
|
|
* option) any later version.
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
#include <linux/kernel.h>
|
|
|
|
#include <linux/string.h>
|
2017-01-20 07:37:49 +07:00
|
|
|
#include <linux/ctype.h>
|
2005-07-31 06:31:23 +07:00
|
|
|
#include <linux/errno.h>
|
|
|
|
#include <linux/unistd.h>
|
2017-01-20 07:37:49 +07:00
|
|
|
#include <linux/hwmon.h>
|
2005-07-31 06:31:23 +07:00
|
|
|
#include <linux/interrupt.h>
|
|
|
|
#include <linux/init.h>
|
|
|
|
#include <linux/delay.h>
|
|
|
|
#include <linux/netdevice.h>
|
|
|
|
#include <linux/etherdevice.h>
|
|
|
|
#include <linux/skbuff.h>
|
|
|
|
#include <linux/spinlock.h>
|
|
|
|
#include <linux/mm.h>
|
|
|
|
#include <linux/module.h>
|
|
|
|
#include <linux/mii.h>
|
|
|
|
#include <linux/ethtool.h>
|
|
|
|
#include <linux/phy.h>
|
2010-06-21 10:20:46 +07:00
|
|
|
#include <linux/marvell_phy.h>
|
of/phylib: Use device tree properties to initialize Marvell PHYs.
Some aspects of PHY initialization are board dependent, things like
indicator LED connections and some clocking modes cannot be determined
by probing. The dev_flags element of struct phy_device can be used to
control these things if an appropriate value can be passed from the
Ethernet driver. We run into problems however if the PHY connections
are specified by the device tree. There is no way for the Ethernet
driver to know what flags it should pass.
If we are using the device tree, the struct phy_device will be
populated with the device tree node corresponding to the PHY, and we
can extract extra configuration information from there.
The next question is what should the format of that information be?
It is highly device specific, and the device tree representation
should not be tied to any arbitrary kernel defined constants. A
straight forward representation is just to specify the exact bits that
should be set using the "marvell,reg-init" property:
phy5: ethernet-phy@5 {
reg = <5>;
compatible = "marvell,88e1149r";
marvell,reg-init =
/* led[0]:1000, led[1]:100, led[2]:10, led[3]:tx */
<3 0x10 0 0x5777>, /* Reg 3,16 <- 0x5777 */
/* mix %:0, led[0123]:drive low off hiZ */
<3 0x11 0 0x00aa>, /* Reg 3,17 <- 0x00aa */
/* default blink periods. */
<3 0x12 0 0x4105>, /* Reg 3,18 <- 0x4105 */
/* led[4]:rx, led[5]:dplx, led[45]:drive low off hiZ */
<3 0x13 0 0x0a60>; /* Reg 3,19 <- 0x0a60 */
};
phy6: ethernet-phy@6 {
reg = <6>;
compatible = "marvell,88e1118";
marvell,reg-init =
/* Fix rx and tx clock transition timing */
<2 0x15 0xffcf 0>, /* Reg 2,21 Clear bits 4, 5 */
/* Adjust LED drive. */
<3 0x11 0 0x442a>, /* Reg 3,17 <- 0442a */
/* irq, blink-activity, blink-link */
<3 0x10 0 0x0242>; /* Reg 3,16 <- 0x0242 */
};
The Marvell PHYs have a page select register at register 22 (0x16), we
can specify any register by its page and register number. These are
the first and second word. The third word contains a mask to be ANDed
with the existing register value, and the fourth word is ORed with the
result to yield the new register value. The new marvell_of_reg_init
function leaves the page select register unchanged, so a call to it
can be dropped into the .config_init functions without unduly
affecting the state of the PHY.
If CONFIG_OF_MDIO is not set, there is no of_node, or no
"marvell,reg-init" property, the PHY initialization is unchanged.
Signed-off-by: David Daney <ddaney@caviumnetworks.com>
Cc: Grant Likely <grant.likely@secretlab.ca>
Cc: Cyril Chemparathy <cyril@ti.com>
Cc: David Daney <ddaney@caviumnetworks.com>
Cc: Arnaud Patard <arnaud.patard@rtp-net.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Reviewed-by: Grant Likely <grant.likely@secretlab.ca>
Signed-off-by: David S. Miller <davem@davemloft.net>
2010-11-19 19:13:18 +07:00
|
|
|
#include <linux/of.h>
|
2005-07-31 06:31:23 +07:00
|
|
|
|
2013-09-30 11:06:44 +07:00
|
|
|
#include <linux/io.h>
|
2005-07-31 06:31:23 +07:00
|
|
|
#include <asm/irq.h>
|
2013-09-30 11:06:44 +07:00
|
|
|
#include <linux/uaccess.h>
|
2005-07-31 06:31:23 +07:00
|
|
|
|
2010-11-19 18:58:52 +07:00
|
|
|
#define MII_MARVELL_PHY_PAGE 22
|
2017-05-26 02:42:08 +07:00
|
|
|
#define MII_MARVELL_COPPER_PAGE 0x00
|
|
|
|
#define MII_MARVELL_FIBER_PAGE 0x01
|
|
|
|
#define MII_MARVELL_MSCR_PAGE 0x02
|
|
|
|
#define MII_MARVELL_LED_PAGE 0x03
|
|
|
|
#define MII_MARVELL_MISC_TEST_PAGE 0x06
|
|
|
|
#define MII_MARVELL_WOL_PAGE 0x11
|
2010-11-19 18:58:52 +07:00
|
|
|
|
2005-07-31 06:31:23 +07:00
|
|
|
#define MII_M1011_IEVENT 0x13
|
|
|
|
#define MII_M1011_IEVENT_CLEAR 0x0000
|
|
|
|
|
|
|
|
#define MII_M1011_IMASK 0x12
|
|
|
|
#define MII_M1011_IMASK_INIT 0x6400
|
|
|
|
#define MII_M1011_IMASK_CLEAR 0x0000
|
|
|
|
|
2017-07-31 03:41:49 +07:00
|
|
|
#define MII_M1011_PHY_SCR 0x10
|
|
|
|
#define MII_M1011_PHY_SCR_DOWNSHIFT_EN BIT(11)
|
|
|
|
#define MII_M1011_PHY_SCR_DOWNSHIFT_SHIFT 12
|
2017-07-31 03:41:50 +07:00
|
|
|
#define MII_M1011_PHY_SRC_DOWNSHIFT_MASK 0x7800
|
2017-07-31 03:41:49 +07:00
|
|
|
#define MII_M1011_PHY_SCR_MDI (0x0 << 5)
|
|
|
|
#define MII_M1011_PHY_SCR_MDI_X (0x1 << 5)
|
|
|
|
#define MII_M1011_PHY_SCR_AUTO_CROSS (0x3 << 5)
|
2007-02-10 07:13:58 +07:00
|
|
|
|
|
|
|
#define MII_M1111_PHY_LED_CONTROL 0x18
|
|
|
|
#define MII_M1111_PHY_LED_DIRECT 0x4100
|
|
|
|
#define MII_M1111_PHY_LED_COMBINE 0x411c
|
2007-06-05 17:46:47 +07:00
|
|
|
#define MII_M1111_PHY_EXT_CR 0x14
|
2017-07-31 03:41:46 +07:00
|
|
|
#define MII_M1111_RGMII_RX_DELAY BIT(7)
|
|
|
|
#define MII_M1111_RGMII_TX_DELAY BIT(1)
|
2007-06-05 17:46:47 +07:00
|
|
|
#define MII_M1111_PHY_EXT_SR 0x1b
|
2008-03-19 04:37:24 +07:00
|
|
|
|
|
|
|
#define MII_M1111_HWCFG_MODE_MASK 0xf
|
|
|
|
#define MII_M1111_HWCFG_MODE_FIBER_RGMII 0x3
|
2007-05-12 06:25:18 +07:00
|
|
|
#define MII_M1111_HWCFG_MODE_SGMII_NO_CLK 0x4
|
2017-07-31 03:41:47 +07:00
|
|
|
#define MII_M1111_HWCFG_MODE_RTBI 0x7
|
2010-01-14 05:13:19 +07:00
|
|
|
#define MII_M1111_HWCFG_MODE_COPPER_RTBI 0x9
|
2017-07-31 03:41:47 +07:00
|
|
|
#define MII_M1111_HWCFG_MODE_COPPER_RGMII 0xb
|
|
|
|
#define MII_M1111_HWCFG_FIBER_COPPER_RES BIT(13)
|
|
|
|
#define MII_M1111_HWCFG_FIBER_COPPER_AUTO BIT(15)
|
2008-03-19 04:37:24 +07:00
|
|
|
|
2010-08-02 16:44:53 +07:00
|
|
|
#define MII_88E1121_PHY_MSCR_REG 21
|
|
|
|
#define MII_88E1121_PHY_MSCR_RX_DELAY BIT(5)
|
|
|
|
#define MII_88E1121_PHY_MSCR_TX_DELAY BIT(4)
|
net: phy: marvell: fix paged access races
For paged accesses to be truely safe, we need to hold the bus lock to
prevent anyone else gaining access to the registers while we modify
them.
The phydev->lock mutex does not do this: userspace via the MII ioctl
can still sneak in and read or write any register while we are on a
different page, and the suspend/resume methods can be called by a
thread different to the thread polling the phy status.
Races have been observed with mvneta on SolidRun Clearfog with phylink,
particularly between the phylib worker reading the PHYs status, and
the thread resuming mvneta, calling phy_start() which then calls
through to m88e1121_config_aneg_rgmii_delays(), which tries to
read-modify-write the MSCR register:
CPU0 CPU1
marvell_read_status_page()
marvell_set_page(phydev, MII_MARVELL_FIBER_PAGE)
...
m88e1121_config_aneg_rgmii_delays()
set_page(MII_MARVELL_MSCR_PAGE)
phy_read(phydev, MII_88E1121_PHY_MSCR_REG)
marvell_set_page(phydev, MII_MARVELL_COPPER_PAGE);
...
phy_write(phydev, MII_88E1121_PHY_MSCR_REG)
The result of this is we end up writing the copper page register 21,
which causes the copper PHY to be disabled, and the link partner sees
the link immediately go down.
Solve this by taking the bus lock instead of the PHY lock, thereby
preventing other accesses to the PHY while we are accessing other PHY
pages.
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
2018-01-02 17:58:48 +07:00
|
|
|
#define MII_88E1121_PHY_MSCR_DELAY_MASK (BIT(5) | BIT(4))
|
2010-08-02 16:44:53 +07:00
|
|
|
|
2017-01-20 07:37:49 +07:00
|
|
|
#define MII_88E1121_MISC_TEST 0x1a
|
|
|
|
#define MII_88E1510_MISC_TEST_TEMP_THRESHOLD_MASK 0x1f00
|
|
|
|
#define MII_88E1510_MISC_TEST_TEMP_THRESHOLD_SHIFT 8
|
|
|
|
#define MII_88E1510_MISC_TEST_TEMP_IRQ_EN BIT(7)
|
|
|
|
#define MII_88E1510_MISC_TEST_TEMP_IRQ BIT(6)
|
|
|
|
#define MII_88E1121_MISC_TEST_TEMP_SENSOR_EN BIT(5)
|
|
|
|
#define MII_88E1121_MISC_TEST_TEMP_MASK 0x1f
|
|
|
|
|
|
|
|
#define MII_88E1510_TEMP_SENSOR 0x1b
|
|
|
|
#define MII_88E1510_TEMP_SENSOR_MASK 0xff
|
|
|
|
|
2018-01-10 04:42:09 +07:00
|
|
|
#define MII_88E6390_MISC_TEST 0x1b
|
|
|
|
#define MII_88E6390_MISC_TEST_SAMPLE_1S 0
|
|
|
|
#define MII_88E6390_MISC_TEST_SAMPLE_10MS BIT(14)
|
|
|
|
#define MII_88E6390_MISC_TEST_SAMPLE_DISABLE BIT(15)
|
|
|
|
#define MII_88E6390_MISC_TEST_SAMPLE_ENABLE 0
|
|
|
|
#define MII_88E6390_MISC_TEST_SAMPLE_MASK (0x3 << 14)
|
|
|
|
|
|
|
|
#define MII_88E6390_TEMP_SENSOR 0x1c
|
|
|
|
#define MII_88E6390_TEMP_SENSOR_MASK 0xff
|
|
|
|
#define MII_88E6390_TEMP_SENSOR_SAMPLES 10
|
|
|
|
|
2010-10-30 03:50:25 +07:00
|
|
|
#define MII_88E1318S_PHY_MSCR1_REG 16
|
|
|
|
#define MII_88E1318S_PHY_MSCR1_PAD_ODD BIT(6)
|
2010-08-04 09:36:06 +07:00
|
|
|
|
2013-03-11 20:56:45 +07:00
|
|
|
/* Copper Specific Interrupt Enable Register */
|
2017-07-31 03:41:44 +07:00
|
|
|
#define MII_88E1318S_PHY_CSIER 0x12
|
2013-03-11 20:56:45 +07:00
|
|
|
/* WOL Event Interrupt Enable */
|
2017-07-31 03:41:44 +07:00
|
|
|
#define MII_88E1318S_PHY_CSIER_WOL_EIE BIT(7)
|
2013-03-11 20:56:45 +07:00
|
|
|
|
|
|
|
/* LED Timer Control Register */
|
2017-07-31 03:41:44 +07:00
|
|
|
#define MII_88E1318S_PHY_LED_TCR 0x12
|
|
|
|
#define MII_88E1318S_PHY_LED_TCR_FORCE_INT BIT(15)
|
|
|
|
#define MII_88E1318S_PHY_LED_TCR_INTn_ENABLE BIT(7)
|
|
|
|
#define MII_88E1318S_PHY_LED_TCR_INT_ACTIVE_LOW BIT(11)
|
2013-03-11 20:56:45 +07:00
|
|
|
|
|
|
|
/* Magic Packet MAC address registers */
|
2017-07-31 03:41:44 +07:00
|
|
|
#define MII_88E1318S_PHY_MAGIC_PACKET_WORD2 0x17
|
|
|
|
#define MII_88E1318S_PHY_MAGIC_PACKET_WORD1 0x18
|
|
|
|
#define MII_88E1318S_PHY_MAGIC_PACKET_WORD0 0x19
|
2013-03-11 20:56:45 +07:00
|
|
|
|
2017-07-31 03:41:44 +07:00
|
|
|
#define MII_88E1318S_PHY_WOL_CTRL 0x10
|
|
|
|
#define MII_88E1318S_PHY_WOL_CTRL_CLEAR_WOL_STATUS BIT(12)
|
|
|
|
#define MII_88E1318S_PHY_WOL_CTRL_MAGIC_PACKET_MATCH_ENABLE BIT(14)
|
2013-03-11 20:56:45 +07:00
|
|
|
|
2009-04-07 09:01:41 +07:00
|
|
|
#define MII_88E1121_PHY_LED_CTRL 16
|
|
|
|
#define MII_88E1121_PHY_LED_DEF 0x0030
|
|
|
|
|
2008-03-19 04:37:24 +07:00
|
|
|
#define MII_M1011_PHY_STATUS 0x11
|
|
|
|
#define MII_M1011_PHY_STATUS_1000 0x8000
|
|
|
|
#define MII_M1011_PHY_STATUS_100 0x4000
|
|
|
|
#define MII_M1011_PHY_STATUS_SPD_MASK 0xc000
|
|
|
|
#define MII_M1011_PHY_STATUS_FULLDUPLEX 0x2000
|
|
|
|
#define MII_M1011_PHY_STATUS_RESOLVED 0x0800
|
|
|
|
#define MII_M1011_PHY_STATUS_LINK 0x0400
|
|
|
|
|
2014-10-23 01:26:44 +07:00
|
|
|
#define MII_88E3016_PHY_SPEC_CTRL 0x10
|
|
|
|
#define MII_88E3016_DISABLE_SCRAMBLER 0x0200
|
|
|
|
#define MII_88E3016_AUTO_MDIX_CROSSOVER 0x0030
|
2007-02-10 07:13:58 +07:00
|
|
|
|
2016-02-18 16:59:07 +07:00
|
|
|
#define MII_88E1510_GEN_CTRL_REG_1 0x14
|
|
|
|
#define MII_88E1510_GEN_CTRL_REG_1_MODE_MASK 0x7
|
|
|
|
#define MII_88E1510_GEN_CTRL_REG_1_MODE_SGMII 0x1 /* SGMII to copper */
|
|
|
|
#define MII_88E1510_GEN_CTRL_REG_1_RESET 0x8000 /* Soft reset */
|
|
|
|
|
2016-07-19 16:13:10 +07:00
|
|
|
#define LPA_FIBER_1000HALF 0x40
|
|
|
|
#define LPA_FIBER_1000FULL 0x20
|
|
|
|
|
2017-07-31 03:41:44 +07:00
|
|
|
#define LPA_PAUSE_FIBER 0x180
|
2016-07-19 16:13:10 +07:00
|
|
|
#define LPA_PAUSE_ASYM_FIBER 0x100
|
|
|
|
|
|
|
|
#define ADVERTISE_FIBER_1000HALF 0x40
|
|
|
|
#define ADVERTISE_FIBER_1000FULL 0x20
|
|
|
|
|
|
|
|
#define ADVERTISE_PAUSE_FIBER 0x180
|
|
|
|
#define ADVERTISE_PAUSE_ASYM_FIBER 0x100
|
|
|
|
|
|
|
|
#define REGISTER_LINK_STATUS 0x400
|
2016-07-19 16:13:11 +07:00
|
|
|
#define NB_FIBER_STATS 1
|
2016-07-19 16:13:10 +07:00
|
|
|
|
2005-07-31 06:31:23 +07:00
|
|
|
MODULE_DESCRIPTION("Marvell PHY driver");
|
|
|
|
MODULE_AUTHOR("Andy Fleming");
|
|
|
|
MODULE_LICENSE("GPL");
|
|
|
|
|
2015-12-30 22:28:26 +07:00
|
|
|
struct marvell_hw_stat {
|
|
|
|
const char *string;
|
|
|
|
u8 page;
|
|
|
|
u8 reg;
|
|
|
|
u8 bits;
|
|
|
|
};
|
|
|
|
|
|
|
|
static struct marvell_hw_stat marvell_hw_stats[] = {
|
2016-07-19 16:13:11 +07:00
|
|
|
{ "phy_receive_errors_copper", 0, 21, 16},
|
2015-12-30 22:28:26 +07:00
|
|
|
{ "phy_idle_errors", 0, 10, 8 },
|
2016-07-19 16:13:11 +07:00
|
|
|
{ "phy_receive_errors_fiber", 1, 21, 16},
|
2015-12-30 22:28:26 +07:00
|
|
|
};
|
|
|
|
|
|
|
|
struct marvell_priv {
|
|
|
|
u64 stats[ARRAY_SIZE(marvell_hw_stats)];
|
2017-01-20 07:37:49 +07:00
|
|
|
char *hwmon_name;
|
|
|
|
struct device *hwmon_dev;
|
2015-12-30 22:28:26 +07:00
|
|
|
};
|
|
|
|
|
net: phy: marvell: fix paged access races
For paged accesses to be truely safe, we need to hold the bus lock to
prevent anyone else gaining access to the registers while we modify
them.
The phydev->lock mutex does not do this: userspace via the MII ioctl
can still sneak in and read or write any register while we are on a
different page, and the suspend/resume methods can be called by a
thread different to the thread polling the phy status.
Races have been observed with mvneta on SolidRun Clearfog with phylink,
particularly between the phylib worker reading the PHYs status, and
the thread resuming mvneta, calling phy_start() which then calls
through to m88e1121_config_aneg_rgmii_delays(), which tries to
read-modify-write the MSCR register:
CPU0 CPU1
marvell_read_status_page()
marvell_set_page(phydev, MII_MARVELL_FIBER_PAGE)
...
m88e1121_config_aneg_rgmii_delays()
set_page(MII_MARVELL_MSCR_PAGE)
phy_read(phydev, MII_88E1121_PHY_MSCR_REG)
marvell_set_page(phydev, MII_MARVELL_COPPER_PAGE);
...
phy_write(phydev, MII_88E1121_PHY_MSCR_REG)
The result of this is we end up writing the copper page register 21,
which causes the copper PHY to be disabled, and the link partner sees
the link immediately go down.
Solve this by taking the bus lock instead of the PHY lock, thereby
preventing other accesses to the PHY while we are accessing other PHY
pages.
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
2018-01-02 17:58:48 +07:00
|
|
|
static int marvell_read_page(struct phy_device *phydev)
|
2017-05-17 08:26:03 +07:00
|
|
|
{
|
net: phy: marvell: fix paged access races
For paged accesses to be truely safe, we need to hold the bus lock to
prevent anyone else gaining access to the registers while we modify
them.
The phydev->lock mutex does not do this: userspace via the MII ioctl
can still sneak in and read or write any register while we are on a
different page, and the suspend/resume methods can be called by a
thread different to the thread polling the phy status.
Races have been observed with mvneta on SolidRun Clearfog with phylink,
particularly between the phylib worker reading the PHYs status, and
the thread resuming mvneta, calling phy_start() which then calls
through to m88e1121_config_aneg_rgmii_delays(), which tries to
read-modify-write the MSCR register:
CPU0 CPU1
marvell_read_status_page()
marvell_set_page(phydev, MII_MARVELL_FIBER_PAGE)
...
m88e1121_config_aneg_rgmii_delays()
set_page(MII_MARVELL_MSCR_PAGE)
phy_read(phydev, MII_88E1121_PHY_MSCR_REG)
marvell_set_page(phydev, MII_MARVELL_COPPER_PAGE);
...
phy_write(phydev, MII_88E1121_PHY_MSCR_REG)
The result of this is we end up writing the copper page register 21,
which causes the copper PHY to be disabled, and the link partner sees
the link immediately go down.
Solve this by taking the bus lock instead of the PHY lock, thereby
preventing other accesses to the PHY while we are accessing other PHY
pages.
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
2018-01-02 17:58:48 +07:00
|
|
|
return __phy_read(phydev, MII_MARVELL_PHY_PAGE);
|
2017-05-17 08:26:03 +07:00
|
|
|
}
|
|
|
|
|
net: phy: marvell: fix paged access races
For paged accesses to be truely safe, we need to hold the bus lock to
prevent anyone else gaining access to the registers while we modify
them.
The phydev->lock mutex does not do this: userspace via the MII ioctl
can still sneak in and read or write any register while we are on a
different page, and the suspend/resume methods can be called by a
thread different to the thread polling the phy status.
Races have been observed with mvneta on SolidRun Clearfog with phylink,
particularly between the phylib worker reading the PHYs status, and
the thread resuming mvneta, calling phy_start() which then calls
through to m88e1121_config_aneg_rgmii_delays(), which tries to
read-modify-write the MSCR register:
CPU0 CPU1
marvell_read_status_page()
marvell_set_page(phydev, MII_MARVELL_FIBER_PAGE)
...
m88e1121_config_aneg_rgmii_delays()
set_page(MII_MARVELL_MSCR_PAGE)
phy_read(phydev, MII_88E1121_PHY_MSCR_REG)
marvell_set_page(phydev, MII_MARVELL_COPPER_PAGE);
...
phy_write(phydev, MII_88E1121_PHY_MSCR_REG)
The result of this is we end up writing the copper page register 21,
which causes the copper PHY to be disabled, and the link partner sees
the link immediately go down.
Solve this by taking the bus lock instead of the PHY lock, thereby
preventing other accesses to the PHY while we are accessing other PHY
pages.
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
2018-01-02 17:58:48 +07:00
|
|
|
static int marvell_write_page(struct phy_device *phydev, int page)
|
2017-05-17 08:26:03 +07:00
|
|
|
{
|
net: phy: marvell: fix paged access races
For paged accesses to be truely safe, we need to hold the bus lock to
prevent anyone else gaining access to the registers while we modify
them.
The phydev->lock mutex does not do this: userspace via the MII ioctl
can still sneak in and read or write any register while we are on a
different page, and the suspend/resume methods can be called by a
thread different to the thread polling the phy status.
Races have been observed with mvneta on SolidRun Clearfog with phylink,
particularly between the phylib worker reading the PHYs status, and
the thread resuming mvneta, calling phy_start() which then calls
through to m88e1121_config_aneg_rgmii_delays(), which tries to
read-modify-write the MSCR register:
CPU0 CPU1
marvell_read_status_page()
marvell_set_page(phydev, MII_MARVELL_FIBER_PAGE)
...
m88e1121_config_aneg_rgmii_delays()
set_page(MII_MARVELL_MSCR_PAGE)
phy_read(phydev, MII_88E1121_PHY_MSCR_REG)
marvell_set_page(phydev, MII_MARVELL_COPPER_PAGE);
...
phy_write(phydev, MII_88E1121_PHY_MSCR_REG)
The result of this is we end up writing the copper page register 21,
which causes the copper PHY to be disabled, and the link partner sees
the link immediately go down.
Solve this by taking the bus lock instead of the PHY lock, thereby
preventing other accesses to the PHY while we are accessing other PHY
pages.
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
2018-01-02 17:58:48 +07:00
|
|
|
return __phy_write(phydev, MII_MARVELL_PHY_PAGE, page);
|
2017-05-17 08:26:03 +07:00
|
|
|
}
|
|
|
|
|
net: phy: marvell: fix paged access races
For paged accesses to be truely safe, we need to hold the bus lock to
prevent anyone else gaining access to the registers while we modify
them.
The phydev->lock mutex does not do this: userspace via the MII ioctl
can still sneak in and read or write any register while we are on a
different page, and the suspend/resume methods can be called by a
thread different to the thread polling the phy status.
Races have been observed with mvneta on SolidRun Clearfog with phylink,
particularly between the phylib worker reading the PHYs status, and
the thread resuming mvneta, calling phy_start() which then calls
through to m88e1121_config_aneg_rgmii_delays(), which tries to
read-modify-write the MSCR register:
CPU0 CPU1
marvell_read_status_page()
marvell_set_page(phydev, MII_MARVELL_FIBER_PAGE)
...
m88e1121_config_aneg_rgmii_delays()
set_page(MII_MARVELL_MSCR_PAGE)
phy_read(phydev, MII_88E1121_PHY_MSCR_REG)
marvell_set_page(phydev, MII_MARVELL_COPPER_PAGE);
...
phy_write(phydev, MII_88E1121_PHY_MSCR_REG)
The result of this is we end up writing the copper page register 21,
which causes the copper PHY to be disabled, and the link partner sees
the link immediately go down.
Solve this by taking the bus lock instead of the PHY lock, thereby
preventing other accesses to the PHY while we are accessing other PHY
pages.
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
2018-01-02 17:58:48 +07:00
|
|
|
static int marvell_set_page(struct phy_device *phydev, int page)
|
2017-05-26 02:42:07 +07:00
|
|
|
{
|
net: phy: marvell: fix paged access races
For paged accesses to be truely safe, we need to hold the bus lock to
prevent anyone else gaining access to the registers while we modify
them.
The phydev->lock mutex does not do this: userspace via the MII ioctl
can still sneak in and read or write any register while we are on a
different page, and the suspend/resume methods can be called by a
thread different to the thread polling the phy status.
Races have been observed with mvneta on SolidRun Clearfog with phylink,
particularly between the phylib worker reading the PHYs status, and
the thread resuming mvneta, calling phy_start() which then calls
through to m88e1121_config_aneg_rgmii_delays(), which tries to
read-modify-write the MSCR register:
CPU0 CPU1
marvell_read_status_page()
marvell_set_page(phydev, MII_MARVELL_FIBER_PAGE)
...
m88e1121_config_aneg_rgmii_delays()
set_page(MII_MARVELL_MSCR_PAGE)
phy_read(phydev, MII_88E1121_PHY_MSCR_REG)
marvell_set_page(phydev, MII_MARVELL_COPPER_PAGE);
...
phy_write(phydev, MII_88E1121_PHY_MSCR_REG)
The result of this is we end up writing the copper page register 21,
which causes the copper PHY to be disabled, and the link partner sees
the link immediately go down.
Solve this by taking the bus lock instead of the PHY lock, thereby
preventing other accesses to the PHY while we are accessing other PHY
pages.
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
2018-01-02 17:58:48 +07:00
|
|
|
return phy_write(phydev, MII_MARVELL_PHY_PAGE, page);
|
2017-05-26 02:42:07 +07:00
|
|
|
}
|
|
|
|
|
2005-07-31 06:31:23 +07:00
|
|
|
static int marvell_ack_interrupt(struct phy_device *phydev)
|
|
|
|
{
|
|
|
|
int err;
|
|
|
|
|
|
|
|
/* Clear the interrupts by reading the reg */
|
|
|
|
err = phy_read(phydev, MII_M1011_IEVENT);
|
|
|
|
|
|
|
|
if (err < 0)
|
|
|
|
return err;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int marvell_config_intr(struct phy_device *phydev)
|
|
|
|
{
|
|
|
|
int err;
|
|
|
|
|
2007-02-10 07:13:58 +07:00
|
|
|
if (phydev->interrupts == PHY_INTERRUPT_ENABLED)
|
2017-05-17 08:26:04 +07:00
|
|
|
err = phy_write(phydev, MII_M1011_IMASK,
|
|
|
|
MII_M1011_IMASK_INIT);
|
2005-07-31 06:31:23 +07:00
|
|
|
else
|
2017-05-17 08:26:04 +07:00
|
|
|
err = phy_write(phydev, MII_M1011_IMASK,
|
|
|
|
MII_M1011_IMASK_CLEAR);
|
2005-07-31 06:31:23 +07:00
|
|
|
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
2015-07-10 11:28:25 +07:00
|
|
|
static int marvell_set_polarity(struct phy_device *phydev, int polarity)
|
|
|
|
{
|
|
|
|
int reg;
|
|
|
|
int err;
|
|
|
|
int val;
|
|
|
|
|
|
|
|
/* get the current settings */
|
|
|
|
reg = phy_read(phydev, MII_M1011_PHY_SCR);
|
|
|
|
if (reg < 0)
|
|
|
|
return reg;
|
|
|
|
|
|
|
|
val = reg;
|
|
|
|
val &= ~MII_M1011_PHY_SCR_AUTO_CROSS;
|
|
|
|
switch (polarity) {
|
|
|
|
case ETH_TP_MDI:
|
|
|
|
val |= MII_M1011_PHY_SCR_MDI;
|
|
|
|
break;
|
|
|
|
case ETH_TP_MDI_X:
|
|
|
|
val |= MII_M1011_PHY_SCR_MDI_X;
|
|
|
|
break;
|
|
|
|
case ETH_TP_MDI_AUTO:
|
|
|
|
case ETH_TP_MDI_INVALID:
|
|
|
|
default:
|
|
|
|
val |= MII_M1011_PHY_SCR_AUTO_CROSS;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (val != reg) {
|
|
|
|
/* Set the new polarity value in the register */
|
|
|
|
err = phy_write(phydev, MII_M1011_PHY_SCR, val);
|
|
|
|
if (err)
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2017-07-31 03:41:50 +07:00
|
|
|
static int marvell_set_downshift(struct phy_device *phydev, bool enable,
|
|
|
|
u8 retries)
|
|
|
|
{
|
|
|
|
int reg;
|
|
|
|
|
|
|
|
reg = phy_read(phydev, MII_M1011_PHY_SCR);
|
|
|
|
if (reg < 0)
|
|
|
|
return reg;
|
|
|
|
|
|
|
|
reg &= MII_M1011_PHY_SRC_DOWNSHIFT_MASK;
|
|
|
|
reg |= ((retries - 1) << MII_M1011_PHY_SCR_DOWNSHIFT_SHIFT);
|
|
|
|
if (enable)
|
|
|
|
reg |= MII_M1011_PHY_SCR_DOWNSHIFT_EN;
|
|
|
|
|
|
|
|
return phy_write(phydev, MII_M1011_PHY_SCR, reg);
|
|
|
|
}
|
|
|
|
|
2005-07-31 06:31:23 +07:00
|
|
|
static int marvell_config_aneg(struct phy_device *phydev)
|
|
|
|
{
|
|
|
|
int err;
|
|
|
|
|
2016-11-29 16:46:49 +07:00
|
|
|
err = marvell_set_polarity(phydev, phydev->mdix_ctrl);
|
2007-02-10 07:13:58 +07:00
|
|
|
if (err < 0)
|
|
|
|
return err;
|
|
|
|
|
|
|
|
err = phy_write(phydev, MII_M1111_PHY_LED_CONTROL,
|
|
|
|
MII_M1111_PHY_LED_DIRECT);
|
|
|
|
if (err < 0)
|
|
|
|
return err;
|
2005-07-31 06:31:23 +07:00
|
|
|
|
|
|
|
err = genphy_config_aneg(phydev);
|
2009-09-09 23:01:30 +07:00
|
|
|
if (err < 0)
|
|
|
|
return err;
|
2005-07-31 06:31:23 +07:00
|
|
|
|
2009-09-09 23:01:30 +07:00
|
|
|
if (phydev->autoneg != AUTONEG_ENABLE) {
|
2017-05-17 08:25:59 +07:00
|
|
|
/* A write to speed/duplex bits (that is performed by
|
2009-09-09 23:01:30 +07:00
|
|
|
* genphy_config_aneg() call above) must be followed by
|
|
|
|
* a software reset. Otherwise, the write has no effect.
|
|
|
|
*/
|
2017-07-31 03:41:45 +07:00
|
|
|
err = genphy_soft_reset(phydev);
|
2009-09-09 23:01:30 +07:00
|
|
|
if (err < 0)
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
2005-07-31 06:31:23 +07:00
|
|
|
}
|
|
|
|
|
2017-05-23 22:49:13 +07:00
|
|
|
static int m88e1101_config_aneg(struct phy_device *phydev)
|
|
|
|
{
|
|
|
|
int err;
|
|
|
|
|
|
|
|
/* This Marvell PHY has an errata which requires
|
|
|
|
* that certain registers get written in order
|
|
|
|
* to restart autonegotiation
|
|
|
|
*/
|
2017-07-31 03:41:45 +07:00
|
|
|
err = genphy_soft_reset(phydev);
|
2017-05-23 22:49:13 +07:00
|
|
|
if (err < 0)
|
|
|
|
return err;
|
|
|
|
|
|
|
|
err = phy_write(phydev, 0x1d, 0x1f);
|
|
|
|
if (err < 0)
|
|
|
|
return err;
|
|
|
|
|
|
|
|
err = phy_write(phydev, 0x1e, 0x200c);
|
|
|
|
if (err < 0)
|
|
|
|
return err;
|
|
|
|
|
|
|
|
err = phy_write(phydev, 0x1d, 0x5);
|
|
|
|
if (err < 0)
|
|
|
|
return err;
|
|
|
|
|
|
|
|
err = phy_write(phydev, 0x1e, 0);
|
|
|
|
if (err < 0)
|
|
|
|
return err;
|
|
|
|
|
|
|
|
err = phy_write(phydev, 0x1e, 0x100);
|
|
|
|
if (err < 0)
|
|
|
|
return err;
|
|
|
|
|
|
|
|
return marvell_config_aneg(phydev);
|
|
|
|
}
|
|
|
|
|
2016-06-27 14:39:59 +07:00
|
|
|
static int m88e1111_config_aneg(struct phy_device *phydev)
|
|
|
|
{
|
|
|
|
int err;
|
|
|
|
|
|
|
|
/* The Marvell PHY has an errata which requires
|
|
|
|
* that certain registers get written in order
|
|
|
|
* to restart autonegotiation
|
|
|
|
*/
|
2017-07-31 03:41:45 +07:00
|
|
|
err = genphy_soft_reset(phydev);
|
2016-06-27 14:39:59 +07:00
|
|
|
|
2016-11-29 16:46:49 +07:00
|
|
|
err = marvell_set_polarity(phydev, phydev->mdix_ctrl);
|
2016-06-27 14:39:59 +07:00
|
|
|
if (err < 0)
|
|
|
|
return err;
|
|
|
|
|
|
|
|
err = phy_write(phydev, MII_M1111_PHY_LED_CONTROL,
|
|
|
|
MII_M1111_PHY_LED_DIRECT);
|
|
|
|
if (err < 0)
|
|
|
|
return err;
|
|
|
|
|
|
|
|
err = genphy_config_aneg(phydev);
|
|
|
|
if (err < 0)
|
|
|
|
return err;
|
|
|
|
|
|
|
|
if (phydev->autoneg != AUTONEG_ENABLE) {
|
|
|
|
/* A write to speed/duplex bits (that is performed by
|
|
|
|
* genphy_config_aneg() call above) must be followed by
|
|
|
|
* a software reset. Otherwise, the write has no effect.
|
|
|
|
*/
|
2017-07-31 03:41:45 +07:00
|
|
|
err = genphy_soft_reset(phydev);
|
2016-06-27 14:39:59 +07:00
|
|
|
if (err < 0)
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
of/phylib: Use device tree properties to initialize Marvell PHYs.
Some aspects of PHY initialization are board dependent, things like
indicator LED connections and some clocking modes cannot be determined
by probing. The dev_flags element of struct phy_device can be used to
control these things if an appropriate value can be passed from the
Ethernet driver. We run into problems however if the PHY connections
are specified by the device tree. There is no way for the Ethernet
driver to know what flags it should pass.
If we are using the device tree, the struct phy_device will be
populated with the device tree node corresponding to the PHY, and we
can extract extra configuration information from there.
The next question is what should the format of that information be?
It is highly device specific, and the device tree representation
should not be tied to any arbitrary kernel defined constants. A
straight forward representation is just to specify the exact bits that
should be set using the "marvell,reg-init" property:
phy5: ethernet-phy@5 {
reg = <5>;
compatible = "marvell,88e1149r";
marvell,reg-init =
/* led[0]:1000, led[1]:100, led[2]:10, led[3]:tx */
<3 0x10 0 0x5777>, /* Reg 3,16 <- 0x5777 */
/* mix %:0, led[0123]:drive low off hiZ */
<3 0x11 0 0x00aa>, /* Reg 3,17 <- 0x00aa */
/* default blink periods. */
<3 0x12 0 0x4105>, /* Reg 3,18 <- 0x4105 */
/* led[4]:rx, led[5]:dplx, led[45]:drive low off hiZ */
<3 0x13 0 0x0a60>; /* Reg 3,19 <- 0x0a60 */
};
phy6: ethernet-phy@6 {
reg = <6>;
compatible = "marvell,88e1118";
marvell,reg-init =
/* Fix rx and tx clock transition timing */
<2 0x15 0xffcf 0>, /* Reg 2,21 Clear bits 4, 5 */
/* Adjust LED drive. */
<3 0x11 0 0x442a>, /* Reg 3,17 <- 0442a */
/* irq, blink-activity, blink-link */
<3 0x10 0 0x0242>; /* Reg 3,16 <- 0x0242 */
};
The Marvell PHYs have a page select register at register 22 (0x16), we
can specify any register by its page and register number. These are
the first and second word. The third word contains a mask to be ANDed
with the existing register value, and the fourth word is ORed with the
result to yield the new register value. The new marvell_of_reg_init
function leaves the page select register unchanged, so a call to it
can be dropped into the .config_init functions without unduly
affecting the state of the PHY.
If CONFIG_OF_MDIO is not set, there is no of_node, or no
"marvell,reg-init" property, the PHY initialization is unchanged.
Signed-off-by: David Daney <ddaney@caviumnetworks.com>
Cc: Grant Likely <grant.likely@secretlab.ca>
Cc: Cyril Chemparathy <cyril@ti.com>
Cc: David Daney <ddaney@caviumnetworks.com>
Cc: Arnaud Patard <arnaud.patard@rtp-net.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Reviewed-by: Grant Likely <grant.likely@secretlab.ca>
Signed-off-by: David S. Miller <davem@davemloft.net>
2010-11-19 19:13:18 +07:00
|
|
|
#ifdef CONFIG_OF_MDIO
|
2017-05-17 08:25:59 +07:00
|
|
|
/* Set and/or override some configuration registers based on the
|
of/phylib: Use device tree properties to initialize Marvell PHYs.
Some aspects of PHY initialization are board dependent, things like
indicator LED connections and some clocking modes cannot be determined
by probing. The dev_flags element of struct phy_device can be used to
control these things if an appropriate value can be passed from the
Ethernet driver. We run into problems however if the PHY connections
are specified by the device tree. There is no way for the Ethernet
driver to know what flags it should pass.
If we are using the device tree, the struct phy_device will be
populated with the device tree node corresponding to the PHY, and we
can extract extra configuration information from there.
The next question is what should the format of that information be?
It is highly device specific, and the device tree representation
should not be tied to any arbitrary kernel defined constants. A
straight forward representation is just to specify the exact bits that
should be set using the "marvell,reg-init" property:
phy5: ethernet-phy@5 {
reg = <5>;
compatible = "marvell,88e1149r";
marvell,reg-init =
/* led[0]:1000, led[1]:100, led[2]:10, led[3]:tx */
<3 0x10 0 0x5777>, /* Reg 3,16 <- 0x5777 */
/* mix %:0, led[0123]:drive low off hiZ */
<3 0x11 0 0x00aa>, /* Reg 3,17 <- 0x00aa */
/* default blink periods. */
<3 0x12 0 0x4105>, /* Reg 3,18 <- 0x4105 */
/* led[4]:rx, led[5]:dplx, led[45]:drive low off hiZ */
<3 0x13 0 0x0a60>; /* Reg 3,19 <- 0x0a60 */
};
phy6: ethernet-phy@6 {
reg = <6>;
compatible = "marvell,88e1118";
marvell,reg-init =
/* Fix rx and tx clock transition timing */
<2 0x15 0xffcf 0>, /* Reg 2,21 Clear bits 4, 5 */
/* Adjust LED drive. */
<3 0x11 0 0x442a>, /* Reg 3,17 <- 0442a */
/* irq, blink-activity, blink-link */
<3 0x10 0 0x0242>; /* Reg 3,16 <- 0x0242 */
};
The Marvell PHYs have a page select register at register 22 (0x16), we
can specify any register by its page and register number. These are
the first and second word. The third word contains a mask to be ANDed
with the existing register value, and the fourth word is ORed with the
result to yield the new register value. The new marvell_of_reg_init
function leaves the page select register unchanged, so a call to it
can be dropped into the .config_init functions without unduly
affecting the state of the PHY.
If CONFIG_OF_MDIO is not set, there is no of_node, or no
"marvell,reg-init" property, the PHY initialization is unchanged.
Signed-off-by: David Daney <ddaney@caviumnetworks.com>
Cc: Grant Likely <grant.likely@secretlab.ca>
Cc: Cyril Chemparathy <cyril@ti.com>
Cc: David Daney <ddaney@caviumnetworks.com>
Cc: Arnaud Patard <arnaud.patard@rtp-net.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Reviewed-by: Grant Likely <grant.likely@secretlab.ca>
Signed-off-by: David S. Miller <davem@davemloft.net>
2010-11-19 19:13:18 +07:00
|
|
|
* marvell,reg-init property stored in the of_node for the phydev.
|
|
|
|
*
|
|
|
|
* marvell,reg-init = <reg-page reg mask value>,...;
|
|
|
|
*
|
|
|
|
* There may be one or more sets of <reg-page reg mask value>:
|
|
|
|
*
|
|
|
|
* reg-page: which register bank to use.
|
|
|
|
* reg: the register.
|
|
|
|
* mask: if non-zero, ANDed with existing register value.
|
|
|
|
* value: ORed with the masked value and written to the regiser.
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
static int marvell_of_reg_init(struct phy_device *phydev)
|
|
|
|
{
|
|
|
|
const __be32 *paddr;
|
net: phy: marvell: fix paged access races
For paged accesses to be truely safe, we need to hold the bus lock to
prevent anyone else gaining access to the registers while we modify
them.
The phydev->lock mutex does not do this: userspace via the MII ioctl
can still sneak in and read or write any register while we are on a
different page, and the suspend/resume methods can be called by a
thread different to the thread polling the phy status.
Races have been observed with mvneta on SolidRun Clearfog with phylink,
particularly between the phylib worker reading the PHYs status, and
the thread resuming mvneta, calling phy_start() which then calls
through to m88e1121_config_aneg_rgmii_delays(), which tries to
read-modify-write the MSCR register:
CPU0 CPU1
marvell_read_status_page()
marvell_set_page(phydev, MII_MARVELL_FIBER_PAGE)
...
m88e1121_config_aneg_rgmii_delays()
set_page(MII_MARVELL_MSCR_PAGE)
phy_read(phydev, MII_88E1121_PHY_MSCR_REG)
marvell_set_page(phydev, MII_MARVELL_COPPER_PAGE);
...
phy_write(phydev, MII_88E1121_PHY_MSCR_REG)
The result of this is we end up writing the copper page register 21,
which causes the copper PHY to be disabled, and the link partner sees
the link immediately go down.
Solve this by taking the bus lock instead of the PHY lock, thereby
preventing other accesses to the PHY while we are accessing other PHY
pages.
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
2018-01-02 17:58:48 +07:00
|
|
|
int len, i, saved_page, current_page, ret = 0;
|
of/phylib: Use device tree properties to initialize Marvell PHYs.
Some aspects of PHY initialization are board dependent, things like
indicator LED connections and some clocking modes cannot be determined
by probing. The dev_flags element of struct phy_device can be used to
control these things if an appropriate value can be passed from the
Ethernet driver. We run into problems however if the PHY connections
are specified by the device tree. There is no way for the Ethernet
driver to know what flags it should pass.
If we are using the device tree, the struct phy_device will be
populated with the device tree node corresponding to the PHY, and we
can extract extra configuration information from there.
The next question is what should the format of that information be?
It is highly device specific, and the device tree representation
should not be tied to any arbitrary kernel defined constants. A
straight forward representation is just to specify the exact bits that
should be set using the "marvell,reg-init" property:
phy5: ethernet-phy@5 {
reg = <5>;
compatible = "marvell,88e1149r";
marvell,reg-init =
/* led[0]:1000, led[1]:100, led[2]:10, led[3]:tx */
<3 0x10 0 0x5777>, /* Reg 3,16 <- 0x5777 */
/* mix %:0, led[0123]:drive low off hiZ */
<3 0x11 0 0x00aa>, /* Reg 3,17 <- 0x00aa */
/* default blink periods. */
<3 0x12 0 0x4105>, /* Reg 3,18 <- 0x4105 */
/* led[4]:rx, led[5]:dplx, led[45]:drive low off hiZ */
<3 0x13 0 0x0a60>; /* Reg 3,19 <- 0x0a60 */
};
phy6: ethernet-phy@6 {
reg = <6>;
compatible = "marvell,88e1118";
marvell,reg-init =
/* Fix rx and tx clock transition timing */
<2 0x15 0xffcf 0>, /* Reg 2,21 Clear bits 4, 5 */
/* Adjust LED drive. */
<3 0x11 0 0x442a>, /* Reg 3,17 <- 0442a */
/* irq, blink-activity, blink-link */
<3 0x10 0 0x0242>; /* Reg 3,16 <- 0x0242 */
};
The Marvell PHYs have a page select register at register 22 (0x16), we
can specify any register by its page and register number. These are
the first and second word. The third word contains a mask to be ANDed
with the existing register value, and the fourth word is ORed with the
result to yield the new register value. The new marvell_of_reg_init
function leaves the page select register unchanged, so a call to it
can be dropped into the .config_init functions without unduly
affecting the state of the PHY.
If CONFIG_OF_MDIO is not set, there is no of_node, or no
"marvell,reg-init" property, the PHY initialization is unchanged.
Signed-off-by: David Daney <ddaney@caviumnetworks.com>
Cc: Grant Likely <grant.likely@secretlab.ca>
Cc: Cyril Chemparathy <cyril@ti.com>
Cc: David Daney <ddaney@caviumnetworks.com>
Cc: Arnaud Patard <arnaud.patard@rtp-net.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Reviewed-by: Grant Likely <grant.likely@secretlab.ca>
Signed-off-by: David S. Miller <davem@davemloft.net>
2010-11-19 19:13:18 +07:00
|
|
|
|
2016-01-07 02:11:16 +07:00
|
|
|
if (!phydev->mdio.dev.of_node)
|
of/phylib: Use device tree properties to initialize Marvell PHYs.
Some aspects of PHY initialization are board dependent, things like
indicator LED connections and some clocking modes cannot be determined
by probing. The dev_flags element of struct phy_device can be used to
control these things if an appropriate value can be passed from the
Ethernet driver. We run into problems however if the PHY connections
are specified by the device tree. There is no way for the Ethernet
driver to know what flags it should pass.
If we are using the device tree, the struct phy_device will be
populated with the device tree node corresponding to the PHY, and we
can extract extra configuration information from there.
The next question is what should the format of that information be?
It is highly device specific, and the device tree representation
should not be tied to any arbitrary kernel defined constants. A
straight forward representation is just to specify the exact bits that
should be set using the "marvell,reg-init" property:
phy5: ethernet-phy@5 {
reg = <5>;
compatible = "marvell,88e1149r";
marvell,reg-init =
/* led[0]:1000, led[1]:100, led[2]:10, led[3]:tx */
<3 0x10 0 0x5777>, /* Reg 3,16 <- 0x5777 */
/* mix %:0, led[0123]:drive low off hiZ */
<3 0x11 0 0x00aa>, /* Reg 3,17 <- 0x00aa */
/* default blink periods. */
<3 0x12 0 0x4105>, /* Reg 3,18 <- 0x4105 */
/* led[4]:rx, led[5]:dplx, led[45]:drive low off hiZ */
<3 0x13 0 0x0a60>; /* Reg 3,19 <- 0x0a60 */
};
phy6: ethernet-phy@6 {
reg = <6>;
compatible = "marvell,88e1118";
marvell,reg-init =
/* Fix rx and tx clock transition timing */
<2 0x15 0xffcf 0>, /* Reg 2,21 Clear bits 4, 5 */
/* Adjust LED drive. */
<3 0x11 0 0x442a>, /* Reg 3,17 <- 0442a */
/* irq, blink-activity, blink-link */
<3 0x10 0 0x0242>; /* Reg 3,16 <- 0x0242 */
};
The Marvell PHYs have a page select register at register 22 (0x16), we
can specify any register by its page and register number. These are
the first and second word. The third word contains a mask to be ANDed
with the existing register value, and the fourth word is ORed with the
result to yield the new register value. The new marvell_of_reg_init
function leaves the page select register unchanged, so a call to it
can be dropped into the .config_init functions without unduly
affecting the state of the PHY.
If CONFIG_OF_MDIO is not set, there is no of_node, or no
"marvell,reg-init" property, the PHY initialization is unchanged.
Signed-off-by: David Daney <ddaney@caviumnetworks.com>
Cc: Grant Likely <grant.likely@secretlab.ca>
Cc: Cyril Chemparathy <cyril@ti.com>
Cc: David Daney <ddaney@caviumnetworks.com>
Cc: Arnaud Patard <arnaud.patard@rtp-net.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Reviewed-by: Grant Likely <grant.likely@secretlab.ca>
Signed-off-by: David S. Miller <davem@davemloft.net>
2010-11-19 19:13:18 +07:00
|
|
|
return 0;
|
|
|
|
|
2016-01-07 02:11:16 +07:00
|
|
|
paddr = of_get_property(phydev->mdio.dev.of_node,
|
|
|
|
"marvell,reg-init", &len);
|
of/phylib: Use device tree properties to initialize Marvell PHYs.
Some aspects of PHY initialization are board dependent, things like
indicator LED connections and some clocking modes cannot be determined
by probing. The dev_flags element of struct phy_device can be used to
control these things if an appropriate value can be passed from the
Ethernet driver. We run into problems however if the PHY connections
are specified by the device tree. There is no way for the Ethernet
driver to know what flags it should pass.
If we are using the device tree, the struct phy_device will be
populated with the device tree node corresponding to the PHY, and we
can extract extra configuration information from there.
The next question is what should the format of that information be?
It is highly device specific, and the device tree representation
should not be tied to any arbitrary kernel defined constants. A
straight forward representation is just to specify the exact bits that
should be set using the "marvell,reg-init" property:
phy5: ethernet-phy@5 {
reg = <5>;
compatible = "marvell,88e1149r";
marvell,reg-init =
/* led[0]:1000, led[1]:100, led[2]:10, led[3]:tx */
<3 0x10 0 0x5777>, /* Reg 3,16 <- 0x5777 */
/* mix %:0, led[0123]:drive low off hiZ */
<3 0x11 0 0x00aa>, /* Reg 3,17 <- 0x00aa */
/* default blink periods. */
<3 0x12 0 0x4105>, /* Reg 3,18 <- 0x4105 */
/* led[4]:rx, led[5]:dplx, led[45]:drive low off hiZ */
<3 0x13 0 0x0a60>; /* Reg 3,19 <- 0x0a60 */
};
phy6: ethernet-phy@6 {
reg = <6>;
compatible = "marvell,88e1118";
marvell,reg-init =
/* Fix rx and tx clock transition timing */
<2 0x15 0xffcf 0>, /* Reg 2,21 Clear bits 4, 5 */
/* Adjust LED drive. */
<3 0x11 0 0x442a>, /* Reg 3,17 <- 0442a */
/* irq, blink-activity, blink-link */
<3 0x10 0 0x0242>; /* Reg 3,16 <- 0x0242 */
};
The Marvell PHYs have a page select register at register 22 (0x16), we
can specify any register by its page and register number. These are
the first and second word. The third word contains a mask to be ANDed
with the existing register value, and the fourth word is ORed with the
result to yield the new register value. The new marvell_of_reg_init
function leaves the page select register unchanged, so a call to it
can be dropped into the .config_init functions without unduly
affecting the state of the PHY.
If CONFIG_OF_MDIO is not set, there is no of_node, or no
"marvell,reg-init" property, the PHY initialization is unchanged.
Signed-off-by: David Daney <ddaney@caviumnetworks.com>
Cc: Grant Likely <grant.likely@secretlab.ca>
Cc: Cyril Chemparathy <cyril@ti.com>
Cc: David Daney <ddaney@caviumnetworks.com>
Cc: Arnaud Patard <arnaud.patard@rtp-net.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Reviewed-by: Grant Likely <grant.likely@secretlab.ca>
Signed-off-by: David S. Miller <davem@davemloft.net>
2010-11-19 19:13:18 +07:00
|
|
|
if (!paddr || len < (4 * sizeof(*paddr)))
|
|
|
|
return 0;
|
|
|
|
|
net: phy: marvell: fix paged access races
For paged accesses to be truely safe, we need to hold the bus lock to
prevent anyone else gaining access to the registers while we modify
them.
The phydev->lock mutex does not do this: userspace via the MII ioctl
can still sneak in and read or write any register while we are on a
different page, and the suspend/resume methods can be called by a
thread different to the thread polling the phy status.
Races have been observed with mvneta on SolidRun Clearfog with phylink,
particularly between the phylib worker reading the PHYs status, and
the thread resuming mvneta, calling phy_start() which then calls
through to m88e1121_config_aneg_rgmii_delays(), which tries to
read-modify-write the MSCR register:
CPU0 CPU1
marvell_read_status_page()
marvell_set_page(phydev, MII_MARVELL_FIBER_PAGE)
...
m88e1121_config_aneg_rgmii_delays()
set_page(MII_MARVELL_MSCR_PAGE)
phy_read(phydev, MII_88E1121_PHY_MSCR_REG)
marvell_set_page(phydev, MII_MARVELL_COPPER_PAGE);
...
phy_write(phydev, MII_88E1121_PHY_MSCR_REG)
The result of this is we end up writing the copper page register 21,
which causes the copper PHY to be disabled, and the link partner sees
the link immediately go down.
Solve this by taking the bus lock instead of the PHY lock, thereby
preventing other accesses to the PHY while we are accessing other PHY
pages.
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
2018-01-02 17:58:48 +07:00
|
|
|
saved_page = phy_save_page(phydev);
|
of/phylib: Use device tree properties to initialize Marvell PHYs.
Some aspects of PHY initialization are board dependent, things like
indicator LED connections and some clocking modes cannot be determined
by probing. The dev_flags element of struct phy_device can be used to
control these things if an appropriate value can be passed from the
Ethernet driver. We run into problems however if the PHY connections
are specified by the device tree. There is no way for the Ethernet
driver to know what flags it should pass.
If we are using the device tree, the struct phy_device will be
populated with the device tree node corresponding to the PHY, and we
can extract extra configuration information from there.
The next question is what should the format of that information be?
It is highly device specific, and the device tree representation
should not be tied to any arbitrary kernel defined constants. A
straight forward representation is just to specify the exact bits that
should be set using the "marvell,reg-init" property:
phy5: ethernet-phy@5 {
reg = <5>;
compatible = "marvell,88e1149r";
marvell,reg-init =
/* led[0]:1000, led[1]:100, led[2]:10, led[3]:tx */
<3 0x10 0 0x5777>, /* Reg 3,16 <- 0x5777 */
/* mix %:0, led[0123]:drive low off hiZ */
<3 0x11 0 0x00aa>, /* Reg 3,17 <- 0x00aa */
/* default blink periods. */
<3 0x12 0 0x4105>, /* Reg 3,18 <- 0x4105 */
/* led[4]:rx, led[5]:dplx, led[45]:drive low off hiZ */
<3 0x13 0 0x0a60>; /* Reg 3,19 <- 0x0a60 */
};
phy6: ethernet-phy@6 {
reg = <6>;
compatible = "marvell,88e1118";
marvell,reg-init =
/* Fix rx and tx clock transition timing */
<2 0x15 0xffcf 0>, /* Reg 2,21 Clear bits 4, 5 */
/* Adjust LED drive. */
<3 0x11 0 0x442a>, /* Reg 3,17 <- 0442a */
/* irq, blink-activity, blink-link */
<3 0x10 0 0x0242>; /* Reg 3,16 <- 0x0242 */
};
The Marvell PHYs have a page select register at register 22 (0x16), we
can specify any register by its page and register number. These are
the first and second word. The third word contains a mask to be ANDed
with the existing register value, and the fourth word is ORed with the
result to yield the new register value. The new marvell_of_reg_init
function leaves the page select register unchanged, so a call to it
can be dropped into the .config_init functions without unduly
affecting the state of the PHY.
If CONFIG_OF_MDIO is not set, there is no of_node, or no
"marvell,reg-init" property, the PHY initialization is unchanged.
Signed-off-by: David Daney <ddaney@caviumnetworks.com>
Cc: Grant Likely <grant.likely@secretlab.ca>
Cc: Cyril Chemparathy <cyril@ti.com>
Cc: David Daney <ddaney@caviumnetworks.com>
Cc: Arnaud Patard <arnaud.patard@rtp-net.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Reviewed-by: Grant Likely <grant.likely@secretlab.ca>
Signed-off-by: David S. Miller <davem@davemloft.net>
2010-11-19 19:13:18 +07:00
|
|
|
if (saved_page < 0)
|
net: phy: marvell: fix paged access races
For paged accesses to be truely safe, we need to hold the bus lock to
prevent anyone else gaining access to the registers while we modify
them.
The phydev->lock mutex does not do this: userspace via the MII ioctl
can still sneak in and read or write any register while we are on a
different page, and the suspend/resume methods can be called by a
thread different to the thread polling the phy status.
Races have been observed with mvneta on SolidRun Clearfog with phylink,
particularly between the phylib worker reading the PHYs status, and
the thread resuming mvneta, calling phy_start() which then calls
through to m88e1121_config_aneg_rgmii_delays(), which tries to
read-modify-write the MSCR register:
CPU0 CPU1
marvell_read_status_page()
marvell_set_page(phydev, MII_MARVELL_FIBER_PAGE)
...
m88e1121_config_aneg_rgmii_delays()
set_page(MII_MARVELL_MSCR_PAGE)
phy_read(phydev, MII_88E1121_PHY_MSCR_REG)
marvell_set_page(phydev, MII_MARVELL_COPPER_PAGE);
...
phy_write(phydev, MII_88E1121_PHY_MSCR_REG)
The result of this is we end up writing the copper page register 21,
which causes the copper PHY to be disabled, and the link partner sees
the link immediately go down.
Solve this by taking the bus lock instead of the PHY lock, thereby
preventing other accesses to the PHY while we are accessing other PHY
pages.
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
2018-01-02 17:58:48 +07:00
|
|
|
goto err;
|
of/phylib: Use device tree properties to initialize Marvell PHYs.
Some aspects of PHY initialization are board dependent, things like
indicator LED connections and some clocking modes cannot be determined
by probing. The dev_flags element of struct phy_device can be used to
control these things if an appropriate value can be passed from the
Ethernet driver. We run into problems however if the PHY connections
are specified by the device tree. There is no way for the Ethernet
driver to know what flags it should pass.
If we are using the device tree, the struct phy_device will be
populated with the device tree node corresponding to the PHY, and we
can extract extra configuration information from there.
The next question is what should the format of that information be?
It is highly device specific, and the device tree representation
should not be tied to any arbitrary kernel defined constants. A
straight forward representation is just to specify the exact bits that
should be set using the "marvell,reg-init" property:
phy5: ethernet-phy@5 {
reg = <5>;
compatible = "marvell,88e1149r";
marvell,reg-init =
/* led[0]:1000, led[1]:100, led[2]:10, led[3]:tx */
<3 0x10 0 0x5777>, /* Reg 3,16 <- 0x5777 */
/* mix %:0, led[0123]:drive low off hiZ */
<3 0x11 0 0x00aa>, /* Reg 3,17 <- 0x00aa */
/* default blink periods. */
<3 0x12 0 0x4105>, /* Reg 3,18 <- 0x4105 */
/* led[4]:rx, led[5]:dplx, led[45]:drive low off hiZ */
<3 0x13 0 0x0a60>; /* Reg 3,19 <- 0x0a60 */
};
phy6: ethernet-phy@6 {
reg = <6>;
compatible = "marvell,88e1118";
marvell,reg-init =
/* Fix rx and tx clock transition timing */
<2 0x15 0xffcf 0>, /* Reg 2,21 Clear bits 4, 5 */
/* Adjust LED drive. */
<3 0x11 0 0x442a>, /* Reg 3,17 <- 0442a */
/* irq, blink-activity, blink-link */
<3 0x10 0 0x0242>; /* Reg 3,16 <- 0x0242 */
};
The Marvell PHYs have a page select register at register 22 (0x16), we
can specify any register by its page and register number. These are
the first and second word. The third word contains a mask to be ANDed
with the existing register value, and the fourth word is ORed with the
result to yield the new register value. The new marvell_of_reg_init
function leaves the page select register unchanged, so a call to it
can be dropped into the .config_init functions without unduly
affecting the state of the PHY.
If CONFIG_OF_MDIO is not set, there is no of_node, or no
"marvell,reg-init" property, the PHY initialization is unchanged.
Signed-off-by: David Daney <ddaney@caviumnetworks.com>
Cc: Grant Likely <grant.likely@secretlab.ca>
Cc: Cyril Chemparathy <cyril@ti.com>
Cc: David Daney <ddaney@caviumnetworks.com>
Cc: Arnaud Patard <arnaud.patard@rtp-net.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Reviewed-by: Grant Likely <grant.likely@secretlab.ca>
Signed-off-by: David S. Miller <davem@davemloft.net>
2010-11-19 19:13:18 +07:00
|
|
|
current_page = saved_page;
|
|
|
|
|
|
|
|
len /= sizeof(*paddr);
|
|
|
|
for (i = 0; i < len - 3; i += 4) {
|
2017-05-17 08:26:03 +07:00
|
|
|
u16 page = be32_to_cpup(paddr + i);
|
of/phylib: Use device tree properties to initialize Marvell PHYs.
Some aspects of PHY initialization are board dependent, things like
indicator LED connections and some clocking modes cannot be determined
by probing. The dev_flags element of struct phy_device can be used to
control these things if an appropriate value can be passed from the
Ethernet driver. We run into problems however if the PHY connections
are specified by the device tree. There is no way for the Ethernet
driver to know what flags it should pass.
If we are using the device tree, the struct phy_device will be
populated with the device tree node corresponding to the PHY, and we
can extract extra configuration information from there.
The next question is what should the format of that information be?
It is highly device specific, and the device tree representation
should not be tied to any arbitrary kernel defined constants. A
straight forward representation is just to specify the exact bits that
should be set using the "marvell,reg-init" property:
phy5: ethernet-phy@5 {
reg = <5>;
compatible = "marvell,88e1149r";
marvell,reg-init =
/* led[0]:1000, led[1]:100, led[2]:10, led[3]:tx */
<3 0x10 0 0x5777>, /* Reg 3,16 <- 0x5777 */
/* mix %:0, led[0123]:drive low off hiZ */
<3 0x11 0 0x00aa>, /* Reg 3,17 <- 0x00aa */
/* default blink periods. */
<3 0x12 0 0x4105>, /* Reg 3,18 <- 0x4105 */
/* led[4]:rx, led[5]:dplx, led[45]:drive low off hiZ */
<3 0x13 0 0x0a60>; /* Reg 3,19 <- 0x0a60 */
};
phy6: ethernet-phy@6 {
reg = <6>;
compatible = "marvell,88e1118";
marvell,reg-init =
/* Fix rx and tx clock transition timing */
<2 0x15 0xffcf 0>, /* Reg 2,21 Clear bits 4, 5 */
/* Adjust LED drive. */
<3 0x11 0 0x442a>, /* Reg 3,17 <- 0442a */
/* irq, blink-activity, blink-link */
<3 0x10 0 0x0242>; /* Reg 3,16 <- 0x0242 */
};
The Marvell PHYs have a page select register at register 22 (0x16), we
can specify any register by its page and register number. These are
the first and second word. The third word contains a mask to be ANDed
with the existing register value, and the fourth word is ORed with the
result to yield the new register value. The new marvell_of_reg_init
function leaves the page select register unchanged, so a call to it
can be dropped into the .config_init functions without unduly
affecting the state of the PHY.
If CONFIG_OF_MDIO is not set, there is no of_node, or no
"marvell,reg-init" property, the PHY initialization is unchanged.
Signed-off-by: David Daney <ddaney@caviumnetworks.com>
Cc: Grant Likely <grant.likely@secretlab.ca>
Cc: Cyril Chemparathy <cyril@ti.com>
Cc: David Daney <ddaney@caviumnetworks.com>
Cc: Arnaud Patard <arnaud.patard@rtp-net.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Reviewed-by: Grant Likely <grant.likely@secretlab.ca>
Signed-off-by: David S. Miller <davem@davemloft.net>
2010-11-19 19:13:18 +07:00
|
|
|
u16 reg = be32_to_cpup(paddr + i + 1);
|
|
|
|
u16 mask = be32_to_cpup(paddr + i + 2);
|
|
|
|
u16 val_bits = be32_to_cpup(paddr + i + 3);
|
|
|
|
int val;
|
|
|
|
|
2017-05-17 08:26:03 +07:00
|
|
|
if (page != current_page) {
|
|
|
|
current_page = page;
|
net: phy: marvell: fix paged access races
For paged accesses to be truely safe, we need to hold the bus lock to
prevent anyone else gaining access to the registers while we modify
them.
The phydev->lock mutex does not do this: userspace via the MII ioctl
can still sneak in and read or write any register while we are on a
different page, and the suspend/resume methods can be called by a
thread different to the thread polling the phy status.
Races have been observed with mvneta on SolidRun Clearfog with phylink,
particularly between the phylib worker reading the PHYs status, and
the thread resuming mvneta, calling phy_start() which then calls
through to m88e1121_config_aneg_rgmii_delays(), which tries to
read-modify-write the MSCR register:
CPU0 CPU1
marvell_read_status_page()
marvell_set_page(phydev, MII_MARVELL_FIBER_PAGE)
...
m88e1121_config_aneg_rgmii_delays()
set_page(MII_MARVELL_MSCR_PAGE)
phy_read(phydev, MII_88E1121_PHY_MSCR_REG)
marvell_set_page(phydev, MII_MARVELL_COPPER_PAGE);
...
phy_write(phydev, MII_88E1121_PHY_MSCR_REG)
The result of this is we end up writing the copper page register 21,
which causes the copper PHY to be disabled, and the link partner sees
the link immediately go down.
Solve this by taking the bus lock instead of the PHY lock, thereby
preventing other accesses to the PHY while we are accessing other PHY
pages.
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
2018-01-02 17:58:48 +07:00
|
|
|
ret = marvell_write_page(phydev, page);
|
of/phylib: Use device tree properties to initialize Marvell PHYs.
Some aspects of PHY initialization are board dependent, things like
indicator LED connections and some clocking modes cannot be determined
by probing. The dev_flags element of struct phy_device can be used to
control these things if an appropriate value can be passed from the
Ethernet driver. We run into problems however if the PHY connections
are specified by the device tree. There is no way for the Ethernet
driver to know what flags it should pass.
If we are using the device tree, the struct phy_device will be
populated with the device tree node corresponding to the PHY, and we
can extract extra configuration information from there.
The next question is what should the format of that information be?
It is highly device specific, and the device tree representation
should not be tied to any arbitrary kernel defined constants. A
straight forward representation is just to specify the exact bits that
should be set using the "marvell,reg-init" property:
phy5: ethernet-phy@5 {
reg = <5>;
compatible = "marvell,88e1149r";
marvell,reg-init =
/* led[0]:1000, led[1]:100, led[2]:10, led[3]:tx */
<3 0x10 0 0x5777>, /* Reg 3,16 <- 0x5777 */
/* mix %:0, led[0123]:drive low off hiZ */
<3 0x11 0 0x00aa>, /* Reg 3,17 <- 0x00aa */
/* default blink periods. */
<3 0x12 0 0x4105>, /* Reg 3,18 <- 0x4105 */
/* led[4]:rx, led[5]:dplx, led[45]:drive low off hiZ */
<3 0x13 0 0x0a60>; /* Reg 3,19 <- 0x0a60 */
};
phy6: ethernet-phy@6 {
reg = <6>;
compatible = "marvell,88e1118";
marvell,reg-init =
/* Fix rx and tx clock transition timing */
<2 0x15 0xffcf 0>, /* Reg 2,21 Clear bits 4, 5 */
/* Adjust LED drive. */
<3 0x11 0 0x442a>, /* Reg 3,17 <- 0442a */
/* irq, blink-activity, blink-link */
<3 0x10 0 0x0242>; /* Reg 3,16 <- 0x0242 */
};
The Marvell PHYs have a page select register at register 22 (0x16), we
can specify any register by its page and register number. These are
the first and second word. The third word contains a mask to be ANDed
with the existing register value, and the fourth word is ORed with the
result to yield the new register value. The new marvell_of_reg_init
function leaves the page select register unchanged, so a call to it
can be dropped into the .config_init functions without unduly
affecting the state of the PHY.
If CONFIG_OF_MDIO is not set, there is no of_node, or no
"marvell,reg-init" property, the PHY initialization is unchanged.
Signed-off-by: David Daney <ddaney@caviumnetworks.com>
Cc: Grant Likely <grant.likely@secretlab.ca>
Cc: Cyril Chemparathy <cyril@ti.com>
Cc: David Daney <ddaney@caviumnetworks.com>
Cc: Arnaud Patard <arnaud.patard@rtp-net.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Reviewed-by: Grant Likely <grant.likely@secretlab.ca>
Signed-off-by: David S. Miller <davem@davemloft.net>
2010-11-19 19:13:18 +07:00
|
|
|
if (ret < 0)
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
|
|
|
|
val = 0;
|
|
|
|
if (mask) {
|
net: phy: marvell: fix paged access races
For paged accesses to be truely safe, we need to hold the bus lock to
prevent anyone else gaining access to the registers while we modify
them.
The phydev->lock mutex does not do this: userspace via the MII ioctl
can still sneak in and read or write any register while we are on a
different page, and the suspend/resume methods can be called by a
thread different to the thread polling the phy status.
Races have been observed with mvneta on SolidRun Clearfog with phylink,
particularly between the phylib worker reading the PHYs status, and
the thread resuming mvneta, calling phy_start() which then calls
through to m88e1121_config_aneg_rgmii_delays(), which tries to
read-modify-write the MSCR register:
CPU0 CPU1
marvell_read_status_page()
marvell_set_page(phydev, MII_MARVELL_FIBER_PAGE)
...
m88e1121_config_aneg_rgmii_delays()
set_page(MII_MARVELL_MSCR_PAGE)
phy_read(phydev, MII_88E1121_PHY_MSCR_REG)
marvell_set_page(phydev, MII_MARVELL_COPPER_PAGE);
...
phy_write(phydev, MII_88E1121_PHY_MSCR_REG)
The result of this is we end up writing the copper page register 21,
which causes the copper PHY to be disabled, and the link partner sees
the link immediately go down.
Solve this by taking the bus lock instead of the PHY lock, thereby
preventing other accesses to the PHY while we are accessing other PHY
pages.
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
2018-01-02 17:58:48 +07:00
|
|
|
val = __phy_read(phydev, reg);
|
of/phylib: Use device tree properties to initialize Marvell PHYs.
Some aspects of PHY initialization are board dependent, things like
indicator LED connections and some clocking modes cannot be determined
by probing. The dev_flags element of struct phy_device can be used to
control these things if an appropriate value can be passed from the
Ethernet driver. We run into problems however if the PHY connections
are specified by the device tree. There is no way for the Ethernet
driver to know what flags it should pass.
If we are using the device tree, the struct phy_device will be
populated with the device tree node corresponding to the PHY, and we
can extract extra configuration information from there.
The next question is what should the format of that information be?
It is highly device specific, and the device tree representation
should not be tied to any arbitrary kernel defined constants. A
straight forward representation is just to specify the exact bits that
should be set using the "marvell,reg-init" property:
phy5: ethernet-phy@5 {
reg = <5>;
compatible = "marvell,88e1149r";
marvell,reg-init =
/* led[0]:1000, led[1]:100, led[2]:10, led[3]:tx */
<3 0x10 0 0x5777>, /* Reg 3,16 <- 0x5777 */
/* mix %:0, led[0123]:drive low off hiZ */
<3 0x11 0 0x00aa>, /* Reg 3,17 <- 0x00aa */
/* default blink periods. */
<3 0x12 0 0x4105>, /* Reg 3,18 <- 0x4105 */
/* led[4]:rx, led[5]:dplx, led[45]:drive low off hiZ */
<3 0x13 0 0x0a60>; /* Reg 3,19 <- 0x0a60 */
};
phy6: ethernet-phy@6 {
reg = <6>;
compatible = "marvell,88e1118";
marvell,reg-init =
/* Fix rx and tx clock transition timing */
<2 0x15 0xffcf 0>, /* Reg 2,21 Clear bits 4, 5 */
/* Adjust LED drive. */
<3 0x11 0 0x442a>, /* Reg 3,17 <- 0442a */
/* irq, blink-activity, blink-link */
<3 0x10 0 0x0242>; /* Reg 3,16 <- 0x0242 */
};
The Marvell PHYs have a page select register at register 22 (0x16), we
can specify any register by its page and register number. These are
the first and second word. The third word contains a mask to be ANDed
with the existing register value, and the fourth word is ORed with the
result to yield the new register value. The new marvell_of_reg_init
function leaves the page select register unchanged, so a call to it
can be dropped into the .config_init functions without unduly
affecting the state of the PHY.
If CONFIG_OF_MDIO is not set, there is no of_node, or no
"marvell,reg-init" property, the PHY initialization is unchanged.
Signed-off-by: David Daney <ddaney@caviumnetworks.com>
Cc: Grant Likely <grant.likely@secretlab.ca>
Cc: Cyril Chemparathy <cyril@ti.com>
Cc: David Daney <ddaney@caviumnetworks.com>
Cc: Arnaud Patard <arnaud.patard@rtp-net.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Reviewed-by: Grant Likely <grant.likely@secretlab.ca>
Signed-off-by: David S. Miller <davem@davemloft.net>
2010-11-19 19:13:18 +07:00
|
|
|
if (val < 0) {
|
|
|
|
ret = val;
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
val &= mask;
|
|
|
|
}
|
|
|
|
val |= val_bits;
|
|
|
|
|
net: phy: marvell: fix paged access races
For paged accesses to be truely safe, we need to hold the bus lock to
prevent anyone else gaining access to the registers while we modify
them.
The phydev->lock mutex does not do this: userspace via the MII ioctl
can still sneak in and read or write any register while we are on a
different page, and the suspend/resume methods can be called by a
thread different to the thread polling the phy status.
Races have been observed with mvneta on SolidRun Clearfog with phylink,
particularly between the phylib worker reading the PHYs status, and
the thread resuming mvneta, calling phy_start() which then calls
through to m88e1121_config_aneg_rgmii_delays(), which tries to
read-modify-write the MSCR register:
CPU0 CPU1
marvell_read_status_page()
marvell_set_page(phydev, MII_MARVELL_FIBER_PAGE)
...
m88e1121_config_aneg_rgmii_delays()
set_page(MII_MARVELL_MSCR_PAGE)
phy_read(phydev, MII_88E1121_PHY_MSCR_REG)
marvell_set_page(phydev, MII_MARVELL_COPPER_PAGE);
...
phy_write(phydev, MII_88E1121_PHY_MSCR_REG)
The result of this is we end up writing the copper page register 21,
which causes the copper PHY to be disabled, and the link partner sees
the link immediately go down.
Solve this by taking the bus lock instead of the PHY lock, thereby
preventing other accesses to the PHY while we are accessing other PHY
pages.
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
2018-01-02 17:58:48 +07:00
|
|
|
ret = __phy_write(phydev, reg, val);
|
of/phylib: Use device tree properties to initialize Marvell PHYs.
Some aspects of PHY initialization are board dependent, things like
indicator LED connections and some clocking modes cannot be determined
by probing. The dev_flags element of struct phy_device can be used to
control these things if an appropriate value can be passed from the
Ethernet driver. We run into problems however if the PHY connections
are specified by the device tree. There is no way for the Ethernet
driver to know what flags it should pass.
If we are using the device tree, the struct phy_device will be
populated with the device tree node corresponding to the PHY, and we
can extract extra configuration information from there.
The next question is what should the format of that information be?
It is highly device specific, and the device tree representation
should not be tied to any arbitrary kernel defined constants. A
straight forward representation is just to specify the exact bits that
should be set using the "marvell,reg-init" property:
phy5: ethernet-phy@5 {
reg = <5>;
compatible = "marvell,88e1149r";
marvell,reg-init =
/* led[0]:1000, led[1]:100, led[2]:10, led[3]:tx */
<3 0x10 0 0x5777>, /* Reg 3,16 <- 0x5777 */
/* mix %:0, led[0123]:drive low off hiZ */
<3 0x11 0 0x00aa>, /* Reg 3,17 <- 0x00aa */
/* default blink periods. */
<3 0x12 0 0x4105>, /* Reg 3,18 <- 0x4105 */
/* led[4]:rx, led[5]:dplx, led[45]:drive low off hiZ */
<3 0x13 0 0x0a60>; /* Reg 3,19 <- 0x0a60 */
};
phy6: ethernet-phy@6 {
reg = <6>;
compatible = "marvell,88e1118";
marvell,reg-init =
/* Fix rx and tx clock transition timing */
<2 0x15 0xffcf 0>, /* Reg 2,21 Clear bits 4, 5 */
/* Adjust LED drive. */
<3 0x11 0 0x442a>, /* Reg 3,17 <- 0442a */
/* irq, blink-activity, blink-link */
<3 0x10 0 0x0242>; /* Reg 3,16 <- 0x0242 */
};
The Marvell PHYs have a page select register at register 22 (0x16), we
can specify any register by its page and register number. These are
the first and second word. The third word contains a mask to be ANDed
with the existing register value, and the fourth word is ORed with the
result to yield the new register value. The new marvell_of_reg_init
function leaves the page select register unchanged, so a call to it
can be dropped into the .config_init functions without unduly
affecting the state of the PHY.
If CONFIG_OF_MDIO is not set, there is no of_node, or no
"marvell,reg-init" property, the PHY initialization is unchanged.
Signed-off-by: David Daney <ddaney@caviumnetworks.com>
Cc: Grant Likely <grant.likely@secretlab.ca>
Cc: Cyril Chemparathy <cyril@ti.com>
Cc: David Daney <ddaney@caviumnetworks.com>
Cc: Arnaud Patard <arnaud.patard@rtp-net.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Reviewed-by: Grant Likely <grant.likely@secretlab.ca>
Signed-off-by: David S. Miller <davem@davemloft.net>
2010-11-19 19:13:18 +07:00
|
|
|
if (ret < 0)
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
err:
|
net: phy: marvell: fix paged access races
For paged accesses to be truely safe, we need to hold the bus lock to
prevent anyone else gaining access to the registers while we modify
them.
The phydev->lock mutex does not do this: userspace via the MII ioctl
can still sneak in and read or write any register while we are on a
different page, and the suspend/resume methods can be called by a
thread different to the thread polling the phy status.
Races have been observed with mvneta on SolidRun Clearfog with phylink,
particularly between the phylib worker reading the PHYs status, and
the thread resuming mvneta, calling phy_start() which then calls
through to m88e1121_config_aneg_rgmii_delays(), which tries to
read-modify-write the MSCR register:
CPU0 CPU1
marvell_read_status_page()
marvell_set_page(phydev, MII_MARVELL_FIBER_PAGE)
...
m88e1121_config_aneg_rgmii_delays()
set_page(MII_MARVELL_MSCR_PAGE)
phy_read(phydev, MII_88E1121_PHY_MSCR_REG)
marvell_set_page(phydev, MII_MARVELL_COPPER_PAGE);
...
phy_write(phydev, MII_88E1121_PHY_MSCR_REG)
The result of this is we end up writing the copper page register 21,
which causes the copper PHY to be disabled, and the link partner sees
the link immediately go down.
Solve this by taking the bus lock instead of the PHY lock, thereby
preventing other accesses to the PHY while we are accessing other PHY
pages.
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
2018-01-02 17:58:48 +07:00
|
|
|
return phy_restore_page(phydev, saved_page, ret);
|
of/phylib: Use device tree properties to initialize Marvell PHYs.
Some aspects of PHY initialization are board dependent, things like
indicator LED connections and some clocking modes cannot be determined
by probing. The dev_flags element of struct phy_device can be used to
control these things if an appropriate value can be passed from the
Ethernet driver. We run into problems however if the PHY connections
are specified by the device tree. There is no way for the Ethernet
driver to know what flags it should pass.
If we are using the device tree, the struct phy_device will be
populated with the device tree node corresponding to the PHY, and we
can extract extra configuration information from there.
The next question is what should the format of that information be?
It is highly device specific, and the device tree representation
should not be tied to any arbitrary kernel defined constants. A
straight forward representation is just to specify the exact bits that
should be set using the "marvell,reg-init" property:
phy5: ethernet-phy@5 {
reg = <5>;
compatible = "marvell,88e1149r";
marvell,reg-init =
/* led[0]:1000, led[1]:100, led[2]:10, led[3]:tx */
<3 0x10 0 0x5777>, /* Reg 3,16 <- 0x5777 */
/* mix %:0, led[0123]:drive low off hiZ */
<3 0x11 0 0x00aa>, /* Reg 3,17 <- 0x00aa */
/* default blink periods. */
<3 0x12 0 0x4105>, /* Reg 3,18 <- 0x4105 */
/* led[4]:rx, led[5]:dplx, led[45]:drive low off hiZ */
<3 0x13 0 0x0a60>; /* Reg 3,19 <- 0x0a60 */
};
phy6: ethernet-phy@6 {
reg = <6>;
compatible = "marvell,88e1118";
marvell,reg-init =
/* Fix rx and tx clock transition timing */
<2 0x15 0xffcf 0>, /* Reg 2,21 Clear bits 4, 5 */
/* Adjust LED drive. */
<3 0x11 0 0x442a>, /* Reg 3,17 <- 0442a */
/* irq, blink-activity, blink-link */
<3 0x10 0 0x0242>; /* Reg 3,16 <- 0x0242 */
};
The Marvell PHYs have a page select register at register 22 (0x16), we
can specify any register by its page and register number. These are
the first and second word. The third word contains a mask to be ANDed
with the existing register value, and the fourth word is ORed with the
result to yield the new register value. The new marvell_of_reg_init
function leaves the page select register unchanged, so a call to it
can be dropped into the .config_init functions without unduly
affecting the state of the PHY.
If CONFIG_OF_MDIO is not set, there is no of_node, or no
"marvell,reg-init" property, the PHY initialization is unchanged.
Signed-off-by: David Daney <ddaney@caviumnetworks.com>
Cc: Grant Likely <grant.likely@secretlab.ca>
Cc: Cyril Chemparathy <cyril@ti.com>
Cc: David Daney <ddaney@caviumnetworks.com>
Cc: Arnaud Patard <arnaud.patard@rtp-net.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Reviewed-by: Grant Likely <grant.likely@secretlab.ca>
Signed-off-by: David S. Miller <davem@davemloft.net>
2010-11-19 19:13:18 +07:00
|
|
|
}
|
|
|
|
#else
|
|
|
|
static int marvell_of_reg_init(struct phy_device *phydev)
|
|
|
|
{
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
#endif /* CONFIG_OF_MDIO */
|
|
|
|
|
2017-07-31 03:41:48 +07:00
|
|
|
static int m88e1121_config_aneg_rgmii_delays(struct phy_device *phydev)
|
2009-04-07 09:01:41 +07:00
|
|
|
{
|
net: phy: marvell: fix paged access races
For paged accesses to be truely safe, we need to hold the bus lock to
prevent anyone else gaining access to the registers while we modify
them.
The phydev->lock mutex does not do this: userspace via the MII ioctl
can still sneak in and read or write any register while we are on a
different page, and the suspend/resume methods can be called by a
thread different to the thread polling the phy status.
Races have been observed with mvneta on SolidRun Clearfog with phylink,
particularly between the phylib worker reading the PHYs status, and
the thread resuming mvneta, calling phy_start() which then calls
through to m88e1121_config_aneg_rgmii_delays(), which tries to
read-modify-write the MSCR register:
CPU0 CPU1
marvell_read_status_page()
marvell_set_page(phydev, MII_MARVELL_FIBER_PAGE)
...
m88e1121_config_aneg_rgmii_delays()
set_page(MII_MARVELL_MSCR_PAGE)
phy_read(phydev, MII_88E1121_PHY_MSCR_REG)
marvell_set_page(phydev, MII_MARVELL_COPPER_PAGE);
...
phy_write(phydev, MII_88E1121_PHY_MSCR_REG)
The result of this is we end up writing the copper page register 21,
which causes the copper PHY to be disabled, and the link partner sees
the link immediately go down.
Solve this by taking the bus lock instead of the PHY lock, thereby
preventing other accesses to the PHY while we are accessing other PHY
pages.
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
2018-01-02 17:58:48 +07:00
|
|
|
int mscr;
|
2017-07-31 03:41:48 +07:00
|
|
|
|
|
|
|
if (phydev->interface == PHY_INTERFACE_MODE_RGMII_ID)
|
net: phy: marvell: fix paged access races
For paged accesses to be truely safe, we need to hold the bus lock to
prevent anyone else gaining access to the registers while we modify
them.
The phydev->lock mutex does not do this: userspace via the MII ioctl
can still sneak in and read or write any register while we are on a
different page, and the suspend/resume methods can be called by a
thread different to the thread polling the phy status.
Races have been observed with mvneta on SolidRun Clearfog with phylink,
particularly between the phylib worker reading the PHYs status, and
the thread resuming mvneta, calling phy_start() which then calls
through to m88e1121_config_aneg_rgmii_delays(), which tries to
read-modify-write the MSCR register:
CPU0 CPU1
marvell_read_status_page()
marvell_set_page(phydev, MII_MARVELL_FIBER_PAGE)
...
m88e1121_config_aneg_rgmii_delays()
set_page(MII_MARVELL_MSCR_PAGE)
phy_read(phydev, MII_88E1121_PHY_MSCR_REG)
marvell_set_page(phydev, MII_MARVELL_COPPER_PAGE);
...
phy_write(phydev, MII_88E1121_PHY_MSCR_REG)
The result of this is we end up writing the copper page register 21,
which causes the copper PHY to be disabled, and the link partner sees
the link immediately go down.
Solve this by taking the bus lock instead of the PHY lock, thereby
preventing other accesses to the PHY while we are accessing other PHY
pages.
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
2018-01-02 17:58:48 +07:00
|
|
|
mscr = MII_88E1121_PHY_MSCR_RX_DELAY |
|
|
|
|
MII_88E1121_PHY_MSCR_TX_DELAY;
|
2017-07-31 03:41:48 +07:00
|
|
|
else if (phydev->interface == PHY_INTERFACE_MODE_RGMII_RXID)
|
net: phy: marvell: fix paged access races
For paged accesses to be truely safe, we need to hold the bus lock to
prevent anyone else gaining access to the registers while we modify
them.
The phydev->lock mutex does not do this: userspace via the MII ioctl
can still sneak in and read or write any register while we are on a
different page, and the suspend/resume methods can be called by a
thread different to the thread polling the phy status.
Races have been observed with mvneta on SolidRun Clearfog with phylink,
particularly between the phylib worker reading the PHYs status, and
the thread resuming mvneta, calling phy_start() which then calls
through to m88e1121_config_aneg_rgmii_delays(), which tries to
read-modify-write the MSCR register:
CPU0 CPU1
marvell_read_status_page()
marvell_set_page(phydev, MII_MARVELL_FIBER_PAGE)
...
m88e1121_config_aneg_rgmii_delays()
set_page(MII_MARVELL_MSCR_PAGE)
phy_read(phydev, MII_88E1121_PHY_MSCR_REG)
marvell_set_page(phydev, MII_MARVELL_COPPER_PAGE);
...
phy_write(phydev, MII_88E1121_PHY_MSCR_REG)
The result of this is we end up writing the copper page register 21,
which causes the copper PHY to be disabled, and the link partner sees
the link immediately go down.
Solve this by taking the bus lock instead of the PHY lock, thereby
preventing other accesses to the PHY while we are accessing other PHY
pages.
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
2018-01-02 17:58:48 +07:00
|
|
|
mscr = MII_88E1121_PHY_MSCR_RX_DELAY;
|
2017-07-31 03:41:48 +07:00
|
|
|
else if (phydev->interface == PHY_INTERFACE_MODE_RGMII_TXID)
|
net: phy: marvell: fix paged access races
For paged accesses to be truely safe, we need to hold the bus lock to
prevent anyone else gaining access to the registers while we modify
them.
The phydev->lock mutex does not do this: userspace via the MII ioctl
can still sneak in and read or write any register while we are on a
different page, and the suspend/resume methods can be called by a
thread different to the thread polling the phy status.
Races have been observed with mvneta on SolidRun Clearfog with phylink,
particularly between the phylib worker reading the PHYs status, and
the thread resuming mvneta, calling phy_start() which then calls
through to m88e1121_config_aneg_rgmii_delays(), which tries to
read-modify-write the MSCR register:
CPU0 CPU1
marvell_read_status_page()
marvell_set_page(phydev, MII_MARVELL_FIBER_PAGE)
...
m88e1121_config_aneg_rgmii_delays()
set_page(MII_MARVELL_MSCR_PAGE)
phy_read(phydev, MII_88E1121_PHY_MSCR_REG)
marvell_set_page(phydev, MII_MARVELL_COPPER_PAGE);
...
phy_write(phydev, MII_88E1121_PHY_MSCR_REG)
The result of this is we end up writing the copper page register 21,
which causes the copper PHY to be disabled, and the link partner sees
the link immediately go down.
Solve this by taking the bus lock instead of the PHY lock, thereby
preventing other accesses to the PHY while we are accessing other PHY
pages.
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
2018-01-02 17:58:48 +07:00
|
|
|
mscr = MII_88E1121_PHY_MSCR_TX_DELAY;
|
|
|
|
else
|
|
|
|
mscr = 0;
|
2009-04-07 09:01:41 +07:00
|
|
|
|
net: phy: marvell: fix paged access races
For paged accesses to be truely safe, we need to hold the bus lock to
prevent anyone else gaining access to the registers while we modify
them.
The phydev->lock mutex does not do this: userspace via the MII ioctl
can still sneak in and read or write any register while we are on a
different page, and the suspend/resume methods can be called by a
thread different to the thread polling the phy status.
Races have been observed with mvneta on SolidRun Clearfog with phylink,
particularly between the phylib worker reading the PHYs status, and
the thread resuming mvneta, calling phy_start() which then calls
through to m88e1121_config_aneg_rgmii_delays(), which tries to
read-modify-write the MSCR register:
CPU0 CPU1
marvell_read_status_page()
marvell_set_page(phydev, MII_MARVELL_FIBER_PAGE)
...
m88e1121_config_aneg_rgmii_delays()
set_page(MII_MARVELL_MSCR_PAGE)
phy_read(phydev, MII_88E1121_PHY_MSCR_REG)
marvell_set_page(phydev, MII_MARVELL_COPPER_PAGE);
...
phy_write(phydev, MII_88E1121_PHY_MSCR_REG)
The result of this is we end up writing the copper page register 21,
which causes the copper PHY to be disabled, and the link partner sees
the link immediately go down.
Solve this by taking the bus lock instead of the PHY lock, thereby
preventing other accesses to the PHY while we are accessing other PHY
pages.
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
2018-01-02 17:58:48 +07:00
|
|
|
return phy_modify_paged(phydev, MII_MARVELL_MSCR_PAGE,
|
|
|
|
MII_88E1121_PHY_MSCR_REG,
|
|
|
|
MII_88E1121_PHY_MSCR_DELAY_MASK, mscr);
|
2017-07-31 03:41:48 +07:00
|
|
|
}
|
|
|
|
|
|
|
|
static int m88e1121_config_aneg(struct phy_device *phydev)
|
|
|
|
{
|
|
|
|
int err = 0;
|
|
|
|
|
|
|
|
if (phy_interface_is_rgmii(phydev)) {
|
|
|
|
err = m88e1121_config_aneg_rgmii_delays(phydev);
|
2018-01-02 17:58:58 +07:00
|
|
|
if (err < 0)
|
2017-07-31 03:41:48 +07:00
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
2017-07-31 03:41:45 +07:00
|
|
|
err = genphy_soft_reset(phydev);
|
2009-04-07 09:01:41 +07:00
|
|
|
if (err < 0)
|
|
|
|
return err;
|
|
|
|
|
2017-07-31 03:41:49 +07:00
|
|
|
err = marvell_set_polarity(phydev, phydev->mdix_ctrl);
|
2009-04-07 09:01:41 +07:00
|
|
|
if (err < 0)
|
|
|
|
return err;
|
|
|
|
|
2016-06-11 22:21:26 +07:00
|
|
|
return genphy_config_aneg(phydev);
|
2009-04-07 09:01:41 +07:00
|
|
|
}
|
|
|
|
|
2010-10-30 03:50:25 +07:00
|
|
|
static int m88e1318_config_aneg(struct phy_device *phydev)
|
2010-08-04 09:36:06 +07:00
|
|
|
{
|
net: phy: marvell: fix paged access races
For paged accesses to be truely safe, we need to hold the bus lock to
prevent anyone else gaining access to the registers while we modify
them.
The phydev->lock mutex does not do this: userspace via the MII ioctl
can still sneak in and read or write any register while we are on a
different page, and the suspend/resume methods can be called by a
thread different to the thread polling the phy status.
Races have been observed with mvneta on SolidRun Clearfog with phylink,
particularly between the phylib worker reading the PHYs status, and
the thread resuming mvneta, calling phy_start() which then calls
through to m88e1121_config_aneg_rgmii_delays(), which tries to
read-modify-write the MSCR register:
CPU0 CPU1
marvell_read_status_page()
marvell_set_page(phydev, MII_MARVELL_FIBER_PAGE)
...
m88e1121_config_aneg_rgmii_delays()
set_page(MII_MARVELL_MSCR_PAGE)
phy_read(phydev, MII_88E1121_PHY_MSCR_REG)
marvell_set_page(phydev, MII_MARVELL_COPPER_PAGE);
...
phy_write(phydev, MII_88E1121_PHY_MSCR_REG)
The result of this is we end up writing the copper page register 21,
which causes the copper PHY to be disabled, and the link partner sees
the link immediately go down.
Solve this by taking the bus lock instead of the PHY lock, thereby
preventing other accesses to the PHY while we are accessing other PHY
pages.
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
2018-01-02 17:58:48 +07:00
|
|
|
int err;
|
2010-08-04 09:36:06 +07:00
|
|
|
|
net: phy: marvell: fix paged access races
For paged accesses to be truely safe, we need to hold the bus lock to
prevent anyone else gaining access to the registers while we modify
them.
The phydev->lock mutex does not do this: userspace via the MII ioctl
can still sneak in and read or write any register while we are on a
different page, and the suspend/resume methods can be called by a
thread different to the thread polling the phy status.
Races have been observed with mvneta on SolidRun Clearfog with phylink,
particularly between the phylib worker reading the PHYs status, and
the thread resuming mvneta, calling phy_start() which then calls
through to m88e1121_config_aneg_rgmii_delays(), which tries to
read-modify-write the MSCR register:
CPU0 CPU1
marvell_read_status_page()
marvell_set_page(phydev, MII_MARVELL_FIBER_PAGE)
...
m88e1121_config_aneg_rgmii_delays()
set_page(MII_MARVELL_MSCR_PAGE)
phy_read(phydev, MII_88E1121_PHY_MSCR_REG)
marvell_set_page(phydev, MII_MARVELL_COPPER_PAGE);
...
phy_write(phydev, MII_88E1121_PHY_MSCR_REG)
The result of this is we end up writing the copper page register 21,
which causes the copper PHY to be disabled, and the link partner sees
the link immediately go down.
Solve this by taking the bus lock instead of the PHY lock, thereby
preventing other accesses to the PHY while we are accessing other PHY
pages.
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
2018-01-02 17:58:48 +07:00
|
|
|
err = phy_modify_paged(phydev, MII_MARVELL_MSCR_PAGE,
|
|
|
|
MII_88E1318S_PHY_MSCR1_REG,
|
|
|
|
0, MII_88E1318S_PHY_MSCR1_PAD_ODD);
|
2010-08-04 09:36:06 +07:00
|
|
|
if (err < 0)
|
|
|
|
return err;
|
|
|
|
|
|
|
|
return m88e1121_config_aneg(phydev);
|
|
|
|
}
|
|
|
|
|
2016-07-19 16:13:12 +07:00
|
|
|
/**
|
|
|
|
* ethtool_adv_to_fiber_adv_t
|
|
|
|
* @ethadv: the ethtool advertisement settings
|
|
|
|
*
|
|
|
|
* A small helper function that translates ethtool advertisement
|
|
|
|
* settings to phy autonegotiation advertisements for the
|
|
|
|
* MII_ADV register for fiber link.
|
|
|
|
*/
|
|
|
|
static inline u32 ethtool_adv_to_fiber_adv_t(u32 ethadv)
|
|
|
|
{
|
|
|
|
u32 result = 0;
|
|
|
|
|
|
|
|
if (ethadv & ADVERTISED_1000baseT_Half)
|
|
|
|
result |= ADVERTISE_FIBER_1000HALF;
|
|
|
|
if (ethadv & ADVERTISED_1000baseT_Full)
|
|
|
|
result |= ADVERTISE_FIBER_1000FULL;
|
|
|
|
|
|
|
|
if ((ethadv & ADVERTISE_PAUSE_ASYM) && (ethadv & ADVERTISE_PAUSE_CAP))
|
|
|
|
result |= LPA_PAUSE_ASYM_FIBER;
|
|
|
|
else if (ethadv & ADVERTISE_PAUSE_CAP)
|
|
|
|
result |= (ADVERTISE_PAUSE_FIBER
|
|
|
|
& (~ADVERTISE_PAUSE_ASYM_FIBER));
|
|
|
|
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* marvell_config_aneg_fiber - restart auto-negotiation or write BMCR
|
|
|
|
* @phydev: target phy_device struct
|
|
|
|
*
|
|
|
|
* Description: If auto-negotiation is enabled, we configure the
|
|
|
|
* advertising, and then restart auto-negotiation. If it is not
|
|
|
|
* enabled, then we write the BMCR. Adapted for fiber link in
|
|
|
|
* some Marvell's devices.
|
|
|
|
*/
|
|
|
|
static int marvell_config_aneg_fiber(struct phy_device *phydev)
|
|
|
|
{
|
|
|
|
int changed = 0;
|
|
|
|
int err;
|
|
|
|
int adv, oldadv;
|
|
|
|
u32 advertise;
|
|
|
|
|
|
|
|
if (phydev->autoneg != AUTONEG_ENABLE)
|
|
|
|
return genphy_setup_forced(phydev);
|
|
|
|
|
|
|
|
/* Only allow advertising what this PHY supports */
|
|
|
|
phydev->advertising &= phydev->supported;
|
|
|
|
advertise = phydev->advertising;
|
|
|
|
|
|
|
|
/* Setup fiber advertisement */
|
|
|
|
adv = phy_read(phydev, MII_ADVERTISE);
|
|
|
|
if (adv < 0)
|
|
|
|
return adv;
|
|
|
|
|
|
|
|
oldadv = adv;
|
|
|
|
adv &= ~(ADVERTISE_FIBER_1000HALF | ADVERTISE_FIBER_1000FULL
|
|
|
|
| LPA_PAUSE_FIBER);
|
|
|
|
adv |= ethtool_adv_to_fiber_adv_t(advertise);
|
|
|
|
|
|
|
|
if (adv != oldadv) {
|
|
|
|
err = phy_write(phydev, MII_ADVERTISE, adv);
|
|
|
|
if (err < 0)
|
|
|
|
return err;
|
|
|
|
|
|
|
|
changed = 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (changed == 0) {
|
|
|
|
/* Advertisement hasn't changed, but maybe aneg was never on to
|
2017-07-31 03:41:44 +07:00
|
|
|
* begin with? Or maybe phy was isolated?
|
2016-07-19 16:13:12 +07:00
|
|
|
*/
|
|
|
|
int ctl = phy_read(phydev, MII_BMCR);
|
|
|
|
|
|
|
|
if (ctl < 0)
|
|
|
|
return ctl;
|
|
|
|
|
|
|
|
if (!(ctl & BMCR_ANENABLE) || (ctl & BMCR_ISOLATE))
|
|
|
|
changed = 1; /* do restart aneg */
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Only restart aneg if we are advertising something different
|
|
|
|
* than we were before.
|
|
|
|
*/
|
|
|
|
if (changed > 0)
|
|
|
|
changed = genphy_restart_aneg(phydev);
|
|
|
|
|
|
|
|
return changed;
|
|
|
|
}
|
|
|
|
|
2013-05-31 03:08:27 +07:00
|
|
|
static int m88e1510_config_aneg(struct phy_device *phydev)
|
|
|
|
{
|
|
|
|
int err;
|
|
|
|
|
2017-05-26 02:42:08 +07:00
|
|
|
err = marvell_set_page(phydev, MII_MARVELL_COPPER_PAGE);
|
2016-07-19 16:13:12 +07:00
|
|
|
if (err < 0)
|
|
|
|
goto error;
|
|
|
|
|
|
|
|
/* Configure the copper link first */
|
2013-05-31 03:08:27 +07:00
|
|
|
err = m88e1318_config_aneg(phydev);
|
|
|
|
if (err < 0)
|
2016-07-19 16:13:12 +07:00
|
|
|
goto error;
|
2013-05-31 03:08:27 +07:00
|
|
|
|
2017-12-13 16:22:03 +07:00
|
|
|
/* Do not touch the fiber page if we're in copper->sgmii mode */
|
|
|
|
if (phydev->interface == PHY_INTERFACE_MODE_SGMII)
|
|
|
|
return 0;
|
|
|
|
|
2016-07-19 16:13:12 +07:00
|
|
|
/* Then the fiber link */
|
2017-05-26 02:42:08 +07:00
|
|
|
err = marvell_set_page(phydev, MII_MARVELL_FIBER_PAGE);
|
2016-07-19 16:13:12 +07:00
|
|
|
if (err < 0)
|
|
|
|
goto error;
|
|
|
|
|
|
|
|
err = marvell_config_aneg_fiber(phydev);
|
|
|
|
if (err < 0)
|
|
|
|
goto error;
|
|
|
|
|
2017-05-26 02:42:08 +07:00
|
|
|
return marvell_set_page(phydev, MII_MARVELL_COPPER_PAGE);
|
2016-07-19 16:13:12 +07:00
|
|
|
|
|
|
|
error:
|
2017-05-26 02:42:08 +07:00
|
|
|
marvell_set_page(phydev, MII_MARVELL_COPPER_PAGE);
|
2016-07-19 16:13:12 +07:00
|
|
|
return err;
|
2016-02-16 05:46:45 +07:00
|
|
|
}
|
|
|
|
|
|
|
|
static int marvell_config_init(struct phy_device *phydev)
|
|
|
|
{
|
|
|
|
/* Set registers from marvell,reg-init DT property */
|
2013-05-31 03:08:27 +07:00
|
|
|
return marvell_of_reg_init(phydev);
|
|
|
|
}
|
|
|
|
|
2013-05-31 03:08:26 +07:00
|
|
|
static int m88e1116r_config_init(struct phy_device *phydev)
|
|
|
|
{
|
|
|
|
int err;
|
|
|
|
|
2017-07-31 03:41:45 +07:00
|
|
|
err = genphy_soft_reset(phydev);
|
2013-05-31 03:08:26 +07:00
|
|
|
if (err < 0)
|
|
|
|
return err;
|
|
|
|
|
|
|
|
mdelay(500);
|
|
|
|
|
2017-05-26 02:42:08 +07:00
|
|
|
err = marvell_set_page(phydev, MII_MARVELL_COPPER_PAGE);
|
2013-05-31 03:08:26 +07:00
|
|
|
if (err < 0)
|
|
|
|
return err;
|
|
|
|
|
2017-07-31 03:41:49 +07:00
|
|
|
err = marvell_set_polarity(phydev, phydev->mdix_ctrl);
|
|
|
|
if (err < 0)
|
|
|
|
return err;
|
|
|
|
|
2017-07-31 03:41:50 +07:00
|
|
|
err = marvell_set_downshift(phydev, true, 8);
|
2013-05-31 03:08:26 +07:00
|
|
|
if (err < 0)
|
|
|
|
return err;
|
|
|
|
|
2017-11-01 02:31:28 +07:00
|
|
|
if (phy_interface_is_rgmii(phydev)) {
|
|
|
|
err = m88e1121_config_aneg_rgmii_delays(phydev);
|
|
|
|
if (err < 0)
|
|
|
|
return err;
|
|
|
|
}
|
2013-05-31 03:08:26 +07:00
|
|
|
|
2017-07-31 03:41:45 +07:00
|
|
|
err = genphy_soft_reset(phydev);
|
2013-05-31 03:08:26 +07:00
|
|
|
if (err < 0)
|
|
|
|
return err;
|
|
|
|
|
2016-02-16 05:46:45 +07:00
|
|
|
return marvell_config_init(phydev);
|
2013-05-31 03:08:26 +07:00
|
|
|
}
|
|
|
|
|
2014-10-23 01:26:44 +07:00
|
|
|
static int m88e3016_config_init(struct phy_device *phydev)
|
|
|
|
{
|
2018-01-02 17:58:58 +07:00
|
|
|
int ret;
|
2014-10-23 01:26:44 +07:00
|
|
|
|
|
|
|
/* Enable Scrambler and Auto-Crossover */
|
2018-01-02 17:58:58 +07:00
|
|
|
ret = phy_modify(phydev, MII_88E3016_PHY_SPEC_CTRL,
|
2018-01-05 23:07:10 +07:00
|
|
|
MII_88E3016_DISABLE_SCRAMBLER,
|
2018-01-02 17:58:58 +07:00
|
|
|
MII_88E3016_AUTO_MDIX_CROSSOVER);
|
|
|
|
if (ret < 0)
|
|
|
|
return ret;
|
2014-10-23 01:26:44 +07:00
|
|
|
|
2016-02-16 05:46:45 +07:00
|
|
|
return marvell_config_init(phydev);
|
2014-10-23 01:26:44 +07:00
|
|
|
}
|
|
|
|
|
2017-07-31 03:41:47 +07:00
|
|
|
static int m88e1111_config_init_hwcfg_mode(struct phy_device *phydev,
|
|
|
|
u16 mode,
|
|
|
|
int fibre_copper_auto)
|
|
|
|
{
|
|
|
|
if (fibre_copper_auto)
|
2018-01-02 17:58:58 +07:00
|
|
|
mode |= MII_M1111_HWCFG_FIBER_COPPER_AUTO;
|
2017-07-31 03:41:47 +07:00
|
|
|
|
2018-01-02 17:58:58 +07:00
|
|
|
return phy_modify(phydev, MII_M1111_PHY_EXT_SR,
|
2018-01-05 23:07:10 +07:00
|
|
|
MII_M1111_HWCFG_MODE_MASK |
|
|
|
|
MII_M1111_HWCFG_FIBER_COPPER_AUTO |
|
|
|
|
MII_M1111_HWCFG_FIBER_COPPER_RES,
|
2018-01-02 17:58:58 +07:00
|
|
|
mode);
|
2017-07-31 03:41:47 +07:00
|
|
|
}
|
|
|
|
|
2017-07-31 03:41:46 +07:00
|
|
|
static int m88e1111_config_init_rgmii_delays(struct phy_device *phydev)
|
2007-06-05 17:46:47 +07:00
|
|
|
{
|
2018-01-02 17:58:58 +07:00
|
|
|
int delay;
|
2007-06-05 17:46:47 +07:00
|
|
|
|
2017-05-17 08:26:02 +07:00
|
|
|
if (phydev->interface == PHY_INTERFACE_MODE_RGMII_ID) {
|
2018-01-02 17:58:58 +07:00
|
|
|
delay = MII_M1111_RGMII_RX_DELAY | MII_M1111_RGMII_TX_DELAY;
|
2017-05-17 08:26:02 +07:00
|
|
|
} else if (phydev->interface == PHY_INTERFACE_MODE_RGMII_RXID) {
|
2018-01-02 17:58:58 +07:00
|
|
|
delay = MII_M1111_RGMII_RX_DELAY;
|
2017-05-17 08:26:02 +07:00
|
|
|
} else if (phydev->interface == PHY_INTERFACE_MODE_RGMII_TXID) {
|
2018-01-02 17:58:58 +07:00
|
|
|
delay = MII_M1111_RGMII_TX_DELAY;
|
|
|
|
} else {
|
|
|
|
delay = 0;
|
2017-05-17 08:26:02 +07:00
|
|
|
}
|
2007-06-05 17:46:47 +07:00
|
|
|
|
2018-01-02 17:58:58 +07:00
|
|
|
return phy_modify(phydev, MII_M1111_PHY_EXT_CR,
|
2018-01-05 23:07:10 +07:00
|
|
|
MII_M1111_RGMII_RX_DELAY | MII_M1111_RGMII_TX_DELAY,
|
2018-01-02 17:58:58 +07:00
|
|
|
delay);
|
2017-07-31 03:41:46 +07:00
|
|
|
}
|
|
|
|
|
|
|
|
static int m88e1111_config_init_rgmii(struct phy_device *phydev)
|
|
|
|
{
|
|
|
|
int temp;
|
|
|
|
int err;
|
|
|
|
|
|
|
|
err = m88e1111_config_init_rgmii_delays(phydev);
|
2017-05-17 08:26:02 +07:00
|
|
|
if (err < 0)
|
|
|
|
return err;
|
2007-11-27 05:17:52 +07:00
|
|
|
|
2017-05-17 08:26:02 +07:00
|
|
|
temp = phy_read(phydev, MII_M1111_PHY_EXT_SR);
|
|
|
|
if (temp < 0)
|
|
|
|
return temp;
|
2007-06-05 17:46:47 +07:00
|
|
|
|
2017-05-17 08:26:02 +07:00
|
|
|
temp &= ~(MII_M1111_HWCFG_MODE_MASK);
|
2008-03-19 04:37:24 +07:00
|
|
|
|
2017-05-17 08:26:02 +07:00
|
|
|
if (temp & MII_M1111_HWCFG_FIBER_COPPER_RES)
|
|
|
|
temp |= MII_M1111_HWCFG_MODE_FIBER_RGMII;
|
|
|
|
else
|
|
|
|
temp |= MII_M1111_HWCFG_MODE_COPPER_RGMII;
|
2007-06-05 17:46:47 +07:00
|
|
|
|
2017-05-17 08:26:02 +07:00
|
|
|
return phy_write(phydev, MII_M1111_PHY_EXT_SR, temp);
|
|
|
|
}
|
2007-06-05 17:46:47 +07:00
|
|
|
|
2017-05-17 08:26:02 +07:00
|
|
|
static int m88e1111_config_init_sgmii(struct phy_device *phydev)
|
|
|
|
{
|
|
|
|
int err;
|
2007-05-12 06:25:18 +07:00
|
|
|
|
2017-07-31 03:41:47 +07:00
|
|
|
err = m88e1111_config_init_hwcfg_mode(
|
|
|
|
phydev,
|
|
|
|
MII_M1111_HWCFG_MODE_SGMII_NO_CLK,
|
|
|
|
MII_M1111_HWCFG_FIBER_COPPER_AUTO);
|
2017-05-17 08:26:02 +07:00
|
|
|
if (err < 0)
|
|
|
|
return err;
|
2015-08-07 16:07:50 +07:00
|
|
|
|
2017-05-17 08:26:02 +07:00
|
|
|
/* make sure copper is selected */
|
2017-05-26 02:42:08 +07:00
|
|
|
return marvell_set_page(phydev, MII_MARVELL_COPPER_PAGE);
|
2017-05-17 08:26:02 +07:00
|
|
|
}
|
2010-01-14 05:13:19 +07:00
|
|
|
|
2017-05-17 08:26:02 +07:00
|
|
|
static int m88e1111_config_init_rtbi(struct phy_device *phydev)
|
|
|
|
{
|
2017-07-31 03:41:46 +07:00
|
|
|
int err;
|
2017-05-17 08:26:02 +07:00
|
|
|
|
2017-07-31 03:41:46 +07:00
|
|
|
err = m88e1111_config_init_rgmii_delays(phydev);
|
2018-01-02 17:58:58 +07:00
|
|
|
if (err < 0)
|
2017-05-17 08:26:02 +07:00
|
|
|
return err;
|
|
|
|
|
2017-07-31 03:41:47 +07:00
|
|
|
err = m88e1111_config_init_hwcfg_mode(
|
|
|
|
phydev,
|
|
|
|
MII_M1111_HWCFG_MODE_RTBI,
|
|
|
|
MII_M1111_HWCFG_FIBER_COPPER_AUTO);
|
2017-05-17 08:26:02 +07:00
|
|
|
if (err < 0)
|
|
|
|
return err;
|
|
|
|
|
|
|
|
/* soft reset */
|
2017-07-31 03:41:45 +07:00
|
|
|
err = genphy_soft_reset(phydev);
|
2017-05-17 08:26:02 +07:00
|
|
|
if (err < 0)
|
|
|
|
return err;
|
|
|
|
|
2017-07-31 03:41:47 +07:00
|
|
|
return m88e1111_config_init_hwcfg_mode(
|
|
|
|
phydev,
|
|
|
|
MII_M1111_HWCFG_MODE_RTBI,
|
|
|
|
MII_M1111_HWCFG_FIBER_COPPER_AUTO);
|
2017-05-17 08:26:02 +07:00
|
|
|
}
|
|
|
|
|
|
|
|
static int m88e1111_config_init(struct phy_device *phydev)
|
|
|
|
{
|
|
|
|
int err;
|
|
|
|
|
|
|
|
if (phy_interface_is_rgmii(phydev)) {
|
|
|
|
err = m88e1111_config_init_rgmii(phydev);
|
2018-01-02 17:58:58 +07:00
|
|
|
if (err < 0)
|
2010-01-14 05:13:19 +07:00
|
|
|
return err;
|
2017-05-17 08:26:02 +07:00
|
|
|
}
|
2010-01-14 05:13:19 +07:00
|
|
|
|
2017-05-17 08:26:02 +07:00
|
|
|
if (phydev->interface == PHY_INTERFACE_MODE_SGMII) {
|
|
|
|
err = m88e1111_config_init_sgmii(phydev);
|
2010-01-14 05:13:19 +07:00
|
|
|
if (err < 0)
|
|
|
|
return err;
|
2017-05-17 08:26:02 +07:00
|
|
|
}
|
2010-01-14 05:13:19 +07:00
|
|
|
|
2017-05-17 08:26:02 +07:00
|
|
|
if (phydev->interface == PHY_INTERFACE_MODE_RTBI) {
|
|
|
|
err = m88e1111_config_init_rtbi(phydev);
|
2010-01-14 05:13:19 +07:00
|
|
|
if (err < 0)
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
of/phylib: Use device tree properties to initialize Marvell PHYs.
Some aspects of PHY initialization are board dependent, things like
indicator LED connections and some clocking modes cannot be determined
by probing. The dev_flags element of struct phy_device can be used to
control these things if an appropriate value can be passed from the
Ethernet driver. We run into problems however if the PHY connections
are specified by the device tree. There is no way for the Ethernet
driver to know what flags it should pass.
If we are using the device tree, the struct phy_device will be
populated with the device tree node corresponding to the PHY, and we
can extract extra configuration information from there.
The next question is what should the format of that information be?
It is highly device specific, and the device tree representation
should not be tied to any arbitrary kernel defined constants. A
straight forward representation is just to specify the exact bits that
should be set using the "marvell,reg-init" property:
phy5: ethernet-phy@5 {
reg = <5>;
compatible = "marvell,88e1149r";
marvell,reg-init =
/* led[0]:1000, led[1]:100, led[2]:10, led[3]:tx */
<3 0x10 0 0x5777>, /* Reg 3,16 <- 0x5777 */
/* mix %:0, led[0123]:drive low off hiZ */
<3 0x11 0 0x00aa>, /* Reg 3,17 <- 0x00aa */
/* default blink periods. */
<3 0x12 0 0x4105>, /* Reg 3,18 <- 0x4105 */
/* led[4]:rx, led[5]:dplx, led[45]:drive low off hiZ */
<3 0x13 0 0x0a60>; /* Reg 3,19 <- 0x0a60 */
};
phy6: ethernet-phy@6 {
reg = <6>;
compatible = "marvell,88e1118";
marvell,reg-init =
/* Fix rx and tx clock transition timing */
<2 0x15 0xffcf 0>, /* Reg 2,21 Clear bits 4, 5 */
/* Adjust LED drive. */
<3 0x11 0 0x442a>, /* Reg 3,17 <- 0442a */
/* irq, blink-activity, blink-link */
<3 0x10 0 0x0242>; /* Reg 3,16 <- 0x0242 */
};
The Marvell PHYs have a page select register at register 22 (0x16), we
can specify any register by its page and register number. These are
the first and second word. The third word contains a mask to be ANDed
with the existing register value, and the fourth word is ORed with the
result to yield the new register value. The new marvell_of_reg_init
function leaves the page select register unchanged, so a call to it
can be dropped into the .config_init functions without unduly
affecting the state of the PHY.
If CONFIG_OF_MDIO is not set, there is no of_node, or no
"marvell,reg-init" property, the PHY initialization is unchanged.
Signed-off-by: David Daney <ddaney@caviumnetworks.com>
Cc: Grant Likely <grant.likely@secretlab.ca>
Cc: Cyril Chemparathy <cyril@ti.com>
Cc: David Daney <ddaney@caviumnetworks.com>
Cc: Arnaud Patard <arnaud.patard@rtp-net.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Reviewed-by: Grant Likely <grant.likely@secretlab.ca>
Signed-off-by: David S. Miller <davem@davemloft.net>
2010-11-19 19:13:18 +07:00
|
|
|
err = marvell_of_reg_init(phydev);
|
|
|
|
if (err < 0)
|
|
|
|
return err;
|
2010-01-14 05:13:19 +07:00
|
|
|
|
2017-07-31 03:41:45 +07:00
|
|
|
return genphy_soft_reset(phydev);
|
2007-06-05 17:46:47 +07:00
|
|
|
}
|
|
|
|
|
2016-06-11 22:21:26 +07:00
|
|
|
static int m88e1121_config_init(struct phy_device *phydev)
|
|
|
|
{
|
net: phy: marvell: fix paged access races
For paged accesses to be truely safe, we need to hold the bus lock to
prevent anyone else gaining access to the registers while we modify
them.
The phydev->lock mutex does not do this: userspace via the MII ioctl
can still sneak in and read or write any register while we are on a
different page, and the suspend/resume methods can be called by a
thread different to the thread polling the phy status.
Races have been observed with mvneta on SolidRun Clearfog with phylink,
particularly between the phylib worker reading the PHYs status, and
the thread resuming mvneta, calling phy_start() which then calls
through to m88e1121_config_aneg_rgmii_delays(), which tries to
read-modify-write the MSCR register:
CPU0 CPU1
marvell_read_status_page()
marvell_set_page(phydev, MII_MARVELL_FIBER_PAGE)
...
m88e1121_config_aneg_rgmii_delays()
set_page(MII_MARVELL_MSCR_PAGE)
phy_read(phydev, MII_88E1121_PHY_MSCR_REG)
marvell_set_page(phydev, MII_MARVELL_COPPER_PAGE);
...
phy_write(phydev, MII_88E1121_PHY_MSCR_REG)
The result of this is we end up writing the copper page register 21,
which causes the copper PHY to be disabled, and the link partner sees
the link immediately go down.
Solve this by taking the bus lock instead of the PHY lock, thereby
preventing other accesses to the PHY while we are accessing other PHY
pages.
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
2018-01-02 17:58:48 +07:00
|
|
|
int err;
|
2016-06-11 22:21:26 +07:00
|
|
|
|
|
|
|
/* Default PHY LED config: LED[0] .. Link, LED[1] .. Activity */
|
net: phy: marvell: fix paged access races
For paged accesses to be truely safe, we need to hold the bus lock to
prevent anyone else gaining access to the registers while we modify
them.
The phydev->lock mutex does not do this: userspace via the MII ioctl
can still sneak in and read or write any register while we are on a
different page, and the suspend/resume methods can be called by a
thread different to the thread polling the phy status.
Races have been observed with mvneta on SolidRun Clearfog with phylink,
particularly between the phylib worker reading the PHYs status, and
the thread resuming mvneta, calling phy_start() which then calls
through to m88e1121_config_aneg_rgmii_delays(), which tries to
read-modify-write the MSCR register:
CPU0 CPU1
marvell_read_status_page()
marvell_set_page(phydev, MII_MARVELL_FIBER_PAGE)
...
m88e1121_config_aneg_rgmii_delays()
set_page(MII_MARVELL_MSCR_PAGE)
phy_read(phydev, MII_88E1121_PHY_MSCR_REG)
marvell_set_page(phydev, MII_MARVELL_COPPER_PAGE);
...
phy_write(phydev, MII_88E1121_PHY_MSCR_REG)
The result of this is we end up writing the copper page register 21,
which causes the copper PHY to be disabled, and the link partner sees
the link immediately go down.
Solve this by taking the bus lock instead of the PHY lock, thereby
preventing other accesses to the PHY while we are accessing other PHY
pages.
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
2018-01-02 17:58:48 +07:00
|
|
|
err = phy_write_paged(phydev, MII_MARVELL_LED_PAGE,
|
|
|
|
MII_88E1121_PHY_LED_CTRL,
|
|
|
|
MII_88E1121_PHY_LED_DEF);
|
2016-06-11 22:21:26 +07:00
|
|
|
if (err < 0)
|
|
|
|
return err;
|
|
|
|
|
|
|
|
/* Set marvell,reg-init configuration from device tree */
|
|
|
|
return marvell_config_init(phydev);
|
|
|
|
}
|
|
|
|
|
2018-04-06 03:40:29 +07:00
|
|
|
static int m88e1318_config_init(struct phy_device *phydev)
|
|
|
|
{
|
|
|
|
if (phy_interrupt_is_valid(phydev)) {
|
|
|
|
int err = phy_modify_paged(
|
|
|
|
phydev, MII_MARVELL_LED_PAGE,
|
|
|
|
MII_88E1318S_PHY_LED_TCR,
|
|
|
|
MII_88E1318S_PHY_LED_TCR_FORCE_INT,
|
|
|
|
MII_88E1318S_PHY_LED_TCR_INTn_ENABLE |
|
|
|
|
MII_88E1318S_PHY_LED_TCR_INT_ACTIVE_LOW);
|
|
|
|
if (err < 0)
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
|
|
|
return m88e1121_config_init(phydev);
|
|
|
|
}
|
|
|
|
|
2016-02-24 02:16:58 +07:00
|
|
|
static int m88e1510_config_init(struct phy_device *phydev)
|
|
|
|
{
|
|
|
|
int err;
|
|
|
|
|
|
|
|
/* SGMII-to-Copper mode initialization */
|
|
|
|
if (phydev->interface == PHY_INTERFACE_MODE_SGMII) {
|
2017-12-15 23:10:20 +07:00
|
|
|
u32 pause;
|
|
|
|
|
2016-02-24 02:16:58 +07:00
|
|
|
/* Select page 18 */
|
2017-05-17 08:26:03 +07:00
|
|
|
err = marvell_set_page(phydev, 18);
|
2016-02-24 02:16:58 +07:00
|
|
|
if (err < 0)
|
|
|
|
return err;
|
|
|
|
|
|
|
|
/* In reg 20, write MODE[2:0] = 0x1 (SGMII to Copper) */
|
2018-01-02 17:58:58 +07:00
|
|
|
err = phy_modify(phydev, MII_88E1510_GEN_CTRL_REG_1,
|
2018-01-05 23:07:10 +07:00
|
|
|
MII_88E1510_GEN_CTRL_REG_1_MODE_MASK,
|
2018-01-02 17:58:58 +07:00
|
|
|
MII_88E1510_GEN_CTRL_REG_1_MODE_SGMII);
|
2016-02-24 02:16:58 +07:00
|
|
|
if (err < 0)
|
|
|
|
return err;
|
|
|
|
|
|
|
|
/* PHY reset is necessary after changing MODE[2:0] */
|
2018-01-02 17:58:58 +07:00
|
|
|
err = phy_modify(phydev, MII_88E1510_GEN_CTRL_REG_1, 0,
|
|
|
|
MII_88E1510_GEN_CTRL_REG_1_RESET);
|
2016-02-24 02:16:58 +07:00
|
|
|
if (err < 0)
|
|
|
|
return err;
|
|
|
|
|
|
|
|
/* Reset page selection */
|
2017-05-26 02:42:08 +07:00
|
|
|
err = marvell_set_page(phydev, MII_MARVELL_COPPER_PAGE);
|
2016-02-24 02:16:58 +07:00
|
|
|
if (err < 0)
|
|
|
|
return err;
|
2017-12-15 23:10:20 +07:00
|
|
|
|
|
|
|
/* There appears to be a bug in the 88e1512 when used in
|
2018-03-01 17:23:03 +07:00
|
|
|
* SGMII to copper mode, where the AN advertisement register
|
2017-12-15 23:10:20 +07:00
|
|
|
* clears the pause bits each time a negotiation occurs.
|
|
|
|
* This means we can never be truely sure what was advertised,
|
|
|
|
* so disable Pause support.
|
|
|
|
*/
|
|
|
|
pause = SUPPORTED_Pause | SUPPORTED_Asym_Pause;
|
|
|
|
phydev->supported &= ~pause;
|
|
|
|
phydev->advertising &= ~pause;
|
2016-02-24 02:16:58 +07:00
|
|
|
}
|
|
|
|
|
2018-04-06 03:40:29 +07:00
|
|
|
return m88e1318_config_init(phydev);
|
2016-02-24 02:16:58 +07:00
|
|
|
}
|
|
|
|
|
2008-11-06 16:05:26 +07:00
|
|
|
static int m88e1118_config_aneg(struct phy_device *phydev)
|
|
|
|
{
|
|
|
|
int err;
|
|
|
|
|
2017-07-31 03:41:45 +07:00
|
|
|
err = genphy_soft_reset(phydev);
|
2008-11-06 16:05:26 +07:00
|
|
|
if (err < 0)
|
|
|
|
return err;
|
|
|
|
|
2017-07-31 03:41:49 +07:00
|
|
|
err = marvell_set_polarity(phydev, phydev->mdix_ctrl);
|
2008-11-06 16:05:26 +07:00
|
|
|
if (err < 0)
|
|
|
|
return err;
|
|
|
|
|
|
|
|
err = genphy_config_aneg(phydev);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int m88e1118_config_init(struct phy_device *phydev)
|
|
|
|
{
|
|
|
|
int err;
|
|
|
|
|
|
|
|
/* Change address */
|
2017-05-26 02:42:08 +07:00
|
|
|
err = marvell_set_page(phydev, MII_MARVELL_MSCR_PAGE);
|
2008-11-06 16:05:26 +07:00
|
|
|
if (err < 0)
|
|
|
|
return err;
|
|
|
|
|
|
|
|
/* Enable 1000 Mbit */
|
|
|
|
err = phy_write(phydev, 0x15, 0x1070);
|
|
|
|
if (err < 0)
|
|
|
|
return err;
|
|
|
|
|
|
|
|
/* Change address */
|
2017-05-26 02:42:08 +07:00
|
|
|
err = marvell_set_page(phydev, MII_MARVELL_LED_PAGE);
|
2008-11-06 16:05:26 +07:00
|
|
|
if (err < 0)
|
|
|
|
return err;
|
|
|
|
|
|
|
|
/* Adjust LED Control */
|
2010-06-21 10:20:46 +07:00
|
|
|
if (phydev->dev_flags & MARVELL_PHY_M1118_DNS323_LEDS)
|
|
|
|
err = phy_write(phydev, 0x10, 0x1100);
|
|
|
|
else
|
|
|
|
err = phy_write(phydev, 0x10, 0x021e);
|
2008-11-06 16:05:26 +07:00
|
|
|
if (err < 0)
|
|
|
|
return err;
|
|
|
|
|
of/phylib: Use device tree properties to initialize Marvell PHYs.
Some aspects of PHY initialization are board dependent, things like
indicator LED connections and some clocking modes cannot be determined
by probing. The dev_flags element of struct phy_device can be used to
control these things if an appropriate value can be passed from the
Ethernet driver. We run into problems however if the PHY connections
are specified by the device tree. There is no way for the Ethernet
driver to know what flags it should pass.
If we are using the device tree, the struct phy_device will be
populated with the device tree node corresponding to the PHY, and we
can extract extra configuration information from there.
The next question is what should the format of that information be?
It is highly device specific, and the device tree representation
should not be tied to any arbitrary kernel defined constants. A
straight forward representation is just to specify the exact bits that
should be set using the "marvell,reg-init" property:
phy5: ethernet-phy@5 {
reg = <5>;
compatible = "marvell,88e1149r";
marvell,reg-init =
/* led[0]:1000, led[1]:100, led[2]:10, led[3]:tx */
<3 0x10 0 0x5777>, /* Reg 3,16 <- 0x5777 */
/* mix %:0, led[0123]:drive low off hiZ */
<3 0x11 0 0x00aa>, /* Reg 3,17 <- 0x00aa */
/* default blink periods. */
<3 0x12 0 0x4105>, /* Reg 3,18 <- 0x4105 */
/* led[4]:rx, led[5]:dplx, led[45]:drive low off hiZ */
<3 0x13 0 0x0a60>; /* Reg 3,19 <- 0x0a60 */
};
phy6: ethernet-phy@6 {
reg = <6>;
compatible = "marvell,88e1118";
marvell,reg-init =
/* Fix rx and tx clock transition timing */
<2 0x15 0xffcf 0>, /* Reg 2,21 Clear bits 4, 5 */
/* Adjust LED drive. */
<3 0x11 0 0x442a>, /* Reg 3,17 <- 0442a */
/* irq, blink-activity, blink-link */
<3 0x10 0 0x0242>; /* Reg 3,16 <- 0x0242 */
};
The Marvell PHYs have a page select register at register 22 (0x16), we
can specify any register by its page and register number. These are
the first and second word. The third word contains a mask to be ANDed
with the existing register value, and the fourth word is ORed with the
result to yield the new register value. The new marvell_of_reg_init
function leaves the page select register unchanged, so a call to it
can be dropped into the .config_init functions without unduly
affecting the state of the PHY.
If CONFIG_OF_MDIO is not set, there is no of_node, or no
"marvell,reg-init" property, the PHY initialization is unchanged.
Signed-off-by: David Daney <ddaney@caviumnetworks.com>
Cc: Grant Likely <grant.likely@secretlab.ca>
Cc: Cyril Chemparathy <cyril@ti.com>
Cc: David Daney <ddaney@caviumnetworks.com>
Cc: Arnaud Patard <arnaud.patard@rtp-net.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Reviewed-by: Grant Likely <grant.likely@secretlab.ca>
Signed-off-by: David S. Miller <davem@davemloft.net>
2010-11-19 19:13:18 +07:00
|
|
|
err = marvell_of_reg_init(phydev);
|
|
|
|
if (err < 0)
|
|
|
|
return err;
|
|
|
|
|
2008-11-06 16:05:26 +07:00
|
|
|
/* Reset address */
|
2017-05-26 02:42:08 +07:00
|
|
|
err = marvell_set_page(phydev, MII_MARVELL_COPPER_PAGE);
|
2008-11-06 16:05:26 +07:00
|
|
|
if (err < 0)
|
|
|
|
return err;
|
|
|
|
|
2017-07-31 03:41:45 +07:00
|
|
|
return genphy_soft_reset(phydev);
|
2008-11-06 16:05:26 +07:00
|
|
|
}
|
|
|
|
|
2010-11-19 18:58:53 +07:00
|
|
|
static int m88e1149_config_init(struct phy_device *phydev)
|
|
|
|
{
|
|
|
|
int err;
|
|
|
|
|
|
|
|
/* Change address */
|
2017-05-26 02:42:08 +07:00
|
|
|
err = marvell_set_page(phydev, MII_MARVELL_MSCR_PAGE);
|
2010-11-19 18:58:53 +07:00
|
|
|
if (err < 0)
|
|
|
|
return err;
|
|
|
|
|
|
|
|
/* Enable 1000 Mbit */
|
|
|
|
err = phy_write(phydev, 0x15, 0x1048);
|
|
|
|
if (err < 0)
|
|
|
|
return err;
|
|
|
|
|
of/phylib: Use device tree properties to initialize Marvell PHYs.
Some aspects of PHY initialization are board dependent, things like
indicator LED connections and some clocking modes cannot be determined
by probing. The dev_flags element of struct phy_device can be used to
control these things if an appropriate value can be passed from the
Ethernet driver. We run into problems however if the PHY connections
are specified by the device tree. There is no way for the Ethernet
driver to know what flags it should pass.
If we are using the device tree, the struct phy_device will be
populated with the device tree node corresponding to the PHY, and we
can extract extra configuration information from there.
The next question is what should the format of that information be?
It is highly device specific, and the device tree representation
should not be tied to any arbitrary kernel defined constants. A
straight forward representation is just to specify the exact bits that
should be set using the "marvell,reg-init" property:
phy5: ethernet-phy@5 {
reg = <5>;
compatible = "marvell,88e1149r";
marvell,reg-init =
/* led[0]:1000, led[1]:100, led[2]:10, led[3]:tx */
<3 0x10 0 0x5777>, /* Reg 3,16 <- 0x5777 */
/* mix %:0, led[0123]:drive low off hiZ */
<3 0x11 0 0x00aa>, /* Reg 3,17 <- 0x00aa */
/* default blink periods. */
<3 0x12 0 0x4105>, /* Reg 3,18 <- 0x4105 */
/* led[4]:rx, led[5]:dplx, led[45]:drive low off hiZ */
<3 0x13 0 0x0a60>; /* Reg 3,19 <- 0x0a60 */
};
phy6: ethernet-phy@6 {
reg = <6>;
compatible = "marvell,88e1118";
marvell,reg-init =
/* Fix rx and tx clock transition timing */
<2 0x15 0xffcf 0>, /* Reg 2,21 Clear bits 4, 5 */
/* Adjust LED drive. */
<3 0x11 0 0x442a>, /* Reg 3,17 <- 0442a */
/* irq, blink-activity, blink-link */
<3 0x10 0 0x0242>; /* Reg 3,16 <- 0x0242 */
};
The Marvell PHYs have a page select register at register 22 (0x16), we
can specify any register by its page and register number. These are
the first and second word. The third word contains a mask to be ANDed
with the existing register value, and the fourth word is ORed with the
result to yield the new register value. The new marvell_of_reg_init
function leaves the page select register unchanged, so a call to it
can be dropped into the .config_init functions without unduly
affecting the state of the PHY.
If CONFIG_OF_MDIO is not set, there is no of_node, or no
"marvell,reg-init" property, the PHY initialization is unchanged.
Signed-off-by: David Daney <ddaney@caviumnetworks.com>
Cc: Grant Likely <grant.likely@secretlab.ca>
Cc: Cyril Chemparathy <cyril@ti.com>
Cc: David Daney <ddaney@caviumnetworks.com>
Cc: Arnaud Patard <arnaud.patard@rtp-net.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Reviewed-by: Grant Likely <grant.likely@secretlab.ca>
Signed-off-by: David S. Miller <davem@davemloft.net>
2010-11-19 19:13:18 +07:00
|
|
|
err = marvell_of_reg_init(phydev);
|
|
|
|
if (err < 0)
|
|
|
|
return err;
|
|
|
|
|
2010-11-19 18:58:53 +07:00
|
|
|
/* Reset address */
|
2017-05-26 02:42:08 +07:00
|
|
|
err = marvell_set_page(phydev, MII_MARVELL_COPPER_PAGE);
|
2010-11-19 18:58:53 +07:00
|
|
|
if (err < 0)
|
|
|
|
return err;
|
|
|
|
|
2017-07-31 03:41:45 +07:00
|
|
|
return genphy_soft_reset(phydev);
|
2010-11-19 18:58:53 +07:00
|
|
|
}
|
|
|
|
|
2017-05-17 08:26:02 +07:00
|
|
|
static int m88e1145_config_init_rgmii(struct phy_device *phydev)
|
|
|
|
{
|
|
|
|
int err;
|
|
|
|
|
2017-07-31 03:41:46 +07:00
|
|
|
err = m88e1111_config_init_rgmii_delays(phydev);
|
2017-05-17 08:26:02 +07:00
|
|
|
if (err < 0)
|
|
|
|
return err;
|
|
|
|
|
|
|
|
if (phydev->dev_flags & MARVELL_PHY_M1145_FLAGS_RESISTANCE) {
|
|
|
|
err = phy_write(phydev, 0x1d, 0x0012);
|
|
|
|
if (err < 0)
|
|
|
|
return err;
|
|
|
|
|
2018-01-05 23:07:10 +07:00
|
|
|
err = phy_modify(phydev, 0x1e, 0x0fc0,
|
2018-01-02 17:58:58 +07:00
|
|
|
2 << 9 | /* 36 ohm */
|
|
|
|
2 << 6); /* 39 ohm */
|
2017-05-17 08:26:02 +07:00
|
|
|
if (err < 0)
|
|
|
|
return err;
|
|
|
|
|
|
|
|
err = phy_write(phydev, 0x1d, 0x3);
|
|
|
|
if (err < 0)
|
|
|
|
return err;
|
|
|
|
|
|
|
|
err = phy_write(phydev, 0x1e, 0x8000);
|
|
|
|
}
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int m88e1145_config_init_sgmii(struct phy_device *phydev)
|
|
|
|
{
|
2017-07-31 03:41:47 +07:00
|
|
|
return m88e1111_config_init_hwcfg_mode(
|
|
|
|
phydev, MII_M1111_HWCFG_MODE_SGMII_NO_CLK,
|
|
|
|
MII_M1111_HWCFG_FIBER_COPPER_AUTO);
|
2017-05-17 08:26:02 +07:00
|
|
|
}
|
|
|
|
|
2007-02-10 07:13:58 +07:00
|
|
|
static int m88e1145_config_init(struct phy_device *phydev)
|
|
|
|
{
|
|
|
|
int err;
|
|
|
|
|
|
|
|
/* Take care of errata E0 & E1 */
|
|
|
|
err = phy_write(phydev, 0x1d, 0x001b);
|
|
|
|
if (err < 0)
|
|
|
|
return err;
|
|
|
|
|
|
|
|
err = phy_write(phydev, 0x1e, 0x418f);
|
|
|
|
if (err < 0)
|
|
|
|
return err;
|
|
|
|
|
|
|
|
err = phy_write(phydev, 0x1d, 0x0016);
|
|
|
|
if (err < 0)
|
|
|
|
return err;
|
|
|
|
|
|
|
|
err = phy_write(phydev, 0x1e, 0xa2da);
|
|
|
|
if (err < 0)
|
|
|
|
return err;
|
|
|
|
|
2007-06-05 17:46:47 +07:00
|
|
|
if (phydev->interface == PHY_INTERFACE_MODE_RGMII_ID) {
|
2017-05-17 08:26:02 +07:00
|
|
|
err = m88e1145_config_init_rgmii(phydev);
|
2007-02-10 07:13:58 +07:00
|
|
|
if (err < 0)
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
2014-10-24 09:41:53 +07:00
|
|
|
if (phydev->interface == PHY_INTERFACE_MODE_SGMII) {
|
2017-05-17 08:26:02 +07:00
|
|
|
err = m88e1145_config_init_sgmii(phydev);
|
2014-10-24 09:41:53 +07:00
|
|
|
if (err < 0)
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
of/phylib: Use device tree properties to initialize Marvell PHYs.
Some aspects of PHY initialization are board dependent, things like
indicator LED connections and some clocking modes cannot be determined
by probing. The dev_flags element of struct phy_device can be used to
control these things if an appropriate value can be passed from the
Ethernet driver. We run into problems however if the PHY connections
are specified by the device tree. There is no way for the Ethernet
driver to know what flags it should pass.
If we are using the device tree, the struct phy_device will be
populated with the device tree node corresponding to the PHY, and we
can extract extra configuration information from there.
The next question is what should the format of that information be?
It is highly device specific, and the device tree representation
should not be tied to any arbitrary kernel defined constants. A
straight forward representation is just to specify the exact bits that
should be set using the "marvell,reg-init" property:
phy5: ethernet-phy@5 {
reg = <5>;
compatible = "marvell,88e1149r";
marvell,reg-init =
/* led[0]:1000, led[1]:100, led[2]:10, led[3]:tx */
<3 0x10 0 0x5777>, /* Reg 3,16 <- 0x5777 */
/* mix %:0, led[0123]:drive low off hiZ */
<3 0x11 0 0x00aa>, /* Reg 3,17 <- 0x00aa */
/* default blink periods. */
<3 0x12 0 0x4105>, /* Reg 3,18 <- 0x4105 */
/* led[4]:rx, led[5]:dplx, led[45]:drive low off hiZ */
<3 0x13 0 0x0a60>; /* Reg 3,19 <- 0x0a60 */
};
phy6: ethernet-phy@6 {
reg = <6>;
compatible = "marvell,88e1118";
marvell,reg-init =
/* Fix rx and tx clock transition timing */
<2 0x15 0xffcf 0>, /* Reg 2,21 Clear bits 4, 5 */
/* Adjust LED drive. */
<3 0x11 0 0x442a>, /* Reg 3,17 <- 0442a */
/* irq, blink-activity, blink-link */
<3 0x10 0 0x0242>; /* Reg 3,16 <- 0x0242 */
};
The Marvell PHYs have a page select register at register 22 (0x16), we
can specify any register by its page and register number. These are
the first and second word. The third word contains a mask to be ANDed
with the existing register value, and the fourth word is ORed with the
result to yield the new register value. The new marvell_of_reg_init
function leaves the page select register unchanged, so a call to it
can be dropped into the .config_init functions without unduly
affecting the state of the PHY.
If CONFIG_OF_MDIO is not set, there is no of_node, or no
"marvell,reg-init" property, the PHY initialization is unchanged.
Signed-off-by: David Daney <ddaney@caviumnetworks.com>
Cc: Grant Likely <grant.likely@secretlab.ca>
Cc: Cyril Chemparathy <cyril@ti.com>
Cc: David Daney <ddaney@caviumnetworks.com>
Cc: Arnaud Patard <arnaud.patard@rtp-net.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Reviewed-by: Grant Likely <grant.likely@secretlab.ca>
Signed-off-by: David S. Miller <davem@davemloft.net>
2010-11-19 19:13:18 +07:00
|
|
|
err = marvell_of_reg_init(phydev);
|
|
|
|
if (err < 0)
|
|
|
|
return err;
|
|
|
|
|
2007-02-10 07:13:58 +07:00
|
|
|
return 0;
|
|
|
|
}
|
2005-07-31 06:31:23 +07:00
|
|
|
|
2016-07-19 16:13:10 +07:00
|
|
|
/**
|
|
|
|
* fiber_lpa_to_ethtool_lpa_t
|
|
|
|
* @lpa: value of the MII_LPA register for fiber link
|
|
|
|
*
|
|
|
|
* A small helper function that translates MII_LPA
|
|
|
|
* bits to ethtool LP advertisement settings.
|
|
|
|
*/
|
|
|
|
static u32 fiber_lpa_to_ethtool_lpa_t(u32 lpa)
|
|
|
|
{
|
|
|
|
u32 result = 0;
|
|
|
|
|
|
|
|
if (lpa & LPA_FIBER_1000HALF)
|
|
|
|
result |= ADVERTISED_1000baseT_Half;
|
|
|
|
if (lpa & LPA_FIBER_1000FULL)
|
|
|
|
result |= ADVERTISED_1000baseT_Full;
|
|
|
|
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* marvell_update_link - update link status in real time in @phydev
|
|
|
|
* @phydev: target phy_device struct
|
|
|
|
*
|
|
|
|
* Description: Update the value in phydev->link to reflect the
|
|
|
|
* current link value.
|
|
|
|
*/
|
|
|
|
static int marvell_update_link(struct phy_device *phydev, int fiber)
|
|
|
|
{
|
|
|
|
int status;
|
|
|
|
|
|
|
|
/* Use the generic register for copper link, or specific
|
2017-05-17 08:25:59 +07:00
|
|
|
* register for fiber case
|
|
|
|
*/
|
2016-07-19 16:13:10 +07:00
|
|
|
if (fiber) {
|
|
|
|
status = phy_read(phydev, MII_M1011_PHY_STATUS);
|
|
|
|
if (status < 0)
|
|
|
|
return status;
|
|
|
|
|
|
|
|
if ((status & REGISTER_LINK_STATUS) == 0)
|
|
|
|
phydev->link = 0;
|
|
|
|
else
|
|
|
|
phydev->link = 1;
|
|
|
|
} else {
|
|
|
|
return genphy_update_link(phydev);
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2017-05-17 08:26:02 +07:00
|
|
|
static int marvell_read_status_page_an(struct phy_device *phydev,
|
|
|
|
int fiber)
|
|
|
|
{
|
|
|
|
int status;
|
|
|
|
int lpa;
|
|
|
|
int lpagb;
|
|
|
|
|
|
|
|
status = phy_read(phydev, MII_M1011_PHY_STATUS);
|
|
|
|
if (status < 0)
|
|
|
|
return status;
|
|
|
|
|
|
|
|
lpa = phy_read(phydev, MII_LPA);
|
|
|
|
if (lpa < 0)
|
|
|
|
return lpa;
|
|
|
|
|
|
|
|
lpagb = phy_read(phydev, MII_STAT1000);
|
|
|
|
if (lpagb < 0)
|
|
|
|
return lpagb;
|
|
|
|
|
|
|
|
if (status & MII_M1011_PHY_STATUS_FULLDUPLEX)
|
|
|
|
phydev->duplex = DUPLEX_FULL;
|
|
|
|
else
|
|
|
|
phydev->duplex = DUPLEX_HALF;
|
|
|
|
|
|
|
|
status = status & MII_M1011_PHY_STATUS_SPD_MASK;
|
|
|
|
phydev->pause = 0;
|
|
|
|
phydev->asym_pause = 0;
|
|
|
|
|
|
|
|
switch (status) {
|
|
|
|
case MII_M1011_PHY_STATUS_1000:
|
|
|
|
phydev->speed = SPEED_1000;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case MII_M1011_PHY_STATUS_100:
|
|
|
|
phydev->speed = SPEED_100;
|
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
|
|
|
phydev->speed = SPEED_10;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!fiber) {
|
|
|
|
phydev->lp_advertising =
|
|
|
|
mii_stat1000_to_ethtool_lpa_t(lpagb) |
|
|
|
|
mii_lpa_to_ethtool_lpa_t(lpa);
|
|
|
|
|
|
|
|
if (phydev->duplex == DUPLEX_FULL) {
|
|
|
|
phydev->pause = lpa & LPA_PAUSE_CAP ? 1 : 0;
|
|
|
|
phydev->asym_pause = lpa & LPA_PAUSE_ASYM ? 1 : 0;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
/* The fiber link is only 1000M capable */
|
|
|
|
phydev->lp_advertising = fiber_lpa_to_ethtool_lpa_t(lpa);
|
|
|
|
|
|
|
|
if (phydev->duplex == DUPLEX_FULL) {
|
|
|
|
if (!(lpa & LPA_PAUSE_FIBER)) {
|
|
|
|
phydev->pause = 0;
|
|
|
|
phydev->asym_pause = 0;
|
|
|
|
} else if ((lpa & LPA_PAUSE_ASYM_FIBER)) {
|
|
|
|
phydev->pause = 1;
|
|
|
|
phydev->asym_pause = 1;
|
|
|
|
} else {
|
|
|
|
phydev->pause = 1;
|
|
|
|
phydev->asym_pause = 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int marvell_read_status_page_fixed(struct phy_device *phydev)
|
|
|
|
{
|
|
|
|
int bmcr = phy_read(phydev, MII_BMCR);
|
|
|
|
|
|
|
|
if (bmcr < 0)
|
|
|
|
return bmcr;
|
|
|
|
|
|
|
|
if (bmcr & BMCR_FULLDPLX)
|
|
|
|
phydev->duplex = DUPLEX_FULL;
|
|
|
|
else
|
|
|
|
phydev->duplex = DUPLEX_HALF;
|
|
|
|
|
|
|
|
if (bmcr & BMCR_SPEED1000)
|
|
|
|
phydev->speed = SPEED_1000;
|
|
|
|
else if (bmcr & BMCR_SPEED100)
|
|
|
|
phydev->speed = SPEED_100;
|
|
|
|
else
|
|
|
|
phydev->speed = SPEED_10;
|
|
|
|
|
|
|
|
phydev->pause = 0;
|
|
|
|
phydev->asym_pause = 0;
|
|
|
|
phydev->lp_advertising = 0;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2016-07-19 16:13:10 +07:00
|
|
|
/* marvell_read_status_page
|
2008-03-19 04:37:24 +07:00
|
|
|
*
|
2008-03-26 10:53:24 +07:00
|
|
|
* Description:
|
2008-03-19 04:37:24 +07:00
|
|
|
* Check the link, then figure out the current state
|
|
|
|
* by comparing what we advertise with what the link partner
|
|
|
|
* advertises. Start by checking the gigabit possibilities,
|
|
|
|
* then move on to 10/100.
|
|
|
|
*/
|
2016-07-19 16:13:10 +07:00
|
|
|
static int marvell_read_status_page(struct phy_device *phydev, int page)
|
2008-03-19 04:37:24 +07:00
|
|
|
{
|
2016-07-19 16:13:10 +07:00
|
|
|
int fiber;
|
2017-05-17 08:26:02 +07:00
|
|
|
int err;
|
2008-03-19 04:37:24 +07:00
|
|
|
|
2016-07-19 16:13:10 +07:00
|
|
|
/* Detect and update the link, but return if there
|
2017-05-17 08:25:59 +07:00
|
|
|
* was an error
|
|
|
|
*/
|
2017-05-26 02:42:08 +07:00
|
|
|
if (page == MII_MARVELL_FIBER_PAGE)
|
2016-07-19 16:13:10 +07:00
|
|
|
fiber = 1;
|
|
|
|
else
|
|
|
|
fiber = 0;
|
|
|
|
|
|
|
|
err = marvell_update_link(phydev, fiber);
|
2008-03-19 04:37:24 +07:00
|
|
|
if (err)
|
|
|
|
return err;
|
|
|
|
|
2017-05-17 08:26:02 +07:00
|
|
|
if (phydev->autoneg == AUTONEG_ENABLE)
|
|
|
|
err = marvell_read_status_page_an(phydev, fiber);
|
|
|
|
else
|
|
|
|
err = marvell_read_status_page_fixed(phydev);
|
2008-03-19 04:37:24 +07:00
|
|
|
|
2017-05-17 08:26:02 +07:00
|
|
|
return err;
|
2008-03-19 04:37:24 +07:00
|
|
|
}
|
|
|
|
|
2016-07-19 16:13:10 +07:00
|
|
|
/* marvell_read_status
|
|
|
|
*
|
|
|
|
* Some Marvell's phys have two modes: fiber and copper.
|
|
|
|
* Both need status checked.
|
|
|
|
* Description:
|
|
|
|
* First, check the fiber link and status.
|
|
|
|
* If the fiber link is down, check the copper link and status which
|
|
|
|
* will be the default value if both link are down.
|
|
|
|
*/
|
|
|
|
static int marvell_read_status(struct phy_device *phydev)
|
|
|
|
{
|
|
|
|
int err;
|
|
|
|
|
|
|
|
/* Check the fiber mode first */
|
2017-01-11 06:13:45 +07:00
|
|
|
if (phydev->supported & SUPPORTED_FIBRE &&
|
|
|
|
phydev->interface != PHY_INTERFACE_MODE_SGMII) {
|
2017-05-26 02:42:08 +07:00
|
|
|
err = marvell_set_page(phydev, MII_MARVELL_FIBER_PAGE);
|
2016-07-19 16:13:10 +07:00
|
|
|
if (err < 0)
|
|
|
|
goto error;
|
|
|
|
|
2017-05-26 02:42:08 +07:00
|
|
|
err = marvell_read_status_page(phydev, MII_MARVELL_FIBER_PAGE);
|
2016-07-19 16:13:10 +07:00
|
|
|
if (err < 0)
|
|
|
|
goto error;
|
|
|
|
|
2017-05-17 08:25:59 +07:00
|
|
|
/* If the fiber link is up, it is the selected and
|
|
|
|
* used link. In this case, we need to stay in the
|
|
|
|
* fiber page. Please to be careful about that, avoid
|
|
|
|
* to restore Copper page in other functions which
|
|
|
|
* could break the behaviour for some fiber phy like
|
|
|
|
* 88E1512.
|
|
|
|
*/
|
2016-07-19 16:13:10 +07:00
|
|
|
if (phydev->link)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
/* If fiber link is down, check and save copper mode state */
|
2017-05-26 02:42:08 +07:00
|
|
|
err = marvell_set_page(phydev, MII_MARVELL_COPPER_PAGE);
|
2016-07-19 16:13:10 +07:00
|
|
|
if (err < 0)
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
|
2017-05-26 02:42:08 +07:00
|
|
|
return marvell_read_status_page(phydev, MII_MARVELL_COPPER_PAGE);
|
2016-07-19 16:13:10 +07:00
|
|
|
|
|
|
|
error:
|
2017-05-26 02:42:08 +07:00
|
|
|
marvell_set_page(phydev, MII_MARVELL_COPPER_PAGE);
|
2016-07-19 16:13:10 +07:00
|
|
|
return err;
|
|
|
|
}
|
2016-07-19 16:13:13 +07:00
|
|
|
|
|
|
|
/* marvell_suspend
|
|
|
|
*
|
|
|
|
* Some Marvell's phys have two modes: fiber and copper.
|
|
|
|
* Both need to be suspended
|
|
|
|
*/
|
|
|
|
static int marvell_suspend(struct phy_device *phydev)
|
|
|
|
{
|
|
|
|
int err;
|
|
|
|
|
|
|
|
/* Suspend the fiber mode first */
|
|
|
|
if (!(phydev->supported & SUPPORTED_FIBRE)) {
|
2017-05-26 02:42:08 +07:00
|
|
|
err = marvell_set_page(phydev, MII_MARVELL_FIBER_PAGE);
|
2016-07-19 16:13:13 +07:00
|
|
|
if (err < 0)
|
|
|
|
goto error;
|
|
|
|
|
|
|
|
/* With the page set, use the generic suspend */
|
|
|
|
err = genphy_suspend(phydev);
|
|
|
|
if (err < 0)
|
|
|
|
goto error;
|
|
|
|
|
|
|
|
/* Then, the copper link */
|
2017-05-26 02:42:08 +07:00
|
|
|
err = marvell_set_page(phydev, MII_MARVELL_COPPER_PAGE);
|
2016-07-19 16:13:13 +07:00
|
|
|
if (err < 0)
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* With the page set, use the generic suspend */
|
|
|
|
return genphy_suspend(phydev);
|
|
|
|
|
|
|
|
error:
|
2017-05-26 02:42:08 +07:00
|
|
|
marvell_set_page(phydev, MII_MARVELL_COPPER_PAGE);
|
2016-07-19 16:13:13 +07:00
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* marvell_resume
|
|
|
|
*
|
|
|
|
* Some Marvell's phys have two modes: fiber and copper.
|
|
|
|
* Both need to be resumed
|
|
|
|
*/
|
|
|
|
static int marvell_resume(struct phy_device *phydev)
|
|
|
|
{
|
|
|
|
int err;
|
|
|
|
|
|
|
|
/* Resume the fiber mode first */
|
|
|
|
if (!(phydev->supported & SUPPORTED_FIBRE)) {
|
2017-05-26 02:42:08 +07:00
|
|
|
err = marvell_set_page(phydev, MII_MARVELL_FIBER_PAGE);
|
2016-07-19 16:13:13 +07:00
|
|
|
if (err < 0)
|
|
|
|
goto error;
|
|
|
|
|
|
|
|
/* With the page set, use the generic resume */
|
|
|
|
err = genphy_resume(phydev);
|
|
|
|
if (err < 0)
|
|
|
|
goto error;
|
|
|
|
|
|
|
|
/* Then, the copper link */
|
2017-05-26 02:42:08 +07:00
|
|
|
err = marvell_set_page(phydev, MII_MARVELL_COPPER_PAGE);
|
2016-07-19 16:13:13 +07:00
|
|
|
if (err < 0)
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* With the page set, use the generic resume */
|
|
|
|
return genphy_resume(phydev);
|
|
|
|
|
|
|
|
error:
|
2017-05-26 02:42:08 +07:00
|
|
|
marvell_set_page(phydev, MII_MARVELL_COPPER_PAGE);
|
2016-07-19 16:13:13 +07:00
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
2014-10-23 01:26:44 +07:00
|
|
|
static int marvell_aneg_done(struct phy_device *phydev)
|
|
|
|
{
|
|
|
|
int retval = phy_read(phydev, MII_M1011_PHY_STATUS);
|
2017-05-17 08:26:00 +07:00
|
|
|
|
2014-10-23 01:26:44 +07:00
|
|
|
return (retval < 0) ? retval : (retval & MII_M1011_PHY_STATUS_RESOLVED);
|
|
|
|
}
|
|
|
|
|
2009-04-07 09:01:43 +07:00
|
|
|
static int m88e1121_did_interrupt(struct phy_device *phydev)
|
|
|
|
{
|
|
|
|
int imask;
|
|
|
|
|
|
|
|
imask = phy_read(phydev, MII_M1011_IEVENT);
|
|
|
|
|
|
|
|
if (imask & MII_M1011_IMASK_INIT)
|
|
|
|
return 1;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2017-05-17 08:26:04 +07:00
|
|
|
static void m88e1318_get_wol(struct phy_device *phydev,
|
|
|
|
struct ethtool_wolinfo *wol)
|
2013-03-11 20:56:45 +07:00
|
|
|
{
|
net: phy: marvell: fix paged access races
For paged accesses to be truely safe, we need to hold the bus lock to
prevent anyone else gaining access to the registers while we modify
them.
The phydev->lock mutex does not do this: userspace via the MII ioctl
can still sneak in and read or write any register while we are on a
different page, and the suspend/resume methods can be called by a
thread different to the thread polling the phy status.
Races have been observed with mvneta on SolidRun Clearfog with phylink,
particularly between the phylib worker reading the PHYs status, and
the thread resuming mvneta, calling phy_start() which then calls
through to m88e1121_config_aneg_rgmii_delays(), which tries to
read-modify-write the MSCR register:
CPU0 CPU1
marvell_read_status_page()
marvell_set_page(phydev, MII_MARVELL_FIBER_PAGE)
...
m88e1121_config_aneg_rgmii_delays()
set_page(MII_MARVELL_MSCR_PAGE)
phy_read(phydev, MII_88E1121_PHY_MSCR_REG)
marvell_set_page(phydev, MII_MARVELL_COPPER_PAGE);
...
phy_write(phydev, MII_88E1121_PHY_MSCR_REG)
The result of this is we end up writing the copper page register 21,
which causes the copper PHY to be disabled, and the link partner sees
the link immediately go down.
Solve this by taking the bus lock instead of the PHY lock, thereby
preventing other accesses to the PHY while we are accessing other PHY
pages.
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
2018-01-02 17:58:48 +07:00
|
|
|
int oldpage, ret = 0;
|
|
|
|
|
2013-03-11 20:56:45 +07:00
|
|
|
wol->supported = WAKE_MAGIC;
|
|
|
|
wol->wolopts = 0;
|
|
|
|
|
net: phy: marvell: fix paged access races
For paged accesses to be truely safe, we need to hold the bus lock to
prevent anyone else gaining access to the registers while we modify
them.
The phydev->lock mutex does not do this: userspace via the MII ioctl
can still sneak in and read or write any register while we are on a
different page, and the suspend/resume methods can be called by a
thread different to the thread polling the phy status.
Races have been observed with mvneta on SolidRun Clearfog with phylink,
particularly between the phylib worker reading the PHYs status, and
the thread resuming mvneta, calling phy_start() which then calls
through to m88e1121_config_aneg_rgmii_delays(), which tries to
read-modify-write the MSCR register:
CPU0 CPU1
marvell_read_status_page()
marvell_set_page(phydev, MII_MARVELL_FIBER_PAGE)
...
m88e1121_config_aneg_rgmii_delays()
set_page(MII_MARVELL_MSCR_PAGE)
phy_read(phydev, MII_88E1121_PHY_MSCR_REG)
marvell_set_page(phydev, MII_MARVELL_COPPER_PAGE);
...
phy_write(phydev, MII_88E1121_PHY_MSCR_REG)
The result of this is we end up writing the copper page register 21,
which causes the copper PHY to be disabled, and the link partner sees
the link immediately go down.
Solve this by taking the bus lock instead of the PHY lock, thereby
preventing other accesses to the PHY while we are accessing other PHY
pages.
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
2018-01-02 17:58:48 +07:00
|
|
|
oldpage = phy_select_page(phydev, MII_MARVELL_WOL_PAGE);
|
|
|
|
if (oldpage < 0)
|
|
|
|
goto error;
|
2013-03-11 20:56:45 +07:00
|
|
|
|
net: phy: marvell: fix paged access races
For paged accesses to be truely safe, we need to hold the bus lock to
prevent anyone else gaining access to the registers while we modify
them.
The phydev->lock mutex does not do this: userspace via the MII ioctl
can still sneak in and read or write any register while we are on a
different page, and the suspend/resume methods can be called by a
thread different to the thread polling the phy status.
Races have been observed with mvneta on SolidRun Clearfog with phylink,
particularly between the phylib worker reading the PHYs status, and
the thread resuming mvneta, calling phy_start() which then calls
through to m88e1121_config_aneg_rgmii_delays(), which tries to
read-modify-write the MSCR register:
CPU0 CPU1
marvell_read_status_page()
marvell_set_page(phydev, MII_MARVELL_FIBER_PAGE)
...
m88e1121_config_aneg_rgmii_delays()
set_page(MII_MARVELL_MSCR_PAGE)
phy_read(phydev, MII_88E1121_PHY_MSCR_REG)
marvell_set_page(phydev, MII_MARVELL_COPPER_PAGE);
...
phy_write(phydev, MII_88E1121_PHY_MSCR_REG)
The result of this is we end up writing the copper page register 21,
which causes the copper PHY to be disabled, and the link partner sees
the link immediately go down.
Solve this by taking the bus lock instead of the PHY lock, thereby
preventing other accesses to the PHY while we are accessing other PHY
pages.
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
2018-01-02 17:58:48 +07:00
|
|
|
ret = __phy_read(phydev, MII_88E1318S_PHY_WOL_CTRL);
|
|
|
|
if (ret & MII_88E1318S_PHY_WOL_CTRL_MAGIC_PACKET_MATCH_ENABLE)
|
2013-03-11 20:56:45 +07:00
|
|
|
wol->wolopts |= WAKE_MAGIC;
|
|
|
|
|
net: phy: marvell: fix paged access races
For paged accesses to be truely safe, we need to hold the bus lock to
prevent anyone else gaining access to the registers while we modify
them.
The phydev->lock mutex does not do this: userspace via the MII ioctl
can still sneak in and read or write any register while we are on a
different page, and the suspend/resume methods can be called by a
thread different to the thread polling the phy status.
Races have been observed with mvneta on SolidRun Clearfog with phylink,
particularly between the phylib worker reading the PHYs status, and
the thread resuming mvneta, calling phy_start() which then calls
through to m88e1121_config_aneg_rgmii_delays(), which tries to
read-modify-write the MSCR register:
CPU0 CPU1
marvell_read_status_page()
marvell_set_page(phydev, MII_MARVELL_FIBER_PAGE)
...
m88e1121_config_aneg_rgmii_delays()
set_page(MII_MARVELL_MSCR_PAGE)
phy_read(phydev, MII_88E1121_PHY_MSCR_REG)
marvell_set_page(phydev, MII_MARVELL_COPPER_PAGE);
...
phy_write(phydev, MII_88E1121_PHY_MSCR_REG)
The result of this is we end up writing the copper page register 21,
which causes the copper PHY to be disabled, and the link partner sees
the link immediately go down.
Solve this by taking the bus lock instead of the PHY lock, thereby
preventing other accesses to the PHY while we are accessing other PHY
pages.
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
2018-01-02 17:58:48 +07:00
|
|
|
error:
|
|
|
|
phy_restore_page(phydev, oldpage, ret);
|
2013-03-11 20:56:45 +07:00
|
|
|
}
|
|
|
|
|
2017-05-17 08:26:04 +07:00
|
|
|
static int m88e1318_set_wol(struct phy_device *phydev,
|
|
|
|
struct ethtool_wolinfo *wol)
|
2013-03-11 20:56:45 +07:00
|
|
|
{
|
net: phy: marvell: fix paged access races
For paged accesses to be truely safe, we need to hold the bus lock to
prevent anyone else gaining access to the registers while we modify
them.
The phydev->lock mutex does not do this: userspace via the MII ioctl
can still sneak in and read or write any register while we are on a
different page, and the suspend/resume methods can be called by a
thread different to the thread polling the phy status.
Races have been observed with mvneta on SolidRun Clearfog with phylink,
particularly between the phylib worker reading the PHYs status, and
the thread resuming mvneta, calling phy_start() which then calls
through to m88e1121_config_aneg_rgmii_delays(), which tries to
read-modify-write the MSCR register:
CPU0 CPU1
marvell_read_status_page()
marvell_set_page(phydev, MII_MARVELL_FIBER_PAGE)
...
m88e1121_config_aneg_rgmii_delays()
set_page(MII_MARVELL_MSCR_PAGE)
phy_read(phydev, MII_88E1121_PHY_MSCR_REG)
marvell_set_page(phydev, MII_MARVELL_COPPER_PAGE);
...
phy_write(phydev, MII_88E1121_PHY_MSCR_REG)
The result of this is we end up writing the copper page register 21,
which causes the copper PHY to be disabled, and the link partner sees
the link immediately go down.
Solve this by taking the bus lock instead of the PHY lock, thereby
preventing other accesses to the PHY while we are accessing other PHY
pages.
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
2018-01-02 17:58:48 +07:00
|
|
|
int err = 0, oldpage;
|
2013-03-11 20:56:45 +07:00
|
|
|
|
net: phy: marvell: fix paged access races
For paged accesses to be truely safe, we need to hold the bus lock to
prevent anyone else gaining access to the registers while we modify
them.
The phydev->lock mutex does not do this: userspace via the MII ioctl
can still sneak in and read or write any register while we are on a
different page, and the suspend/resume methods can be called by a
thread different to the thread polling the phy status.
Races have been observed with mvneta on SolidRun Clearfog with phylink,
particularly between the phylib worker reading the PHYs status, and
the thread resuming mvneta, calling phy_start() which then calls
through to m88e1121_config_aneg_rgmii_delays(), which tries to
read-modify-write the MSCR register:
CPU0 CPU1
marvell_read_status_page()
marvell_set_page(phydev, MII_MARVELL_FIBER_PAGE)
...
m88e1121_config_aneg_rgmii_delays()
set_page(MII_MARVELL_MSCR_PAGE)
phy_read(phydev, MII_88E1121_PHY_MSCR_REG)
marvell_set_page(phydev, MII_MARVELL_COPPER_PAGE);
...
phy_write(phydev, MII_88E1121_PHY_MSCR_REG)
The result of this is we end up writing the copper page register 21,
which causes the copper PHY to be disabled, and the link partner sees
the link immediately go down.
Solve this by taking the bus lock instead of the PHY lock, thereby
preventing other accesses to the PHY while we are accessing other PHY
pages.
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
2018-01-02 17:58:48 +07:00
|
|
|
oldpage = phy_save_page(phydev);
|
|
|
|
if (oldpage < 0)
|
|
|
|
goto error;
|
2013-03-11 20:56:45 +07:00
|
|
|
|
|
|
|
if (wol->wolopts & WAKE_MAGIC) {
|
|
|
|
/* Explicitly switch to page 0x00, just to be sure */
|
net: phy: marvell: fix paged access races
For paged accesses to be truely safe, we need to hold the bus lock to
prevent anyone else gaining access to the registers while we modify
them.
The phydev->lock mutex does not do this: userspace via the MII ioctl
can still sneak in and read or write any register while we are on a
different page, and the suspend/resume methods can be called by a
thread different to the thread polling the phy status.
Races have been observed with mvneta on SolidRun Clearfog with phylink,
particularly between the phylib worker reading the PHYs status, and
the thread resuming mvneta, calling phy_start() which then calls
through to m88e1121_config_aneg_rgmii_delays(), which tries to
read-modify-write the MSCR register:
CPU0 CPU1
marvell_read_status_page()
marvell_set_page(phydev, MII_MARVELL_FIBER_PAGE)
...
m88e1121_config_aneg_rgmii_delays()
set_page(MII_MARVELL_MSCR_PAGE)
phy_read(phydev, MII_88E1121_PHY_MSCR_REG)
marvell_set_page(phydev, MII_MARVELL_COPPER_PAGE);
...
phy_write(phydev, MII_88E1121_PHY_MSCR_REG)
The result of this is we end up writing the copper page register 21,
which causes the copper PHY to be disabled, and the link partner sees
the link immediately go down.
Solve this by taking the bus lock instead of the PHY lock, thereby
preventing other accesses to the PHY while we are accessing other PHY
pages.
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
2018-01-02 17:58:48 +07:00
|
|
|
err = marvell_write_page(phydev, MII_MARVELL_COPPER_PAGE);
|
2013-03-11 20:56:45 +07:00
|
|
|
if (err < 0)
|
net: phy: marvell: fix paged access races
For paged accesses to be truely safe, we need to hold the bus lock to
prevent anyone else gaining access to the registers while we modify
them.
The phydev->lock mutex does not do this: userspace via the MII ioctl
can still sneak in and read or write any register while we are on a
different page, and the suspend/resume methods can be called by a
thread different to the thread polling the phy status.
Races have been observed with mvneta on SolidRun Clearfog with phylink,
particularly between the phylib worker reading the PHYs status, and
the thread resuming mvneta, calling phy_start() which then calls
through to m88e1121_config_aneg_rgmii_delays(), which tries to
read-modify-write the MSCR register:
CPU0 CPU1
marvell_read_status_page()
marvell_set_page(phydev, MII_MARVELL_FIBER_PAGE)
...
m88e1121_config_aneg_rgmii_delays()
set_page(MII_MARVELL_MSCR_PAGE)
phy_read(phydev, MII_88E1121_PHY_MSCR_REG)
marvell_set_page(phydev, MII_MARVELL_COPPER_PAGE);
...
phy_write(phydev, MII_88E1121_PHY_MSCR_REG)
The result of this is we end up writing the copper page register 21,
which causes the copper PHY to be disabled, and the link partner sees
the link immediately go down.
Solve this by taking the bus lock instead of the PHY lock, thereby
preventing other accesses to the PHY while we are accessing other PHY
pages.
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
2018-01-02 17:58:48 +07:00
|
|
|
goto error;
|
2013-03-11 20:56:45 +07:00
|
|
|
|
2018-04-23 14:22:49 +07:00
|
|
|
/* If WOL event happened once, the LED[2] interrupt pin
|
|
|
|
* will not be cleared unless we reading the interrupt status
|
|
|
|
* register. If interrupts are in use, the normal interrupt
|
|
|
|
* handling will clear the WOL event. Clear the WOL event
|
|
|
|
* before enabling it if !phy_interrupt_is_valid()
|
|
|
|
*/
|
|
|
|
if (!phy_interrupt_is_valid(phydev))
|
|
|
|
phy_read(phydev, MII_M1011_IEVENT);
|
|
|
|
|
2013-03-11 20:56:45 +07:00
|
|
|
/* Enable the WOL interrupt */
|
net: phy: marvell: fix paged access races
For paged accesses to be truely safe, we need to hold the bus lock to
prevent anyone else gaining access to the registers while we modify
them.
The phydev->lock mutex does not do this: userspace via the MII ioctl
can still sneak in and read or write any register while we are on a
different page, and the suspend/resume methods can be called by a
thread different to the thread polling the phy status.
Races have been observed with mvneta on SolidRun Clearfog with phylink,
particularly between the phylib worker reading the PHYs status, and
the thread resuming mvneta, calling phy_start() which then calls
through to m88e1121_config_aneg_rgmii_delays(), which tries to
read-modify-write the MSCR register:
CPU0 CPU1
marvell_read_status_page()
marvell_set_page(phydev, MII_MARVELL_FIBER_PAGE)
...
m88e1121_config_aneg_rgmii_delays()
set_page(MII_MARVELL_MSCR_PAGE)
phy_read(phydev, MII_88E1121_PHY_MSCR_REG)
marvell_set_page(phydev, MII_MARVELL_COPPER_PAGE);
...
phy_write(phydev, MII_88E1121_PHY_MSCR_REG)
The result of this is we end up writing the copper page register 21,
which causes the copper PHY to be disabled, and the link partner sees
the link immediately go down.
Solve this by taking the bus lock instead of the PHY lock, thereby
preventing other accesses to the PHY while we are accessing other PHY
pages.
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
2018-01-02 17:58:48 +07:00
|
|
|
err = __phy_modify(phydev, MII_88E1318S_PHY_CSIER, 0,
|
|
|
|
MII_88E1318S_PHY_CSIER_WOL_EIE);
|
2013-03-11 20:56:45 +07:00
|
|
|
if (err < 0)
|
net: phy: marvell: fix paged access races
For paged accesses to be truely safe, we need to hold the bus lock to
prevent anyone else gaining access to the registers while we modify
them.
The phydev->lock mutex does not do this: userspace via the MII ioctl
can still sneak in and read or write any register while we are on a
different page, and the suspend/resume methods can be called by a
thread different to the thread polling the phy status.
Races have been observed with mvneta on SolidRun Clearfog with phylink,
particularly between the phylib worker reading the PHYs status, and
the thread resuming mvneta, calling phy_start() which then calls
through to m88e1121_config_aneg_rgmii_delays(), which tries to
read-modify-write the MSCR register:
CPU0 CPU1
marvell_read_status_page()
marvell_set_page(phydev, MII_MARVELL_FIBER_PAGE)
...
m88e1121_config_aneg_rgmii_delays()
set_page(MII_MARVELL_MSCR_PAGE)
phy_read(phydev, MII_88E1121_PHY_MSCR_REG)
marvell_set_page(phydev, MII_MARVELL_COPPER_PAGE);
...
phy_write(phydev, MII_88E1121_PHY_MSCR_REG)
The result of this is we end up writing the copper page register 21,
which causes the copper PHY to be disabled, and the link partner sees
the link immediately go down.
Solve this by taking the bus lock instead of the PHY lock, thereby
preventing other accesses to the PHY while we are accessing other PHY
pages.
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
2018-01-02 17:58:48 +07:00
|
|
|
goto error;
|
2013-03-11 20:56:45 +07:00
|
|
|
|
net: phy: marvell: fix paged access races
For paged accesses to be truely safe, we need to hold the bus lock to
prevent anyone else gaining access to the registers while we modify
them.
The phydev->lock mutex does not do this: userspace via the MII ioctl
can still sneak in and read or write any register while we are on a
different page, and the suspend/resume methods can be called by a
thread different to the thread polling the phy status.
Races have been observed with mvneta on SolidRun Clearfog with phylink,
particularly between the phylib worker reading the PHYs status, and
the thread resuming mvneta, calling phy_start() which then calls
through to m88e1121_config_aneg_rgmii_delays(), which tries to
read-modify-write the MSCR register:
CPU0 CPU1
marvell_read_status_page()
marvell_set_page(phydev, MII_MARVELL_FIBER_PAGE)
...
m88e1121_config_aneg_rgmii_delays()
set_page(MII_MARVELL_MSCR_PAGE)
phy_read(phydev, MII_88E1121_PHY_MSCR_REG)
marvell_set_page(phydev, MII_MARVELL_COPPER_PAGE);
...
phy_write(phydev, MII_88E1121_PHY_MSCR_REG)
The result of this is we end up writing the copper page register 21,
which causes the copper PHY to be disabled, and the link partner sees
the link immediately go down.
Solve this by taking the bus lock instead of the PHY lock, thereby
preventing other accesses to the PHY while we are accessing other PHY
pages.
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
2018-01-02 17:58:48 +07:00
|
|
|
err = marvell_write_page(phydev, MII_MARVELL_LED_PAGE);
|
2013-03-11 20:56:45 +07:00
|
|
|
if (err < 0)
|
net: phy: marvell: fix paged access races
For paged accesses to be truely safe, we need to hold the bus lock to
prevent anyone else gaining access to the registers while we modify
them.
The phydev->lock mutex does not do this: userspace via the MII ioctl
can still sneak in and read or write any register while we are on a
different page, and the suspend/resume methods can be called by a
thread different to the thread polling the phy status.
Races have been observed with mvneta on SolidRun Clearfog with phylink,
particularly between the phylib worker reading the PHYs status, and
the thread resuming mvneta, calling phy_start() which then calls
through to m88e1121_config_aneg_rgmii_delays(), which tries to
read-modify-write the MSCR register:
CPU0 CPU1
marvell_read_status_page()
marvell_set_page(phydev, MII_MARVELL_FIBER_PAGE)
...
m88e1121_config_aneg_rgmii_delays()
set_page(MII_MARVELL_MSCR_PAGE)
phy_read(phydev, MII_88E1121_PHY_MSCR_REG)
marvell_set_page(phydev, MII_MARVELL_COPPER_PAGE);
...
phy_write(phydev, MII_88E1121_PHY_MSCR_REG)
The result of this is we end up writing the copper page register 21,
which causes the copper PHY to be disabled, and the link partner sees
the link immediately go down.
Solve this by taking the bus lock instead of the PHY lock, thereby
preventing other accesses to the PHY while we are accessing other PHY
pages.
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
2018-01-02 17:58:48 +07:00
|
|
|
goto error;
|
2013-03-11 20:56:45 +07:00
|
|
|
|
|
|
|
/* Setup LED[2] as interrupt pin (active low) */
|
net: phy: marvell: fix paged access races
For paged accesses to be truely safe, we need to hold the bus lock to
prevent anyone else gaining access to the registers while we modify
them.
The phydev->lock mutex does not do this: userspace via the MII ioctl
can still sneak in and read or write any register while we are on a
different page, and the suspend/resume methods can be called by a
thread different to the thread polling the phy status.
Races have been observed with mvneta on SolidRun Clearfog with phylink,
particularly between the phylib worker reading the PHYs status, and
the thread resuming mvneta, calling phy_start() which then calls
through to m88e1121_config_aneg_rgmii_delays(), which tries to
read-modify-write the MSCR register:
CPU0 CPU1
marvell_read_status_page()
marvell_set_page(phydev, MII_MARVELL_FIBER_PAGE)
...
m88e1121_config_aneg_rgmii_delays()
set_page(MII_MARVELL_MSCR_PAGE)
phy_read(phydev, MII_88E1121_PHY_MSCR_REG)
marvell_set_page(phydev, MII_MARVELL_COPPER_PAGE);
...
phy_write(phydev, MII_88E1121_PHY_MSCR_REG)
The result of this is we end up writing the copper page register 21,
which causes the copper PHY to be disabled, and the link partner sees
the link immediately go down.
Solve this by taking the bus lock instead of the PHY lock, thereby
preventing other accesses to the PHY while we are accessing other PHY
pages.
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
2018-01-02 17:58:48 +07:00
|
|
|
err = __phy_modify(phydev, MII_88E1318S_PHY_LED_TCR,
|
2018-01-05 23:07:10 +07:00
|
|
|
MII_88E1318S_PHY_LED_TCR_FORCE_INT,
|
net: phy: marvell: fix paged access races
For paged accesses to be truely safe, we need to hold the bus lock to
prevent anyone else gaining access to the registers while we modify
them.
The phydev->lock mutex does not do this: userspace via the MII ioctl
can still sneak in and read or write any register while we are on a
different page, and the suspend/resume methods can be called by a
thread different to the thread polling the phy status.
Races have been observed with mvneta on SolidRun Clearfog with phylink,
particularly between the phylib worker reading the PHYs status, and
the thread resuming mvneta, calling phy_start() which then calls
through to m88e1121_config_aneg_rgmii_delays(), which tries to
read-modify-write the MSCR register:
CPU0 CPU1
marvell_read_status_page()
marvell_set_page(phydev, MII_MARVELL_FIBER_PAGE)
...
m88e1121_config_aneg_rgmii_delays()
set_page(MII_MARVELL_MSCR_PAGE)
phy_read(phydev, MII_88E1121_PHY_MSCR_REG)
marvell_set_page(phydev, MII_MARVELL_COPPER_PAGE);
...
phy_write(phydev, MII_88E1121_PHY_MSCR_REG)
The result of this is we end up writing the copper page register 21,
which causes the copper PHY to be disabled, and the link partner sees
the link immediately go down.
Solve this by taking the bus lock instead of the PHY lock, thereby
preventing other accesses to the PHY while we are accessing other PHY
pages.
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
2018-01-02 17:58:48 +07:00
|
|
|
MII_88E1318S_PHY_LED_TCR_INTn_ENABLE |
|
|
|
|
MII_88E1318S_PHY_LED_TCR_INT_ACTIVE_LOW);
|
2013-03-11 20:56:45 +07:00
|
|
|
if (err < 0)
|
net: phy: marvell: fix paged access races
For paged accesses to be truely safe, we need to hold the bus lock to
prevent anyone else gaining access to the registers while we modify
them.
The phydev->lock mutex does not do this: userspace via the MII ioctl
can still sneak in and read or write any register while we are on a
different page, and the suspend/resume methods can be called by a
thread different to the thread polling the phy status.
Races have been observed with mvneta on SolidRun Clearfog with phylink,
particularly between the phylib worker reading the PHYs status, and
the thread resuming mvneta, calling phy_start() which then calls
through to m88e1121_config_aneg_rgmii_delays(), which tries to
read-modify-write the MSCR register:
CPU0 CPU1
marvell_read_status_page()
marvell_set_page(phydev, MII_MARVELL_FIBER_PAGE)
...
m88e1121_config_aneg_rgmii_delays()
set_page(MII_MARVELL_MSCR_PAGE)
phy_read(phydev, MII_88E1121_PHY_MSCR_REG)
marvell_set_page(phydev, MII_MARVELL_COPPER_PAGE);
...
phy_write(phydev, MII_88E1121_PHY_MSCR_REG)
The result of this is we end up writing the copper page register 21,
which causes the copper PHY to be disabled, and the link partner sees
the link immediately go down.
Solve this by taking the bus lock instead of the PHY lock, thereby
preventing other accesses to the PHY while we are accessing other PHY
pages.
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
2018-01-02 17:58:48 +07:00
|
|
|
goto error;
|
2013-03-11 20:56:45 +07:00
|
|
|
|
net: phy: marvell: fix paged access races
For paged accesses to be truely safe, we need to hold the bus lock to
prevent anyone else gaining access to the registers while we modify
them.
The phydev->lock mutex does not do this: userspace via the MII ioctl
can still sneak in and read or write any register while we are on a
different page, and the suspend/resume methods can be called by a
thread different to the thread polling the phy status.
Races have been observed with mvneta on SolidRun Clearfog with phylink,
particularly between the phylib worker reading the PHYs status, and
the thread resuming mvneta, calling phy_start() which then calls
through to m88e1121_config_aneg_rgmii_delays(), which tries to
read-modify-write the MSCR register:
CPU0 CPU1
marvell_read_status_page()
marvell_set_page(phydev, MII_MARVELL_FIBER_PAGE)
...
m88e1121_config_aneg_rgmii_delays()
set_page(MII_MARVELL_MSCR_PAGE)
phy_read(phydev, MII_88E1121_PHY_MSCR_REG)
marvell_set_page(phydev, MII_MARVELL_COPPER_PAGE);
...
phy_write(phydev, MII_88E1121_PHY_MSCR_REG)
The result of this is we end up writing the copper page register 21,
which causes the copper PHY to be disabled, and the link partner sees
the link immediately go down.
Solve this by taking the bus lock instead of the PHY lock, thereby
preventing other accesses to the PHY while we are accessing other PHY
pages.
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
2018-01-02 17:58:48 +07:00
|
|
|
err = marvell_write_page(phydev, MII_MARVELL_WOL_PAGE);
|
2013-03-11 20:56:45 +07:00
|
|
|
if (err < 0)
|
net: phy: marvell: fix paged access races
For paged accesses to be truely safe, we need to hold the bus lock to
prevent anyone else gaining access to the registers while we modify
them.
The phydev->lock mutex does not do this: userspace via the MII ioctl
can still sneak in and read or write any register while we are on a
different page, and the suspend/resume methods can be called by a
thread different to the thread polling the phy status.
Races have been observed with mvneta on SolidRun Clearfog with phylink,
particularly between the phylib worker reading the PHYs status, and
the thread resuming mvneta, calling phy_start() which then calls
through to m88e1121_config_aneg_rgmii_delays(), which tries to
read-modify-write the MSCR register:
CPU0 CPU1
marvell_read_status_page()
marvell_set_page(phydev, MII_MARVELL_FIBER_PAGE)
...
m88e1121_config_aneg_rgmii_delays()
set_page(MII_MARVELL_MSCR_PAGE)
phy_read(phydev, MII_88E1121_PHY_MSCR_REG)
marvell_set_page(phydev, MII_MARVELL_COPPER_PAGE);
...
phy_write(phydev, MII_88E1121_PHY_MSCR_REG)
The result of this is we end up writing the copper page register 21,
which causes the copper PHY to be disabled, and the link partner sees
the link immediately go down.
Solve this by taking the bus lock instead of the PHY lock, thereby
preventing other accesses to the PHY while we are accessing other PHY
pages.
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
2018-01-02 17:58:48 +07:00
|
|
|
goto error;
|
2013-03-11 20:56:45 +07:00
|
|
|
|
|
|
|
/* Store the device address for the magic packet */
|
net: phy: marvell: fix paged access races
For paged accesses to be truely safe, we need to hold the bus lock to
prevent anyone else gaining access to the registers while we modify
them.
The phydev->lock mutex does not do this: userspace via the MII ioctl
can still sneak in and read or write any register while we are on a
different page, and the suspend/resume methods can be called by a
thread different to the thread polling the phy status.
Races have been observed with mvneta on SolidRun Clearfog with phylink,
particularly between the phylib worker reading the PHYs status, and
the thread resuming mvneta, calling phy_start() which then calls
through to m88e1121_config_aneg_rgmii_delays(), which tries to
read-modify-write the MSCR register:
CPU0 CPU1
marvell_read_status_page()
marvell_set_page(phydev, MII_MARVELL_FIBER_PAGE)
...
m88e1121_config_aneg_rgmii_delays()
set_page(MII_MARVELL_MSCR_PAGE)
phy_read(phydev, MII_88E1121_PHY_MSCR_REG)
marvell_set_page(phydev, MII_MARVELL_COPPER_PAGE);
...
phy_write(phydev, MII_88E1121_PHY_MSCR_REG)
The result of this is we end up writing the copper page register 21,
which causes the copper PHY to be disabled, and the link partner sees
the link immediately go down.
Solve this by taking the bus lock instead of the PHY lock, thereby
preventing other accesses to the PHY while we are accessing other PHY
pages.
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
2018-01-02 17:58:48 +07:00
|
|
|
err = __phy_write(phydev, MII_88E1318S_PHY_MAGIC_PACKET_WORD2,
|
2013-03-11 20:56:45 +07:00
|
|
|
((phydev->attached_dev->dev_addr[5] << 8) |
|
|
|
|
phydev->attached_dev->dev_addr[4]));
|
|
|
|
if (err < 0)
|
net: phy: marvell: fix paged access races
For paged accesses to be truely safe, we need to hold the bus lock to
prevent anyone else gaining access to the registers while we modify
them.
The phydev->lock mutex does not do this: userspace via the MII ioctl
can still sneak in and read or write any register while we are on a
different page, and the suspend/resume methods can be called by a
thread different to the thread polling the phy status.
Races have been observed with mvneta on SolidRun Clearfog with phylink,
particularly between the phylib worker reading the PHYs status, and
the thread resuming mvneta, calling phy_start() which then calls
through to m88e1121_config_aneg_rgmii_delays(), which tries to
read-modify-write the MSCR register:
CPU0 CPU1
marvell_read_status_page()
marvell_set_page(phydev, MII_MARVELL_FIBER_PAGE)
...
m88e1121_config_aneg_rgmii_delays()
set_page(MII_MARVELL_MSCR_PAGE)
phy_read(phydev, MII_88E1121_PHY_MSCR_REG)
marvell_set_page(phydev, MII_MARVELL_COPPER_PAGE);
...
phy_write(phydev, MII_88E1121_PHY_MSCR_REG)
The result of this is we end up writing the copper page register 21,
which causes the copper PHY to be disabled, and the link partner sees
the link immediately go down.
Solve this by taking the bus lock instead of the PHY lock, thereby
preventing other accesses to the PHY while we are accessing other PHY
pages.
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
2018-01-02 17:58:48 +07:00
|
|
|
goto error;
|
|
|
|
err = __phy_write(phydev, MII_88E1318S_PHY_MAGIC_PACKET_WORD1,
|
2013-03-11 20:56:45 +07:00
|
|
|
((phydev->attached_dev->dev_addr[3] << 8) |
|
|
|
|
phydev->attached_dev->dev_addr[2]));
|
|
|
|
if (err < 0)
|
net: phy: marvell: fix paged access races
For paged accesses to be truely safe, we need to hold the bus lock to
prevent anyone else gaining access to the registers while we modify
them.
The phydev->lock mutex does not do this: userspace via the MII ioctl
can still sneak in and read or write any register while we are on a
different page, and the suspend/resume methods can be called by a
thread different to the thread polling the phy status.
Races have been observed with mvneta on SolidRun Clearfog with phylink,
particularly between the phylib worker reading the PHYs status, and
the thread resuming mvneta, calling phy_start() which then calls
through to m88e1121_config_aneg_rgmii_delays(), which tries to
read-modify-write the MSCR register:
CPU0 CPU1
marvell_read_status_page()
marvell_set_page(phydev, MII_MARVELL_FIBER_PAGE)
...
m88e1121_config_aneg_rgmii_delays()
set_page(MII_MARVELL_MSCR_PAGE)
phy_read(phydev, MII_88E1121_PHY_MSCR_REG)
marvell_set_page(phydev, MII_MARVELL_COPPER_PAGE);
...
phy_write(phydev, MII_88E1121_PHY_MSCR_REG)
The result of this is we end up writing the copper page register 21,
which causes the copper PHY to be disabled, and the link partner sees
the link immediately go down.
Solve this by taking the bus lock instead of the PHY lock, thereby
preventing other accesses to the PHY while we are accessing other PHY
pages.
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
2018-01-02 17:58:48 +07:00
|
|
|
goto error;
|
|
|
|
err = __phy_write(phydev, MII_88E1318S_PHY_MAGIC_PACKET_WORD0,
|
2013-03-11 20:56:45 +07:00
|
|
|
((phydev->attached_dev->dev_addr[1] << 8) |
|
|
|
|
phydev->attached_dev->dev_addr[0]));
|
|
|
|
if (err < 0)
|
net: phy: marvell: fix paged access races
For paged accesses to be truely safe, we need to hold the bus lock to
prevent anyone else gaining access to the registers while we modify
them.
The phydev->lock mutex does not do this: userspace via the MII ioctl
can still sneak in and read or write any register while we are on a
different page, and the suspend/resume methods can be called by a
thread different to the thread polling the phy status.
Races have been observed with mvneta on SolidRun Clearfog with phylink,
particularly between the phylib worker reading the PHYs status, and
the thread resuming mvneta, calling phy_start() which then calls
through to m88e1121_config_aneg_rgmii_delays(), which tries to
read-modify-write the MSCR register:
CPU0 CPU1
marvell_read_status_page()
marvell_set_page(phydev, MII_MARVELL_FIBER_PAGE)
...
m88e1121_config_aneg_rgmii_delays()
set_page(MII_MARVELL_MSCR_PAGE)
phy_read(phydev, MII_88E1121_PHY_MSCR_REG)
marvell_set_page(phydev, MII_MARVELL_COPPER_PAGE);
...
phy_write(phydev, MII_88E1121_PHY_MSCR_REG)
The result of this is we end up writing the copper page register 21,
which causes the copper PHY to be disabled, and the link partner sees
the link immediately go down.
Solve this by taking the bus lock instead of the PHY lock, thereby
preventing other accesses to the PHY while we are accessing other PHY
pages.
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
2018-01-02 17:58:48 +07:00
|
|
|
goto error;
|
2013-03-11 20:56:45 +07:00
|
|
|
|
|
|
|
/* Clear WOL status and enable magic packet matching */
|
net: phy: marvell: fix paged access races
For paged accesses to be truely safe, we need to hold the bus lock to
prevent anyone else gaining access to the registers while we modify
them.
The phydev->lock mutex does not do this: userspace via the MII ioctl
can still sneak in and read or write any register while we are on a
different page, and the suspend/resume methods can be called by a
thread different to the thread polling the phy status.
Races have been observed with mvneta on SolidRun Clearfog with phylink,
particularly between the phylib worker reading the PHYs status, and
the thread resuming mvneta, calling phy_start() which then calls
through to m88e1121_config_aneg_rgmii_delays(), which tries to
read-modify-write the MSCR register:
CPU0 CPU1
marvell_read_status_page()
marvell_set_page(phydev, MII_MARVELL_FIBER_PAGE)
...
m88e1121_config_aneg_rgmii_delays()
set_page(MII_MARVELL_MSCR_PAGE)
phy_read(phydev, MII_88E1121_PHY_MSCR_REG)
marvell_set_page(phydev, MII_MARVELL_COPPER_PAGE);
...
phy_write(phydev, MII_88E1121_PHY_MSCR_REG)
The result of this is we end up writing the copper page register 21,
which causes the copper PHY to be disabled, and the link partner sees
the link immediately go down.
Solve this by taking the bus lock instead of the PHY lock, thereby
preventing other accesses to the PHY while we are accessing other PHY
pages.
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
2018-01-02 17:58:48 +07:00
|
|
|
err = __phy_modify(phydev, MII_88E1318S_PHY_WOL_CTRL, 0,
|
|
|
|
MII_88E1318S_PHY_WOL_CTRL_CLEAR_WOL_STATUS |
|
|
|
|
MII_88E1318S_PHY_WOL_CTRL_MAGIC_PACKET_MATCH_ENABLE);
|
2013-03-11 20:56:45 +07:00
|
|
|
if (err < 0)
|
net: phy: marvell: fix paged access races
For paged accesses to be truely safe, we need to hold the bus lock to
prevent anyone else gaining access to the registers while we modify
them.
The phydev->lock mutex does not do this: userspace via the MII ioctl
can still sneak in and read or write any register while we are on a
different page, and the suspend/resume methods can be called by a
thread different to the thread polling the phy status.
Races have been observed with mvneta on SolidRun Clearfog with phylink,
particularly between the phylib worker reading the PHYs status, and
the thread resuming mvneta, calling phy_start() which then calls
through to m88e1121_config_aneg_rgmii_delays(), which tries to
read-modify-write the MSCR register:
CPU0 CPU1
marvell_read_status_page()
marvell_set_page(phydev, MII_MARVELL_FIBER_PAGE)
...
m88e1121_config_aneg_rgmii_delays()
set_page(MII_MARVELL_MSCR_PAGE)
phy_read(phydev, MII_88E1121_PHY_MSCR_REG)
marvell_set_page(phydev, MII_MARVELL_COPPER_PAGE);
...
phy_write(phydev, MII_88E1121_PHY_MSCR_REG)
The result of this is we end up writing the copper page register 21,
which causes the copper PHY to be disabled, and the link partner sees
the link immediately go down.
Solve this by taking the bus lock instead of the PHY lock, thereby
preventing other accesses to the PHY while we are accessing other PHY
pages.
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
2018-01-02 17:58:48 +07:00
|
|
|
goto error;
|
2013-03-11 20:56:45 +07:00
|
|
|
} else {
|
net: phy: marvell: fix paged access races
For paged accesses to be truely safe, we need to hold the bus lock to
prevent anyone else gaining access to the registers while we modify
them.
The phydev->lock mutex does not do this: userspace via the MII ioctl
can still sneak in and read or write any register while we are on a
different page, and the suspend/resume methods can be called by a
thread different to the thread polling the phy status.
Races have been observed with mvneta on SolidRun Clearfog with phylink,
particularly between the phylib worker reading the PHYs status, and
the thread resuming mvneta, calling phy_start() which then calls
through to m88e1121_config_aneg_rgmii_delays(), which tries to
read-modify-write the MSCR register:
CPU0 CPU1
marvell_read_status_page()
marvell_set_page(phydev, MII_MARVELL_FIBER_PAGE)
...
m88e1121_config_aneg_rgmii_delays()
set_page(MII_MARVELL_MSCR_PAGE)
phy_read(phydev, MII_88E1121_PHY_MSCR_REG)
marvell_set_page(phydev, MII_MARVELL_COPPER_PAGE);
...
phy_write(phydev, MII_88E1121_PHY_MSCR_REG)
The result of this is we end up writing the copper page register 21,
which causes the copper PHY to be disabled, and the link partner sees
the link immediately go down.
Solve this by taking the bus lock instead of the PHY lock, thereby
preventing other accesses to the PHY while we are accessing other PHY
pages.
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
2018-01-02 17:58:48 +07:00
|
|
|
err = marvell_write_page(phydev, MII_MARVELL_WOL_PAGE);
|
2013-03-11 20:56:45 +07:00
|
|
|
if (err < 0)
|
net: phy: marvell: fix paged access races
For paged accesses to be truely safe, we need to hold the bus lock to
prevent anyone else gaining access to the registers while we modify
them.
The phydev->lock mutex does not do this: userspace via the MII ioctl
can still sneak in and read or write any register while we are on a
different page, and the suspend/resume methods can be called by a
thread different to the thread polling the phy status.
Races have been observed with mvneta on SolidRun Clearfog with phylink,
particularly between the phylib worker reading the PHYs status, and
the thread resuming mvneta, calling phy_start() which then calls
through to m88e1121_config_aneg_rgmii_delays(), which tries to
read-modify-write the MSCR register:
CPU0 CPU1
marvell_read_status_page()
marvell_set_page(phydev, MII_MARVELL_FIBER_PAGE)
...
m88e1121_config_aneg_rgmii_delays()
set_page(MII_MARVELL_MSCR_PAGE)
phy_read(phydev, MII_88E1121_PHY_MSCR_REG)
marvell_set_page(phydev, MII_MARVELL_COPPER_PAGE);
...
phy_write(phydev, MII_88E1121_PHY_MSCR_REG)
The result of this is we end up writing the copper page register 21,
which causes the copper PHY to be disabled, and the link partner sees
the link immediately go down.
Solve this by taking the bus lock instead of the PHY lock, thereby
preventing other accesses to the PHY while we are accessing other PHY
pages.
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
2018-01-02 17:58:48 +07:00
|
|
|
goto error;
|
2013-03-11 20:56:45 +07:00
|
|
|
|
|
|
|
/* Clear WOL status and disable magic packet matching */
|
net: phy: marvell: fix paged access races
For paged accesses to be truely safe, we need to hold the bus lock to
prevent anyone else gaining access to the registers while we modify
them.
The phydev->lock mutex does not do this: userspace via the MII ioctl
can still sneak in and read or write any register while we are on a
different page, and the suspend/resume methods can be called by a
thread different to the thread polling the phy status.
Races have been observed with mvneta on SolidRun Clearfog with phylink,
particularly between the phylib worker reading the PHYs status, and
the thread resuming mvneta, calling phy_start() which then calls
through to m88e1121_config_aneg_rgmii_delays(), which tries to
read-modify-write the MSCR register:
CPU0 CPU1
marvell_read_status_page()
marvell_set_page(phydev, MII_MARVELL_FIBER_PAGE)
...
m88e1121_config_aneg_rgmii_delays()
set_page(MII_MARVELL_MSCR_PAGE)
phy_read(phydev, MII_88E1121_PHY_MSCR_REG)
marvell_set_page(phydev, MII_MARVELL_COPPER_PAGE);
...
phy_write(phydev, MII_88E1121_PHY_MSCR_REG)
The result of this is we end up writing the copper page register 21,
which causes the copper PHY to be disabled, and the link partner sees
the link immediately go down.
Solve this by taking the bus lock instead of the PHY lock, thereby
preventing other accesses to the PHY while we are accessing other PHY
pages.
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
2018-01-02 17:58:48 +07:00
|
|
|
err = __phy_modify(phydev, MII_88E1318S_PHY_WOL_CTRL,
|
2018-01-05 23:07:10 +07:00
|
|
|
MII_88E1318S_PHY_WOL_CTRL_MAGIC_PACKET_MATCH_ENABLE,
|
net: phy: marvell: fix paged access races
For paged accesses to be truely safe, we need to hold the bus lock to
prevent anyone else gaining access to the registers while we modify
them.
The phydev->lock mutex does not do this: userspace via the MII ioctl
can still sneak in and read or write any register while we are on a
different page, and the suspend/resume methods can be called by a
thread different to the thread polling the phy status.
Races have been observed with mvneta on SolidRun Clearfog with phylink,
particularly between the phylib worker reading the PHYs status, and
the thread resuming mvneta, calling phy_start() which then calls
through to m88e1121_config_aneg_rgmii_delays(), which tries to
read-modify-write the MSCR register:
CPU0 CPU1
marvell_read_status_page()
marvell_set_page(phydev, MII_MARVELL_FIBER_PAGE)
...
m88e1121_config_aneg_rgmii_delays()
set_page(MII_MARVELL_MSCR_PAGE)
phy_read(phydev, MII_88E1121_PHY_MSCR_REG)
marvell_set_page(phydev, MII_MARVELL_COPPER_PAGE);
...
phy_write(phydev, MII_88E1121_PHY_MSCR_REG)
The result of this is we end up writing the copper page register 21,
which causes the copper PHY to be disabled, and the link partner sees
the link immediately go down.
Solve this by taking the bus lock instead of the PHY lock, thereby
preventing other accesses to the PHY while we are accessing other PHY
pages.
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
2018-01-02 17:58:48 +07:00
|
|
|
MII_88E1318S_PHY_WOL_CTRL_CLEAR_WOL_STATUS);
|
2013-03-11 20:56:45 +07:00
|
|
|
if (err < 0)
|
net: phy: marvell: fix paged access races
For paged accesses to be truely safe, we need to hold the bus lock to
prevent anyone else gaining access to the registers while we modify
them.
The phydev->lock mutex does not do this: userspace via the MII ioctl
can still sneak in and read or write any register while we are on a
different page, and the suspend/resume methods can be called by a
thread different to the thread polling the phy status.
Races have been observed with mvneta on SolidRun Clearfog with phylink,
particularly between the phylib worker reading the PHYs status, and
the thread resuming mvneta, calling phy_start() which then calls
through to m88e1121_config_aneg_rgmii_delays(), which tries to
read-modify-write the MSCR register:
CPU0 CPU1
marvell_read_status_page()
marvell_set_page(phydev, MII_MARVELL_FIBER_PAGE)
...
m88e1121_config_aneg_rgmii_delays()
set_page(MII_MARVELL_MSCR_PAGE)
phy_read(phydev, MII_88E1121_PHY_MSCR_REG)
marvell_set_page(phydev, MII_MARVELL_COPPER_PAGE);
...
phy_write(phydev, MII_88E1121_PHY_MSCR_REG)
The result of this is we end up writing the copper page register 21,
which causes the copper PHY to be disabled, and the link partner sees
the link immediately go down.
Solve this by taking the bus lock instead of the PHY lock, thereby
preventing other accesses to the PHY while we are accessing other PHY
pages.
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
2018-01-02 17:58:48 +07:00
|
|
|
goto error;
|
2013-03-11 20:56:45 +07:00
|
|
|
}
|
|
|
|
|
net: phy: marvell: fix paged access races
For paged accesses to be truely safe, we need to hold the bus lock to
prevent anyone else gaining access to the registers while we modify
them.
The phydev->lock mutex does not do this: userspace via the MII ioctl
can still sneak in and read or write any register while we are on a
different page, and the suspend/resume methods can be called by a
thread different to the thread polling the phy status.
Races have been observed with mvneta on SolidRun Clearfog with phylink,
particularly between the phylib worker reading the PHYs status, and
the thread resuming mvneta, calling phy_start() which then calls
through to m88e1121_config_aneg_rgmii_delays(), which tries to
read-modify-write the MSCR register:
CPU0 CPU1
marvell_read_status_page()
marvell_set_page(phydev, MII_MARVELL_FIBER_PAGE)
...
m88e1121_config_aneg_rgmii_delays()
set_page(MII_MARVELL_MSCR_PAGE)
phy_read(phydev, MII_88E1121_PHY_MSCR_REG)
marvell_set_page(phydev, MII_MARVELL_COPPER_PAGE);
...
phy_write(phydev, MII_88E1121_PHY_MSCR_REG)
The result of this is we end up writing the copper page register 21,
which causes the copper PHY to be disabled, and the link partner sees
the link immediately go down.
Solve this by taking the bus lock instead of the PHY lock, thereby
preventing other accesses to the PHY while we are accessing other PHY
pages.
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
2018-01-02 17:58:48 +07:00
|
|
|
error:
|
|
|
|
return phy_restore_page(phydev, oldpage, err);
|
2013-03-11 20:56:45 +07:00
|
|
|
}
|
|
|
|
|
2015-12-30 22:28:26 +07:00
|
|
|
static int marvell_get_sset_count(struct phy_device *phydev)
|
|
|
|
{
|
2016-07-19 16:13:11 +07:00
|
|
|
if (phydev->supported & SUPPORTED_FIBRE)
|
|
|
|
return ARRAY_SIZE(marvell_hw_stats);
|
|
|
|
else
|
|
|
|
return ARRAY_SIZE(marvell_hw_stats) - NB_FIBER_STATS;
|
2015-12-30 22:28:26 +07:00
|
|
|
}
|
|
|
|
|
|
|
|
static void marvell_get_strings(struct phy_device *phydev, u8 *data)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
|
|
|
for (i = 0; i < ARRAY_SIZE(marvell_hw_stats); i++) {
|
2018-03-03 06:08:37 +07:00
|
|
|
strlcpy(data + i * ETH_GSTRING_LEN,
|
|
|
|
marvell_hw_stats[i].string, ETH_GSTRING_LEN);
|
2015-12-30 22:28:26 +07:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static u64 marvell_get_stat(struct phy_device *phydev, int i)
|
|
|
|
{
|
|
|
|
struct marvell_hw_stat stat = marvell_hw_stats[i];
|
|
|
|
struct marvell_priv *priv = phydev->priv;
|
net: phy: marvell: fix paged access races
For paged accesses to be truely safe, we need to hold the bus lock to
prevent anyone else gaining access to the registers while we modify
them.
The phydev->lock mutex does not do this: userspace via the MII ioctl
can still sneak in and read or write any register while we are on a
different page, and the suspend/resume methods can be called by a
thread different to the thread polling the phy status.
Races have been observed with mvneta on SolidRun Clearfog with phylink,
particularly between the phylib worker reading the PHYs status, and
the thread resuming mvneta, calling phy_start() which then calls
through to m88e1121_config_aneg_rgmii_delays(), which tries to
read-modify-write the MSCR register:
CPU0 CPU1
marvell_read_status_page()
marvell_set_page(phydev, MII_MARVELL_FIBER_PAGE)
...
m88e1121_config_aneg_rgmii_delays()
set_page(MII_MARVELL_MSCR_PAGE)
phy_read(phydev, MII_88E1121_PHY_MSCR_REG)
marvell_set_page(phydev, MII_MARVELL_COPPER_PAGE);
...
phy_write(phydev, MII_88E1121_PHY_MSCR_REG)
The result of this is we end up writing the copper page register 21,
which causes the copper PHY to be disabled, and the link partner sees
the link immediately go down.
Solve this by taking the bus lock instead of the PHY lock, thereby
preventing other accesses to the PHY while we are accessing other PHY
pages.
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
2018-01-02 17:58:48 +07:00
|
|
|
int val;
|
2016-02-20 06:35:29 +07:00
|
|
|
u64 ret;
|
2015-12-30 22:28:26 +07:00
|
|
|
|
net: phy: marvell: fix paged access races
For paged accesses to be truely safe, we need to hold the bus lock to
prevent anyone else gaining access to the registers while we modify
them.
The phydev->lock mutex does not do this: userspace via the MII ioctl
can still sneak in and read or write any register while we are on a
different page, and the suspend/resume methods can be called by a
thread different to the thread polling the phy status.
Races have been observed with mvneta on SolidRun Clearfog with phylink,
particularly between the phylib worker reading the PHYs status, and
the thread resuming mvneta, calling phy_start() which then calls
through to m88e1121_config_aneg_rgmii_delays(), which tries to
read-modify-write the MSCR register:
CPU0 CPU1
marvell_read_status_page()
marvell_set_page(phydev, MII_MARVELL_FIBER_PAGE)
...
m88e1121_config_aneg_rgmii_delays()
set_page(MII_MARVELL_MSCR_PAGE)
phy_read(phydev, MII_88E1121_PHY_MSCR_REG)
marvell_set_page(phydev, MII_MARVELL_COPPER_PAGE);
...
phy_write(phydev, MII_88E1121_PHY_MSCR_REG)
The result of this is we end up writing the copper page register 21,
which causes the copper PHY to be disabled, and the link partner sees
the link immediately go down.
Solve this by taking the bus lock instead of the PHY lock, thereby
preventing other accesses to the PHY while we are accessing other PHY
pages.
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
2018-01-02 17:58:48 +07:00
|
|
|
val = phy_read_paged(phydev, stat.page, stat.reg);
|
2015-12-30 22:28:26 +07:00
|
|
|
if (val < 0) {
|
2018-04-27 15:18:58 +07:00
|
|
|
ret = U64_MAX;
|
2015-12-30 22:28:26 +07:00
|
|
|
} else {
|
|
|
|
val = val & ((1 << stat.bits) - 1);
|
|
|
|
priv->stats[i] += val;
|
2016-02-20 06:35:29 +07:00
|
|
|
ret = priv->stats[i];
|
2015-12-30 22:28:26 +07:00
|
|
|
}
|
|
|
|
|
2016-02-20 06:35:29 +07:00
|
|
|
return ret;
|
2015-12-30 22:28:26 +07:00
|
|
|
}
|
|
|
|
|
|
|
|
static void marvell_get_stats(struct phy_device *phydev,
|
|
|
|
struct ethtool_stats *stats, u64 *data)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
|
|
|
for (i = 0; i < ARRAY_SIZE(marvell_hw_stats); i++)
|
|
|
|
data[i] = marvell_get_stat(phydev, i);
|
|
|
|
}
|
|
|
|
|
2017-01-20 07:37:49 +07:00
|
|
|
#ifdef CONFIG_HWMON
|
|
|
|
static int m88e1121_get_temp(struct phy_device *phydev, long *temp)
|
|
|
|
{
|
2017-05-26 02:42:06 +07:00
|
|
|
int oldpage;
|
net: phy: marvell: fix paged access races
For paged accesses to be truely safe, we need to hold the bus lock to
prevent anyone else gaining access to the registers while we modify
them.
The phydev->lock mutex does not do this: userspace via the MII ioctl
can still sneak in and read or write any register while we are on a
different page, and the suspend/resume methods can be called by a
thread different to the thread polling the phy status.
Races have been observed with mvneta on SolidRun Clearfog with phylink,
particularly between the phylib worker reading the PHYs status, and
the thread resuming mvneta, calling phy_start() which then calls
through to m88e1121_config_aneg_rgmii_delays(), which tries to
read-modify-write the MSCR register:
CPU0 CPU1
marvell_read_status_page()
marvell_set_page(phydev, MII_MARVELL_FIBER_PAGE)
...
m88e1121_config_aneg_rgmii_delays()
set_page(MII_MARVELL_MSCR_PAGE)
phy_read(phydev, MII_88E1121_PHY_MSCR_REG)
marvell_set_page(phydev, MII_MARVELL_COPPER_PAGE);
...
phy_write(phydev, MII_88E1121_PHY_MSCR_REG)
The result of this is we end up writing the copper page register 21,
which causes the copper PHY to be disabled, and the link partner sees
the link immediately go down.
Solve this by taking the bus lock instead of the PHY lock, thereby
preventing other accesses to the PHY while we are accessing other PHY
pages.
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
2018-01-02 17:58:48 +07:00
|
|
|
int ret = 0;
|
2017-01-20 07:37:49 +07:00
|
|
|
int val;
|
|
|
|
|
|
|
|
*temp = 0;
|
|
|
|
|
net: phy: marvell: fix paged access races
For paged accesses to be truely safe, we need to hold the bus lock to
prevent anyone else gaining access to the registers while we modify
them.
The phydev->lock mutex does not do this: userspace via the MII ioctl
can still sneak in and read or write any register while we are on a
different page, and the suspend/resume methods can be called by a
thread different to the thread polling the phy status.
Races have been observed with mvneta on SolidRun Clearfog with phylink,
particularly between the phylib worker reading the PHYs status, and
the thread resuming mvneta, calling phy_start() which then calls
through to m88e1121_config_aneg_rgmii_delays(), which tries to
read-modify-write the MSCR register:
CPU0 CPU1
marvell_read_status_page()
marvell_set_page(phydev, MII_MARVELL_FIBER_PAGE)
...
m88e1121_config_aneg_rgmii_delays()
set_page(MII_MARVELL_MSCR_PAGE)
phy_read(phydev, MII_88E1121_PHY_MSCR_REG)
marvell_set_page(phydev, MII_MARVELL_COPPER_PAGE);
...
phy_write(phydev, MII_88E1121_PHY_MSCR_REG)
The result of this is we end up writing the copper page register 21,
which causes the copper PHY to be disabled, and the link partner sees
the link immediately go down.
Solve this by taking the bus lock instead of the PHY lock, thereby
preventing other accesses to the PHY while we are accessing other PHY
pages.
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
2018-01-02 17:58:48 +07:00
|
|
|
oldpage = phy_select_page(phydev, MII_MARVELL_MISC_TEST_PAGE);
|
|
|
|
if (oldpage < 0)
|
|
|
|
goto error;
|
2017-05-26 02:42:06 +07:00
|
|
|
|
2017-01-20 07:37:49 +07:00
|
|
|
/* Enable temperature sensor */
|
net: phy: marvell: fix paged access races
For paged accesses to be truely safe, we need to hold the bus lock to
prevent anyone else gaining access to the registers while we modify
them.
The phydev->lock mutex does not do this: userspace via the MII ioctl
can still sneak in and read or write any register while we are on a
different page, and the suspend/resume methods can be called by a
thread different to the thread polling the phy status.
Races have been observed with mvneta on SolidRun Clearfog with phylink,
particularly between the phylib worker reading the PHYs status, and
the thread resuming mvneta, calling phy_start() which then calls
through to m88e1121_config_aneg_rgmii_delays(), which tries to
read-modify-write the MSCR register:
CPU0 CPU1
marvell_read_status_page()
marvell_set_page(phydev, MII_MARVELL_FIBER_PAGE)
...
m88e1121_config_aneg_rgmii_delays()
set_page(MII_MARVELL_MSCR_PAGE)
phy_read(phydev, MII_88E1121_PHY_MSCR_REG)
marvell_set_page(phydev, MII_MARVELL_COPPER_PAGE);
...
phy_write(phydev, MII_88E1121_PHY_MSCR_REG)
The result of this is we end up writing the copper page register 21,
which causes the copper PHY to be disabled, and the link partner sees
the link immediately go down.
Solve this by taking the bus lock instead of the PHY lock, thereby
preventing other accesses to the PHY while we are accessing other PHY
pages.
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
2018-01-02 17:58:48 +07:00
|
|
|
ret = __phy_read(phydev, MII_88E1121_MISC_TEST);
|
2017-01-20 07:37:49 +07:00
|
|
|
if (ret < 0)
|
|
|
|
goto error;
|
|
|
|
|
net: phy: marvell: fix paged access races
For paged accesses to be truely safe, we need to hold the bus lock to
prevent anyone else gaining access to the registers while we modify
them.
The phydev->lock mutex does not do this: userspace via the MII ioctl
can still sneak in and read or write any register while we are on a
different page, and the suspend/resume methods can be called by a
thread different to the thread polling the phy status.
Races have been observed with mvneta on SolidRun Clearfog with phylink,
particularly between the phylib worker reading the PHYs status, and
the thread resuming mvneta, calling phy_start() which then calls
through to m88e1121_config_aneg_rgmii_delays(), which tries to
read-modify-write the MSCR register:
CPU0 CPU1
marvell_read_status_page()
marvell_set_page(phydev, MII_MARVELL_FIBER_PAGE)
...
m88e1121_config_aneg_rgmii_delays()
set_page(MII_MARVELL_MSCR_PAGE)
phy_read(phydev, MII_88E1121_PHY_MSCR_REG)
marvell_set_page(phydev, MII_MARVELL_COPPER_PAGE);
...
phy_write(phydev, MII_88E1121_PHY_MSCR_REG)
The result of this is we end up writing the copper page register 21,
which causes the copper PHY to be disabled, and the link partner sees
the link immediately go down.
Solve this by taking the bus lock instead of the PHY lock, thereby
preventing other accesses to the PHY while we are accessing other PHY
pages.
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
2018-01-02 17:58:48 +07:00
|
|
|
ret = __phy_write(phydev, MII_88E1121_MISC_TEST,
|
|
|
|
ret | MII_88E1121_MISC_TEST_TEMP_SENSOR_EN);
|
2017-01-20 07:37:49 +07:00
|
|
|
if (ret < 0)
|
|
|
|
goto error;
|
|
|
|
|
|
|
|
/* Wait for temperature to stabilize */
|
|
|
|
usleep_range(10000, 12000);
|
|
|
|
|
net: phy: marvell: fix paged access races
For paged accesses to be truely safe, we need to hold the bus lock to
prevent anyone else gaining access to the registers while we modify
them.
The phydev->lock mutex does not do this: userspace via the MII ioctl
can still sneak in and read or write any register while we are on a
different page, and the suspend/resume methods can be called by a
thread different to the thread polling the phy status.
Races have been observed with mvneta on SolidRun Clearfog with phylink,
particularly between the phylib worker reading the PHYs status, and
the thread resuming mvneta, calling phy_start() which then calls
through to m88e1121_config_aneg_rgmii_delays(), which tries to
read-modify-write the MSCR register:
CPU0 CPU1
marvell_read_status_page()
marvell_set_page(phydev, MII_MARVELL_FIBER_PAGE)
...
m88e1121_config_aneg_rgmii_delays()
set_page(MII_MARVELL_MSCR_PAGE)
phy_read(phydev, MII_88E1121_PHY_MSCR_REG)
marvell_set_page(phydev, MII_MARVELL_COPPER_PAGE);
...
phy_write(phydev, MII_88E1121_PHY_MSCR_REG)
The result of this is we end up writing the copper page register 21,
which causes the copper PHY to be disabled, and the link partner sees
the link immediately go down.
Solve this by taking the bus lock instead of the PHY lock, thereby
preventing other accesses to the PHY while we are accessing other PHY
pages.
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
2018-01-02 17:58:48 +07:00
|
|
|
val = __phy_read(phydev, MII_88E1121_MISC_TEST);
|
2017-01-20 07:37:49 +07:00
|
|
|
if (val < 0) {
|
|
|
|
ret = val;
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Disable temperature sensor */
|
net: phy: marvell: fix paged access races
For paged accesses to be truely safe, we need to hold the bus lock to
prevent anyone else gaining access to the registers while we modify
them.
The phydev->lock mutex does not do this: userspace via the MII ioctl
can still sneak in and read or write any register while we are on a
different page, and the suspend/resume methods can be called by a
thread different to the thread polling the phy status.
Races have been observed with mvneta on SolidRun Clearfog with phylink,
particularly between the phylib worker reading the PHYs status, and
the thread resuming mvneta, calling phy_start() which then calls
through to m88e1121_config_aneg_rgmii_delays(), which tries to
read-modify-write the MSCR register:
CPU0 CPU1
marvell_read_status_page()
marvell_set_page(phydev, MII_MARVELL_FIBER_PAGE)
...
m88e1121_config_aneg_rgmii_delays()
set_page(MII_MARVELL_MSCR_PAGE)
phy_read(phydev, MII_88E1121_PHY_MSCR_REG)
marvell_set_page(phydev, MII_MARVELL_COPPER_PAGE);
...
phy_write(phydev, MII_88E1121_PHY_MSCR_REG)
The result of this is we end up writing the copper page register 21,
which causes the copper PHY to be disabled, and the link partner sees
the link immediately go down.
Solve this by taking the bus lock instead of the PHY lock, thereby
preventing other accesses to the PHY while we are accessing other PHY
pages.
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
2018-01-02 17:58:48 +07:00
|
|
|
ret = __phy_write(phydev, MII_88E1121_MISC_TEST,
|
|
|
|
ret & ~MII_88E1121_MISC_TEST_TEMP_SENSOR_EN);
|
2017-01-20 07:37:49 +07:00
|
|
|
if (ret < 0)
|
|
|
|
goto error;
|
|
|
|
|
|
|
|
*temp = ((val & MII_88E1121_MISC_TEST_TEMP_MASK) - 5) * 5000;
|
|
|
|
|
|
|
|
error:
|
net: phy: marvell: fix paged access races
For paged accesses to be truely safe, we need to hold the bus lock to
prevent anyone else gaining access to the registers while we modify
them.
The phydev->lock mutex does not do this: userspace via the MII ioctl
can still sneak in and read or write any register while we are on a
different page, and the suspend/resume methods can be called by a
thread different to the thread polling the phy status.
Races have been observed with mvneta on SolidRun Clearfog with phylink,
particularly between the phylib worker reading the PHYs status, and
the thread resuming mvneta, calling phy_start() which then calls
through to m88e1121_config_aneg_rgmii_delays(), which tries to
read-modify-write the MSCR register:
CPU0 CPU1
marvell_read_status_page()
marvell_set_page(phydev, MII_MARVELL_FIBER_PAGE)
...
m88e1121_config_aneg_rgmii_delays()
set_page(MII_MARVELL_MSCR_PAGE)
phy_read(phydev, MII_88E1121_PHY_MSCR_REG)
marvell_set_page(phydev, MII_MARVELL_COPPER_PAGE);
...
phy_write(phydev, MII_88E1121_PHY_MSCR_REG)
The result of this is we end up writing the copper page register 21,
which causes the copper PHY to be disabled, and the link partner sees
the link immediately go down.
Solve this by taking the bus lock instead of the PHY lock, thereby
preventing other accesses to the PHY while we are accessing other PHY
pages.
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
2018-01-02 17:58:48 +07:00
|
|
|
return phy_restore_page(phydev, oldpage, ret);
|
2017-01-20 07:37:49 +07:00
|
|
|
}
|
|
|
|
|
|
|
|
static int m88e1121_hwmon_read(struct device *dev,
|
|
|
|
enum hwmon_sensor_types type,
|
|
|
|
u32 attr, int channel, long *temp)
|
|
|
|
{
|
|
|
|
struct phy_device *phydev = dev_get_drvdata(dev);
|
|
|
|
int err;
|
|
|
|
|
|
|
|
switch (attr) {
|
|
|
|
case hwmon_temp_input:
|
|
|
|
err = m88e1121_get_temp(phydev, temp);
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
return -EOPNOTSUPP;
|
|
|
|
}
|
|
|
|
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
|
|
|
static umode_t m88e1121_hwmon_is_visible(const void *data,
|
|
|
|
enum hwmon_sensor_types type,
|
|
|
|
u32 attr, int channel)
|
|
|
|
{
|
|
|
|
if (type != hwmon_temp)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
switch (attr) {
|
|
|
|
case hwmon_temp_input:
|
|
|
|
return 0444;
|
|
|
|
default:
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static u32 m88e1121_hwmon_chip_config[] = {
|
|
|
|
HWMON_C_REGISTER_TZ,
|
|
|
|
0
|
|
|
|
};
|
|
|
|
|
|
|
|
static const struct hwmon_channel_info m88e1121_hwmon_chip = {
|
|
|
|
.type = hwmon_chip,
|
|
|
|
.config = m88e1121_hwmon_chip_config,
|
|
|
|
};
|
|
|
|
|
|
|
|
static u32 m88e1121_hwmon_temp_config[] = {
|
|
|
|
HWMON_T_INPUT,
|
|
|
|
0
|
|
|
|
};
|
|
|
|
|
|
|
|
static const struct hwmon_channel_info m88e1121_hwmon_temp = {
|
|
|
|
.type = hwmon_temp,
|
|
|
|
.config = m88e1121_hwmon_temp_config,
|
|
|
|
};
|
|
|
|
|
|
|
|
static const struct hwmon_channel_info *m88e1121_hwmon_info[] = {
|
|
|
|
&m88e1121_hwmon_chip,
|
|
|
|
&m88e1121_hwmon_temp,
|
|
|
|
NULL
|
|
|
|
};
|
|
|
|
|
|
|
|
static const struct hwmon_ops m88e1121_hwmon_hwmon_ops = {
|
|
|
|
.is_visible = m88e1121_hwmon_is_visible,
|
|
|
|
.read = m88e1121_hwmon_read,
|
|
|
|
};
|
|
|
|
|
|
|
|
static const struct hwmon_chip_info m88e1121_hwmon_chip_info = {
|
|
|
|
.ops = &m88e1121_hwmon_hwmon_ops,
|
|
|
|
.info = m88e1121_hwmon_info,
|
|
|
|
};
|
|
|
|
|
|
|
|
static int m88e1510_get_temp(struct phy_device *phydev, long *temp)
|
|
|
|
{
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
*temp = 0;
|
|
|
|
|
net: phy: marvell: fix paged access races
For paged accesses to be truely safe, we need to hold the bus lock to
prevent anyone else gaining access to the registers while we modify
them.
The phydev->lock mutex does not do this: userspace via the MII ioctl
can still sneak in and read or write any register while we are on a
different page, and the suspend/resume methods can be called by a
thread different to the thread polling the phy status.
Races have been observed with mvneta on SolidRun Clearfog with phylink,
particularly between the phylib worker reading the PHYs status, and
the thread resuming mvneta, calling phy_start() which then calls
through to m88e1121_config_aneg_rgmii_delays(), which tries to
read-modify-write the MSCR register:
CPU0 CPU1
marvell_read_status_page()
marvell_set_page(phydev, MII_MARVELL_FIBER_PAGE)
...
m88e1121_config_aneg_rgmii_delays()
set_page(MII_MARVELL_MSCR_PAGE)
phy_read(phydev, MII_88E1121_PHY_MSCR_REG)
marvell_set_page(phydev, MII_MARVELL_COPPER_PAGE);
...
phy_write(phydev, MII_88E1121_PHY_MSCR_REG)
The result of this is we end up writing the copper page register 21,
which causes the copper PHY to be disabled, and the link partner sees
the link immediately go down.
Solve this by taking the bus lock instead of the PHY lock, thereby
preventing other accesses to the PHY while we are accessing other PHY
pages.
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
2018-01-02 17:58:48 +07:00
|
|
|
ret = phy_read_paged(phydev, MII_MARVELL_MISC_TEST_PAGE,
|
|
|
|
MII_88E1510_TEMP_SENSOR);
|
2017-01-20 07:37:49 +07:00
|
|
|
if (ret < 0)
|
net: phy: marvell: fix paged access races
For paged accesses to be truely safe, we need to hold the bus lock to
prevent anyone else gaining access to the registers while we modify
them.
The phydev->lock mutex does not do this: userspace via the MII ioctl
can still sneak in and read or write any register while we are on a
different page, and the suspend/resume methods can be called by a
thread different to the thread polling the phy status.
Races have been observed with mvneta on SolidRun Clearfog with phylink,
particularly between the phylib worker reading the PHYs status, and
the thread resuming mvneta, calling phy_start() which then calls
through to m88e1121_config_aneg_rgmii_delays(), which tries to
read-modify-write the MSCR register:
CPU0 CPU1
marvell_read_status_page()
marvell_set_page(phydev, MII_MARVELL_FIBER_PAGE)
...
m88e1121_config_aneg_rgmii_delays()
set_page(MII_MARVELL_MSCR_PAGE)
phy_read(phydev, MII_88E1121_PHY_MSCR_REG)
marvell_set_page(phydev, MII_MARVELL_COPPER_PAGE);
...
phy_write(phydev, MII_88E1121_PHY_MSCR_REG)
The result of this is we end up writing the copper page register 21,
which causes the copper PHY to be disabled, and the link partner sees
the link immediately go down.
Solve this by taking the bus lock instead of the PHY lock, thereby
preventing other accesses to the PHY while we are accessing other PHY
pages.
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
2018-01-02 17:58:48 +07:00
|
|
|
return ret;
|
2017-01-20 07:37:49 +07:00
|
|
|
|
|
|
|
*temp = ((ret & MII_88E1510_TEMP_SENSOR_MASK) - 25) * 1000;
|
|
|
|
|
net: phy: marvell: fix paged access races
For paged accesses to be truely safe, we need to hold the bus lock to
prevent anyone else gaining access to the registers while we modify
them.
The phydev->lock mutex does not do this: userspace via the MII ioctl
can still sneak in and read or write any register while we are on a
different page, and the suspend/resume methods can be called by a
thread different to the thread polling the phy status.
Races have been observed with mvneta on SolidRun Clearfog with phylink,
particularly between the phylib worker reading the PHYs status, and
the thread resuming mvneta, calling phy_start() which then calls
through to m88e1121_config_aneg_rgmii_delays(), which tries to
read-modify-write the MSCR register:
CPU0 CPU1
marvell_read_status_page()
marvell_set_page(phydev, MII_MARVELL_FIBER_PAGE)
...
m88e1121_config_aneg_rgmii_delays()
set_page(MII_MARVELL_MSCR_PAGE)
phy_read(phydev, MII_88E1121_PHY_MSCR_REG)
marvell_set_page(phydev, MII_MARVELL_COPPER_PAGE);
...
phy_write(phydev, MII_88E1121_PHY_MSCR_REG)
The result of this is we end up writing the copper page register 21,
which causes the copper PHY to be disabled, and the link partner sees
the link immediately go down.
Solve this by taking the bus lock instead of the PHY lock, thereby
preventing other accesses to the PHY while we are accessing other PHY
pages.
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
2018-01-02 17:58:48 +07:00
|
|
|
return 0;
|
2017-01-20 07:37:49 +07:00
|
|
|
}
|
|
|
|
|
2017-06-02 21:13:34 +07:00
|
|
|
static int m88e1510_get_temp_critical(struct phy_device *phydev, long *temp)
|
2017-01-20 07:37:49 +07:00
|
|
|
{
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
*temp = 0;
|
|
|
|
|
net: phy: marvell: fix paged access races
For paged accesses to be truely safe, we need to hold the bus lock to
prevent anyone else gaining access to the registers while we modify
them.
The phydev->lock mutex does not do this: userspace via the MII ioctl
can still sneak in and read or write any register while we are on a
different page, and the suspend/resume methods can be called by a
thread different to the thread polling the phy status.
Races have been observed with mvneta on SolidRun Clearfog with phylink,
particularly between the phylib worker reading the PHYs status, and
the thread resuming mvneta, calling phy_start() which then calls
through to m88e1121_config_aneg_rgmii_delays(), which tries to
read-modify-write the MSCR register:
CPU0 CPU1
marvell_read_status_page()
marvell_set_page(phydev, MII_MARVELL_FIBER_PAGE)
...
m88e1121_config_aneg_rgmii_delays()
set_page(MII_MARVELL_MSCR_PAGE)
phy_read(phydev, MII_88E1121_PHY_MSCR_REG)
marvell_set_page(phydev, MII_MARVELL_COPPER_PAGE);
...
phy_write(phydev, MII_88E1121_PHY_MSCR_REG)
The result of this is we end up writing the copper page register 21,
which causes the copper PHY to be disabled, and the link partner sees
the link immediately go down.
Solve this by taking the bus lock instead of the PHY lock, thereby
preventing other accesses to the PHY while we are accessing other PHY
pages.
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
2018-01-02 17:58:48 +07:00
|
|
|
ret = phy_read_paged(phydev, MII_MARVELL_MISC_TEST_PAGE,
|
|
|
|
MII_88E1121_MISC_TEST);
|
2017-01-20 07:37:49 +07:00
|
|
|
if (ret < 0)
|
net: phy: marvell: fix paged access races
For paged accesses to be truely safe, we need to hold the bus lock to
prevent anyone else gaining access to the registers while we modify
them.
The phydev->lock mutex does not do this: userspace via the MII ioctl
can still sneak in and read or write any register while we are on a
different page, and the suspend/resume methods can be called by a
thread different to the thread polling the phy status.
Races have been observed with mvneta on SolidRun Clearfog with phylink,
particularly between the phylib worker reading the PHYs status, and
the thread resuming mvneta, calling phy_start() which then calls
through to m88e1121_config_aneg_rgmii_delays(), which tries to
read-modify-write the MSCR register:
CPU0 CPU1
marvell_read_status_page()
marvell_set_page(phydev, MII_MARVELL_FIBER_PAGE)
...
m88e1121_config_aneg_rgmii_delays()
set_page(MII_MARVELL_MSCR_PAGE)
phy_read(phydev, MII_88E1121_PHY_MSCR_REG)
marvell_set_page(phydev, MII_MARVELL_COPPER_PAGE);
...
phy_write(phydev, MII_88E1121_PHY_MSCR_REG)
The result of this is we end up writing the copper page register 21,
which causes the copper PHY to be disabled, and the link partner sees
the link immediately go down.
Solve this by taking the bus lock instead of the PHY lock, thereby
preventing other accesses to the PHY while we are accessing other PHY
pages.
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
2018-01-02 17:58:48 +07:00
|
|
|
return ret;
|
2017-01-20 07:37:49 +07:00
|
|
|
|
|
|
|
*temp = (((ret & MII_88E1510_MISC_TEST_TEMP_THRESHOLD_MASK) >>
|
|
|
|
MII_88E1510_MISC_TEST_TEMP_THRESHOLD_SHIFT) * 5) - 25;
|
|
|
|
/* convert to mC */
|
|
|
|
*temp *= 1000;
|
|
|
|
|
net: phy: marvell: fix paged access races
For paged accesses to be truely safe, we need to hold the bus lock to
prevent anyone else gaining access to the registers while we modify
them.
The phydev->lock mutex does not do this: userspace via the MII ioctl
can still sneak in and read or write any register while we are on a
different page, and the suspend/resume methods can be called by a
thread different to the thread polling the phy status.
Races have been observed with mvneta on SolidRun Clearfog with phylink,
particularly between the phylib worker reading the PHYs status, and
the thread resuming mvneta, calling phy_start() which then calls
through to m88e1121_config_aneg_rgmii_delays(), which tries to
read-modify-write the MSCR register:
CPU0 CPU1
marvell_read_status_page()
marvell_set_page(phydev, MII_MARVELL_FIBER_PAGE)
...
m88e1121_config_aneg_rgmii_delays()
set_page(MII_MARVELL_MSCR_PAGE)
phy_read(phydev, MII_88E1121_PHY_MSCR_REG)
marvell_set_page(phydev, MII_MARVELL_COPPER_PAGE);
...
phy_write(phydev, MII_88E1121_PHY_MSCR_REG)
The result of this is we end up writing the copper page register 21,
which causes the copper PHY to be disabled, and the link partner sees
the link immediately go down.
Solve this by taking the bus lock instead of the PHY lock, thereby
preventing other accesses to the PHY while we are accessing other PHY
pages.
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
2018-01-02 17:58:48 +07:00
|
|
|
return 0;
|
2017-01-20 07:37:49 +07:00
|
|
|
}
|
|
|
|
|
2017-06-02 21:13:34 +07:00
|
|
|
static int m88e1510_set_temp_critical(struct phy_device *phydev, long temp)
|
2017-01-20 07:37:49 +07:00
|
|
|
{
|
|
|
|
temp = temp / 1000;
|
|
|
|
temp = clamp_val(DIV_ROUND_CLOSEST(temp, 5) + 5, 0, 0x1f);
|
|
|
|
|
net: phy: marvell: fix paged access races
For paged accesses to be truely safe, we need to hold the bus lock to
prevent anyone else gaining access to the registers while we modify
them.
The phydev->lock mutex does not do this: userspace via the MII ioctl
can still sneak in and read or write any register while we are on a
different page, and the suspend/resume methods can be called by a
thread different to the thread polling the phy status.
Races have been observed with mvneta on SolidRun Clearfog with phylink,
particularly between the phylib worker reading the PHYs status, and
the thread resuming mvneta, calling phy_start() which then calls
through to m88e1121_config_aneg_rgmii_delays(), which tries to
read-modify-write the MSCR register:
CPU0 CPU1
marvell_read_status_page()
marvell_set_page(phydev, MII_MARVELL_FIBER_PAGE)
...
m88e1121_config_aneg_rgmii_delays()
set_page(MII_MARVELL_MSCR_PAGE)
phy_read(phydev, MII_88E1121_PHY_MSCR_REG)
marvell_set_page(phydev, MII_MARVELL_COPPER_PAGE);
...
phy_write(phydev, MII_88E1121_PHY_MSCR_REG)
The result of this is we end up writing the copper page register 21,
which causes the copper PHY to be disabled, and the link partner sees
the link immediately go down.
Solve this by taking the bus lock instead of the PHY lock, thereby
preventing other accesses to the PHY while we are accessing other PHY
pages.
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
2018-01-02 17:58:48 +07:00
|
|
|
return phy_modify_paged(phydev, MII_MARVELL_MISC_TEST_PAGE,
|
|
|
|
MII_88E1121_MISC_TEST,
|
|
|
|
MII_88E1510_MISC_TEST_TEMP_THRESHOLD_MASK,
|
|
|
|
temp << MII_88E1510_MISC_TEST_TEMP_THRESHOLD_SHIFT);
|
2017-01-20 07:37:49 +07:00
|
|
|
}
|
|
|
|
|
2017-06-02 21:13:34 +07:00
|
|
|
static int m88e1510_get_temp_alarm(struct phy_device *phydev, long *alarm)
|
2017-01-20 07:37:49 +07:00
|
|
|
{
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
*alarm = false;
|
|
|
|
|
net: phy: marvell: fix paged access races
For paged accesses to be truely safe, we need to hold the bus lock to
prevent anyone else gaining access to the registers while we modify
them.
The phydev->lock mutex does not do this: userspace via the MII ioctl
can still sneak in and read or write any register while we are on a
different page, and the suspend/resume methods can be called by a
thread different to the thread polling the phy status.
Races have been observed with mvneta on SolidRun Clearfog with phylink,
particularly between the phylib worker reading the PHYs status, and
the thread resuming mvneta, calling phy_start() which then calls
through to m88e1121_config_aneg_rgmii_delays(), which tries to
read-modify-write the MSCR register:
CPU0 CPU1
marvell_read_status_page()
marvell_set_page(phydev, MII_MARVELL_FIBER_PAGE)
...
m88e1121_config_aneg_rgmii_delays()
set_page(MII_MARVELL_MSCR_PAGE)
phy_read(phydev, MII_88E1121_PHY_MSCR_REG)
marvell_set_page(phydev, MII_MARVELL_COPPER_PAGE);
...
phy_write(phydev, MII_88E1121_PHY_MSCR_REG)
The result of this is we end up writing the copper page register 21,
which causes the copper PHY to be disabled, and the link partner sees
the link immediately go down.
Solve this by taking the bus lock instead of the PHY lock, thereby
preventing other accesses to the PHY while we are accessing other PHY
pages.
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
2018-01-02 17:58:48 +07:00
|
|
|
ret = phy_read_paged(phydev, MII_MARVELL_MISC_TEST_PAGE,
|
|
|
|
MII_88E1121_MISC_TEST);
|
2017-01-20 07:37:49 +07:00
|
|
|
if (ret < 0)
|
net: phy: marvell: fix paged access races
For paged accesses to be truely safe, we need to hold the bus lock to
prevent anyone else gaining access to the registers while we modify
them.
The phydev->lock mutex does not do this: userspace via the MII ioctl
can still sneak in and read or write any register while we are on a
different page, and the suspend/resume methods can be called by a
thread different to the thread polling the phy status.
Races have been observed with mvneta on SolidRun Clearfog with phylink,
particularly between the phylib worker reading the PHYs status, and
the thread resuming mvneta, calling phy_start() which then calls
through to m88e1121_config_aneg_rgmii_delays(), which tries to
read-modify-write the MSCR register:
CPU0 CPU1
marvell_read_status_page()
marvell_set_page(phydev, MII_MARVELL_FIBER_PAGE)
...
m88e1121_config_aneg_rgmii_delays()
set_page(MII_MARVELL_MSCR_PAGE)
phy_read(phydev, MII_88E1121_PHY_MSCR_REG)
marvell_set_page(phydev, MII_MARVELL_COPPER_PAGE);
...
phy_write(phydev, MII_88E1121_PHY_MSCR_REG)
The result of this is we end up writing the copper page register 21,
which causes the copper PHY to be disabled, and the link partner sees
the link immediately go down.
Solve this by taking the bus lock instead of the PHY lock, thereby
preventing other accesses to the PHY while we are accessing other PHY
pages.
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
2018-01-02 17:58:48 +07:00
|
|
|
return ret;
|
2017-01-20 07:37:49 +07:00
|
|
|
|
net: phy: marvell: fix paged access races
For paged accesses to be truely safe, we need to hold the bus lock to
prevent anyone else gaining access to the registers while we modify
them.
The phydev->lock mutex does not do this: userspace via the MII ioctl
can still sneak in and read or write any register while we are on a
different page, and the suspend/resume methods can be called by a
thread different to the thread polling the phy status.
Races have been observed with mvneta on SolidRun Clearfog with phylink,
particularly between the phylib worker reading the PHYs status, and
the thread resuming mvneta, calling phy_start() which then calls
through to m88e1121_config_aneg_rgmii_delays(), which tries to
read-modify-write the MSCR register:
CPU0 CPU1
marvell_read_status_page()
marvell_set_page(phydev, MII_MARVELL_FIBER_PAGE)
...
m88e1121_config_aneg_rgmii_delays()
set_page(MII_MARVELL_MSCR_PAGE)
phy_read(phydev, MII_88E1121_PHY_MSCR_REG)
marvell_set_page(phydev, MII_MARVELL_COPPER_PAGE);
...
phy_write(phydev, MII_88E1121_PHY_MSCR_REG)
The result of this is we end up writing the copper page register 21,
which causes the copper PHY to be disabled, and the link partner sees
the link immediately go down.
Solve this by taking the bus lock instead of the PHY lock, thereby
preventing other accesses to the PHY while we are accessing other PHY
pages.
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
2018-01-02 17:58:48 +07:00
|
|
|
*alarm = !!(ret & MII_88E1510_MISC_TEST_TEMP_IRQ);
|
2017-01-20 07:37:49 +07:00
|
|
|
|
net: phy: marvell: fix paged access races
For paged accesses to be truely safe, we need to hold the bus lock to
prevent anyone else gaining access to the registers while we modify
them.
The phydev->lock mutex does not do this: userspace via the MII ioctl
can still sneak in and read or write any register while we are on a
different page, and the suspend/resume methods can be called by a
thread different to the thread polling the phy status.
Races have been observed with mvneta on SolidRun Clearfog with phylink,
particularly between the phylib worker reading the PHYs status, and
the thread resuming mvneta, calling phy_start() which then calls
through to m88e1121_config_aneg_rgmii_delays(), which tries to
read-modify-write the MSCR register:
CPU0 CPU1
marvell_read_status_page()
marvell_set_page(phydev, MII_MARVELL_FIBER_PAGE)
...
m88e1121_config_aneg_rgmii_delays()
set_page(MII_MARVELL_MSCR_PAGE)
phy_read(phydev, MII_88E1121_PHY_MSCR_REG)
marvell_set_page(phydev, MII_MARVELL_COPPER_PAGE);
...
phy_write(phydev, MII_88E1121_PHY_MSCR_REG)
The result of this is we end up writing the copper page register 21,
which causes the copper PHY to be disabled, and the link partner sees
the link immediately go down.
Solve this by taking the bus lock instead of the PHY lock, thereby
preventing other accesses to the PHY while we are accessing other PHY
pages.
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
2018-01-02 17:58:48 +07:00
|
|
|
return 0;
|
2017-01-20 07:37:49 +07:00
|
|
|
}
|
|
|
|
|
|
|
|
static int m88e1510_hwmon_read(struct device *dev,
|
|
|
|
enum hwmon_sensor_types type,
|
|
|
|
u32 attr, int channel, long *temp)
|
|
|
|
{
|
|
|
|
struct phy_device *phydev = dev_get_drvdata(dev);
|
|
|
|
int err;
|
|
|
|
|
|
|
|
switch (attr) {
|
|
|
|
case hwmon_temp_input:
|
|
|
|
err = m88e1510_get_temp(phydev, temp);
|
|
|
|
break;
|
|
|
|
case hwmon_temp_crit:
|
|
|
|
err = m88e1510_get_temp_critical(phydev, temp);
|
|
|
|
break;
|
|
|
|
case hwmon_temp_max_alarm:
|
|
|
|
err = m88e1510_get_temp_alarm(phydev, temp);
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
return -EOPNOTSUPP;
|
|
|
|
}
|
|
|
|
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int m88e1510_hwmon_write(struct device *dev,
|
|
|
|
enum hwmon_sensor_types type,
|
|
|
|
u32 attr, int channel, long temp)
|
|
|
|
{
|
|
|
|
struct phy_device *phydev = dev_get_drvdata(dev);
|
|
|
|
int err;
|
|
|
|
|
|
|
|
switch (attr) {
|
|
|
|
case hwmon_temp_crit:
|
|
|
|
err = m88e1510_set_temp_critical(phydev, temp);
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
return -EOPNOTSUPP;
|
|
|
|
}
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
|
|
|
static umode_t m88e1510_hwmon_is_visible(const void *data,
|
|
|
|
enum hwmon_sensor_types type,
|
|
|
|
u32 attr, int channel)
|
|
|
|
{
|
|
|
|
if (type != hwmon_temp)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
switch (attr) {
|
|
|
|
case hwmon_temp_input:
|
|
|
|
case hwmon_temp_max_alarm:
|
|
|
|
return 0444;
|
|
|
|
case hwmon_temp_crit:
|
|
|
|
return 0644;
|
|
|
|
default:
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static u32 m88e1510_hwmon_temp_config[] = {
|
|
|
|
HWMON_T_INPUT | HWMON_T_CRIT | HWMON_T_MAX_ALARM,
|
|
|
|
0
|
|
|
|
};
|
|
|
|
|
|
|
|
static const struct hwmon_channel_info m88e1510_hwmon_temp = {
|
|
|
|
.type = hwmon_temp,
|
|
|
|
.config = m88e1510_hwmon_temp_config,
|
|
|
|
};
|
|
|
|
|
|
|
|
static const struct hwmon_channel_info *m88e1510_hwmon_info[] = {
|
|
|
|
&m88e1121_hwmon_chip,
|
|
|
|
&m88e1510_hwmon_temp,
|
|
|
|
NULL
|
|
|
|
};
|
|
|
|
|
|
|
|
static const struct hwmon_ops m88e1510_hwmon_hwmon_ops = {
|
|
|
|
.is_visible = m88e1510_hwmon_is_visible,
|
|
|
|
.read = m88e1510_hwmon_read,
|
|
|
|
.write = m88e1510_hwmon_write,
|
|
|
|
};
|
|
|
|
|
|
|
|
static const struct hwmon_chip_info m88e1510_hwmon_chip_info = {
|
|
|
|
.ops = &m88e1510_hwmon_hwmon_ops,
|
|
|
|
.info = m88e1510_hwmon_info,
|
|
|
|
};
|
|
|
|
|
2018-01-10 04:42:09 +07:00
|
|
|
static int m88e6390_get_temp(struct phy_device *phydev, long *temp)
|
|
|
|
{
|
|
|
|
int sum = 0;
|
|
|
|
int oldpage;
|
|
|
|
int ret = 0;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
*temp = 0;
|
|
|
|
|
|
|
|
oldpage = phy_select_page(phydev, MII_MARVELL_MISC_TEST_PAGE);
|
|
|
|
if (oldpage < 0)
|
|
|
|
goto error;
|
|
|
|
|
|
|
|
/* Enable temperature sensor */
|
|
|
|
ret = __phy_read(phydev, MII_88E6390_MISC_TEST);
|
|
|
|
if (ret < 0)
|
|
|
|
goto error;
|
|
|
|
|
|
|
|
ret = ret & ~MII_88E6390_MISC_TEST_SAMPLE_MASK;
|
|
|
|
ret |= MII_88E6390_MISC_TEST_SAMPLE_ENABLE |
|
|
|
|
MII_88E6390_MISC_TEST_SAMPLE_1S;
|
|
|
|
|
|
|
|
ret = __phy_write(phydev, MII_88E6390_MISC_TEST, ret);
|
|
|
|
if (ret < 0)
|
|
|
|
goto error;
|
|
|
|
|
|
|
|
/* Wait for temperature to stabilize */
|
|
|
|
usleep_range(10000, 12000);
|
|
|
|
|
|
|
|
/* Reading the temperature sense has an errata. You need to read
|
|
|
|
* a number of times and take an average.
|
|
|
|
*/
|
|
|
|
for (i = 0; i < MII_88E6390_TEMP_SENSOR_SAMPLES; i++) {
|
|
|
|
ret = __phy_read(phydev, MII_88E6390_TEMP_SENSOR);
|
|
|
|
if (ret < 0)
|
|
|
|
goto error;
|
|
|
|
sum += ret & MII_88E6390_TEMP_SENSOR_MASK;
|
|
|
|
}
|
|
|
|
|
|
|
|
sum /= MII_88E6390_TEMP_SENSOR_SAMPLES;
|
|
|
|
*temp = (sum - 75) * 1000;
|
|
|
|
|
|
|
|
/* Disable temperature sensor */
|
|
|
|
ret = __phy_read(phydev, MII_88E6390_MISC_TEST);
|
|
|
|
if (ret < 0)
|
|
|
|
goto error;
|
|
|
|
|
|
|
|
ret = ret & ~MII_88E6390_MISC_TEST_SAMPLE_MASK;
|
|
|
|
ret |= MII_88E6390_MISC_TEST_SAMPLE_DISABLE;
|
|
|
|
|
|
|
|
ret = __phy_write(phydev, MII_88E6390_MISC_TEST, ret);
|
|
|
|
|
|
|
|
error:
|
|
|
|
phy_restore_page(phydev, oldpage, ret);
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int m88e6390_hwmon_read(struct device *dev,
|
|
|
|
enum hwmon_sensor_types type,
|
|
|
|
u32 attr, int channel, long *temp)
|
|
|
|
{
|
|
|
|
struct phy_device *phydev = dev_get_drvdata(dev);
|
|
|
|
int err;
|
|
|
|
|
|
|
|
switch (attr) {
|
|
|
|
case hwmon_temp_input:
|
|
|
|
err = m88e6390_get_temp(phydev, temp);
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
return -EOPNOTSUPP;
|
|
|
|
}
|
|
|
|
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
|
|
|
static umode_t m88e6390_hwmon_is_visible(const void *data,
|
|
|
|
enum hwmon_sensor_types type,
|
|
|
|
u32 attr, int channel)
|
|
|
|
{
|
|
|
|
if (type != hwmon_temp)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
switch (attr) {
|
|
|
|
case hwmon_temp_input:
|
|
|
|
return 0444;
|
|
|
|
default:
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static u32 m88e6390_hwmon_temp_config[] = {
|
|
|
|
HWMON_T_INPUT,
|
|
|
|
0
|
|
|
|
};
|
|
|
|
|
|
|
|
static const struct hwmon_channel_info m88e6390_hwmon_temp = {
|
|
|
|
.type = hwmon_temp,
|
|
|
|
.config = m88e6390_hwmon_temp_config,
|
|
|
|
};
|
|
|
|
|
|
|
|
static const struct hwmon_channel_info *m88e6390_hwmon_info[] = {
|
|
|
|
&m88e1121_hwmon_chip,
|
|
|
|
&m88e6390_hwmon_temp,
|
|
|
|
NULL
|
|
|
|
};
|
|
|
|
|
|
|
|
static const struct hwmon_ops m88e6390_hwmon_hwmon_ops = {
|
|
|
|
.is_visible = m88e6390_hwmon_is_visible,
|
|
|
|
.read = m88e6390_hwmon_read,
|
|
|
|
};
|
|
|
|
|
|
|
|
static const struct hwmon_chip_info m88e6390_hwmon_chip_info = {
|
|
|
|
.ops = &m88e6390_hwmon_hwmon_ops,
|
|
|
|
.info = m88e6390_hwmon_info,
|
|
|
|
};
|
|
|
|
|
2017-01-20 07:37:49 +07:00
|
|
|
static int marvell_hwmon_name(struct phy_device *phydev)
|
|
|
|
{
|
|
|
|
struct marvell_priv *priv = phydev->priv;
|
|
|
|
struct device *dev = &phydev->mdio.dev;
|
|
|
|
const char *devname = dev_name(dev);
|
|
|
|
size_t len = strlen(devname);
|
|
|
|
int i, j;
|
|
|
|
|
|
|
|
priv->hwmon_name = devm_kzalloc(dev, len, GFP_KERNEL);
|
|
|
|
if (!priv->hwmon_name)
|
|
|
|
return -ENOMEM;
|
|
|
|
|
|
|
|
for (i = j = 0; i < len && devname[i]; i++) {
|
|
|
|
if (isalnum(devname[i]))
|
|
|
|
priv->hwmon_name[j++] = devname[i];
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int marvell_hwmon_probe(struct phy_device *phydev,
|
|
|
|
const struct hwmon_chip_info *chip)
|
|
|
|
{
|
|
|
|
struct marvell_priv *priv = phydev->priv;
|
|
|
|
struct device *dev = &phydev->mdio.dev;
|
|
|
|
int err;
|
|
|
|
|
|
|
|
err = marvell_hwmon_name(phydev);
|
|
|
|
if (err)
|
|
|
|
return err;
|
|
|
|
|
|
|
|
priv->hwmon_dev = devm_hwmon_device_register_with_info(
|
|
|
|
dev, priv->hwmon_name, phydev, chip, NULL);
|
|
|
|
|
|
|
|
return PTR_ERR_OR_ZERO(priv->hwmon_dev);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int m88e1121_hwmon_probe(struct phy_device *phydev)
|
|
|
|
{
|
|
|
|
return marvell_hwmon_probe(phydev, &m88e1121_hwmon_chip_info);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int m88e1510_hwmon_probe(struct phy_device *phydev)
|
|
|
|
{
|
|
|
|
return marvell_hwmon_probe(phydev, &m88e1510_hwmon_chip_info);
|
|
|
|
}
|
2018-01-10 04:42:09 +07:00
|
|
|
|
|
|
|
static int m88e6390_hwmon_probe(struct phy_device *phydev)
|
|
|
|
{
|
|
|
|
return marvell_hwmon_probe(phydev, &m88e6390_hwmon_chip_info);
|
|
|
|
}
|
2017-01-20 07:37:49 +07:00
|
|
|
#else
|
|
|
|
static int m88e1121_hwmon_probe(struct phy_device *phydev)
|
|
|
|
{
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int m88e1510_hwmon_probe(struct phy_device *phydev)
|
|
|
|
{
|
|
|
|
return 0;
|
|
|
|
}
|
2018-01-10 04:42:09 +07:00
|
|
|
|
|
|
|
static int m88e6390_hwmon_probe(struct phy_device *phydev)
|
|
|
|
{
|
|
|
|
return 0;
|
|
|
|
}
|
2017-01-20 07:37:49 +07:00
|
|
|
#endif
|
|
|
|
|
2015-12-30 22:28:26 +07:00
|
|
|
static int marvell_probe(struct phy_device *phydev)
|
|
|
|
{
|
|
|
|
struct marvell_priv *priv;
|
|
|
|
|
2016-01-07 02:11:16 +07:00
|
|
|
priv = devm_kzalloc(&phydev->mdio.dev, sizeof(*priv), GFP_KERNEL);
|
2015-12-30 22:28:26 +07:00
|
|
|
if (!priv)
|
|
|
|
return -ENOMEM;
|
|
|
|
|
|
|
|
phydev->priv = priv;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2017-01-20 07:37:49 +07:00
|
|
|
static int m88e1121_probe(struct phy_device *phydev)
|
|
|
|
{
|
|
|
|
int err;
|
|
|
|
|
|
|
|
err = marvell_probe(phydev);
|
|
|
|
if (err)
|
|
|
|
return err;
|
|
|
|
|
|
|
|
return m88e1121_hwmon_probe(phydev);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int m88e1510_probe(struct phy_device *phydev)
|
|
|
|
{
|
|
|
|
int err;
|
|
|
|
|
|
|
|
err = marvell_probe(phydev);
|
|
|
|
if (err)
|
|
|
|
return err;
|
|
|
|
|
|
|
|
return m88e1510_hwmon_probe(phydev);
|
|
|
|
}
|
|
|
|
|
2018-01-10 04:42:09 +07:00
|
|
|
static int m88e6390_probe(struct phy_device *phydev)
|
|
|
|
{
|
|
|
|
int err;
|
|
|
|
|
|
|
|
err = marvell_probe(phydev);
|
|
|
|
if (err)
|
|
|
|
return err;
|
|
|
|
|
|
|
|
return m88e6390_hwmon_probe(phydev);
|
|
|
|
}
|
|
|
|
|
2007-07-04 04:23:46 +07:00
|
|
|
static struct phy_driver marvell_drivers[] = {
|
|
|
|
{
|
2010-06-21 10:20:46 +07:00
|
|
|
.phy_id = MARVELL_PHY_ID_88E1101,
|
|
|
|
.phy_id_mask = MARVELL_PHY_ID_MASK,
|
2007-07-04 04:23:46 +07:00
|
|
|
.name = "Marvell 88E1101",
|
|
|
|
.features = PHY_GBIT_FEATURES,
|
|
|
|
.flags = PHY_HAS_INTERRUPT,
|
2017-01-23 19:18:41 +07:00
|
|
|
.probe = marvell_probe,
|
2016-02-16 05:46:45 +07:00
|
|
|
.config_init = &marvell_config_init,
|
2017-05-23 22:49:13 +07:00
|
|
|
.config_aneg = &m88e1101_config_aneg,
|
2007-07-04 04:23:46 +07:00
|
|
|
.ack_interrupt = &marvell_ack_interrupt,
|
|
|
|
.config_intr = &marvell_config_intr,
|
2013-12-13 16:20:26 +07:00
|
|
|
.resume = &genphy_resume,
|
|
|
|
.suspend = &genphy_suspend,
|
net: phy: marvell: fix paged access races
For paged accesses to be truely safe, we need to hold the bus lock to
prevent anyone else gaining access to the registers while we modify
them.
The phydev->lock mutex does not do this: userspace via the MII ioctl
can still sneak in and read or write any register while we are on a
different page, and the suspend/resume methods can be called by a
thread different to the thread polling the phy status.
Races have been observed with mvneta on SolidRun Clearfog with phylink,
particularly between the phylib worker reading the PHYs status, and
the thread resuming mvneta, calling phy_start() which then calls
through to m88e1121_config_aneg_rgmii_delays(), which tries to
read-modify-write the MSCR register:
CPU0 CPU1
marvell_read_status_page()
marvell_set_page(phydev, MII_MARVELL_FIBER_PAGE)
...
m88e1121_config_aneg_rgmii_delays()
set_page(MII_MARVELL_MSCR_PAGE)
phy_read(phydev, MII_88E1121_PHY_MSCR_REG)
marvell_set_page(phydev, MII_MARVELL_COPPER_PAGE);
...
phy_write(phydev, MII_88E1121_PHY_MSCR_REG)
The result of this is we end up writing the copper page register 21,
which causes the copper PHY to be disabled, and the link partner sees
the link immediately go down.
Solve this by taking the bus lock instead of the PHY lock, thereby
preventing other accesses to the PHY while we are accessing other PHY
pages.
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
2018-01-02 17:58:48 +07:00
|
|
|
.read_page = marvell_read_page,
|
|
|
|
.write_page = marvell_write_page,
|
2015-12-30 22:28:26 +07:00
|
|
|
.get_sset_count = marvell_get_sset_count,
|
|
|
|
.get_strings = marvell_get_strings,
|
|
|
|
.get_stats = marvell_get_stats,
|
2007-07-04 04:23:46 +07:00
|
|
|
},
|
2007-07-04 04:24:32 +07:00
|
|
|
{
|
2010-06-21 10:20:46 +07:00
|
|
|
.phy_id = MARVELL_PHY_ID_88E1112,
|
|
|
|
.phy_id_mask = MARVELL_PHY_ID_MASK,
|
2007-07-04 04:24:32 +07:00
|
|
|
.name = "Marvell 88E1112",
|
|
|
|
.features = PHY_GBIT_FEATURES,
|
|
|
|
.flags = PHY_HAS_INTERRUPT,
|
2015-12-30 22:28:26 +07:00
|
|
|
.probe = marvell_probe,
|
2007-07-04 04:24:32 +07:00
|
|
|
.config_init = &m88e1111_config_init,
|
|
|
|
.config_aneg = &marvell_config_aneg,
|
|
|
|
.ack_interrupt = &marvell_ack_interrupt,
|
|
|
|
.config_intr = &marvell_config_intr,
|
2013-12-13 16:20:26 +07:00
|
|
|
.resume = &genphy_resume,
|
|
|
|
.suspend = &genphy_suspend,
|
net: phy: marvell: fix paged access races
For paged accesses to be truely safe, we need to hold the bus lock to
prevent anyone else gaining access to the registers while we modify
them.
The phydev->lock mutex does not do this: userspace via the MII ioctl
can still sneak in and read or write any register while we are on a
different page, and the suspend/resume methods can be called by a
thread different to the thread polling the phy status.
Races have been observed with mvneta on SolidRun Clearfog with phylink,
particularly between the phylib worker reading the PHYs status, and
the thread resuming mvneta, calling phy_start() which then calls
through to m88e1121_config_aneg_rgmii_delays(), which tries to
read-modify-write the MSCR register:
CPU0 CPU1
marvell_read_status_page()
marvell_set_page(phydev, MII_MARVELL_FIBER_PAGE)
...
m88e1121_config_aneg_rgmii_delays()
set_page(MII_MARVELL_MSCR_PAGE)
phy_read(phydev, MII_88E1121_PHY_MSCR_REG)
marvell_set_page(phydev, MII_MARVELL_COPPER_PAGE);
...
phy_write(phydev, MII_88E1121_PHY_MSCR_REG)
The result of this is we end up writing the copper page register 21,
which causes the copper PHY to be disabled, and the link partner sees
the link immediately go down.
Solve this by taking the bus lock instead of the PHY lock, thereby
preventing other accesses to the PHY while we are accessing other PHY
pages.
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
2018-01-02 17:58:48 +07:00
|
|
|
.read_page = marvell_read_page,
|
|
|
|
.write_page = marvell_write_page,
|
2015-12-30 22:28:26 +07:00
|
|
|
.get_sset_count = marvell_get_sset_count,
|
|
|
|
.get_strings = marvell_get_strings,
|
|
|
|
.get_stats = marvell_get_stats,
|
2007-07-04 04:24:32 +07:00
|
|
|
},
|
2007-07-04 04:23:46 +07:00
|
|
|
{
|
2010-06-21 10:20:46 +07:00
|
|
|
.phy_id = MARVELL_PHY_ID_88E1111,
|
|
|
|
.phy_id_mask = MARVELL_PHY_ID_MASK,
|
2007-07-04 04:23:46 +07:00
|
|
|
.name = "Marvell 88E1111",
|
|
|
|
.features = PHY_GBIT_FEATURES,
|
|
|
|
.flags = PHY_HAS_INTERRUPT,
|
2015-12-30 22:28:26 +07:00
|
|
|
.probe = marvell_probe,
|
2007-07-04 04:23:46 +07:00
|
|
|
.config_init = &m88e1111_config_init,
|
2016-06-27 14:39:59 +07:00
|
|
|
.config_aneg = &m88e1111_config_aneg,
|
2008-03-19 04:37:24 +07:00
|
|
|
.read_status = &marvell_read_status,
|
2007-07-04 04:23:46 +07:00
|
|
|
.ack_interrupt = &marvell_ack_interrupt,
|
|
|
|
.config_intr = &marvell_config_intr,
|
2013-12-13 16:20:26 +07:00
|
|
|
.resume = &genphy_resume,
|
|
|
|
.suspend = &genphy_suspend,
|
net: phy: marvell: fix paged access races
For paged accesses to be truely safe, we need to hold the bus lock to
prevent anyone else gaining access to the registers while we modify
them.
The phydev->lock mutex does not do this: userspace via the MII ioctl
can still sneak in and read or write any register while we are on a
different page, and the suspend/resume methods can be called by a
thread different to the thread polling the phy status.
Races have been observed with mvneta on SolidRun Clearfog with phylink,
particularly between the phylib worker reading the PHYs status, and
the thread resuming mvneta, calling phy_start() which then calls
through to m88e1121_config_aneg_rgmii_delays(), which tries to
read-modify-write the MSCR register:
CPU0 CPU1
marvell_read_status_page()
marvell_set_page(phydev, MII_MARVELL_FIBER_PAGE)
...
m88e1121_config_aneg_rgmii_delays()
set_page(MII_MARVELL_MSCR_PAGE)
phy_read(phydev, MII_88E1121_PHY_MSCR_REG)
marvell_set_page(phydev, MII_MARVELL_COPPER_PAGE);
...
phy_write(phydev, MII_88E1121_PHY_MSCR_REG)
The result of this is we end up writing the copper page register 21,
which causes the copper PHY to be disabled, and the link partner sees
the link immediately go down.
Solve this by taking the bus lock instead of the PHY lock, thereby
preventing other accesses to the PHY while we are accessing other PHY
pages.
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
2018-01-02 17:58:48 +07:00
|
|
|
.read_page = marvell_read_page,
|
|
|
|
.write_page = marvell_write_page,
|
2015-12-30 22:28:26 +07:00
|
|
|
.get_sset_count = marvell_get_sset_count,
|
|
|
|
.get_strings = marvell_get_strings,
|
|
|
|
.get_stats = marvell_get_stats,
|
2007-07-04 04:23:46 +07:00
|
|
|
},
|
2008-11-06 16:05:26 +07:00
|
|
|
{
|
2010-06-21 10:20:46 +07:00
|
|
|
.phy_id = MARVELL_PHY_ID_88E1118,
|
|
|
|
.phy_id_mask = MARVELL_PHY_ID_MASK,
|
2008-11-06 16:05:26 +07:00
|
|
|
.name = "Marvell 88E1118",
|
|
|
|
.features = PHY_GBIT_FEATURES,
|
|
|
|
.flags = PHY_HAS_INTERRUPT,
|
2015-12-30 22:28:26 +07:00
|
|
|
.probe = marvell_probe,
|
2008-11-06 16:05:26 +07:00
|
|
|
.config_init = &m88e1118_config_init,
|
|
|
|
.config_aneg = &m88e1118_config_aneg,
|
|
|
|
.ack_interrupt = &marvell_ack_interrupt,
|
|
|
|
.config_intr = &marvell_config_intr,
|
2013-12-13 16:20:26 +07:00
|
|
|
.resume = &genphy_resume,
|
|
|
|
.suspend = &genphy_suspend,
|
net: phy: marvell: fix paged access races
For paged accesses to be truely safe, we need to hold the bus lock to
prevent anyone else gaining access to the registers while we modify
them.
The phydev->lock mutex does not do this: userspace via the MII ioctl
can still sneak in and read or write any register while we are on a
different page, and the suspend/resume methods can be called by a
thread different to the thread polling the phy status.
Races have been observed with mvneta on SolidRun Clearfog with phylink,
particularly between the phylib worker reading the PHYs status, and
the thread resuming mvneta, calling phy_start() which then calls
through to m88e1121_config_aneg_rgmii_delays(), which tries to
read-modify-write the MSCR register:
CPU0 CPU1
marvell_read_status_page()
marvell_set_page(phydev, MII_MARVELL_FIBER_PAGE)
...
m88e1121_config_aneg_rgmii_delays()
set_page(MII_MARVELL_MSCR_PAGE)
phy_read(phydev, MII_88E1121_PHY_MSCR_REG)
marvell_set_page(phydev, MII_MARVELL_COPPER_PAGE);
...
phy_write(phydev, MII_88E1121_PHY_MSCR_REG)
The result of this is we end up writing the copper page register 21,
which causes the copper PHY to be disabled, and the link partner sees
the link immediately go down.
Solve this by taking the bus lock instead of the PHY lock, thereby
preventing other accesses to the PHY while we are accessing other PHY
pages.
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
2018-01-02 17:58:48 +07:00
|
|
|
.read_page = marvell_read_page,
|
|
|
|
.write_page = marvell_write_page,
|
2015-12-30 22:28:26 +07:00
|
|
|
.get_sset_count = marvell_get_sset_count,
|
|
|
|
.get_strings = marvell_get_strings,
|
|
|
|
.get_stats = marvell_get_stats,
|
2008-11-06 16:05:26 +07:00
|
|
|
},
|
2009-04-07 09:01:41 +07:00
|
|
|
{
|
2010-06-21 10:20:46 +07:00
|
|
|
.phy_id = MARVELL_PHY_ID_88E1121R,
|
|
|
|
.phy_id_mask = MARVELL_PHY_ID_MASK,
|
2009-04-07 09:01:41 +07:00
|
|
|
.name = "Marvell 88E1121R",
|
|
|
|
.features = PHY_GBIT_FEATURES,
|
|
|
|
.flags = PHY_HAS_INTERRUPT,
|
2017-01-23 19:18:41 +07:00
|
|
|
.probe = &m88e1121_probe,
|
2016-06-11 22:21:26 +07:00
|
|
|
.config_init = &m88e1121_config_init,
|
2009-04-07 09:01:41 +07:00
|
|
|
.config_aneg = &m88e1121_config_aneg,
|
|
|
|
.read_status = &marvell_read_status,
|
|
|
|
.ack_interrupt = &marvell_ack_interrupt,
|
|
|
|
.config_intr = &marvell_config_intr,
|
2009-04-07 09:01:43 +07:00
|
|
|
.did_interrupt = &m88e1121_did_interrupt,
|
2013-12-13 16:20:26 +07:00
|
|
|
.resume = &genphy_resume,
|
|
|
|
.suspend = &genphy_suspend,
|
net: phy: marvell: fix paged access races
For paged accesses to be truely safe, we need to hold the bus lock to
prevent anyone else gaining access to the registers while we modify
them.
The phydev->lock mutex does not do this: userspace via the MII ioctl
can still sneak in and read or write any register while we are on a
different page, and the suspend/resume methods can be called by a
thread different to the thread polling the phy status.
Races have been observed with mvneta on SolidRun Clearfog with phylink,
particularly between the phylib worker reading the PHYs status, and
the thread resuming mvneta, calling phy_start() which then calls
through to m88e1121_config_aneg_rgmii_delays(), which tries to
read-modify-write the MSCR register:
CPU0 CPU1
marvell_read_status_page()
marvell_set_page(phydev, MII_MARVELL_FIBER_PAGE)
...
m88e1121_config_aneg_rgmii_delays()
set_page(MII_MARVELL_MSCR_PAGE)
phy_read(phydev, MII_88E1121_PHY_MSCR_REG)
marvell_set_page(phydev, MII_MARVELL_COPPER_PAGE);
...
phy_write(phydev, MII_88E1121_PHY_MSCR_REG)
The result of this is we end up writing the copper page register 21,
which causes the copper PHY to be disabled, and the link partner sees
the link immediately go down.
Solve this by taking the bus lock instead of the PHY lock, thereby
preventing other accesses to the PHY while we are accessing other PHY
pages.
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
2018-01-02 17:58:48 +07:00
|
|
|
.read_page = marvell_read_page,
|
|
|
|
.write_page = marvell_write_page,
|
2015-12-30 22:28:26 +07:00
|
|
|
.get_sset_count = marvell_get_sset_count,
|
|
|
|
.get_strings = marvell_get_strings,
|
|
|
|
.get_stats = marvell_get_stats,
|
2009-04-07 09:01:41 +07:00
|
|
|
},
|
2010-08-04 09:36:06 +07:00
|
|
|
{
|
2010-10-30 03:50:25 +07:00
|
|
|
.phy_id = MARVELL_PHY_ID_88E1318S,
|
2010-08-05 01:47:58 +07:00
|
|
|
.phy_id_mask = MARVELL_PHY_ID_MASK,
|
2010-10-30 03:50:25 +07:00
|
|
|
.name = "Marvell 88E1318S",
|
2010-08-04 09:36:06 +07:00
|
|
|
.features = PHY_GBIT_FEATURES,
|
|
|
|
.flags = PHY_HAS_INTERRUPT,
|
2015-12-30 22:28:26 +07:00
|
|
|
.probe = marvell_probe,
|
2018-04-06 03:40:29 +07:00
|
|
|
.config_init = &m88e1318_config_init,
|
2010-10-30 03:50:25 +07:00
|
|
|
.config_aneg = &m88e1318_config_aneg,
|
2010-08-04 09:36:06 +07:00
|
|
|
.read_status = &marvell_read_status,
|
|
|
|
.ack_interrupt = &marvell_ack_interrupt,
|
|
|
|
.config_intr = &marvell_config_intr,
|
|
|
|
.did_interrupt = &m88e1121_did_interrupt,
|
2013-03-11 20:56:45 +07:00
|
|
|
.get_wol = &m88e1318_get_wol,
|
|
|
|
.set_wol = &m88e1318_set_wol,
|
2013-12-13 16:20:26 +07:00
|
|
|
.resume = &genphy_resume,
|
|
|
|
.suspend = &genphy_suspend,
|
net: phy: marvell: fix paged access races
For paged accesses to be truely safe, we need to hold the bus lock to
prevent anyone else gaining access to the registers while we modify
them.
The phydev->lock mutex does not do this: userspace via the MII ioctl
can still sneak in and read or write any register while we are on a
different page, and the suspend/resume methods can be called by a
thread different to the thread polling the phy status.
Races have been observed with mvneta on SolidRun Clearfog with phylink,
particularly between the phylib worker reading the PHYs status, and
the thread resuming mvneta, calling phy_start() which then calls
through to m88e1121_config_aneg_rgmii_delays(), which tries to
read-modify-write the MSCR register:
CPU0 CPU1
marvell_read_status_page()
marvell_set_page(phydev, MII_MARVELL_FIBER_PAGE)
...
m88e1121_config_aneg_rgmii_delays()
set_page(MII_MARVELL_MSCR_PAGE)
phy_read(phydev, MII_88E1121_PHY_MSCR_REG)
marvell_set_page(phydev, MII_MARVELL_COPPER_PAGE);
...
phy_write(phydev, MII_88E1121_PHY_MSCR_REG)
The result of this is we end up writing the copper page register 21,
which causes the copper PHY to be disabled, and the link partner sees
the link immediately go down.
Solve this by taking the bus lock instead of the PHY lock, thereby
preventing other accesses to the PHY while we are accessing other PHY
pages.
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
2018-01-02 17:58:48 +07:00
|
|
|
.read_page = marvell_read_page,
|
|
|
|
.write_page = marvell_write_page,
|
2015-12-30 22:28:26 +07:00
|
|
|
.get_sset_count = marvell_get_sset_count,
|
|
|
|
.get_strings = marvell_get_strings,
|
|
|
|
.get_stats = marvell_get_stats,
|
2010-08-04 09:36:06 +07:00
|
|
|
},
|
2007-07-04 04:23:46 +07:00
|
|
|
{
|
2010-06-21 10:20:46 +07:00
|
|
|
.phy_id = MARVELL_PHY_ID_88E1145,
|
|
|
|
.phy_id_mask = MARVELL_PHY_ID_MASK,
|
2007-07-04 04:23:46 +07:00
|
|
|
.name = "Marvell 88E1145",
|
|
|
|
.features = PHY_GBIT_FEATURES,
|
|
|
|
.flags = PHY_HAS_INTERRUPT,
|
2015-12-30 22:28:26 +07:00
|
|
|
.probe = marvell_probe,
|
2007-07-04 04:23:46 +07:00
|
|
|
.config_init = &m88e1145_config_init,
|
2017-12-18 09:26:43 +07:00
|
|
|
.config_aneg = &m88e1101_config_aneg,
|
2007-07-04 04:23:46 +07:00
|
|
|
.read_status = &genphy_read_status,
|
|
|
|
.ack_interrupt = &marvell_ack_interrupt,
|
|
|
|
.config_intr = &marvell_config_intr,
|
2013-12-13 16:20:26 +07:00
|
|
|
.resume = &genphy_resume,
|
|
|
|
.suspend = &genphy_suspend,
|
net: phy: marvell: fix paged access races
For paged accesses to be truely safe, we need to hold the bus lock to
prevent anyone else gaining access to the registers while we modify
them.
The phydev->lock mutex does not do this: userspace via the MII ioctl
can still sneak in and read or write any register while we are on a
different page, and the suspend/resume methods can be called by a
thread different to the thread polling the phy status.
Races have been observed with mvneta on SolidRun Clearfog with phylink,
particularly between the phylib worker reading the PHYs status, and
the thread resuming mvneta, calling phy_start() which then calls
through to m88e1121_config_aneg_rgmii_delays(), which tries to
read-modify-write the MSCR register:
CPU0 CPU1
marvell_read_status_page()
marvell_set_page(phydev, MII_MARVELL_FIBER_PAGE)
...
m88e1121_config_aneg_rgmii_delays()
set_page(MII_MARVELL_MSCR_PAGE)
phy_read(phydev, MII_88E1121_PHY_MSCR_REG)
marvell_set_page(phydev, MII_MARVELL_COPPER_PAGE);
...
phy_write(phydev, MII_88E1121_PHY_MSCR_REG)
The result of this is we end up writing the copper page register 21,
which causes the copper PHY to be disabled, and the link partner sees
the link immediately go down.
Solve this by taking the bus lock instead of the PHY lock, thereby
preventing other accesses to the PHY while we are accessing other PHY
pages.
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
2018-01-02 17:58:48 +07:00
|
|
|
.read_page = marvell_read_page,
|
|
|
|
.write_page = marvell_write_page,
|
2015-12-30 22:28:26 +07:00
|
|
|
.get_sset_count = marvell_get_sset_count,
|
|
|
|
.get_strings = marvell_get_strings,
|
|
|
|
.get_stats = marvell_get_stats,
|
2007-11-05 05:08:51 +07:00
|
|
|
},
|
2010-11-19 18:58:53 +07:00
|
|
|
{
|
|
|
|
.phy_id = MARVELL_PHY_ID_88E1149R,
|
|
|
|
.phy_id_mask = MARVELL_PHY_ID_MASK,
|
|
|
|
.name = "Marvell 88E1149R",
|
|
|
|
.features = PHY_GBIT_FEATURES,
|
|
|
|
.flags = PHY_HAS_INTERRUPT,
|
2015-12-30 22:28:26 +07:00
|
|
|
.probe = marvell_probe,
|
2010-11-19 18:58:53 +07:00
|
|
|
.config_init = &m88e1149_config_init,
|
|
|
|
.config_aneg = &m88e1118_config_aneg,
|
|
|
|
.ack_interrupt = &marvell_ack_interrupt,
|
|
|
|
.config_intr = &marvell_config_intr,
|
2013-12-13 16:20:26 +07:00
|
|
|
.resume = &genphy_resume,
|
|
|
|
.suspend = &genphy_suspend,
|
net: phy: marvell: fix paged access races
For paged accesses to be truely safe, we need to hold the bus lock to
prevent anyone else gaining access to the registers while we modify
them.
The phydev->lock mutex does not do this: userspace via the MII ioctl
can still sneak in and read or write any register while we are on a
different page, and the suspend/resume methods can be called by a
thread different to the thread polling the phy status.
Races have been observed with mvneta on SolidRun Clearfog with phylink,
particularly between the phylib worker reading the PHYs status, and
the thread resuming mvneta, calling phy_start() which then calls
through to m88e1121_config_aneg_rgmii_delays(), which tries to
read-modify-write the MSCR register:
CPU0 CPU1
marvell_read_status_page()
marvell_set_page(phydev, MII_MARVELL_FIBER_PAGE)
...
m88e1121_config_aneg_rgmii_delays()
set_page(MII_MARVELL_MSCR_PAGE)
phy_read(phydev, MII_88E1121_PHY_MSCR_REG)
marvell_set_page(phydev, MII_MARVELL_COPPER_PAGE);
...
phy_write(phydev, MII_88E1121_PHY_MSCR_REG)
The result of this is we end up writing the copper page register 21,
which causes the copper PHY to be disabled, and the link partner sees
the link immediately go down.
Solve this by taking the bus lock instead of the PHY lock, thereby
preventing other accesses to the PHY while we are accessing other PHY
pages.
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
2018-01-02 17:58:48 +07:00
|
|
|
.read_page = marvell_read_page,
|
|
|
|
.write_page = marvell_write_page,
|
2015-12-30 22:28:26 +07:00
|
|
|
.get_sset_count = marvell_get_sset_count,
|
|
|
|
.get_strings = marvell_get_strings,
|
|
|
|
.get_stats = marvell_get_stats,
|
2010-11-19 18:58:53 +07:00
|
|
|
},
|
2007-11-05 05:08:51 +07:00
|
|
|
{
|
2010-06-21 10:20:46 +07:00
|
|
|
.phy_id = MARVELL_PHY_ID_88E1240,
|
|
|
|
.phy_id_mask = MARVELL_PHY_ID_MASK,
|
2007-11-05 05:08:51 +07:00
|
|
|
.name = "Marvell 88E1240",
|
|
|
|
.features = PHY_GBIT_FEATURES,
|
|
|
|
.flags = PHY_HAS_INTERRUPT,
|
2015-12-30 22:28:26 +07:00
|
|
|
.probe = marvell_probe,
|
2007-11-05 05:08:51 +07:00
|
|
|
.config_init = &m88e1111_config_init,
|
|
|
|
.config_aneg = &marvell_config_aneg,
|
|
|
|
.ack_interrupt = &marvell_ack_interrupt,
|
|
|
|
.config_intr = &marvell_config_intr,
|
2013-12-13 16:20:26 +07:00
|
|
|
.resume = &genphy_resume,
|
|
|
|
.suspend = &genphy_suspend,
|
net: phy: marvell: fix paged access races
For paged accesses to be truely safe, we need to hold the bus lock to
prevent anyone else gaining access to the registers while we modify
them.
The phydev->lock mutex does not do this: userspace via the MII ioctl
can still sneak in and read or write any register while we are on a
different page, and the suspend/resume methods can be called by a
thread different to the thread polling the phy status.
Races have been observed with mvneta on SolidRun Clearfog with phylink,
particularly between the phylib worker reading the PHYs status, and
the thread resuming mvneta, calling phy_start() which then calls
through to m88e1121_config_aneg_rgmii_delays(), which tries to
read-modify-write the MSCR register:
CPU0 CPU1
marvell_read_status_page()
marvell_set_page(phydev, MII_MARVELL_FIBER_PAGE)
...
m88e1121_config_aneg_rgmii_delays()
set_page(MII_MARVELL_MSCR_PAGE)
phy_read(phydev, MII_88E1121_PHY_MSCR_REG)
marvell_set_page(phydev, MII_MARVELL_COPPER_PAGE);
...
phy_write(phydev, MII_88E1121_PHY_MSCR_REG)
The result of this is we end up writing the copper page register 21,
which causes the copper PHY to be disabled, and the link partner sees
the link immediately go down.
Solve this by taking the bus lock instead of the PHY lock, thereby
preventing other accesses to the PHY while we are accessing other PHY
pages.
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
2018-01-02 17:58:48 +07:00
|
|
|
.read_page = marvell_read_page,
|
|
|
|
.write_page = marvell_write_page,
|
2015-12-30 22:28:26 +07:00
|
|
|
.get_sset_count = marvell_get_sset_count,
|
|
|
|
.get_strings = marvell_get_strings,
|
|
|
|
.get_stats = marvell_get_stats,
|
2007-11-05 05:08:51 +07:00
|
|
|
},
|
2013-05-31 03:08:26 +07:00
|
|
|
{
|
|
|
|
.phy_id = MARVELL_PHY_ID_88E1116R,
|
|
|
|
.phy_id_mask = MARVELL_PHY_ID_MASK,
|
|
|
|
.name = "Marvell 88E1116R",
|
|
|
|
.features = PHY_GBIT_FEATURES,
|
|
|
|
.flags = PHY_HAS_INTERRUPT,
|
2015-12-30 22:28:26 +07:00
|
|
|
.probe = marvell_probe,
|
2013-05-31 03:08:26 +07:00
|
|
|
.config_init = &m88e1116r_config_init,
|
|
|
|
.ack_interrupt = &marvell_ack_interrupt,
|
|
|
|
.config_intr = &marvell_config_intr,
|
2013-12-13 16:20:26 +07:00
|
|
|
.resume = &genphy_resume,
|
|
|
|
.suspend = &genphy_suspend,
|
net: phy: marvell: fix paged access races
For paged accesses to be truely safe, we need to hold the bus lock to
prevent anyone else gaining access to the registers while we modify
them.
The phydev->lock mutex does not do this: userspace via the MII ioctl
can still sneak in and read or write any register while we are on a
different page, and the suspend/resume methods can be called by a
thread different to the thread polling the phy status.
Races have been observed with mvneta on SolidRun Clearfog with phylink,
particularly between the phylib worker reading the PHYs status, and
the thread resuming mvneta, calling phy_start() which then calls
through to m88e1121_config_aneg_rgmii_delays(), which tries to
read-modify-write the MSCR register:
CPU0 CPU1
marvell_read_status_page()
marvell_set_page(phydev, MII_MARVELL_FIBER_PAGE)
...
m88e1121_config_aneg_rgmii_delays()
set_page(MII_MARVELL_MSCR_PAGE)
phy_read(phydev, MII_88E1121_PHY_MSCR_REG)
marvell_set_page(phydev, MII_MARVELL_COPPER_PAGE);
...
phy_write(phydev, MII_88E1121_PHY_MSCR_REG)
The result of this is we end up writing the copper page register 21,
which causes the copper PHY to be disabled, and the link partner sees
the link immediately go down.
Solve this by taking the bus lock instead of the PHY lock, thereby
preventing other accesses to the PHY while we are accessing other PHY
pages.
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
2018-01-02 17:58:48 +07:00
|
|
|
.read_page = marvell_read_page,
|
|
|
|
.write_page = marvell_write_page,
|
2015-12-30 22:28:26 +07:00
|
|
|
.get_sset_count = marvell_get_sset_count,
|
|
|
|
.get_strings = marvell_get_strings,
|
|
|
|
.get_stats = marvell_get_stats,
|
2013-05-31 03:08:26 +07:00
|
|
|
},
|
2013-05-31 03:08:27 +07:00
|
|
|
{
|
|
|
|
.phy_id = MARVELL_PHY_ID_88E1510,
|
|
|
|
.phy_id_mask = MARVELL_PHY_ID_MASK,
|
|
|
|
.name = "Marvell 88E1510",
|
2016-07-19 16:13:10 +07:00
|
|
|
.features = PHY_GBIT_FEATURES | SUPPORTED_FIBRE,
|
2017-01-23 19:18:41 +07:00
|
|
|
.flags = PHY_HAS_INTERRUPT,
|
2017-01-20 07:37:49 +07:00
|
|
|
.probe = &m88e1510_probe,
|
2016-02-18 16:59:07 +07:00
|
|
|
.config_init = &m88e1510_config_init,
|
2013-05-31 03:08:27 +07:00
|
|
|
.config_aneg = &m88e1510_config_aneg,
|
|
|
|
.read_status = &marvell_read_status,
|
|
|
|
.ack_interrupt = &marvell_ack_interrupt,
|
|
|
|
.config_intr = &marvell_config_intr,
|
|
|
|
.did_interrupt = &m88e1121_did_interrupt,
|
2017-01-22 17:20:56 +07:00
|
|
|
.get_wol = &m88e1318_get_wol,
|
|
|
|
.set_wol = &m88e1318_set_wol,
|
2016-07-19 16:13:13 +07:00
|
|
|
.resume = &marvell_resume,
|
|
|
|
.suspend = &marvell_suspend,
|
net: phy: marvell: fix paged access races
For paged accesses to be truely safe, we need to hold the bus lock to
prevent anyone else gaining access to the registers while we modify
them.
The phydev->lock mutex does not do this: userspace via the MII ioctl
can still sneak in and read or write any register while we are on a
different page, and the suspend/resume methods can be called by a
thread different to the thread polling the phy status.
Races have been observed with mvneta on SolidRun Clearfog with phylink,
particularly between the phylib worker reading the PHYs status, and
the thread resuming mvneta, calling phy_start() which then calls
through to m88e1121_config_aneg_rgmii_delays(), which tries to
read-modify-write the MSCR register:
CPU0 CPU1
marvell_read_status_page()
marvell_set_page(phydev, MII_MARVELL_FIBER_PAGE)
...
m88e1121_config_aneg_rgmii_delays()
set_page(MII_MARVELL_MSCR_PAGE)
phy_read(phydev, MII_88E1121_PHY_MSCR_REG)
marvell_set_page(phydev, MII_MARVELL_COPPER_PAGE);
...
phy_write(phydev, MII_88E1121_PHY_MSCR_REG)
The result of this is we end up writing the copper page register 21,
which causes the copper PHY to be disabled, and the link partner sees
the link immediately go down.
Solve this by taking the bus lock instead of the PHY lock, thereby
preventing other accesses to the PHY while we are accessing other PHY
pages.
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
2018-01-02 17:58:48 +07:00
|
|
|
.read_page = marvell_read_page,
|
|
|
|
.write_page = marvell_write_page,
|
2015-12-30 22:28:26 +07:00
|
|
|
.get_sset_count = marvell_get_sset_count,
|
|
|
|
.get_strings = marvell_get_strings,
|
|
|
|
.get_stats = marvell_get_stats,
|
2017-06-30 16:44:15 +07:00
|
|
|
.set_loopback = genphy_loopback,
|
2013-05-31 03:08:27 +07:00
|
|
|
},
|
2015-11-17 05:34:41 +07:00
|
|
|
{
|
|
|
|
.phy_id = MARVELL_PHY_ID_88E1540,
|
|
|
|
.phy_id_mask = MARVELL_PHY_ID_MASK,
|
|
|
|
.name = "Marvell 88E1540",
|
|
|
|
.features = PHY_GBIT_FEATURES,
|
|
|
|
.flags = PHY_HAS_INTERRUPT,
|
2017-01-23 19:18:41 +07:00
|
|
|
.probe = m88e1510_probe,
|
2016-02-16 05:46:45 +07:00
|
|
|
.config_init = &marvell_config_init,
|
2015-11-17 05:34:41 +07:00
|
|
|
.config_aneg = &m88e1510_config_aneg,
|
|
|
|
.read_status = &marvell_read_status,
|
|
|
|
.ack_interrupt = &marvell_ack_interrupt,
|
|
|
|
.config_intr = &marvell_config_intr,
|
|
|
|
.did_interrupt = &m88e1121_did_interrupt,
|
|
|
|
.resume = &genphy_resume,
|
|
|
|
.suspend = &genphy_suspend,
|
net: phy: marvell: fix paged access races
For paged accesses to be truely safe, we need to hold the bus lock to
prevent anyone else gaining access to the registers while we modify
them.
The phydev->lock mutex does not do this: userspace via the MII ioctl
can still sneak in and read or write any register while we are on a
different page, and the suspend/resume methods can be called by a
thread different to the thread polling the phy status.
Races have been observed with mvneta on SolidRun Clearfog with phylink,
particularly between the phylib worker reading the PHYs status, and
the thread resuming mvneta, calling phy_start() which then calls
through to m88e1121_config_aneg_rgmii_delays(), which tries to
read-modify-write the MSCR register:
CPU0 CPU1
marvell_read_status_page()
marvell_set_page(phydev, MII_MARVELL_FIBER_PAGE)
...
m88e1121_config_aneg_rgmii_delays()
set_page(MII_MARVELL_MSCR_PAGE)
phy_read(phydev, MII_88E1121_PHY_MSCR_REG)
marvell_set_page(phydev, MII_MARVELL_COPPER_PAGE);
...
phy_write(phydev, MII_88E1121_PHY_MSCR_REG)
The result of this is we end up writing the copper page register 21,
which causes the copper PHY to be disabled, and the link partner sees
the link immediately go down.
Solve this by taking the bus lock instead of the PHY lock, thereby
preventing other accesses to the PHY while we are accessing other PHY
pages.
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
2018-01-02 17:58:48 +07:00
|
|
|
.read_page = marvell_read_page,
|
|
|
|
.write_page = marvell_write_page,
|
2015-12-30 22:28:26 +07:00
|
|
|
.get_sset_count = marvell_get_sset_count,
|
|
|
|
.get_strings = marvell_get_strings,
|
|
|
|
.get_stats = marvell_get_stats,
|
2015-11-17 05:34:41 +07:00
|
|
|
},
|
2017-02-02 06:35:03 +07:00
|
|
|
{
|
|
|
|
.phy_id = MARVELL_PHY_ID_88E1545,
|
|
|
|
.phy_id_mask = MARVELL_PHY_ID_MASK,
|
|
|
|
.name = "Marvell 88E1545",
|
|
|
|
.probe = m88e1510_probe,
|
|
|
|
.features = PHY_GBIT_FEATURES,
|
|
|
|
.flags = PHY_HAS_INTERRUPT,
|
|
|
|
.config_init = &marvell_config_init,
|
|
|
|
.config_aneg = &m88e1510_config_aneg,
|
|
|
|
.read_status = &marvell_read_status,
|
|
|
|
.ack_interrupt = &marvell_ack_interrupt,
|
|
|
|
.config_intr = &marvell_config_intr,
|
|
|
|
.did_interrupt = &m88e1121_did_interrupt,
|
|
|
|
.resume = &genphy_resume,
|
|
|
|
.suspend = &genphy_suspend,
|
net: phy: marvell: fix paged access races
For paged accesses to be truely safe, we need to hold the bus lock to
prevent anyone else gaining access to the registers while we modify
them.
The phydev->lock mutex does not do this: userspace via the MII ioctl
can still sneak in and read or write any register while we are on a
different page, and the suspend/resume methods can be called by a
thread different to the thread polling the phy status.
Races have been observed with mvneta on SolidRun Clearfog with phylink,
particularly between the phylib worker reading the PHYs status, and
the thread resuming mvneta, calling phy_start() which then calls
through to m88e1121_config_aneg_rgmii_delays(), which tries to
read-modify-write the MSCR register:
CPU0 CPU1
marvell_read_status_page()
marvell_set_page(phydev, MII_MARVELL_FIBER_PAGE)
...
m88e1121_config_aneg_rgmii_delays()
set_page(MII_MARVELL_MSCR_PAGE)
phy_read(phydev, MII_88E1121_PHY_MSCR_REG)
marvell_set_page(phydev, MII_MARVELL_COPPER_PAGE);
...
phy_write(phydev, MII_88E1121_PHY_MSCR_REG)
The result of this is we end up writing the copper page register 21,
which causes the copper PHY to be disabled, and the link partner sees
the link immediately go down.
Solve this by taking the bus lock instead of the PHY lock, thereby
preventing other accesses to the PHY while we are accessing other PHY
pages.
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
2018-01-02 17:58:48 +07:00
|
|
|
.read_page = marvell_read_page,
|
|
|
|
.write_page = marvell_write_page,
|
2017-02-02 06:35:03 +07:00
|
|
|
.get_sset_count = marvell_get_sset_count,
|
|
|
|
.get_strings = marvell_get_strings,
|
|
|
|
.get_stats = marvell_get_stats,
|
|
|
|
},
|
2014-10-23 01:26:44 +07:00
|
|
|
{
|
|
|
|
.phy_id = MARVELL_PHY_ID_88E3016,
|
|
|
|
.phy_id_mask = MARVELL_PHY_ID_MASK,
|
|
|
|
.name = "Marvell 88E3016",
|
|
|
|
.features = PHY_BASIC_FEATURES,
|
|
|
|
.flags = PHY_HAS_INTERRUPT,
|
2015-12-30 22:28:26 +07:00
|
|
|
.probe = marvell_probe,
|
2014-10-23 01:26:44 +07:00
|
|
|
.config_init = &m88e3016_config_init,
|
|
|
|
.aneg_done = &marvell_aneg_done,
|
|
|
|
.read_status = &marvell_read_status,
|
|
|
|
.ack_interrupt = &marvell_ack_interrupt,
|
|
|
|
.config_intr = &marvell_config_intr,
|
|
|
|
.did_interrupt = &m88e1121_did_interrupt,
|
|
|
|
.resume = &genphy_resume,
|
|
|
|
.suspend = &genphy_suspend,
|
net: phy: marvell: fix paged access races
For paged accesses to be truely safe, we need to hold the bus lock to
prevent anyone else gaining access to the registers while we modify
them.
The phydev->lock mutex does not do this: userspace via the MII ioctl
can still sneak in and read or write any register while we are on a
different page, and the suspend/resume methods can be called by a
thread different to the thread polling the phy status.
Races have been observed with mvneta on SolidRun Clearfog with phylink,
particularly between the phylib worker reading the PHYs status, and
the thread resuming mvneta, calling phy_start() which then calls
through to m88e1121_config_aneg_rgmii_delays(), which tries to
read-modify-write the MSCR register:
CPU0 CPU1
marvell_read_status_page()
marvell_set_page(phydev, MII_MARVELL_FIBER_PAGE)
...
m88e1121_config_aneg_rgmii_delays()
set_page(MII_MARVELL_MSCR_PAGE)
phy_read(phydev, MII_88E1121_PHY_MSCR_REG)
marvell_set_page(phydev, MII_MARVELL_COPPER_PAGE);
...
phy_write(phydev, MII_88E1121_PHY_MSCR_REG)
The result of this is we end up writing the copper page register 21,
which causes the copper PHY to be disabled, and the link partner sees
the link immediately go down.
Solve this by taking the bus lock instead of the PHY lock, thereby
preventing other accesses to the PHY while we are accessing other PHY
pages.
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
2018-01-02 17:58:48 +07:00
|
|
|
.read_page = marvell_read_page,
|
|
|
|
.write_page = marvell_write_page,
|
2015-12-30 22:28:26 +07:00
|
|
|
.get_sset_count = marvell_get_sset_count,
|
|
|
|
.get_strings = marvell_get_strings,
|
|
|
|
.get_stats = marvell_get_stats,
|
2014-10-23 01:26:44 +07:00
|
|
|
},
|
2017-02-01 09:40:06 +07:00
|
|
|
{
|
|
|
|
.phy_id = MARVELL_PHY_ID_88E6390,
|
|
|
|
.phy_id_mask = MARVELL_PHY_ID_MASK,
|
|
|
|
.name = "Marvell 88E6390",
|
|
|
|
.features = PHY_GBIT_FEATURES,
|
|
|
|
.flags = PHY_HAS_INTERRUPT,
|
2018-01-10 04:42:09 +07:00
|
|
|
.probe = m88e6390_probe,
|
2017-02-01 09:40:06 +07:00
|
|
|
.config_init = &marvell_config_init,
|
|
|
|
.config_aneg = &m88e1510_config_aneg,
|
|
|
|
.read_status = &marvell_read_status,
|
|
|
|
.ack_interrupt = &marvell_ack_interrupt,
|
|
|
|
.config_intr = &marvell_config_intr,
|
|
|
|
.did_interrupt = &m88e1121_did_interrupt,
|
|
|
|
.resume = &genphy_resume,
|
|
|
|
.suspend = &genphy_suspend,
|
net: phy: marvell: fix paged access races
For paged accesses to be truely safe, we need to hold the bus lock to
prevent anyone else gaining access to the registers while we modify
them.
The phydev->lock mutex does not do this: userspace via the MII ioctl
can still sneak in and read or write any register while we are on a
different page, and the suspend/resume methods can be called by a
thread different to the thread polling the phy status.
Races have been observed with mvneta on SolidRun Clearfog with phylink,
particularly between the phylib worker reading the PHYs status, and
the thread resuming mvneta, calling phy_start() which then calls
through to m88e1121_config_aneg_rgmii_delays(), which tries to
read-modify-write the MSCR register:
CPU0 CPU1
marvell_read_status_page()
marvell_set_page(phydev, MII_MARVELL_FIBER_PAGE)
...
m88e1121_config_aneg_rgmii_delays()
set_page(MII_MARVELL_MSCR_PAGE)
phy_read(phydev, MII_88E1121_PHY_MSCR_REG)
marvell_set_page(phydev, MII_MARVELL_COPPER_PAGE);
...
phy_write(phydev, MII_88E1121_PHY_MSCR_REG)
The result of this is we end up writing the copper page register 21,
which causes the copper PHY to be disabled, and the link partner sees
the link immediately go down.
Solve this by taking the bus lock instead of the PHY lock, thereby
preventing other accesses to the PHY while we are accessing other PHY
pages.
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
2018-01-02 17:58:48 +07:00
|
|
|
.read_page = marvell_read_page,
|
|
|
|
.write_page = marvell_write_page,
|
2017-02-01 09:40:06 +07:00
|
|
|
.get_sset_count = marvell_get_sset_count,
|
|
|
|
.get_strings = marvell_get_strings,
|
|
|
|
.get_stats = marvell_get_stats,
|
|
|
|
},
|
2005-07-31 06:31:23 +07:00
|
|
|
};
|
|
|
|
|
2014-11-12 01:45:59 +07:00
|
|
|
module_phy_driver(marvell_drivers);
|
2010-04-02 08:05:56 +07:00
|
|
|
|
2010-10-04 06:43:32 +07:00
|
|
|
static struct mdio_device_id __maybe_unused marvell_tbl[] = {
|
2013-05-31 03:08:25 +07:00
|
|
|
{ MARVELL_PHY_ID_88E1101, MARVELL_PHY_ID_MASK },
|
|
|
|
{ MARVELL_PHY_ID_88E1112, MARVELL_PHY_ID_MASK },
|
|
|
|
{ MARVELL_PHY_ID_88E1111, MARVELL_PHY_ID_MASK },
|
|
|
|
{ MARVELL_PHY_ID_88E1118, MARVELL_PHY_ID_MASK },
|
|
|
|
{ MARVELL_PHY_ID_88E1121R, MARVELL_PHY_ID_MASK },
|
|
|
|
{ MARVELL_PHY_ID_88E1145, MARVELL_PHY_ID_MASK },
|
|
|
|
{ MARVELL_PHY_ID_88E1149R, MARVELL_PHY_ID_MASK },
|
|
|
|
{ MARVELL_PHY_ID_88E1240, MARVELL_PHY_ID_MASK },
|
|
|
|
{ MARVELL_PHY_ID_88E1318S, MARVELL_PHY_ID_MASK },
|
2013-05-31 03:08:26 +07:00
|
|
|
{ MARVELL_PHY_ID_88E1116R, MARVELL_PHY_ID_MASK },
|
2013-05-31 03:08:27 +07:00
|
|
|
{ MARVELL_PHY_ID_88E1510, MARVELL_PHY_ID_MASK },
|
2015-11-17 05:34:41 +07:00
|
|
|
{ MARVELL_PHY_ID_88E1540, MARVELL_PHY_ID_MASK },
|
2017-02-02 06:35:03 +07:00
|
|
|
{ MARVELL_PHY_ID_88E1545, MARVELL_PHY_ID_MASK },
|
2014-10-23 01:26:44 +07:00
|
|
|
{ MARVELL_PHY_ID_88E3016, MARVELL_PHY_ID_MASK },
|
2017-02-01 09:40:06 +07:00
|
|
|
{ MARVELL_PHY_ID_88E6390, MARVELL_PHY_ID_MASK },
|
2010-04-02 08:05:56 +07:00
|
|
|
{ }
|
|
|
|
};
|
|
|
|
|
|
|
|
MODULE_DEVICE_TABLE(mdio, marvell_tbl);
|