Commit 6633fb83 authored by Hayes Wang's avatar Hayes Wang Committed by David S. Miller

r8152: fix the maximum number of PLA bp for RTL8153C

The maximum PLA bp number of RTL8153C is 16, not 8. That is, the
bp 0 ~ 15 are at 0xfc28 ~ 0xfc46, and the bp_en is at 0xfc48.

Fixes: 195aae32 ("r8152: support new chips")
Signed-off-by: default avatarHayes Wang <hayeswang@realtek.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a876a33d
...@@ -3955,13 +3955,24 @@ static void rtl_clear_bp(struct r8152 *tp, u16 type) ...@@ -3955,13 +3955,24 @@ static void rtl_clear_bp(struct r8152 *tp, u16 type)
case RTL_VER_06: case RTL_VER_06:
ocp_write_byte(tp, type, PLA_BP_EN, 0); ocp_write_byte(tp, type, PLA_BP_EN, 0);
break; break;
case RTL_VER_14:
ocp_write_word(tp, type, USB_BP2_EN, 0);
ocp_write_word(tp, type, USB_BP_8, 0);
ocp_write_word(tp, type, USB_BP_9, 0);
ocp_write_word(tp, type, USB_BP_10, 0);
ocp_write_word(tp, type, USB_BP_11, 0);
ocp_write_word(tp, type, USB_BP_12, 0);
ocp_write_word(tp, type, USB_BP_13, 0);
ocp_write_word(tp, type, USB_BP_14, 0);
ocp_write_word(tp, type, USB_BP_15, 0);
break;
case RTL_VER_08: case RTL_VER_08:
case RTL_VER_09: case RTL_VER_09:
case RTL_VER_10: case RTL_VER_10:
case RTL_VER_11: case RTL_VER_11:
case RTL_VER_12: case RTL_VER_12:
case RTL_VER_13: case RTL_VER_13:
case RTL_VER_14:
case RTL_VER_15: case RTL_VER_15:
default: default:
if (type == MCU_TYPE_USB) { if (type == MCU_TYPE_USB) {
...@@ -4331,7 +4342,6 @@ static bool rtl8152_is_fw_mac_ok(struct r8152 *tp, struct fw_mac *mac) ...@@ -4331,7 +4342,6 @@ static bool rtl8152_is_fw_mac_ok(struct r8152 *tp, struct fw_mac *mac)
case RTL_VER_11: case RTL_VER_11:
case RTL_VER_12: case RTL_VER_12:
case RTL_VER_13: case RTL_VER_13:
case RTL_VER_14:
case RTL_VER_15: case RTL_VER_15:
fw_reg = 0xf800; fw_reg = 0xf800;
bp_ba_addr = PLA_BP_BA; bp_ba_addr = PLA_BP_BA;
...@@ -4339,6 +4349,13 @@ static bool rtl8152_is_fw_mac_ok(struct r8152 *tp, struct fw_mac *mac) ...@@ -4339,6 +4349,13 @@ static bool rtl8152_is_fw_mac_ok(struct r8152 *tp, struct fw_mac *mac)
bp_start = PLA_BP_0; bp_start = PLA_BP_0;
max_bp = 8; max_bp = 8;
break; break;
case RTL_VER_14:
fw_reg = 0xf800;
bp_ba_addr = PLA_BP_BA;
bp_en_addr = USB_BP2_EN;
bp_start = PLA_BP_0;
max_bp = 16;
break;
default: default:
goto out; goto out;
} }
......
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