r8152: fix the firmware doesn't work

[ Upstream commit 8487b4af59d4d7feda4b119dc2d92c67ca25c27e ]

generic_ocp_write() asks the parameter "size" must be 4 bytes align.
Therefore, write the bp would fail, if the mac->bp_num is odd. Align the
size to 4 for fixing it. The way may write an extra bp, but the
rtl8152_is_fw_mac_ok() makes sure the value must be 0 for the bp whose
index is more than mac->bp_num. That is, there is no influence for the
firmware.

Besides, I check the return value of generic_ocp_write() to make sure
everything is correct.

Fixes: e5c266a61186 ("r8152: set bp in bulk")
Signed-off-by: Hayes Wang <hayeswang@realtek.com>
Link: https://patch.msgid.link/20240903063333.4502-1-hayeswang@realtek.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c
index 127b34dcc5b373eeb0def19c134f18cad9f78721..ce19ebd180f12669281d5d454c91208d730ebdeb 100644 (file)
--- a/drivers/net/usb/r8152.c
+++ b/drivers/net/usb/r8152.c
@@ -5143,14 +5143,23 @@ static void rtl8152_fw_mac_apply(struct r8152 *tp, struct fw_mac *mac)
        data = (u8 *)mac;
        data += __le16_to_cpu(mac->fw_offset);
 
-       generic_ocp_write(tp, __le16_to_cpu(mac->fw_reg), 0xff, length, data,
-                         type);
+       if (generic_ocp_write(tp, __le16_to_cpu(mac->fw_reg), 0xff, length,
+                             data, type) < 0) {
+               dev_err(&tp->intf->dev, "Write %s fw fail\n",
+                       type ? "PLA" : "USB");
+               return;
+       }
 
        ocp_write_word(tp, type, __le16_to_cpu(mac->bp_ba_addr),
                       __le16_to_cpu(mac->bp_ba_value));
 
-       generic_ocp_write(tp, __le16_to_cpu(mac->bp_start), BYTE_EN_DWORD,
-                         __le16_to_cpu(mac->bp_num) << 1, mac->bp, type);
+       if (generic_ocp_write(tp, __le16_to_cpu(mac->bp_start), BYTE_EN_DWORD,
+                             ALIGN(__le16_to_cpu(mac->bp_num) << 1, 4),
+                             mac->bp, type) < 0) {
+               dev_err(&tp->intf->dev, "Write %s bp fail\n",
+                       type ? "PLA" : "USB");
+               return;
+       }
 
        bp_en_addr = __le16_to_cpu(mac->bp_en_addr);
        if (bp_en_addr)