| From foo@baz Thu Nov 9 09:48:01 CET 2017 |
| From: Volodymyr Bendiuga <volodymyr.bendiuga@gmail.com> |
| Date: Thu, 19 Jan 2017 17:05:04 +0100 |
| Subject: phy: increase size of MII_BUS_ID_SIZE and bus_id |
| |
| From: Volodymyr Bendiuga <volodymyr.bendiuga@gmail.com> |
| |
| |
| [ 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> |
| --- |
| include/linux/phy.h | 8 ++------ |
| 1 file changed, 2 insertions(+), 6 deletions(-) |
| |
| --- a/include/linux/phy.h |
| +++ b/include/linux/phy.h |
| @@ -142,11 +142,7 @@ static inline const char *phy_modes(phy_ |
| /* 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. */ |
| @@ -602,7 +598,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); |
