* [PATCH net-next 0/4] net/mlx4: Mellanox driver update 15-10-2013
@ 2013-10-15 14:55 Amir Vadai
2013-10-15 14:55 ` [PATCH net-next 1/4] net/mlx4: Clean the code to eliminate trivial build warnings Amir Vadai
` (4 more replies)
0 siblings, 5 replies; 6+ messages in thread
From: Amir Vadai @ 2013-10-15 14:55 UTC (permalink / raw)
To: David S. Miller; +Cc: netdev, Eyal Perry, Amir Vadai
Hi Dave,
This patchset contains small code cleaning patches, and a patch to make
mlx4_core use module_request() in order to load the relevant link layer module
(mlx4_en or mlx4_ib) according to the port type.
Thanks,
Amir
Amir Vadai (1):
net/mlx4: Unused local variable in mlx4_opreq_action
Eyal Perry (1):
net/mlx4_core: Load higher level modules according to ports type
Or Gerlitz (2):
net/mlx4: Clean the code to eliminate trivial build warnings
net/mlx4: Fix typo, move similar defs to same location
drivers/net/ethernet/mellanox/mlx4/cmd.c | 2 --
drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 2 +-
drivers/net/ethernet/mellanox/mlx4/fw.c | 4 +---
drivers/net/ethernet/mellanox/mlx4/main.c | 29 ++++++++++++++++++++++++++
drivers/net/ethernet/mellanox/mlx4/mcg.c | 6 +++---
drivers/net/ethernet/mellanox/mlx4/srq.c | 1 +
include/linux/mlx4/cmd.h | 6 ++----
include/linux/mlx4/device.h | 2 +-
8 files changed, 38 insertions(+), 14 deletions(-)
--
1.8.3.4
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH net-next 1/4] net/mlx4: Clean the code to eliminate trivial build warnings
2013-10-15 14:55 [PATCH net-next 0/4] net/mlx4: Mellanox driver update 15-10-2013 Amir Vadai
@ 2013-10-15 14:55 ` Amir Vadai
2013-10-15 14:55 ` [PATCH net-next 2/4] net/mlx4: Fix typo, move similar defs to same location Amir Vadai
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Amir Vadai @ 2013-10-15 14:55 UTC (permalink / raw)
To: David S. Miller; +Cc: netdev, Eyal Perry, Amir Vadai, Or Gerlitz
From: Or Gerlitz <ogerlitz@mellanox.com>
Remove code that triggers trivial build warnings.
drivers/net/ethernet/mellanox/mlx4/cmd.c: In function ‘mlx4_set_vf_vlan’:
drivers/net/ethernet/mellanox/mlx4/cmd.c:2256: warning: variable ‘vf_oper’ set but not used
drivers/net/ethernet/mellanox/mlx4/mcg.c: In function ‘mlx4_map_sw_to_hw_steering_mode’:
drivers/net/ethernet/mellanox/mlx4/mcg.c:648: warning: comparison of unsigned expression < 0 is always false
drivers/net/ethernet/mellanox/mlx4/mcg.c: In function ‘mlx4_map_sw_to_hw_steering_id’:
drivers/net/ethernet/mellanox/mlx4/mcg.c:685: warning: comparison of unsigned expression < 0 is always false
drivers/net/ethernet/mellanox/mlx4/mcg.c: In function ‘mlx4_hw_rule_sz’:
drivers/net/ethernet/mellanox/mlx4/mcg.c:712: warning: comparison of unsigned expression < 0 is always false
drivers/net/ethernet/mellanox/mlx4/fw.c: In function ‘mlx4_opreq_action’:
drivers/net/ethernet/mellanox/mlx4/fw.c:1732: warning: variable ‘type_m’ set but not used
drivers/net/ethernet/mellanox/mlx4/srq.c:302: warning: no previous prototype for ‘mlx4_srq_lookup’
Signed-off-by: Or Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: Amir Vadai <amirv@mellanox.com>
---
drivers/net/ethernet/mellanox/mlx4/cmd.c | 2 --
drivers/net/ethernet/mellanox/mlx4/mcg.c | 6 +++---
drivers/net/ethernet/mellanox/mlx4/srq.c | 1 +
3 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/drivers/net/ethernet/mellanox/mlx4/cmd.c b/drivers/net/ethernet/mellanox/mlx4/cmd.c
index ea20182..735765c 100644
--- a/drivers/net/ethernet/mellanox/mlx4/cmd.c
+++ b/drivers/net/ethernet/mellanox/mlx4/cmd.c
@@ -2253,7 +2253,6 @@ EXPORT_SYMBOL_GPL(mlx4_set_vf_mac);
int mlx4_set_vf_vlan(struct mlx4_dev *dev, int port, int vf, u16 vlan, u8 qos)
{
struct mlx4_priv *priv = mlx4_priv(dev);
- struct mlx4_vport_oper_state *vf_oper;
struct mlx4_vport_state *vf_admin;
int slave;
@@ -2269,7 +2268,6 @@ int mlx4_set_vf_vlan(struct mlx4_dev *dev, int port, int vf, u16 vlan, u8 qos)
return -EINVAL;
vf_admin = &priv->mfunc.master.vf_admin[slave].vport[port];
- vf_oper = &priv->mfunc.master.vf_oper[slave].vport[port];
if ((0 == vlan) && (0 == qos))
vf_admin->default_vlan = MLX4_VGT;
diff --git a/drivers/net/ethernet/mellanox/mlx4/mcg.c b/drivers/net/ethernet/mellanox/mlx4/mcg.c
index 55f6245..70f0213 100644
--- a/drivers/net/ethernet/mellanox/mlx4/mcg.c
+++ b/drivers/net/ethernet/mellanox/mlx4/mcg.c
@@ -645,7 +645,7 @@ static const u8 __promisc_mode[] = {
int mlx4_map_sw_to_hw_steering_mode(struct mlx4_dev *dev,
enum mlx4_net_trans_promisc_mode flow_type)
{
- if (flow_type >= MLX4_FS_MODE_NUM || flow_type < 0) {
+ if (flow_type >= MLX4_FS_MODE_NUM) {
mlx4_err(dev, "Invalid flow type. type = %d\n", flow_type);
return -EINVAL;
}
@@ -681,7 +681,7 @@ const u16 __sw_id_hw[] = {
int mlx4_map_sw_to_hw_steering_id(struct mlx4_dev *dev,
enum mlx4_net_trans_rule_id id)
{
- if (id >= MLX4_NET_TRANS_RULE_NUM || id < 0) {
+ if (id >= MLX4_NET_TRANS_RULE_NUM) {
mlx4_err(dev, "Invalid network rule id. id = %d\n", id);
return -EINVAL;
}
@@ -706,7 +706,7 @@ static const int __rule_hw_sz[] = {
int mlx4_hw_rule_sz(struct mlx4_dev *dev,
enum mlx4_net_trans_rule_id id)
{
- if (id >= MLX4_NET_TRANS_RULE_NUM || id < 0) {
+ if (id >= MLX4_NET_TRANS_RULE_NUM) {
mlx4_err(dev, "Invalid network rule id. id = %d\n", id);
return -EINVAL;
}
diff --git a/drivers/net/ethernet/mellanox/mlx4/srq.c b/drivers/net/ethernet/mellanox/mlx4/srq.c
index 79fd269..9e08e35 100644
--- a/drivers/net/ethernet/mellanox/mlx4/srq.c
+++ b/drivers/net/ethernet/mellanox/mlx4/srq.c
@@ -34,6 +34,7 @@
#include <linux/init.h>
#include <linux/mlx4/cmd.h>
+#include <linux/mlx4/srq.h>
#include <linux/export.h>
#include <linux/gfp.h>
--
1.8.3.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH net-next 2/4] net/mlx4: Fix typo, move similar defs to same location
2013-10-15 14:55 [PATCH net-next 0/4] net/mlx4: Mellanox driver update 15-10-2013 Amir Vadai
2013-10-15 14:55 ` [PATCH net-next 1/4] net/mlx4: Clean the code to eliminate trivial build warnings Amir Vadai
@ 2013-10-15 14:55 ` Amir Vadai
2013-10-15 14:55 ` [PATCH net-next 3/4] net/mlx4: Unused local variable in mlx4_opreq_action Amir Vadai
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Amir Vadai @ 2013-10-15 14:55 UTC (permalink / raw)
To: David S. Miller; +Cc: netdev, Eyal Perry, Amir Vadai, Or Gerlitz
From: Or Gerlitz <ogerlitz@mellanox.com>
Small code cleanup:
1. change MLX4_DEV_CAP_FLAGS2_REASSIGN_MAC_EN to MLX4_DEV_CAP_FLAG2_REASSIGN_MAC_EN
2. put MLX4_SET_PORT_PRIO2TC and MLX4_SET_PORT_SCHEDULER in the same union with the
other MLX4_SET_PORT_yyy
Signed-off-by: Or Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: Amir Vadai <amirv@mellanox.com>
---
drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 2 +-
drivers/net/ethernet/mellanox/mlx4/fw.c | 2 +-
include/linux/mlx4/cmd.h | 6 ++----
include/linux/mlx4/device.h | 2 +-
4 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
index fa37b7a..85d9166 100644
--- a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
@@ -1733,7 +1733,7 @@ void mlx4_en_stop_port(struct net_device *dev, int detach)
/* Unregister Mac address for the port */
mlx4_en_put_qp(priv);
- if (!(mdev->dev->caps.flags2 & MLX4_DEV_CAP_FLAGS2_REASSIGN_MAC_EN))
+ if (!(mdev->dev->caps.flags2 & MLX4_DEV_CAP_FLAG2_REASSIGN_MAC_EN))
mdev->mac_removed[priv->port] = 1;
/* Free RX Rings */
diff --git a/drivers/net/ethernet/mellanox/mlx4/fw.c b/drivers/net/ethernet/mellanox/mlx4/fw.c
index 0d63daa..a377484 100644
--- a/drivers/net/ethernet/mellanox/mlx4/fw.c
+++ b/drivers/net/ethernet/mellanox/mlx4/fw.c
@@ -652,7 +652,7 @@ int mlx4_QUERY_DEV_CAP(struct mlx4_dev *dev, struct mlx4_dev_cap *dev_cap)
QUERY_DEV_CAP_RSVD_LKEY_OFFSET);
MLX4_GET(field, outbox, QUERY_DEV_CAP_FW_REASSIGN_MAC);
if (field & 1<<6)
- dev_cap->flags2 |= MLX4_DEV_CAP_FLAGS2_REASSIGN_MAC_EN;
+ dev_cap->flags2 |= MLX4_DEV_CAP_FLAG2_REASSIGN_MAC_EN;
MLX4_GET(dev_cap->max_icm_sz, outbox,
QUERY_DEV_CAP_MAX_ICM_SZ_OFFSET);
if (dev_cap->flags & MLX4_DEV_CAP_FLAG_COUNTERS)
diff --git a/include/linux/mlx4/cmd.h b/include/linux/mlx4/cmd.h
index cd1fdf7..8df61bc 100644
--- a/include/linux/mlx4/cmd.h
+++ b/include/linux/mlx4/cmd.h
@@ -154,10 +154,6 @@ enum {
MLX4_CMD_QUERY_IF_STAT = 0X54,
MLX4_CMD_SET_IF_STAT = 0X55,
- /* set port opcode modifiers */
- MLX4_SET_PORT_PRIO2TC = 0x8,
- MLX4_SET_PORT_SCHEDULER = 0x9,
-
/* register/delete flow steering network rules */
MLX4_QP_FLOW_STEERING_ATTACH = 0x65,
MLX4_QP_FLOW_STEERING_DETACH = 0x66,
@@ -182,6 +178,8 @@ enum {
MLX4_SET_PORT_VLAN_TABLE = 0x3,
MLX4_SET_PORT_PRIO_MAP = 0x4,
MLX4_SET_PORT_GID_TABLE = 0x5,
+ MLX4_SET_PORT_PRIO2TC = 0x8,
+ MLX4_SET_PORT_SCHEDULER = 0x9,
};
enum {
diff --git a/include/linux/mlx4/device.h b/include/linux/mlx4/device.h
index 24ce6bd..9ad0c18 100644
--- a/include/linux/mlx4/device.h
+++ b/include/linux/mlx4/device.h
@@ -155,7 +155,7 @@ enum {
MLX4_DEV_CAP_FLAG2_RSS_TOP = 1LL << 1,
MLX4_DEV_CAP_FLAG2_RSS_XOR = 1LL << 2,
MLX4_DEV_CAP_FLAG2_FS_EN = 1LL << 3,
- MLX4_DEV_CAP_FLAGS2_REASSIGN_MAC_EN = 1LL << 4,
+ MLX4_DEV_CAP_FLAG2_REASSIGN_MAC_EN = 1LL << 4,
MLX4_DEV_CAP_FLAG2_TS = 1LL << 5,
MLX4_DEV_CAP_FLAG2_VLAN_CONTROL = 1LL << 6,
MLX4_DEV_CAP_FLAG2_FSM = 1LL << 7,
--
1.8.3.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH net-next 3/4] net/mlx4: Unused local variable in mlx4_opreq_action
2013-10-15 14:55 [PATCH net-next 0/4] net/mlx4: Mellanox driver update 15-10-2013 Amir Vadai
2013-10-15 14:55 ` [PATCH net-next 1/4] net/mlx4: Clean the code to eliminate trivial build warnings Amir Vadai
2013-10-15 14:55 ` [PATCH net-next 2/4] net/mlx4: Fix typo, move similar defs to same location Amir Vadai
@ 2013-10-15 14:55 ` Amir Vadai
2013-10-15 14:55 ` [PATCH net-next 4/4] net/mlx4_core: Load higher level modules according to ports type Amir Vadai
2013-10-17 19:13 ` [PATCH net-next 0/4] net/mlx4: Mellanox driver update 15-10-2013 David Miller
4 siblings, 0 replies; 6+ messages in thread
From: Amir Vadai @ 2013-10-15 14:55 UTC (permalink / raw)
To: David S. Miller; +Cc: netdev, Eyal Perry, Amir Vadai
Clean up warning added by commit fe6f700d "net/mlx4_core: Respond to
operation request by firmware".
Signed-off-by: Amir Vadai <amirv@mellanox.com>
---
drivers/net/ethernet/mellanox/mlx4/fw.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/drivers/net/ethernet/mellanox/mlx4/fw.c b/drivers/net/ethernet/mellanox/mlx4/fw.c
index a377484..c151e7a 100644
--- a/drivers/net/ethernet/mellanox/mlx4/fw.c
+++ b/drivers/net/ethernet/mellanox/mlx4/fw.c
@@ -1713,7 +1713,6 @@ void mlx4_opreq_action(struct work_struct *work)
u32 *outbox;
u32 modifier;
u16 token;
- u16 type_m;
u16 type;
int err;
u32 num_qps;
@@ -1746,7 +1745,6 @@ void mlx4_opreq_action(struct work_struct *work)
MLX4_GET(modifier, outbox, GET_OP_REQ_MODIFIER_OFFSET);
MLX4_GET(token, outbox, GET_OP_REQ_TOKEN_OFFSET);
MLX4_GET(type, outbox, GET_OP_REQ_TYPE_OFFSET);
- type_m = type >> 12;
type &= 0xfff;
switch (type) {
--
1.8.3.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH net-next 4/4] net/mlx4_core: Load higher level modules according to ports type
2013-10-15 14:55 [PATCH net-next 0/4] net/mlx4: Mellanox driver update 15-10-2013 Amir Vadai
` (2 preceding siblings ...)
2013-10-15 14:55 ` [PATCH net-next 3/4] net/mlx4: Unused local variable in mlx4_opreq_action Amir Vadai
@ 2013-10-15 14:55 ` Amir Vadai
2013-10-17 19:13 ` [PATCH net-next 0/4] net/mlx4: Mellanox driver update 15-10-2013 David Miller
4 siblings, 0 replies; 6+ messages in thread
From: Amir Vadai @ 2013-10-15 14:55 UTC (permalink / raw)
To: David S. Miller; +Cc: netdev, Eyal Perry, Amir Vadai
From: Eyal Perry <eyalpe@mellanox.com>
Mellanox ConnectX architecture is: mlx4_core is the lower level
PCI driver which register on the PCI id, and protocol specific drivers
are depended on it: mlx4_en - for Ethernet and mlx4_ib for Infiniband.
NIC could have multiple ports which can change their type dynamically.
We use the request_module() call to load the relevant protocol driver
when needed: on loading time or at port type change event.
Signed-off-by: Eyal Perry <eyalpe@mellanox.com>
Signed-off-by: Amir Vadai <amirv@mellanox.com>
---
drivers/net/ethernet/mellanox/mlx4/main.c | 29 +++++++++++++++++++++++++++++
1 file changed, 29 insertions(+)
diff --git a/drivers/net/ethernet/mellanox/mlx4/main.c b/drivers/net/ethernet/mellanox/mlx4/main.c
index 60c9f4f..179d267 100644
--- a/drivers/net/ethernet/mellanox/mlx4/main.c
+++ b/drivers/net/ethernet/mellanox/mlx4/main.c
@@ -42,6 +42,7 @@
#include <linux/io-mapping.h>
#include <linux/delay.h>
#include <linux/netdevice.h>
+#include <linux/kmod.h>
#include <linux/mlx4/device.h>
#include <linux/mlx4/doorbell.h>
@@ -650,6 +651,27 @@ err_mem:
return err;
}
+static void mlx4_request_modules(struct mlx4_dev *dev)
+{
+ int port;
+ int has_ib_port = false;
+ int has_eth_port = false;
+#define EN_DRV_NAME "mlx4_en"
+#define IB_DRV_NAME "mlx4_ib"
+
+ for (port = 1; port <= dev->caps.num_ports; port++) {
+ if (dev->caps.port_type[port] == MLX4_PORT_TYPE_IB)
+ has_ib_port = true;
+ else if (dev->caps.port_type[port] == MLX4_PORT_TYPE_ETH)
+ has_eth_port = true;
+ }
+
+ if (has_ib_port)
+ request_module_nowait(IB_DRV_NAME);
+ if (has_eth_port)
+ request_module_nowait(EN_DRV_NAME);
+}
+
/*
* Change the port configuration of the device.
* Every user of this function must hold the port mutex.
@@ -681,6 +703,11 @@ int mlx4_change_port_types(struct mlx4_dev *dev,
}
mlx4_set_port_mask(dev);
err = mlx4_register_device(dev);
+ if (err) {
+ mlx4_err(dev, "Failed to register device\n");
+ goto out;
+ }
+ mlx4_request_modules(dev);
}
out:
@@ -2305,6 +2332,8 @@ slave_start:
if (err)
goto err_port;
+ mlx4_request_modules(dev);
+
mlx4_sense_init(dev);
mlx4_start_sense(dev);
--
1.8.3.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH net-next 0/4] net/mlx4: Mellanox driver update 15-10-2013
2013-10-15 14:55 [PATCH net-next 0/4] net/mlx4: Mellanox driver update 15-10-2013 Amir Vadai
` (3 preceding siblings ...)
2013-10-15 14:55 ` [PATCH net-next 4/4] net/mlx4_core: Load higher level modules according to ports type Amir Vadai
@ 2013-10-17 19:13 ` David Miller
4 siblings, 0 replies; 6+ messages in thread
From: David Miller @ 2013-10-17 19:13 UTC (permalink / raw)
To: amirv; +Cc: netdev, eyalpe
From: Amir Vadai <amirv@mellanox.com>
Date: Tue, 15 Oct 2013 16:55:20 +0200
> This patchset contains small code cleaning patches, and a patch to make
> mlx4_core use module_request() in order to load the relevant link layer module
> (mlx4_en or mlx4_ib) according to the port type.
Series applied, thanks.
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2013-10-17 19:13 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-10-15 14:55 [PATCH net-next 0/4] net/mlx4: Mellanox driver update 15-10-2013 Amir Vadai
2013-10-15 14:55 ` [PATCH net-next 1/4] net/mlx4: Clean the code to eliminate trivial build warnings Amir Vadai
2013-10-15 14:55 ` [PATCH net-next 2/4] net/mlx4: Fix typo, move similar defs to same location Amir Vadai
2013-10-15 14:55 ` [PATCH net-next 3/4] net/mlx4: Unused local variable in mlx4_opreq_action Amir Vadai
2013-10-15 14:55 ` [PATCH net-next 4/4] net/mlx4_core: Load higher level modules according to ports type Amir Vadai
2013-10-17 19:13 ` [PATCH net-next 0/4] net/mlx4: Mellanox driver update 15-10-2013 David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).