Commit 52c14ea7 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'bnxt_en-3-bug-fixes' 

Michael Chan says:

====================
bnxt_en: 3 bug fixes

The first one fixes a possible failure when setting DCB ETS.
The second one fixes the ethtool coredump (-W 2) not containing
all the FW traces.  The third one fixes the DMA unmap length when
transmitting XDP_REDIRECT packets.
====================

Link: https://patch.msgid.link/20250710213938.1959625-1-michael.chan@broadcom.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents e81750b4 3cdf199d

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

+11 −7
Original line number Diff line number Diff line
@@ -368,23 +368,27 @@ static u32 bnxt_get_ctx_coredump(struct bnxt *bp, void *buf, u32 offset, 
		if (!ctxm->mem_valid || !seg_id)

			continue;



		if (trace)

		if (trace) {

			extra_hlen = BNXT_SEG_RCD_LEN;

			if (buf) {

				u16 trace_type = bnxt_bstore_to_trace[type];



				bnxt_fill_drv_seg_record(bp, &record, ctxm,

							 trace_type);

			}

		}



		if (buf)

			data = buf + BNXT_SEG_HDR_LEN + extra_hlen;



		seg_len = bnxt_copy_ctx_mem(bp, ctxm, data, 0) + extra_hlen;

		if (buf) {

			bnxt_fill_coredump_seg_hdr(bp, &seg_hdr, NULL, seg_len,

						   0, 0, 0, comp_id, seg_id);

			memcpy(buf, &seg_hdr, BNXT_SEG_HDR_LEN);

			buf += BNXT_SEG_HDR_LEN;

			if (trace) {

				u16 trace_type = bnxt_bstore_to_trace[type];



				bnxt_fill_drv_seg_record(bp, &record, ctxm,

							 trace_type);

			if (trace)

				memcpy(buf, &record, BNXT_SEG_RCD_LEN);

			}

			buf += seg_len;

		}

		len += BNXT_SEG_HDR_LEN + seg_len;

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

+2 −0
Original line number Diff line number Diff line
@@ -487,7 +487,9 @@ static int bnxt_ets_validate(struct bnxt *bp, struct ieee_ets *ets, u8 *tc) 


		if ((ets->tc_tx_bw[i] || ets->tc_tsa[i]) && i > bp->max_tc)

			return -EINVAL;

	}



	for (i = 0; i < max_tc; i++) {

		switch (ets->tc_tsa[i]) {

		case IEEE_8021QAZ_TSA_STRICT:

			break;

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

+1 −1
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ static void __bnxt_xmit_xdp_redirect(struct bnxt *bp, 
	tx_buf->action = XDP_REDIRECT;

	tx_buf->xdpf = xdpf;

	dma_unmap_addr_set(tx_buf, mapping, mapping);

	dma_unmap_len_set(tx_buf, len, 0);

	dma_unmap_len_set(tx_buf, len, len);

}



void bnxt_tx_int_xdp(struct bnxt *bp, struct bnxt_napi *bnapi, int budget)