Skip to content

Commit

Permalink
phy: increase size of MII_BUS_ID_SIZE and bus_id
Browse files Browse the repository at this point in the history
Some bus names are pretty long and do not fit into
17 chars. Increase therefore MII_BUS_ID_SIZE and
phy_fixup.bus_id to larger number. Now mii_bus.id
can host larger name.

Signed-off-by: Volodymyr Bendiuga <volodymyr.bendiuga@gmail.com>
Signed-off-by: Magnus Öberg <magnus.oberg@westermo.se>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Volodymyr Bendiuga authored and davem330 committed Jan 19, 2017
1 parent c2594d8 commit 4567d68
Showing 1 changed file with 2 additions and 6 deletions.
8 changes: 2 additions & 6 deletions include/linux/phy.h
Original file line number Diff line number Diff line change
Expand Up @@ -158,11 +158,7 @@ static inline const char *phy_modes(phy_interface_t interface)
/* Used when trying to connect to a specific phy (mii bus id:phy device id) */
#define PHY_ID_FMT "%s:%02x"

/*
* Need to be a little smaller than phydev->dev.bus_id to leave room
* for the ":%02x"
*/
#define MII_BUS_ID_SIZE (20 - 3)
#define MII_BUS_ID_SIZE 61

/* Or MII_ADDR_C45 into regnum for read/write on mii_bus to enable the 21 bit
IEEE 802.3ae clause 45 addressing mode used by 10GIGE phy chips. */
Expand Down Expand Up @@ -632,7 +628,7 @@ struct phy_driver {
/* A Structure for boards to register fixups with the PHY Lib */
struct phy_fixup {
struct list_head list;
char bus_id[20];
char bus_id[MII_BUS_ID_SIZE + 3];
u32 phy_uid;
u32 phy_uid_mask;
int (*run)(struct phy_device *phydev);
Expand Down

0 comments on commit 4567d68

Please sign in to comment.