diff options
author | Huanhuan Wang <huanhuan.wang@corigine.com> | 2022-12-16 15:31:01 +0100 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2022-12-19 12:35:20 +0000 |
commit | 1b0c84a32e37cf85d552261005091eb695313f38 (patch) | |
tree | 5d8c6b70e8b45902b2ea6b9f6b531874e83f05db /drivers/net | |
parent | e0c8bccd40fc1c19e1d246c39bcf79e357e1ada3 (diff) | |
download | linux-stable-1b0c84a32e37cf85d552261005091eb695313f38.tar.gz linux-stable-1b0c84a32e37cf85d552261005091eb695313f38.tar.bz2 linux-stable-1b0c84a32e37cf85d552261005091eb695313f38.zip |
nfp: fix unaligned io read of capabilities word
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>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/ethernet/netronome/nfp/nfp_net_common.c | 2 |
1 files changed, 1 insertions, 1 deletions
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 |