From: Alexander Duyck <aduyck@mirantis.com> To: netdev@vger.kernel.org, intel-wired-lan@lists.osuosl.org Cc: hannes@redhat.com, jesse@kernel.org, eugenia@mellanox.com, jbenc@redhat.com, alexander.duyck@gmail.com, saeedm@mellanox.com, ariel.elior@qlogic.com, tom@herbertland.com, michael.chan@broadcom.com, Dept-GELinuxNICDev@qlogic.com, davem@davemloft.net Subject: [net-next PATCH v3 06/17] bnxt: Move GENEVE support from hard-coded port to using port notifier Date: Thu, 16 Jun 2016 12:21:36 -0700 [thread overview] Message-ID: <20160616192136.20872.49824.stgit@localhost.localdomain> (raw) In-Reply-To: <20160616191851.20872.67154.stgit@localhost.localdomain> The port number for GENEVE is hard coded into the bnxt driver. This is the kind of thing we want to avoid going forward. For now I will integrate this back into the port notifier so that we can change the GENEVE port number if we need to in the future. Signed-off-by: Alexander Duyck <aduyck@mirantis.com> --- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 36 ++++++++++++++++++++++++----- drivers/net/ethernet/broadcom/bnxt/bnxt.h | 3 ++ 2 files changed, 33 insertions(+), 6 deletions(-) diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c index 03a5d84198ee..673f4d62e73e 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c @@ -5253,13 +5253,8 @@ static int __bnxt_open_nic(struct bnxt *bp, bool irq_re_init, bool link_re_init) netdev_warn(bp->dev, "failed to update phy settings\n"); } - if (irq_re_init) { + if (irq_re_init) udp_tunnel_get_rx_info(bp->dev); - if (!bnxt_hwrm_tunnel_dst_port_alloc( - bp, htons(0x17c1), - TUNNEL_DST_PORT_FREE_REQ_TUNNEL_TYPE_GENEVE)) - bp->nge_port_cnt = 1; - } set_bit(BNXT_STATE_OPEN, &bp->state); bnxt_enable_int(bp); @@ -5877,6 +5872,15 @@ static void bnxt_sp_task(struct work_struct *work) bnxt_hwrm_tunnel_dst_port_free( bp, TUNNEL_DST_PORT_FREE_REQ_TUNNEL_TYPE_VXLAN); } + if (test_and_clear_bit(BNXT_GENEVE_ADD_PORT_SP_EVENT, &bp->sp_event)) { + bnxt_hwrm_tunnel_dst_port_alloc( + bp, bp->nge_port, + TUNNEL_DST_PORT_FREE_REQ_TUNNEL_TYPE_GENEVE); + } + if (test_and_clear_bit(BNXT_GENEVE_DEL_PORT_SP_EVENT, &bp->sp_event)) { + bnxt_hwrm_tunnel_dst_port_free( + bp, TUNNEL_DST_PORT_FREE_REQ_TUNNEL_TYPE_GENEVE); + } if (test_and_clear_bit(BNXT_RESET_TASK_SP_EVENT, &bp->sp_event)) bnxt_reset(bp, false); @@ -6269,6 +6273,16 @@ static void bnxt_udp_tunnel_add(struct net_device *dev, schedule_work(&bp->sp_task); } break; + case UDP_TUNNEL_TYPE_GENEVE: + if (bp->nge_port_cnt && bp->nge_port != ti->port) + return; + + bp->nge_port_cnt++; + if (bp->nge_port_cnt == 1) { + bp->nge_port = ti->port; + set_bit(BNXT_GENEVE_ADD_PORT_SP_EVENT, &bp->sp_event); + } + break; default: return; } @@ -6298,6 +6312,16 @@ static void bnxt_udp_tunnel_del(struct net_device *dev, set_bit(BNXT_VXLAN_DEL_PORT_SP_EVENT, &bp->sp_event); break; + case UDP_TUNNEL_TYPE_GENEVE: + if (!bp->nge_port_cnt || bp->nge_port != ti->port) + return; + bp->nge_port_cnt--; + + if (bp->nge_port_cnt != 0) + return; + + set_bit(BNXT_GENEVE_DEL_PORT_SP_EVENT, &bp->sp_event); + break; default: return; } diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.h b/drivers/net/ethernet/broadcom/bnxt/bnxt.h index 04cc69bb9e6a..927ece9c408a 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt.h +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.h @@ -1049,6 +1049,7 @@ struct bnxt { __be16 vxlan_port; u8 vxlan_port_cnt; __le16 vxlan_fw_dst_port_id; + __be16 nge_port; u8 nge_port_cnt; __le16 nge_fw_dst_port_id; u8 port_partition_type; @@ -1078,6 +1079,8 @@ struct bnxt { #define BNXT_PERIODIC_STATS_SP_EVENT 9 #define BNXT_HWRM_PORT_MODULE_SP_EVENT 10 #define BNXT_RESET_TASK_SILENT_SP_EVENT 11 +#define BNXT_GENEVE_ADD_PORT_SP_EVENT 12 +#define BNXT_GENEVE_DEL_PORT_SP_EVENT 13 struct bnxt_pf_info pf; #ifdef CONFIG_BNXT_SRIOV
WARNING: multiple messages have this Message-ID (diff)
From: Alexander Duyck <aduyck@mirantis.com> To: intel-wired-lan@osuosl.org Subject: [Intel-wired-lan] [net-next PATCH v3 06/17] bnxt: Move GENEVE support from hard-coded port to using port notifier Date: Thu, 16 Jun 2016 12:21:36 -0700 [thread overview] Message-ID: <20160616192136.20872.49824.stgit@localhost.localdomain> (raw) In-Reply-To: <20160616191851.20872.67154.stgit@localhost.localdomain> The port number for GENEVE is hard coded into the bnxt driver. This is the kind of thing we want to avoid going forward. For now I will integrate this back into the port notifier so that we can change the GENEVE port number if we need to in the future. Signed-off-by: Alexander Duyck <aduyck@mirantis.com> --- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 36 ++++++++++++++++++++++++----- drivers/net/ethernet/broadcom/bnxt/bnxt.h | 3 ++ 2 files changed, 33 insertions(+), 6 deletions(-) diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c index 03a5d84198ee..673f4d62e73e 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c @@ -5253,13 +5253,8 @@ static int __bnxt_open_nic(struct bnxt *bp, bool irq_re_init, bool link_re_init) netdev_warn(bp->dev, "failed to update phy settings\n"); } - if (irq_re_init) { + if (irq_re_init) udp_tunnel_get_rx_info(bp->dev); - if (!bnxt_hwrm_tunnel_dst_port_alloc( - bp, htons(0x17c1), - TUNNEL_DST_PORT_FREE_REQ_TUNNEL_TYPE_GENEVE)) - bp->nge_port_cnt = 1; - } set_bit(BNXT_STATE_OPEN, &bp->state); bnxt_enable_int(bp); @@ -5877,6 +5872,15 @@ static void bnxt_sp_task(struct work_struct *work) bnxt_hwrm_tunnel_dst_port_free( bp, TUNNEL_DST_PORT_FREE_REQ_TUNNEL_TYPE_VXLAN); } + if (test_and_clear_bit(BNXT_GENEVE_ADD_PORT_SP_EVENT, &bp->sp_event)) { + bnxt_hwrm_tunnel_dst_port_alloc( + bp, bp->nge_port, + TUNNEL_DST_PORT_FREE_REQ_TUNNEL_TYPE_GENEVE); + } + if (test_and_clear_bit(BNXT_GENEVE_DEL_PORT_SP_EVENT, &bp->sp_event)) { + bnxt_hwrm_tunnel_dst_port_free( + bp, TUNNEL_DST_PORT_FREE_REQ_TUNNEL_TYPE_GENEVE); + } if (test_and_clear_bit(BNXT_RESET_TASK_SP_EVENT, &bp->sp_event)) bnxt_reset(bp, false); @@ -6269,6 +6273,16 @@ static void bnxt_udp_tunnel_add(struct net_device *dev, schedule_work(&bp->sp_task); } break; + case UDP_TUNNEL_TYPE_GENEVE: + if (bp->nge_port_cnt && bp->nge_port != ti->port) + return; + + bp->nge_port_cnt++; + if (bp->nge_port_cnt == 1) { + bp->nge_port = ti->port; + set_bit(BNXT_GENEVE_ADD_PORT_SP_EVENT, &bp->sp_event); + } + break; default: return; } @@ -6298,6 +6312,16 @@ static void bnxt_udp_tunnel_del(struct net_device *dev, set_bit(BNXT_VXLAN_DEL_PORT_SP_EVENT, &bp->sp_event); break; + case UDP_TUNNEL_TYPE_GENEVE: + if (!bp->nge_port_cnt || bp->nge_port != ti->port) + return; + bp->nge_port_cnt--; + + if (bp->nge_port_cnt != 0) + return; + + set_bit(BNXT_GENEVE_DEL_PORT_SP_EVENT, &bp->sp_event); + break; default: return; } diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.h b/drivers/net/ethernet/broadcom/bnxt/bnxt.h index 04cc69bb9e6a..927ece9c408a 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt.h +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.h @@ -1049,6 +1049,7 @@ struct bnxt { __be16 vxlan_port; u8 vxlan_port_cnt; __le16 vxlan_fw_dst_port_id; + __be16 nge_port; u8 nge_port_cnt; __le16 nge_fw_dst_port_id; u8 port_partition_type; @@ -1078,6 +1079,8 @@ struct bnxt { #define BNXT_PERIODIC_STATS_SP_EVENT 9 #define BNXT_HWRM_PORT_MODULE_SP_EVENT 10 #define BNXT_RESET_TASK_SILENT_SP_EVENT 11 +#define BNXT_GENEVE_ADD_PORT_SP_EVENT 12 +#define BNXT_GENEVE_DEL_PORT_SP_EVENT 13 struct bnxt_pf_info pf; #ifdef CONFIG_BNXT_SRIOV
next prev parent reply other threads:[~2016-06-16 19:21 UTC|newest] Thread overview: 82+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-06-16 19:20 [net-next PATCH v3 00/17] Future-proof tunnel offload handlers Alexander Duyck 2016-06-16 19:20 ` [Intel-wired-lan] " Alexander Duyck 2016-06-16 19:20 ` [net-next PATCH v3 01/17] vxlan/geneve: Include udp_tunnel.h in vxlan/geneve.h and fixup includes Alexander Duyck 2016-06-16 19:20 ` [Intel-wired-lan] " Alexander Duyck 2016-06-16 23:06 ` Hannes Frederic Sowa 2016-06-16 23:06 ` [Intel-wired-lan] " Hannes Frederic Sowa 2016-06-16 19:20 ` [net-next PATCH v3 02/17] net: Combine GENEVE and VXLAN port notifiers into single functions Alexander Duyck 2016-06-16 19:20 ` [Intel-wired-lan] " Alexander Duyck 2016-06-16 22:45 ` Hannes Frederic Sowa 2016-06-16 22:45 ` [Intel-wired-lan] " Hannes Frederic Sowa 2016-06-16 19:21 ` [net-next PATCH v3 03/17] net: Merge VXLAN and GENEVE push notifiers into a single notifier Alexander Duyck 2016-06-16 19:21 ` [Intel-wired-lan] " Alexander Duyck 2016-06-16 22:47 ` Hannes Frederic Sowa 2016-06-16 22:47 ` [Intel-wired-lan] " Hannes Frederic Sowa 2016-06-16 19:21 ` [net-next PATCH v3 04/17] bnx2x: Move all UDP port notifiers to single function Alexander Duyck 2016-06-16 19:21 ` [Intel-wired-lan] " Alexander Duyck 2016-06-16 19:21 ` [net-next PATCH v3 05/17] bnxt: Update drivers to support unified UDP encapsulation offload functions Alexander Duyck 2016-06-16 19:21 ` [Intel-wired-lan] " Alexander Duyck 2016-06-16 19:21 ` Alexander Duyck [this message] 2016-06-16 19:21 ` [Intel-wired-lan] [net-next PATCH v3 06/17] bnxt: Move GENEVE support from hard-coded port to using port notifier Alexander Duyck 2016-06-16 23:12 ` Michael Chan 2016-06-16 23:12 ` [Intel-wired-lan] " Michael Chan 2016-06-16 19:21 ` [net-next PATCH v3 07/17] benet: Replace ndo_add/del_vxlan_port with ndo_add/del_udp_enc_port Alexander Duyck 2016-06-16 19:21 ` [Intel-wired-lan] " Alexander Duyck 2016-06-16 19:21 ` [net-next PATCH v3 08/17] fm10k: " Alexander Duyck 2016-06-16 19:21 ` [Intel-wired-lan] " Alexander Duyck 2016-06-16 19:22 ` [net-next PATCH v3 09/17] i40e: Move all UDP port notifiers to single function Alexander Duyck 2016-06-16 19:22 ` [Intel-wired-lan] " Alexander Duyck 2016-06-16 19:22 ` [net-next PATCH v3 10/17] ixgbe: Replace ndo_add/del_vxlan_port with ndo_add/del_udp_enc_port Alexander Duyck 2016-06-16 19:22 ` [Intel-wired-lan] " Alexander Duyck 2016-06-16 19:22 ` [net-next PATCH v3 11/17] mlx4_en: " Alexander Duyck 2016-06-16 19:22 ` [Intel-wired-lan] " Alexander Duyck 2016-06-16 19:22 ` [net-next PATCH v3 12/17] mlx5_en: " Alexander Duyck 2016-06-16 19:22 ` [Intel-wired-lan] " Alexander Duyck 2016-06-16 19:22 ` [net-next PATCH v3 13/17] nfp: " Alexander Duyck 2016-06-16 19:22 ` [Intel-wired-lan] " Alexander Duyck 2016-06-16 19:22 ` [net-next PATCH v3 14/17] qede: Move all UDP port notifiers to single function Alexander Duyck 2016-06-16 19:22 ` [Intel-wired-lan] " Alexander Duyck 2016-06-16 19:23 ` [net-next PATCH v3 15/17] qlcnic: Replace ndo_add/del_vxlan_port with ndo_add/del_udp_enc_port Alexander Duyck 2016-06-16 19:23 ` [Intel-wired-lan] " Alexander Duyck 2016-06-16 19:23 ` [net-next PATCH v3 16/17] net: Remove deprecated tunnel specific UDP offload functions Alexander Duyck 2016-06-16 19:23 ` [Intel-wired-lan] " Alexander Duyck 2016-06-16 22:59 ` Hannes Frederic Sowa 2016-06-16 22:59 ` [Intel-wired-lan] " Hannes Frederic Sowa 2016-06-16 19:23 ` [net-next PATCH v3 17/17] vxlan: Add new UDP encapsulation offload type for VXLAN-GPE Alexander Duyck 2016-06-16 19:23 ` [Intel-wired-lan] " Alexander Duyck 2016-06-16 23:01 ` Hannes Frederic Sowa 2016-06-16 23:01 ` [Intel-wired-lan] " Hannes Frederic Sowa 2016-06-18 3:26 ` [net-next PATCH v3 00/17] Future-proof tunnel offload handlers David Miller 2016-06-18 3:26 ` [Intel-wired-lan] " David Miller 2016-06-20 17:05 ` Tom Herbert 2016-06-20 17:05 ` [Intel-wired-lan] " Tom Herbert 2016-06-20 18:11 ` Hannes Frederic Sowa 2016-06-20 18:11 ` [Intel-wired-lan] " Hannes Frederic Sowa 2016-06-20 19:27 ` Tom Herbert 2016-06-20 19:27 ` [Intel-wired-lan] " Tom Herbert 2016-06-20 21:36 ` Hannes Frederic Sowa 2016-06-20 21:36 ` [Intel-wired-lan] " Hannes Frederic Sowa 2016-06-20 21:45 ` Tom Herbert 2016-06-20 21:45 ` [Intel-wired-lan] " Tom Herbert 2016-06-21 8:34 ` David Miller 2016-06-21 8:34 ` [Intel-wired-lan] " David Miller 2016-06-21 8:22 ` David Miller 2016-06-21 8:22 ` [Intel-wired-lan] " David Miller 2016-06-21 10:41 ` Edward Cree 2016-06-21 10:41 ` [Intel-wired-lan] " Edward Cree 2016-06-21 15:23 ` Hannes Frederic Sowa 2016-06-21 15:23 ` [Intel-wired-lan] " Hannes Frederic Sowa 2016-06-21 17:05 ` Alexander Duyck 2016-06-21 17:05 ` [Intel-wired-lan] " Alexander Duyck 2016-06-21 17:27 ` Edward Cree 2016-06-21 17:27 ` [Intel-wired-lan] " Edward Cree 2016-06-21 17:40 ` Hannes Frederic Sowa 2016-06-21 17:40 ` [Intel-wired-lan] " Hannes Frederic Sowa 2016-06-21 18:17 ` Alexander Duyck 2016-06-21 18:17 ` [Intel-wired-lan] " Alexander Duyck 2016-06-21 18:42 ` Tom Herbert 2016-06-21 18:42 ` [Intel-wired-lan] " Tom Herbert 2016-06-21 21:34 ` Hannes Frederic Sowa 2016-06-21 21:34 ` [Intel-wired-lan] " Hannes Frederic Sowa 2016-06-21 18:23 ` Edward Cree 2016-06-21 18:23 ` [Intel-wired-lan] " Edward Cree
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20160616192136.20872.49824.stgit@localhost.localdomain \ --to=aduyck@mirantis.com \ --cc=Dept-GELinuxNICDev@qlogic.com \ --cc=alexander.duyck@gmail.com \ --cc=ariel.elior@qlogic.com \ --cc=davem@davemloft.net \ --cc=eugenia@mellanox.com \ --cc=hannes@redhat.com \ --cc=intel-wired-lan@lists.osuosl.org \ --cc=jbenc@redhat.com \ --cc=jesse@kernel.org \ --cc=michael.chan@broadcom.com \ --cc=netdev@vger.kernel.org \ --cc=saeedm@mellanox.com \ --cc=tom@herbertland.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.