Commit ecb06058 authored by Michael Walle's avatar Michael Walle Committed by David S. Miller

net: enetc: use get/put_unaligned helpers for MAC address handling

The supplied buffer for the MAC address might not be aligned. Thus
doing a 32bit (or 16bit) access could be on an unaligned address. For
now, enetc is only used on aarch64 which can do unaligned accesses, thus
there is no error. In any case, be correct and use the get/put_unaligned
helpers.
Signed-off-by: default avatarMichael Walle <michael@walle.cc>
Reviewed-by: default avatarClaudiu Manoil <claudiu.manoil@nxp.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f7066355
// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) // SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)
/* Copyright 2017-2019 NXP */ /* Copyright 2017-2019 NXP */
#include <asm/unaligned.h>
#include <linux/mdio.h> #include <linux/mdio.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/fsl/enetc_mdio.h> #include <linux/fsl/enetc_mdio.h>
...@@ -17,15 +18,15 @@ static void enetc_pf_get_primary_mac_addr(struct enetc_hw *hw, int si, u8 *addr) ...@@ -17,15 +18,15 @@ static void enetc_pf_get_primary_mac_addr(struct enetc_hw *hw, int si, u8 *addr)
u32 upper = __raw_readl(hw->port + ENETC_PSIPMAR0(si)); u32 upper = __raw_readl(hw->port + ENETC_PSIPMAR0(si));
u16 lower = __raw_readw(hw->port + ENETC_PSIPMAR1(si)); u16 lower = __raw_readw(hw->port + ENETC_PSIPMAR1(si));
*(u32 *)addr = upper; put_unaligned_le32(upper, addr);
*(u16 *)(addr + 4) = lower; put_unaligned_le16(lower, addr + 4);
} }
static void enetc_pf_set_primary_mac_addr(struct enetc_hw *hw, int si, static void enetc_pf_set_primary_mac_addr(struct enetc_hw *hw, int si,
const u8 *addr) const u8 *addr)
{ {
u32 upper = *(const u32 *)addr; u32 upper = get_unaligned_le32(addr);
u16 lower = *(const u16 *)(addr + 4); u16 lower = get_unaligned_le16(addr + 4);
__raw_writel(upper, hw->port + ENETC_PSIPMAR0(si)); __raw_writel(upper, hw->port + ENETC_PSIPMAR0(si));
__raw_writew(lower, hw->port + ENETC_PSIPMAR1(si)); __raw_writew(lower, hw->port + ENETC_PSIPMAR1(si));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment