[PATCH v2 net-next] phy: increase size of bus_id and MII_BUS_ID_SIZE

[PATCH v2 net-next] phy: increase size of bus_id and MII_BUS_ID_SIZE

[Volodymyr Bendiuga]

Some bus names are pretty long and do not fit into
20 chars, therefore bus_id size is increased together
with MII_BUS_ID_SIZE to host larger names.

Signed-off-by: Volodymyr Bendiuga <volodymyr.bendiuga@gmail.com>
Signed-off-by: Magnus Öberg <magnus.oberg@westermo.se>
---
 include/linux/phy.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/linux/phy.h b/include/linux/phy.h
index f7d95f6..f53f0cd 100644
--- a/include/linux/phy.h
+++ b/include/linux/phy.h
@@ -162,7 +162,7 @@ static inline const char *phy_modes(phy_interface_t interface)
  * 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	(64 - 3)
 
 /* 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. */
@@ -632,7 +632,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[64];
 	u32 phy_uid;
 	u32 phy_uid_mask;
 	int (*run)(struct phy_device *phydev);
-- 
2.7.4

Re: [PATCH v2 net-next] phy: increase size of bus_id and MII_BUS_ID_SIZE

[Andrew Lunn]

On Thu, Jan 19, 2017 at 12:46:55PM +0100, Volodymyr Bendiuga wrote:
> Some bus names are pretty long and do not fit into
> 20 chars, therefore bus_id size is increased together
> with MII_BUS_ID_SIZE to host larger names.
> 
> Signed-off-by: Volodymyr Bendiuga <volodymyr.bendiuga@gmail.com>
> Signed-off-by: Magnus Öberg <magnus.oberg@westermo.se>
> ---
>  include/linux/phy.h | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/include/linux/phy.h b/include/linux/phy.h
> index f7d95f6..f53f0cd 100644
> --- a/include/linux/phy.h
> +++ b/include/linux/phy.h
> @@ -162,7 +162,7 @@ static inline const char *phy_modes(phy_interface_t interface)
>   * Need to be a little smaller than phydev->dev.bus_id to leave room
>   * for the ":%02x"

It would also be good to fixup this comment. dev.bus_id does not seem
to exist any more. I think it got replaced by dev->kobj.name, which is
now a char * rather than an array. I think the comment can be removed.

>   */
> -#define MII_BUS_ID_SIZE	(20 - 3)
> +#define MII_BUS_ID_SIZE	(64 - 3)
>  
>  /* 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. */
> @@ -632,7 +632,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[64];

[MII_BUS_ID_SIZE + 3] would be better.

	 Andrew