| Message ID | 20240301110314.29800-1-hkelam@marvell.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | b8b85d048936bd304c7815fd2bce348a22c2055b |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net-next] Octeontx2-af: Fix an issue in firmware shared data reserved space | expand |
Hello: This patch was applied to netdev/net-next.git (main) by David S. Miller <davem@davemloft.net>: On Fri, 1 Mar 2024 16:33:14 +0530 you wrote: > 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. > > [...] Here is the summary with links: - [net-next] Octeontx2-af: Fix an issue in firmware shared data reserved space https://git.kernel.org/netdev/net-next/c/b8b85d048936 You are awesome, thank you!
diff --git a/drivers/net/ethernet/marvell/octeontx2/af/rvu.c b/drivers/net/ethernet/marvell/octeontx2/af/rvu.c index edd12d09dc89..07d4859de53a 100644 --- a/drivers/net/ethernet/marvell/octeontx2/af/rvu.c +++ b/drivers/net/ethernet/marvell/octeontx2/af/rvu.c @@ -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; diff --git a/drivers/net/ethernet/marvell/octeontx2/af/rvu.h b/drivers/net/ethernet/marvell/octeontx2/af/rvu.h index de8eba902276..f390525a6217 100644 --- a/drivers/net/ethernet/marvell/octeontx2/af/rvu.h +++ b/drivers/net/ethernet/marvell/octeontx2/af/rvu.h @@ -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];
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: 997814491cee ("Octeontx2-af: Fetch MAC channel info from firmware") Signed-off-by: Hariprasad Kelam <hkelam@marvell.com> --- drivers/net/ethernet/marvell/octeontx2/af/rvu.c | 2 ++ drivers/net/ethernet/marvell/octeontx2/af/rvu.h | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-)