b8ba452683
- A few minor core fixups needed for the next patch series
- The IB SRIOV series. This has bounced around for several versions.
Of note is the fact that the first patch in this series effects
the net core. It was directed to netdev and DaveM for each iteration
of the series (three versions total). Dave did not object, but did
not respond either. I've taken this as permission to move forward
with the series.
- The new Intel X722 iWARP driver
- A huge set of updates to the Intel hfi1 driver. Of particular interest
here is that we have left the driver in staging since it still has an
API that people object to. Intel is working on a fix, but getting
these patches in now helps keep me sane as the upstream and Intel's
trees were over 300 patches apart.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iQIcBAABAgAGBQJW8HR9AAoJELgmozMOVy/dDYMP+wSBALhIdV/pqVzdLCGfIUbK
H5agonm/3b/Oj74W30w2JYqXBFfZC2LGVJy6OwocJ3wK04v/KfZbA9G+QsOuh2hQ
Db+tFn1eoltvzrcx3k/a7x6zHGC4YyxyH9OX2B3QfRsNHeE7PG9KGp5dfEs2OH1r
WGp3jMLAsHf7o8uKpa0jyTEUEErATaTlG+YoaJ+BGHwurgCNy8ni+wAn+EAFiJ3w
iEJhcXB6KY69vkLsrLYuT9xxJn4udFJ3QEk8xdPkpLKsu+6Ue5i/eNQ19VfbpZgR
c6fTc8genfIv5S+fis+0P44u1oA7Kl2JT6IZYLi35gJ60ZmxTD+7GruWP3xX/wJ2
zuR3sTj5fjcFWenk087RSIU/EK87ONPD4g9QPdZpf3FtgleTVKk3YDlqwjqf8pgv
cO6gQ1BcOBnixJvhjNFiX1c2hvNhb3CkgObly1JBwhcCzZhLkV7BNFPbZuDHAeAx
VqzNEUse4hupkgiiuiGgudcJ4fsSxMW37kyfX9QC/qyk6YVuUDbrekcWI+MAKot7
5e5dHqFExpbn1Zgvc8yfvh88H2MUQAgaYwjanWF/qpppOPRd01nTisVQIOJn7s5C
arcWzvocpQe0GL2UsvDoWwAABXznL3bnnAoCyTWOES2RhOOcw0Ibw46Jl8FQ8gnl
2IRxQ+ltNEscb2cwi5wE
=t2Ko
-----END PGP SIGNATURE-----
Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma
Pull more rdma updates from Doug Ledford:
"Round two of 4.6 merge window patches.
This is a monster pull request. I held off on the hfi1 driver updates
(the hfi1 driver is intimately tied to the qib driver and the new
rdmavt software library that was created to help both of them) in my
first pull request. The hfi1/qib/rdmavt update is probably 90% of
this pull request. The hfi1 driver is being left in staging so that
it can be fixed up in regards to the API that Al and yourself didn't
like. Intel has agreed to do the work, but in the meantime, this
clears out 300+ patches in the backlog queue and brings my tree and
their tree closer to sync.
This also includes about 10 patches to the core and a few to mlx5 to
create an infrastructure for configuring SRIOV ports on IB devices.
That series includes one patch to the net core that we sent to netdev@
and Dave Miller with each of the three revisions to the series. We
didn't get any response to the patch, so we took that as implicit
approval.
Finally, this series includes Intel's new iWARP driver for their x722
cards. It's not nearly the beast as the hfi1 driver. It also has a
linux-next merge issue, but that has been resolved and it now passes
just fine.
Summary:
- A few minor core fixups needed for the next patch series
- The IB SRIOV series. This has bounced around for several versions.
Of note is the fact that the first patch in this series effects the
net core. It was directed to netdev and DaveM for each iteration
of the series (three versions total). Dave did not object, but did
not respond either. I've taken this as permission to move forward
with the series.
- The new Intel X722 iWARP driver
- A huge set of updates to the Intel hfi1 driver. Of particular
interest here is that we have left the driver in staging since it
still has an API that people object to. Intel is working on a fix,
but getting these patches in now helps keep me sane as the upstream
and Intel's trees were over 300 patches apart"
* tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma: (362 commits)
IB/ipoib: Allow mcast packets from other VFs
IB/mlx5: Implement callbacks for manipulating VFs
net/mlx5_core: Implement modify HCA vport command
net/mlx5_core: Add VF param when querying vport counter
IB/ipoib: Add ndo operations for configuring VFs
IB/core: Add interfaces to control VF attributes
IB/core: Support accessing SA in virtualized environment
IB/core: Add subnet prefix to port info
IB/mlx5: Fix decision on using MAD_IFC
net/core: Add support for configuring VF GUIDs
IB/{core, ulp} Support above 32 possible device capability flags
IB/core: Replace setting the zero values in ib_uverbs_ex_query_device
net/mlx5_core: Introduce offload arithmetic hardware capabilities
net/mlx5_core: Refactor device capability function
net/mlx5_core: Fix caching ATOMIC endian mode capability
ib_srpt: fix a WARN_ON() message
i40iw: Replace the obsolete crypto hash interface with shash
IB/hfi1: Add SDMA cache eviction algorithm
IB/hfi1: Switch to using the pin query function
IB/hfi1: Specify mm when releasing pages
...
139 lines
4.6 KiB
C
139 lines
4.6 KiB
C
/*******************************************************************************
|
|
*
|
|
* Intel Ethernet Controller XL710 Family Linux Driver
|
|
* Copyright(c) 2013 - 2015 Intel Corporation.
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify it
|
|
* under the terms and conditions of the GNU General Public License,
|
|
* version 2, as published by the Free Software Foundation.
|
|
*
|
|
* This program is distributed in the hope it will be useful, but WITHOUT
|
|
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
|
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
|
|
* more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License along
|
|
* with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
*
|
|
* The full GNU General Public License is included in this distribution in
|
|
* the file called "COPYING".
|
|
*
|
|
* Contact Information:
|
|
* e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
|
|
* Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
|
|
*
|
|
******************************************************************************/
|
|
|
|
#ifndef _I40E_VIRTCHNL_PF_H_
|
|
#define _I40E_VIRTCHNL_PF_H_
|
|
|
|
#include "i40e.h"
|
|
|
|
#define I40E_MAX_VLANID 4095
|
|
|
|
#define I40E_VIRTCHNL_SUPPORTED_QTYPES 2
|
|
|
|
#define I40E_DEFAULT_NUM_MDD_EVENTS_ALLOWED 3
|
|
#define I40E_DEFAULT_NUM_INVALID_MSGS_ALLOWED 10
|
|
|
|
#define I40E_VLAN_PRIORITY_SHIFT 12
|
|
#define I40E_VLAN_MASK 0xFFF
|
|
#define I40E_PRIORITY_MASK 0x7000
|
|
|
|
#define VF_IS_V10(_v) (((_v)->vf_ver.major == 1) && ((_v)->vf_ver.minor == 0))
|
|
#define VF_IS_V11(_v) (((_v)->vf_ver.major == 1) && ((_v)->vf_ver.minor == 1))
|
|
|
|
/* Various queue ctrls */
|
|
enum i40e_queue_ctrl {
|
|
I40E_QUEUE_CTRL_UNKNOWN = 0,
|
|
I40E_QUEUE_CTRL_ENABLE,
|
|
I40E_QUEUE_CTRL_ENABLECHECK,
|
|
I40E_QUEUE_CTRL_DISABLE,
|
|
I40E_QUEUE_CTRL_DISABLECHECK,
|
|
I40E_QUEUE_CTRL_FASTDISABLE,
|
|
I40E_QUEUE_CTRL_FASTDISABLECHECK,
|
|
};
|
|
|
|
/* VF states */
|
|
enum i40e_vf_states {
|
|
I40E_VF_STAT_INIT = 0,
|
|
I40E_VF_STAT_ACTIVE,
|
|
I40E_VF_STAT_IWARPENA,
|
|
I40E_VF_STAT_FCOEENA,
|
|
I40E_VF_STAT_DISABLED,
|
|
};
|
|
|
|
/* VF capabilities */
|
|
enum i40e_vf_capabilities {
|
|
I40E_VIRTCHNL_VF_CAP_PRIVILEGE = 0,
|
|
I40E_VIRTCHNL_VF_CAP_L2,
|
|
I40E_VIRTCHNL_VF_CAP_IWARP,
|
|
};
|
|
|
|
/* VF information structure */
|
|
struct i40e_vf {
|
|
struct i40e_pf *pf;
|
|
|
|
/* VF id in the PF space */
|
|
u16 vf_id;
|
|
/* all VF vsis connect to the same parent */
|
|
enum i40e_switch_element_types parent_type;
|
|
struct i40e_virtchnl_version_info vf_ver;
|
|
u32 driver_caps; /* reported by VF driver */
|
|
|
|
/* VF Port Extender (PE) stag if used */
|
|
u16 stag;
|
|
|
|
struct i40e_virtchnl_ether_addr default_lan_addr;
|
|
struct i40e_virtchnl_ether_addr default_fcoe_addr;
|
|
u16 port_vlan_id;
|
|
bool pf_set_mac; /* The VMM admin set the VF MAC address */
|
|
|
|
/* VSI indices - actual VSI pointers are maintained in the PF structure
|
|
* When assigned, these will be non-zero, because VSI 0 is always
|
|
* the main LAN VSI for the PF.
|
|
*/
|
|
u16 lan_vsi_idx; /* index into PF struct */
|
|
u16 lan_vsi_id; /* ID as used by firmware */
|
|
|
|
u8 num_queue_pairs; /* num of qps assigned to VF vsis */
|
|
u64 num_mdd_events; /* num of mdd events detected */
|
|
/* num of continuous malformed or invalid msgs detected */
|
|
u64 num_invalid_msgs;
|
|
u64 num_valid_msgs; /* num of valid msgs detected */
|
|
|
|
unsigned long vf_caps; /* vf's adv. capabilities */
|
|
unsigned long vf_states; /* vf's runtime states */
|
|
unsigned int tx_rate; /* Tx bandwidth limit in Mbps */
|
|
bool link_forced;
|
|
bool link_up; /* only valid if VF link is forced */
|
|
bool spoofchk;
|
|
/* RDMA Client */
|
|
struct i40e_virtchnl_iwarp_qvlist_info *qvlist_info;
|
|
};
|
|
|
|
void i40e_free_vfs(struct i40e_pf *pf);
|
|
int i40e_pci_sriov_configure(struct pci_dev *dev, int num_vfs);
|
|
int i40e_alloc_vfs(struct i40e_pf *pf, u16 num_alloc_vfs);
|
|
int i40e_vc_process_vf_msg(struct i40e_pf *pf, u16 vf_id, u32 v_opcode,
|
|
u32 v_retval, u8 *msg, u16 msglen);
|
|
int i40e_vc_process_vflr_event(struct i40e_pf *pf);
|
|
void i40e_reset_vf(struct i40e_vf *vf, bool flr);
|
|
void i40e_vc_notify_vf_reset(struct i40e_vf *vf);
|
|
|
|
/* VF configuration related iplink handlers */
|
|
int i40e_ndo_set_vf_mac(struct net_device *netdev, int vf_id, u8 *mac);
|
|
int i40e_ndo_set_vf_port_vlan(struct net_device *netdev,
|
|
int vf_id, u16 vlan_id, u8 qos);
|
|
int i40e_ndo_set_vf_bw(struct net_device *netdev, int vf_id, int min_tx_rate,
|
|
int max_tx_rate);
|
|
int i40e_ndo_get_vf_config(struct net_device *netdev,
|
|
int vf_id, struct ifla_vf_info *ivi);
|
|
int i40e_ndo_set_vf_link_state(struct net_device *netdev, int vf_id, int link);
|
|
int i40e_ndo_set_vf_spoofchk(struct net_device *netdev, int vf_id, bool enable);
|
|
|
|
void i40e_vc_notify_link_state(struct i40e_pf *pf);
|
|
void i40e_vc_notify_reset(struct i40e_pf *pf);
|
|
|
|
#endif /* _I40E_VIRTCHNL_PF_H_ */
|