diff options
author | David S. Miller | 2017-06-27 21:48:50 +0200 |
---|---|---|
committer | David S. Miller | 2017-06-27 21:48:50 +0200 |
commit | 2ee87db3a287f81bf1bbc10ef52e7cb6d034ef92 (patch) | |
tree | 1034257ad3d5de3a434669ff3b9637588d7d6a67 /drivers/net/bonding/bond_options.c | |
parent | Merge branch 'udp-ipv6-use-scratch-helpers' (diff) | |
parent | nfp: flower: add Kconfig for flower app (diff) | |
download | kernel-qcow2-linux-2ee87db3a287f81bf1bbc10ef52e7cb6d034ef92.tar.gz kernel-qcow2-linux-2ee87db3a287f81bf1bbc10ef52e7cb6d034ef92.tar.xz kernel-qcow2-linux-2ee87db3a287f81bf1bbc10ef52e7cb6d034ef92.zip |
Merge branch 'nfp-get_phys_port_name-for-representors-and-SR-IOV-reorder'
Jakub Kicinski says:
====================
nfp: get_phys_port_name for representors and SR-IOV reorder
This series starts by making the error message if FW cannot be located
easier to understand. Then I move some functions from PCI probe files
into library code (nfpcore) where they belong, and remove one function
which is never used.
Next few patches equip representors with nfp_port structure and make
their NDOs fully shared (not defined in apps), thanks to which we can
easily determine which netdevs are NFP's by comparing the NDO pointers.
10th patch makes use of the shared NDOs and nfp_ports to deliver
netdev-type independent .ndo_get_phys_port_name() implementation.
Patches 11 and 12 reorder the nfp_app SR-IOV callbacks with enabling
SR-IOV VFs. Unfortunately due to how PCI subsystem works we can't
guarantee being able to disable SR-IOV at exit or that it will be
disabled when we first probe... We must therefore make sure FW is
able to deal with being loaded while SR-IOV is already on.
Patch 13 fixes potential deadlock when enabling SR-IOV happens at
the same time as port state refresh. Note that this can't happen
at this point, since Flower doesn't refresh ports... but lockdep
doesn't know about such details and we will have to deal with this
sooner or later anyway.
Last but not least a new Kconfig is added to make sure those who
don't care about flower offloads have a way of not including the
code in their kernels. Thanks to nfp_app separation this costs us
a single ifdef and excluding flower files from the build.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/bonding/bond_options.c')
0 files changed, 0 insertions, 0 deletions