Commit d8fbd274 authored Jun 15, 2017 by hayeswang Committed by David S. Miller Jun 15, 2017

r8152: add byte_enable for ocp_read_word function



Add byte_enable for ocp_read_word() to replace reading 4
bytes data with reading the desired 2 bytes data.

This is used to avoid the issue which is described in
commit b4d99def ("r8152: remove sram_read"). The
original method always reads 4 bytes data, and it may
have problem when reading the PHY registers.

The new method is supported since RTL8153B, but it
doesn't influence the previous chips. The bits of the
byte_enable for the previous chips are the reserved
bits, and the hw would ignore them.

Signed-off-by: Hayes Wang <hayeswang@realtek.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 65b82d69

drivers/net/usb/r8152.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -962,11 +962,13 @@ static u16 ocp_read_word(struct r8152 *tp, u16 type, u16 index)
		{
		u32 data;
		__le32 tmp;
		u16 byen = BYTE_EN_WORD;
		u8 shift = index & 2;

		index &= ~3;
		byen <<= shift;

		generic_ocp_read(tp, index, sizeof(tmp), &tmp, type);
		generic_ocp_read(tp, index, sizeof(tmp), &tmp, type \| byen);

		data = __le32_to_cpu(tmp);
		data >>= (shift * 8);

Admin message