Subject: linux-next: manual merge of the net-next tree with the net tree

From: Stephen Rothwell <[email-masked]>
Date: Mon, 11 Dec 2023 11:00:22 +1100

Hi all,

Today's linux-next merge of the net-next tree got a conflict in:

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

between commit:

  c13e268c0768 ("bnxt_en: Fix HWTSTAMP_FILTER_ALL packet timestamp logic")

from the net tree and commits:

  c2f8063309da ("bnxt_en: Refactor RX VLAN acceleration logic.")
  a7445d69809f ("bnxt_en: Add support for new RX and TPA_START completion types for P7")
  1c7fd6ee2fe4 ("bnxt_en: Rename some macros for the P5 chips")

from the net-next tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/net/ethernet/broadcom/bnxt/bnxt.c
index 579eebb6fc56,92a54113f872..000000000000
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
@@@ -1759,21 -1823,65 +1825,79 @@@ static void bnxt_deliver_skb(struct bnx
  	napi_gro_receive(&bnapi->napi, skb);
  }
  
 +static bool bnxt_rx_ts_valid(struct bnxt *bp, u32 flags,
 +			     struct rx_cmp_ext *rxcmp1, u32 *cmpl_ts)
 +{
 +	u32 ts = le32_to_cpu(rxcmp1->rx_cmp_timestamp);
 +
 +	if (BNXT_PTP_RX_TS_VALID(flags))
 +		goto ts_valid;
 +	if (!bp->ptp_all_rx_tstamp || !ts || !BNXT_ALL_RX_TS_VALID(flags))
 +		return false;
 +
 +ts_valid:
 +	*cmpl_ts = ts;
 +	return true;
 +}
 +
+ static struct sk_buff *bnxt_rx_vlan(struct sk_buff *skb, u8 cmp_type,
+ 				    struct rx_cmp *rxcmp,
+ 				    struct rx_cmp_ext *rxcmp1)
+ {
+ 	__be16 vlan_proto;
+ 	u16 vtag;
+ 
+ 	if (cmp_type == CMP_TYPE_RX_L2_CMP) {
+ 		__le32 flags2 = rxcmp1->rx_cmp_flags2;
+ 		u32 meta_data;
+ 
+ 		if (!(flags2 & cpu_to_le32(RX_CMP_FLAGS2_META_FORMAT_VLAN)))
+ 			return skb;
+ 
+ 		meta_data = le32_to_cpu(rxcmp1->rx_cmp_meta_data);
+ 		vtag = meta_data & RX_CMP_FLAGS2_METADATA_TCI_MASK;
+ 		vlan_proto = htons(meta_data >> RX_CMP_FLAGS2_METADATA_TPID_SFT);
+ 		if (eth_type_vlan(vlan_proto))
+ 			__vlan_hwaccel_put_tag(skb, vlan_proto, vtag);
+ 		else
+ 			goto vlan_err;
+ 	} else if (cmp_type == CMP_TYPE_RX_L2_V3_CMP) {
+ 		if (RX_CMP_VLAN_VALID(rxcmp)) {
+ 			u32 tpid_sel = RX_CMP_VLAN_TPID_SEL(rxcmp);
+ 
+ 			if (tpid_sel == RX_CMP_METADATA1_TPID_8021Q)
+ 				vlan_proto = htons(ETH_P_8021Q);
+ 			else if (tpid_sel == RX_CMP_METADATA1_TPID_8021AD)
+ 				vlan_proto = htons(ETH_P_8021AD);
+ 			else
+ 				goto vlan_err;
+ 			vtag = RX_CMP_METADATA0_TCI(rxcmp1);
+ 			__vlan_hwaccel_put_tag(skb, vlan_proto, vtag);
+ 		}
+ 	}
+ 	return skb;
+ vlan_err:
+ 	dev_kfree_skb(skb);
+ 	return NULL;
+ }
+ 
+ static enum pkt_hash_types bnxt_rss_ext_op(struct bnxt *bp,
+ 					   struct rx_cmp *rxcmp)
+ {
+ 	u8 ext_op;
+ 
+ 	ext_op = RX_CMP_V3_HASH_TYPE(bp, rxcmp);
+ 	switch (ext_op) {
+ 	case EXT_OP_INNER_4:
+ 	case EXT_OP_OUTER_4:
+ 	case EXT_OP_INNFL_3:
+ 	case EXT_OP_OUTFL_3:
+ 		return PKT_HASH_TYPE_L4;
+ 	default:
+ 		return PKT_HASH_TYPE_L3;
+ 	}
+ }
+ 
  /* returns the following:
   * 1       - 1 packet successfully received
   * 0       - successful TPA_START, packet not completed yet
@@@ -2022,8 -2131,10 +2148,8 @@@ static int bnxt_rx_pkt(struct bnxt *bp
  		}
  	}
  
 -	if (unlikely((flags & RX_CMP_FLAGS_ITYPES_MASK) ==
 -		     RX_CMP_FLAGS_ITYPE_PTP_W_TS) || bp->ptp_all_rx_tstamp) {
 +	if (bnxt_rx_ts_valid(bp, flags, rxcmp1, &cmpl_ts)) {
- 		if (bp->flags & BNXT_FLAG_CHIP_P5) {
+ 		if (bp->flags & BNXT_FLAG_CHIP_P5_PLUS) {
 -			u32 cmpl_ts = le32_to_cpu(rxcmp1->rx_cmp_timestamp);
  			u64 ns, ts;
  
  			if (!bnxt_get_rx_ts_p5(bp, &ts, cmpl_ts)) {