From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751952AbcADPaO (ORCPT ); Mon, 4 Jan 2016 10:30:14 -0500 Received: from mout.gmx.net ([212.227.17.22]:50717 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751308AbcADPaM (ORCPT ); Mon, 4 Jan 2016 10:30:12 -0500 From: Sven Dziadek To: Larry.Finger@lwfinger.net, Jes.Sorensen@redhat.com, gregkh@linuxfoundation.org Cc: linux-wireless@vger.kernel.org, devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org Subject: [RFC PATCH] staging: rtl8723au: fix byte order problems Date: Mon, 4 Jan 2016 16:29:34 +0100 Message-Id: <1451921374-471-1-git-send-email-sven.dziadek@gmx.de> X-Mailer: git-send-email 2.1.4 X-Provags-ID: V03:K0:Kd/2YZ5xMeavCy5WVBpznxJIRGqFzxFJLY3Q14tIsl1egme2gpK ndsVLynouBPA70YV0CNfNX1h62f/gFleay7ePZiEN1ZYwF9Kv4zjFCIWVLRfB2lD4BJ9Rt4 9oUAPqsaGeOrbo6u6nedPuxK1dF4Tk5hj3tCUnwxDzJa4qv9LjvUyAMTwy7wFurVBHQzdbe bCPj5ceUN67HvDu3NyAJQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:aZgzdZFOWkY=:v3BP2XQjwvK7y1olH1y8vY +vw11u3gUlmIHc82VMx2MVQUBA/VyiHxDikMns9hSckKSj4q2opRCjGBUZdmr0yTdOc2RpwmM 542Q0KqBqDTihL/kX4MgThMzeiq0/I8sHMLGMmjMLrGLOiMz0gnm6OihvUuWmtkgQVxhy1j4k 4/ba7wiYGqQdeFQOxc/y2/QMlPfevkmbtjM//niUTl4qLVFviruZUM+fFxfE/oljOdEsIjWBs lubEXTFgLjjSMrTL6LL2cqKH0pw835QE7saeLPIoUwWzrhBRJkiRH2wEpAXtbLirQIxs1SDm/ 7PwzDWmmFlV3YxczxchD7lrPR2EW1yHkim0av5fepeUrSb8lqG08m0B1jaxPkD/Z8TeTQNAm8 hTM8KPueUVCam6d9yJDhSl6SdaJORNObyFXw5sBUmmX622wUIdlzwL0xLb9LQoAOeMLg9JjuC 4XTAmzLr8rJbjTfTADqX9p9OXpmmeIwT6Uafyb8COsC9sh7WTIq2V4ZAgFo50bp3gND1Ky5wu xGt5nDoLrT8Ck3TONCDzpR8QjpUYx+B82YxMrOuwUVUBsSKJbASNuNTwilaw/rAGEAA6/dGeT vZcWOhB/qJnN7CHlqvADR9z7gARn77kwOigj6lJ7b4D66LntvXirUGe0KxHdFv0oBNv4dfmOZ nKzXAasW+Hj5HVBAbIP/3DCr4uvunuo4hgFYO89gGYvcHbv/vByM9cupQoMDG5cWkk4Nml83R QwwsuozHLvfaIacSlmLMlssTzebDk8v9C0B4VlTdB/Awz4lHDYw1p8r/cGk= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Remove byte order conversions. Conversion is already done in usb_ops_linux.c when accessing usb port. The deleted lines convert to little-endian and then call FillH2CCmd to convert back. Additionally, they are applied to wrong types and process wrong parts of variables later on. Signed-off-by: Sven Dziadek --- I was looking for some Sparse warnings that I could fix and found this: drivers/staging/rtl8723au//hal/rtl8723a_cmd.c:96:38: warning: cast to restricted __le16 drivers/staging/rtl8723au//hal/rtl8723a_cmd.c:100:27: warning: cast to restricted __le32 drivers/staging/rtl8723au//hal/rtl8723a_cmd.c:118:25: warning: incorrect type in assignment (different base types) drivers/staging/rtl8723au//hal/rtl8723a_cmd.c:118:25: expected unsigned int [unsigned] [usertype] drivers/staging/rtl8723au//hal/rtl8723a_cmd.c:118:25: got restricted __le32 [usertype] The rtl8723au drivers seems to work on many machines already, but probably mostly on little-endian machines. The file staging/rtl8723au/hal/rtl8723a_cmd.c contains four conversions from or to little-endian that look suspicious. The best example is: int rtl8723a_set_rssi_cmd(struct rtw_adapter *padapter, u8 *param) { *((u32 *)param) = cpu_to_le32(*((u32 *)param)); FillH2CCmd(padapter, RSSI_SETTING_EID, 3, param); return _SUCCESS; } On little-endian, the conversion does nothing, but on big-endian, it swaps the order and then only 3 bytes are used in FillH2CCmd (3rd argument). So it actually ignores the original argument param. I think it is best to delete these conversions because the actual conversions are done when transferring data to or from the usb port already. Unfortunately, I do not have the hardware to test it. What do you think about the patch? drivers/staging/rtl8723au/hal/rtl8723a_cmd.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/drivers/staging/rtl8723au/hal/rtl8723a_cmd.c b/drivers/staging/rtl8723au/hal/rtl8723a_cmd.c index 1662c03c..57f5941 100644 --- a/drivers/staging/rtl8723au/hal/rtl8723a_cmd.c +++ b/drivers/staging/rtl8723au/hal/rtl8723a_cmd.c @@ -93,11 +93,9 @@ int FillH2CCmd(struct rtw_adapter *padapter, u8 ElementID, u32 CmdLen, if (h2c_cmd & BIT(7)) { msgbox_ex_addr = REG_HMEBOX_EXT_0 + (h2c_box_num * EX_MESSAGE_BOX_SIZE); - h2c_cmd_ex = le16_to_cpu(h2c_cmd_ex); rtl8723au_write16(padapter, msgbox_ex_addr, h2c_cmd_ex); } msgbox_addr = REG_HMEBOX_0 + (h2c_box_num * MESSAGE_BOX_SIZE); - h2c_cmd = le32_to_cpu(h2c_cmd); rtl8723au_write32(padapter, msgbox_addr, h2c_cmd); bcmd_down = true; @@ -115,8 +113,6 @@ exit: int rtl8723a_set_rssi_cmd(struct rtw_adapter *padapter, u8 *param) { - *((u32 *)param) = cpu_to_le32(*((u32 *)param)); - FillH2CCmd(padapter, RSSI_SETTING_EID, 3, param); return _SUCCESS; @@ -127,7 +123,7 @@ int rtl8723a_set_raid_cmd(struct rtw_adapter *padapter, u32 mask, u8 arg) u8 buf[5]; memset(buf, 0, 5); - put_unaligned_le32(mask, buf); + memcpy(buf, &mask, 4); buf[4] = arg; FillH2CCmd(padapter, MACID_CONFIG_EID, 5, buf); -- 2.1.4