Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7cdd5fc3 authored by Alexander Duyck's avatar Alexander Duyck Committed by David S. Miller
Browse files

bnxt: Move GENEVE support from hard-coded port to using port notifier 



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: default avatarAlexander Duyck <aduyck@mirantis.com>
Acked-by: default avatarMichael Chan <michael.chan@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ad51b8e9

drivers/net/ethernet/broadcom/bnxt/bnxt.c

+30 −6
Original line number Diff line number Diff line
@@ -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;

	}

drivers/net/ethernet/broadcom/bnxt/bnxt.h

+3 −0
Original line number Diff line number Diff line
@@ -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