Skip to content

Commit ca2090a

Browse files
Volodymyr Bendiugagregkh
authored andcommitted
phy: increase size of MII_BUS_ID_SIZE and bus_id
[ Upstream commit 4567d686f5c6d955e57a3afa1741944c1e7f4033 ] 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> Signed-off-by: Sasha Levin <alexander.levin@verizon.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 079822d commit ca2090a

1 file changed

Lines changed: 2 additions & 6 deletions

File tree

include/linux/phy.h

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -136,11 +136,7 @@ static inline const char *phy_modes(phy_interface_t interface)
136136
/* Used when trying to connect to a specific phy (mii bus id:phy device id) */
137137
#define PHY_ID_FMT "%s:%02x"
138138

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

145141
/* Or MII_ADDR_C45 into regnum for read/write on mii_bus to enable the 21 bit
146142
IEEE 802.3ae clause 45 addressing mode used by 10GIGE phy chips. */
@@ -599,7 +595,7 @@ struct phy_driver {
599595
/* A Structure for boards to register fixups with the PHY Lib */
600596
struct phy_fixup {
601597
struct list_head list;
602-
char bus_id[20];
598+
char bus_id[MII_BUS_ID_SIZE + 3];
603599
u32 phy_uid;
604600
u32 phy_uid_mask;
605601
int (*run)(struct phy_device *phydev);

0 commit comments

Comments
 (0)