Skip to content

Commit 623ed84

Browse files
Jack Morgensteindavem330
authored andcommitted
mlx4_core: initial header-file changes for SRIOV support
These changes will not affect module operation as yet. They are only to get some structs and enums in place for use by subsequent patches (making those smaller). Added here: * sriov state structs and inlines (mlx4_is_master/slave/mfunc) * comm-channel and vhcr support structures * enum values for new FW and comm-channel virtual commands (i.e., commands, passed via the comm channel to the PF-driver). * prototypes for many command wrapper functions (used by the PF context for processing FW commands passed to it by the VFs). * struct mlx4_eqe is moved from eq.c to mlx4.h (it will be used by other mlx4_core source files). Signed-off-by: Jack Morgenstein <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 9f048bf commit 623ed84

File tree

5 files changed

+523
-49
lines changed

5 files changed

+523
-49
lines changed

drivers/net/ethernet/mellanox/mlx4/en_port.h

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,6 @@
3939
#define SET_PORT_PROMISC_SHIFT 31
4040
#define SET_PORT_MC_PROMISC_SHIFT 30
4141

42-
enum {
43-
MLX4_CMD_SET_VLAN_FLTR = 0x47,
44-
MLX4_CMD_SET_MCAST_FLTR = 0x48,
45-
MLX4_CMD_DUMP_ETH_STATS = 0x49,
46-
};
47-
4842
enum {
4943
MCAST_DIRECT_ONLY = 0,
5044
MCAST_DIRECT = 1,

drivers/net/ethernet/mellanox/mlx4/eq.c

Lines changed: 0 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -102,45 +102,6 @@ struct mlx4_eq_context {
102102
(1ull << MLX4_EVENT_TYPE_SRQ_LIMIT) | \
103103
(1ull << MLX4_EVENT_TYPE_CMD))
104104

105-
struct mlx4_eqe {
106-
u8 reserved1;
107-
u8 type;
108-
u8 reserved2;
109-
u8 subtype;
110-
union {
111-
u32 raw[6];
112-
struct {
113-
__be32 cqn;
114-
} __packed comp;
115-
struct {
116-
u16 reserved1;
117-
__be16 token;
118-
u32 reserved2;
119-
u8 reserved3[3];
120-
u8 status;
121-
__be64 out_param;
122-
} __packed cmd;
123-
struct {
124-
__be32 qpn;
125-
} __packed qp;
126-
struct {
127-
__be32 srqn;
128-
} __packed srq;
129-
struct {
130-
__be32 cqn;
131-
u32 reserved1;
132-
u8 reserved2[3];
133-
u8 syndrome;
134-
} __packed cq_err;
135-
struct {
136-
u32 reserved1[2];
137-
__be32 port;
138-
} __packed port_change;
139-
} event;
140-
u8 reserved3[3];
141-
u8 owner;
142-
} __packed;
143-
144105
static void eq_set_ci(struct mlx4_eq *eq, int req_not)
145106
{
146107
__raw_writel((__force u32) cpu_to_be32((eq->cons_index & 0xffffff) |

0 commit comments

Comments
 (0)