Message ID | 20221216143101.976739-1-simon.horman@corigine.com (mailing list archive) |
---|---|
State | Accepted |
Commit | 1b0c84a32e37cf85d552261005091eb695313f38 |
Delegated to: | Netdev Maintainers |
Headers | show |
Series | [net] nfp: fix unaligned io read of capabilities word | expand |
Hello: This patch was applied to netdev/net.git (master) by David S. Miller <davem@davemloft.net>: On Fri, 16 Dec 2022 15:31:01 +0100 you wrote: > From: Huanhuan Wang <huanhuan.wang@corigine.com> > > The address of 32-bit extend capability is not qword aligned, > and may cause exception in some arch. > > Fixes: 484963ce9f1e ("nfp: extend capability and control words") > Signed-off-by: Huanhuan Wang <huanhuan.wang@corigine.com> > Reviewed-by: Niklas Söderlund <niklas.soderlund@corigine.com> > Signed-off-by: Simon Horman <simon.horman@corigine.com> > > [...] Here is the summary with links: - [net] nfp: fix unaligned io read of capabilities word https://git.kernel.org/netdev/net/c/1b0c84a32e37 You are awesome, thank you!
diff --git a/drivers/net/ethernet/netronome/nfp/nfp_net_common.c b/drivers/net/ethernet/netronome/nfp/nfp_net_common.c index 2314cf55e821..09053373288f 100644 --- a/drivers/net/ethernet/netronome/nfp/nfp_net_common.c +++ b/drivers/net/ethernet/netronome/nfp/nfp_net_common.c @@ -2509,7 +2509,7 @@ static int nfp_net_read_caps(struct nfp_net *nn) { /* Get some of the read-only fields from the BAR */ nn->cap = nn_readl(nn, NFP_NET_CFG_CAP); - nn->cap_w1 = nn_readq(nn, NFP_NET_CFG_CAP_WORD1); + nn->cap_w1 = nn_readl(nn, NFP_NET_CFG_CAP_WORD1); nn->max_mtu = nn_readl(nn, NFP_NET_CFG_MAX_MTU); /* ABI 4.x and ctrl vNIC always use chained metadata, in other cases