提交 952b6b3b 编写于 作者: A Antoine Tenart 提交者: David S. Miller

net: phy: marvell10g: fix the PHY id mask

The Marvell 10G PHY driver supports different hardware revisions, which
have their bits 3..0 differing. To get the correct revision number these
bits should be ignored. This patch fixes this by using the already
defined MARVELL_PHY_ID_MASK (0xfffffff0) instead of the custom
0xffffffff mask.

Fixes: 20b2af32 ("net: phy: add Marvell Alaska X 88X3310 10Gigabit PHY support")
Suggested-by: NYan Markman <ymarkman@marvell.com>
Signed-off-by: NAntoine Tenart <antoine.tenart@free-electrons.com>
Reviewed-by: NAndrew Lunn <andrew@lunn.ch>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
上级 f40b55ab
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
* link takes priority and the other port is completely locked out. * link takes priority and the other port is completely locked out.
*/ */
#include <linux/phy.h> #include <linux/phy.h>
#include <linux/marvell_phy.h>
enum { enum {
MV_PCS_BASE_T = 0x0000, MV_PCS_BASE_T = 0x0000,
...@@ -338,7 +339,7 @@ static int mv3310_read_status(struct phy_device *phydev) ...@@ -338,7 +339,7 @@ static int mv3310_read_status(struct phy_device *phydev)
static struct phy_driver mv3310_drivers[] = { static struct phy_driver mv3310_drivers[] = {
{ {
.phy_id = 0x002b09aa, .phy_id = 0x002b09aa,
.phy_id_mask = 0xffffffff, .phy_id_mask = MARVELL_PHY_ID_MASK,
.name = "mv88x3310", .name = "mv88x3310",
.features = SUPPORTED_10baseT_Full | .features = SUPPORTED_10baseT_Full |
SUPPORTED_100baseT_Full | SUPPORTED_100baseT_Full |
...@@ -360,7 +361,7 @@ static struct phy_driver mv3310_drivers[] = { ...@@ -360,7 +361,7 @@ static struct phy_driver mv3310_drivers[] = {
module_phy_driver(mv3310_drivers); module_phy_driver(mv3310_drivers);
static struct mdio_device_id __maybe_unused mv3310_tbl[] = { static struct mdio_device_id __maybe_unused mv3310_tbl[] = {
{ 0x002b09aa, 0xffffffff }, { 0x002b09aa, MARVELL_PHY_ID_MASK },
{ }, { },
}; };
MODULE_DEVICE_TABLE(mdio, mv3310_tbl); MODULE_DEVICE_TABLE(mdio, mv3310_tbl);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册