From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Marek Vasut <marex@denx.de>,
"David S . Miller" <davem@davemloft.net>,
Lukas Wunner <lukas@wunner.de>, Petr Stetiar <ynezz@true.cz>,
YueHaibing <yuehaibing@huawei.com>,
Sasha Levin <sashal@kernel.org>,
netdev@vger.kernel.org
Subject: [PATCH AUTOSEL 4.19 19/32] net: ks8851-ml: Fix 16-bit data access
Date: Mon, 2 Mar 2020 21:48:38 -0500 [thread overview]
Message-ID: <20200303024851.10054-19-sashal@kernel.org> (raw)
In-Reply-To: <20200303024851.10054-1-sashal@kernel.org>
From: Marek Vasut <marex@denx.de>
[ Upstream commit edacb098ea9c31589276152f09b4439052c0f2b1 ]
The packet data written to and read from Micrel KSZ8851-16MLLI must be
byte-swapped in 16-bit mode, add this byte-swapping.
Signed-off-by: Marek Vasut <marex@denx.de>
Cc: David S. Miller <davem@davemloft.net>
Cc: Lukas Wunner <lukas@wunner.de>
Cc: Petr Stetiar <ynezz@true.cz>
Cc: YueHaibing <yuehaibing@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
drivers/net/ethernet/micrel/ks8851_mll.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/micrel/ks8851_mll.c b/drivers/net/ethernet/micrel/ks8851_mll.c
index 29ac83f4683a6..aff1619fb0e0e 100644
--- a/drivers/net/ethernet/micrel/ks8851_mll.c
+++ b/drivers/net/ethernet/micrel/ks8851_mll.c
@@ -516,7 +516,7 @@ static inline void ks_inblk(struct ks_net *ks, u16 *wptr, u32 len)
{
len >>= 1;
while (len--)
- *wptr++ = (u16)ioread16(ks->hw_addr);
+ *wptr++ = be16_to_cpu(ioread16(ks->hw_addr));
}
/**
@@ -530,7 +530,7 @@ static inline void ks_outblk(struct ks_net *ks, u16 *wptr, u32 len)
{
len >>= 1;
while (len--)
- iowrite16(*wptr++, ks->hw_addr);
+ iowrite16(cpu_to_be16(*wptr++), ks->hw_addr);
}
static void ks_disable_int(struct ks_net *ks)
--
2.20.1
next prev parent reply other threads:[~2020-03-03 2:54 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-03 2:48 [PATCH AUTOSEL 4.19 01/32] ALSA: hda: do not override bus codec_mask in link_get() Sasha Levin
2020-03-03 2:48 ` [PATCH AUTOSEL 4.19 02/32] usb: charger: assign specific number for enum value Sasha Levin
2020-03-03 2:48 ` [PATCH AUTOSEL 4.19 03/32] serial: ar933x_uart: set UART_CS_{RX,TX}_READY_ORIDE Sasha Levin
2020-03-03 2:48 ` [PATCH AUTOSEL 4.19 04/32] selftests: fix too long argument Sasha Levin
2020-03-03 2:48 ` [PATCH AUTOSEL 4.19 05/32] usb: gadget: composite: Support more than 500mA MaxPower Sasha Levin
2020-03-03 2:48 ` [PATCH AUTOSEL 4.19 06/32] usb: gadget: ffs: ffs_aio_cancel(): Save/restore IRQ flags Sasha Levin
2020-03-03 2:48 ` [PATCH AUTOSEL 4.19 07/32] usb: gadget: serial: fix Tx stall after buffer overflow Sasha Levin
2020-03-03 2:48 ` [PATCH AUTOSEL 4.19 08/32] drm/msm/mdp5: rate limit pp done timeout warnings Sasha Levin
2020-03-03 2:48 ` [PATCH AUTOSEL 4.19 09/32] drm: msm: Fix return type of dsi_mgr_connector_mode_valid for kCFI Sasha Levin
2020-03-03 2:48 ` [PATCH AUTOSEL 4.19 10/32] scsi: megaraid_sas: silence a warning Sasha Levin
2020-03-03 2:48 ` [PATCH AUTOSEL 4.19 11/32] drm/msm/dsi: save pll state before dsi host is powered off Sasha Levin
2020-03-03 2:48 ` [PATCH AUTOSEL 4.19 12/32] drm/msm/dsi/pll: call vco set rate explicitly Sasha Levin
2020-03-03 2:48 ` [PATCH AUTOSEL 4.19 13/32] selftests: forwarding: use proto icmp for {gretap, ip6gretap}_mac testing Sasha Levin
2020-03-03 2:48 ` [PATCH AUTOSEL 4.19 14/32] net: atlantic: fix use after free kasan warn Sasha Levin
2020-03-03 2:48 ` [PATCH AUTOSEL 4.19 15/32] net: atlantic: fix potential error handling Sasha Levin
2020-03-03 2:48 ` [PATCH AUTOSEL 4.19 16/32] net: phy: restore mdio regs in the iproc mdio driver Sasha Levin
2020-03-03 2:48 ` [PATCH AUTOSEL 4.19 17/32] net: dsa: b53: Ensure the default VID is untagged Sasha Levin
2020-03-03 2:48 ` [PATCH AUTOSEL 4.19 18/32] net: ks8851-ml: Remove 8-bit bus accessors Sasha Levin
2020-03-03 2:48 ` Sasha Levin [this message]
2020-03-03 2:48 ` [PATCH AUTOSEL 4.19 20/32] net: ks8851-ml: Fix 16-bit IO operation Sasha Levin
2020-03-03 2:48 ` [PATCH AUTOSEL 4.19 21/32] watchdog: da9062: do not ping the hw during stop() Sasha Levin
2020-03-03 2:48 ` [PATCH AUTOSEL 4.19 22/32] s390/cio: cio_ignore_proc_seq_next should increase position index Sasha Levin
2020-03-03 2:48 ` [PATCH AUTOSEL 4.19 23/32] s390: make 'install' not depend on vmlinux Sasha Levin
2020-03-03 2:48 ` [PATCH AUTOSEL 4.19 24/32] net: mscc: fix in frame extraction Sasha Levin
2020-03-03 2:48 ` [PATCH AUTOSEL 4.19 25/32] x86/boot/compressed: Don't declare __force_order in kaslr_64.c Sasha Levin
2020-03-03 2:48 ` [PATCH AUTOSEL 4.19 26/32] s390/qdio: fill SL with absolute addresses Sasha Levin
2020-03-03 2:48 ` [PATCH AUTOSEL 4.19 27/32] nvme: Fix uninitialized-variable warning Sasha Levin
2020-03-03 2:48 ` [PATCH AUTOSEL 4.19 28/32] nfc: pn544: Fix occasional HW initialization failure Sasha Levin
2020-03-03 2:48 ` [PATCH AUTOSEL 4.19 29/32] ice: Don't tell the OS that link is going down Sasha Levin
2020-03-03 2:48 ` [PATCH AUTOSEL 4.19 30/32] x86/xen: Distribute switch variables for initialization Sasha Levin
2020-03-03 2:48 ` [PATCH AUTOSEL 4.19 31/32] s390/qeth: vnicc Fix EOPNOTSUPP precedence Sasha Levin
2020-03-03 2:48 ` [PATCH AUTOSEL 4.19 32/32] net: thunderx: workaround BGX TX Underflow issue Sasha Levin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200303024851.10054-19-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=lukas@wunner.de \
--cc=marex@denx.de \
--cc=netdev@vger.kernel.org \
--cc=stable@vger.kernel.org \
--cc=ynezz@true.cz \
--cc=yuehaibing@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox