Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-17 09:31:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

mlx4: Extanding port_mask functionality

Browse Source 
Port mask now has additional state.
Port can be set as "none". In this case neither the mlx4_en or mlx4_ib
drivers take ownership of the port.
In multifunction mode there is an option to set the vfs as single ported devices.
(in single function mode, both physical ports belong to same function)

Signed-off-by: Jack Morgenstein <jackm@dev.mellanox.co.il>
Signed-off-by: Yevgeny Petrilin <yevgenyp@mellanox.co.il>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Jack Morgenstein 2011-12-13 04:10:41 +00:00 committed by David S. Miller
parent 623ed84b1f
commit 65dab25deb
3 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/infiniband/hw/mlx4/main.c
View File

@ -177,7 +177,7 @@ mlx4_ib_port_link_layer(struct ib_device *device, u8 port_num)
{ {
struct mlx4_dev *dev = to_mdev(device)->dev; struct mlx4_dev *dev = to_mdev(device)->dev;
return dev->caps.port_mask & (1 << (port_num - 1)) ? return dev->caps.port_mask[port_num] == MLX4_PORT_TYPE_IB ?
IB_LINK_LAYER_INFINIBAND : IB_LINK_LAYER_ETHERNET; IB_LINK_LAYER_INFINIBAND : IB_LINK_LAYER_ETHERNET;
} }

4
drivers/net/ethernet/mellanox/mlx4/main.c
View File

@ -140,10 +140,8 @@ static void mlx4_set_port_mask(struct mlx4_dev *dev)
{ {
int i; int i;
dev->caps.port_mask = 0;
for (i = 1; i <= dev->caps.num_ports; ++i) for (i = 1; i <= dev->caps.num_ports; ++i)
if (dev->caps.port_type[i] == MLX4_PORT_TYPE_IB) dev->caps.port_mask[i] = dev->caps.port_type[i];
dev->caps.port_mask |= 1 << (i - 1);
} }
static int mlx4_dev_cap(struct mlx4_dev *dev, struct mlx4_dev_cap *dev_cap) static int mlx4_dev_cap(struct mlx4_dev *dev, struct mlx4_dev_cap *dev_cap)

13
include/linux/mlx4/device.h
View File

@ -302,7 +302,7 @@ struct mlx4_caps {
int log_num_prios; int log_num_prios;
enum mlx4_port_type port_type[MLX4_MAX_PORTS + 1]; enum mlx4_port_type port_type[MLX4_MAX_PORTS + 1];
u8 supported_type[MLX4_MAX_PORTS + 1]; u8 supported_type[MLX4_MAX_PORTS + 1];
u32 port_mask; u32 port_mask[MLX4_MAX_PORTS + 1];
enum mlx4_port_type possible_type[MLX4_MAX_PORTS + 1]; enum mlx4_port_type possible_type[MLX4_MAX_PORTS + 1];
u32 max_counters; u32 max_counters;
u8 ext_port_cap[MLX4_MAX_PORTS + 1]; u8 ext_port_cap[MLX4_MAX_PORTS + 1];
@ -507,13 +507,12 @@ struct mlx4_init_port_param {
#define mlx4_foreach_port(port, dev, type) \ #define mlx4_foreach_port(port, dev, type) \
for ((port) = 1; (port) <= (dev)->caps.num_ports; (port)++) \ for ((port) = 1; (port) <= (dev)->caps.num_ports; (port)++) \
if (((type) == MLX4_PORT_TYPE_IB ? (dev)->caps.port_mask : \ if ((type) == (dev)->caps.port_mask[(port)])
~(dev)->caps.port_mask) & 1 << ((port) - 1))
#define mlx4_foreach_ib_transport_port(port, dev) \ #define mlx4_foreach_ib_transport_port(port, dev) \
for ((port) = 1; (port) <= (dev)->caps.num_ports; (port)++) \ for ((port) = 1; (port) <= (dev)->caps.num_ports; (port)++) \
if (((dev)->caps.port_mask & 1 << ((port) - 1)) || \ if (((dev)->caps.port_mask[port] == MLX4_PORT_TYPE_IB) || \
((dev)->caps.flags & MLX4_DEV_CAP_FLAG_IBOE)) ((dev)->caps.flags & MLX4_DEV_CAP_FLAG_IBOE))
static inline int mlx4_is_master(struct mlx4_dev *dev) static inline int mlx4_is_master(struct mlx4_dev *dev)
{ {