nfp: flower: add Kconfig for flower app

Give users an option not to build the flower-offload related code.

Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Reviewed-by: Simon Horman <simon.horman@netronome.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/netronome/Kconfig b/drivers/net/ethernet/netronome/Kconfig
index 0d5a7b9203a41d5235cb8a725ac3a81d4fc4c936..0e331e2f685ad25029aabbcd7112a51b086a7a2c 100644 (file)
--- a/drivers/net/ethernet/netronome/Kconfig
+++ b/drivers/net/ethernet/netronome/Kconfig
@@ -25,6 +25,16 @@ config NFP
          cards working as a advanced Ethernet NIC.  It works with both
          SR-IOV physical and virtual functions.
 
+config NFP_APP_FLOWER
+       bool "NFP4000/NFP6000 TC Flower offload support"
+       depends on NFP
+       depends on NET_SWITCHDEV
+       ---help---
+         Enable driver support for TC Flower offload on NFP4000 and NFP6000.
+         Say Y, if you are planning to make use of TC Flower offload
+         either directly, with Open vSwitch, or any other way.  Note that
+         TC Flower offload requires specific FW to work.
+
 config NFP_DEBUG
        bool "Debug support for Netronome(R) NFP4000/NFP6000 NIC drivers"
        depends on NFP

diff --git a/drivers/net/ethernet/netronome/nfp/Makefile b/drivers/net/ethernet/netronome/nfp/Makefile
index 10b556b2c59d277fb73b7b27cbd03c852eec6a36..43bdbc228969129059ca779c7cfb57edd7990ee5 100644 (file)
--- a/drivers/net/ethernet/netronome/nfp/Makefile
+++ b/drivers/net/ethernet/netronome/nfp/Makefile
@@ -27,10 +27,14 @@ nfp-objs := \
            nfp_port.o \
            bpf/main.o \
            bpf/offload.o \
-           flower/cmsg.o \
-           flower/main.o \
            nic/main.o
 
+ifeq ($(CONFIG_NFP_APP_FLOWER),y)
+nfp-objs += \
+           flower/cmsg.o \
+           flower/main.o
+endif
+
 ifeq ($(CONFIG_BPF_SYSCALL),y)
 nfp-objs += \
            bpf/verifier.o \

diff --git a/drivers/net/ethernet/netronome/nfp/nfp_app.c b/drivers/net/ethernet/netronome/nfp/nfp_app.c
index 5620de05c9969275681166423ef41eeef79165c4..c704c022574f419ead4f7b4c9a9b54e1b273eb77 100644 (file)
--- a/drivers/net/ethernet/netronome/nfp/nfp_app.c
+++ b/drivers/net/ethernet/netronome/nfp/nfp_app.c
@@ -43,7 +43,9 @@
 static const struct nfp_app_type *apps[] = {
        &app_nic,
        &app_bpf,
+#ifdef CONFIG_NFP_APP_FLOWER
        &app_flower,
+#endif
 };
 
 const char *nfp_app_mip_name(struct nfp_app *app)