Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-25 20:32:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

ethtool: untangle the linkmode and ethtool headers

Browse Source 
Commit 26c5334d34 ("ethtool: Add forced speed to supported link
modes maps") added a dependency between ethtool.h and linkmode.h.
The dependency in the opposite direction already exists so the
new code was inserted in an awkward place.

The reason for ethtool.h to include linkmode.h, is that
ethtool_forced_speed_maps_init() is a static inline helper.
That's not really necessary.

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Reviewed-by: Paul Greenwalt <paul.greenwalt@intel.com>
Reviewed-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
Reviewed-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Jakub Kicinski 2023-10-19 08:28:15 -07:00 committed by David S. Miller
parent b4a11b2033
commit 20c6e05bd3
3 changed files with 37 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
include/linux/ethtool.h
View File

@ -13,7 +13,6 @@
#ifndef _LINUX_ETHTOOL_H
#define _LINUX_ETHTOOL_H
#include <linux/linkmode.h>
#include <linux/bitmap.h>
#include <linux/compat.h>
#include <linux/if_ether.h>
@ -1070,23 +1069,6 @@ struct ethtool_forced_speed_map {
.arr_size = ARRAY_SIZE(prefix##_##value), \
}
/**
* ethtool_forced_speed_maps_init
* @maps: Pointer to an array of Ethtool forced speed map
* @size: Array size
*
* Initialize an array of Ethtool forced speed map to Ethtool link modes. This
* should be called during driver module init.
*/
static inline void
ethtool_forced_speed_maps_init(struct ethtool_forced_speed_map *maps, u32 size)
{
for (u32 i = 0; i < size; i++) {
struct ethtool_forced_speed_map *map = &maps[i];
linkmode_set_bit_array(map->cap_arr, map->arr_size, map->caps);
map->cap_arr = NULL;
map->arr_size = 0;
}
}
void
ethtool_forced_speed_maps_init(struct ethtool_forced_speed_map *maps, u32 size);
#endif /* _LINUX_ETHTOOL_H */

29
include/linux/linkmode.h
View File

@ -2,21 +2,6 @@
#define __LINKMODE_H
#include <linux/bitmap.h>
static inline void linkmode_set_bit(int nr, volatile unsigned long *addr)
{
__set_bit(nr, addr);
}
static inline void linkmode_set_bit_array(const int *array, int array_size,
unsigned long *addr)
{
int i;
for (i = 0; i < array_size; i++)
linkmode_set_bit(array[i], addr);
}
#include <linux/ethtool.h>
#include <uapi/linux/ethtool.h>
@ -53,6 +38,11 @@ static inline int linkmode_andnot(unsigned long *dst, const unsigned long *src1,
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);
@ -72,6 +62,15 @@ static inline int linkmode_test_bit(int nr, const volatile unsigned long *addr)
return test_bit(nr, addr);
}
static inline void linkmode_set_bit_array(const int *array, int array_size,
unsigned long *addr)
{
int i;
for (i = 0; i < array_size; i++)
linkmode_set_bit(array[i], addr);
}
static inline int linkmode_equal(const unsigned long *src1,
const unsigned long *src2)
{

21
net/ethtool/common.c
View File

@ -685,3 +685,24 @@ ethtool_params_from_link_mode(struct ethtool_link_ksettings *link_ksettings,
link_ksettings->base.duplex = link_info->duplex;
}
EXPORT_SYMBOL_GPL(ethtool_params_from_link_mode);
/**
* ethtool_forced_speed_maps_init
* @maps: Pointer to an array of Ethtool forced speed map
* @size: Array size
*
* Initialize an array of Ethtool forced speed map to Ethtool link modes. This
* should be called during driver module init.
*/
void
ethtool_forced_speed_maps_init(struct ethtool_forced_speed_map *maps, u32 size)
{
for (u32 i = 0; i < size; i++) {
struct ethtool_forced_speed_map *map = &maps[i];
linkmode_set_bit_array(map->cap_arr, map->arr_size, map->caps);
map->cap_arr = NULL;
map->arr_size = 0;
}
}
EXPORT_SYMBOL_GPL(ethtool_forced_speed_maps_init);