Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b31cdffa authored by Andrew Lunn's avatar Andrew Lunn Committed by David S. Miller
Browse files

net: phy: Move linkmode helpers to somewhere public 



phylink has some useful helpers to working with linkmode bitmaps.
Move them to there own header so other code can use them.

Signed-off-by: default avatarAndrew Lunn <andrew@lunn.ch>
Acked-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Reviewed-by: default avatarMaxime Chevallier <maxime.chevallier@bootlin.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 97ea8ac3

drivers/net/phy/phylink.c

+0 −27
Original line number Diff line number Diff line
@@ -68,33 +68,6 @@ struct phylink { 
	struct sfp_bus *sfp_bus;

};



static inline void linkmode_zero(unsigned long *dst)

{

	bitmap_zero(dst, __ETHTOOL_LINK_MODE_MASK_NBITS);

}



static inline void linkmode_copy(unsigned long *dst, const unsigned long *src)

{

	bitmap_copy(dst, src, __ETHTOOL_LINK_MODE_MASK_NBITS);

}



static inline void linkmode_and(unsigned long *dst, const unsigned long *a,

				const unsigned long *b)

{

	bitmap_and(dst, a, b, __ETHTOOL_LINK_MODE_MASK_NBITS);

}



static inline void linkmode_or(unsigned long *dst, const unsigned long *a,

				const unsigned long *b)

{

	bitmap_or(dst, a, b, __ETHTOOL_LINK_MODE_MASK_NBITS);

}



static inline bool linkmode_empty(const unsigned long *src)

{

	return bitmap_empty(src, __ETHTOOL_LINK_MODE_MASK_NBITS);

}



/**

 * phylink_set_port_modes() - set the port type modes in the ethtool mask

 * @mask: ethtool link mode mask

include/linux/linkmode.h

0 → 100644
+67 −0
Original line number Diff line number Diff line 
#ifndef __LINKMODE_H

#define __LINKMODE_H



#include <linux/bitmap.h>

#include <linux/ethtool.h>

#include <uapi/linux/ethtool.h>



static inline void linkmode_zero(unsigned long *dst)

{

	bitmap_zero(dst, __ETHTOOL_LINK_MODE_MASK_NBITS);

}



static inline void linkmode_copy(unsigned long *dst, const unsigned long *src)

{

	bitmap_copy(dst, src, __ETHTOOL_LINK_MODE_MASK_NBITS);

}



static inline void linkmode_and(unsigned long *dst, const unsigned long *a,

				const unsigned long *b)

{

	bitmap_and(dst, a, b, __ETHTOOL_LINK_MODE_MASK_NBITS);

}



static inline void linkmode_or(unsigned long *dst, const unsigned long *a,

				const unsigned long *b)

{

	bitmap_or(dst, a, b, __ETHTOOL_LINK_MODE_MASK_NBITS);

}



static inline bool linkmode_empty(const unsigned long *src)

{

	return bitmap_empty(src, __ETHTOOL_LINK_MODE_MASK_NBITS);

}



static inline int linkmode_andnot(unsigned long *dst, const unsigned long *src1,

				  const unsigned long *src2)

{

	return bitmap_andnot(dst, src1, src2,  __ETHTOOL_LINK_MODE_MASK_NBITS);

}



static inline void linkmode_set_bit(int nr, volatile unsigned long *addr)

{

	__set_bit(nr, addr);

}



static inline void linkmode_clear_bit(int nr, volatile unsigned long *addr)

{

	__clear_bit(nr, addr);

}



static inline void linkmode_change_bit(int nr, volatile unsigned long *addr)

{

	__change_bit(nr, addr);

}



static inline int linkmode_test_bit(int nr, volatile unsigned long *addr)

{

	return test_bit(nr, addr);

}



static inline int linkmode_equal(const unsigned long *src1,

				 const unsigned long *src2)

{

	return bitmap_equal(src1, src2, __ETHTOOL_LINK_MODE_MASK_NBITS);

}



#endif /* __LINKMODE_H */

include/linux/mii.h

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 




#include <linux/if.h>

#include <linux/linkmode.h>

#include <uapi/linux/mii.h>



struct ethtool_cmd;

include/linux/phy.h

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include <linux/compiler.h>

#include <linux/spinlock.h>

#include <linux/ethtool.h>

#include <linux/linkmode.h>

#include <linux/mdio.h>

#include <linux/mii.h>

#include <linux/module.h>