Commit b8b85d04 authored by Hariprasad Kelam's avatar Hariprasad Kelam Committed by David S. Miller
Browse files

Octeontx2-af: Fix an issue in firmware shared data reserved space 



The last patch which added support to extend the firmware shared
data to add channel data information has introduced a bug due to
the reserved space not adjusted accordingly.

This patch fixes the issue and also adds BUILD_BUG to avoid this
regression error.

Fixes: 99781449 ("Octeontx2-af: Fetch MAC channel info from firmware")
Signed-off-by: default avatarHariprasad Kelam <hkelam@marvell.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c2a22688

drivers/net/ethernet/marvell/octeontx2/af/rvu.c

+2 −0
Original line number Diff line number Diff line
@@ -817,6 +817,8 @@ static int rvu_fwdata_init(struct rvu *rvu) 
	err = cgx_get_fwdata_base(&fwdbase);

	if (err)

		goto fail;



	BUILD_BUG_ON(offsetof(struct rvu_fwdata, cgx_fw_data) > FWDATA_CGX_LMAC_OFFSET);

	rvu->fwdata = ioremap_wc(fwdbase, sizeof(struct rvu_fwdata));

	if (!rvu->fwdata)

		goto fail;

drivers/net/ethernet/marvell/octeontx2/af/rvu.h

+2 −1
Original line number Diff line number Diff line
@@ -469,11 +469,12 @@ struct rvu_fwdata { 
	u32 ptp_ext_clk_rate;

	u32 ptp_ext_tstamp;

	struct channel_fwdata channel_data;

#define FWDATA_RESERVED_MEM 1014

#define FWDATA_RESERVED_MEM 958

	u64 reserved[FWDATA_RESERVED_MEM];

#define CGX_MAX         9

#define CGX_LMACS_MAX   4

#define CGX_LMACS_USX   8

#define FWDATA_CGX_LMAC_OFFSET 10536

	union {

		struct cgx_lmac_fwdata_s

			cgx_fw_data[CGX_MAX][CGX_LMACS_MAX];