From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 26A72C433EF for ; Fri, 17 Sep 2021 07:20:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0B8FB60ED7 for ; Fri, 17 Sep 2021 07:20:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239784AbhIQHVj (ORCPT ); Fri, 17 Sep 2021 03:21:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50550 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239569AbhIQHU6 (ORCPT ); Fri, 17 Sep 2021 03:20:58 -0400 Received: from mail-ed1-x529.google.com (mail-ed1-x529.google.com [IPv6:2a00:1450:4864:20::529]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D7DBDC06178A for ; Fri, 17 Sep 2021 00:19:25 -0700 (PDT) Received: by mail-ed1-x529.google.com with SMTP id n10so25814786eda.10 for ; Fri, 17 Sep 2021 00:19:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=RNiXSGmTWJIXucIVTYI19TOmaeUkhe+pucBqWiOUQW0=; b=PirKQcWjwLp0gHJlEX7h3O0bCzBPR1UVezTBDGCWnscHkYmsz8BoovTtbG7c2N2yy1 5T7QCd4niKY3TeeHt37L0c0aAmzItYp4LKBneiIvfGvlv8+oPNICpYz2BRhjY8SoM3UO aaeZrzldNgtH7YT+14/eM9GxycrlJtF612xzfmCzK/idBpUbipuYPvJNB2B+b49OUu/F TM1d24iXOLxTfljcxy2sxC5pb3uLbet8Alo2LwBDXTCFGcxP2Htc818zslgBQb/1+HNi 5yVd4IOJjIAyeyIWg/B1kSjwPz8XXeZxWo+eJIJpvCIg7ggZNYZCRRkSDjR4aCLT78Tz 0lnQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=RNiXSGmTWJIXucIVTYI19TOmaeUkhe+pucBqWiOUQW0=; b=BguqF8Srs5xl50uR/8X55LF6I7LVnOcZn/oafUEbXiRlb7orEZKWFifQAy95doWHhj l1fDhgMbA66Kn3kBgtz59GHOGEG7bCQ0CYb6zQCJhJ37iX43iHPKV89ZsGcJAu7ULwad nns7pnh6xG0zNF6XrVzHWutE6cQ1nWLeHLRz/X22gapdBdZOa4hnG4/J6Fb3FkudNqem b/jO2JtpyNf+akhGbU0B/Ql15OO1Lpj2P81ulsFzT5seWBGdUqeU2GgYaf0IQFWoMH/f y2g+0GQnbUP2tFMcAH8Neu4ICKrhZ/uSCzaSRqceccGRmeTWyXjO+SmyaqvmJm6a708s yPYQ== X-Gm-Message-State: AOAM5310+LPHFfCXCP65ohQyFE5s29J2RuT2nZgsQ/PyiZak+hIAf6Bv jhbPoAgpfLMSfY1WfYNvma4= X-Google-Smtp-Source: ABdhPJyG8nPovjW9xl9dqzgIYeMXCB2L+sH50Y5T8w7ifN5hKYzwgqrD4PT35yHiwkNm/30BFLvN/A== X-Received: by 2002:a17:906:3e08:: with SMTP id k8mr10994659eji.361.1631863164405; Fri, 17 Sep 2021 00:19:24 -0700 (PDT) Received: from localhost.localdomain.it (host-79-47-104-104.retail.telecomitalia.it. [79.47.104.104]) by smtp.gmail.com with ESMTPSA id q19sm2297140edc.74.2021.09.17.00.19.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Sep 2021 00:19:24 -0700 (PDT) From: "Fabio M. De Francesco" To: Larry Finger , Phillip Potter , Greg Kroah-Hartman , Pavel Skripkin , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, David Laight , Dan Carpenter Cc: "Fabio M. De Francesco" Subject: [PATCH v7 18/19] staging: r8188eu: shorten calls chain of rtw_write{8,16,32,N}() Date: Fri, 17 Sep 2021 09:18:36 +0200 Message-Id: <20210917071837.10926-19-fmdefrancesco@gmail.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210917071837.10926-1-fmdefrancesco@gmail.com> References: <20210917071837.10926-1-fmdefrancesco@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Shorten the calls chain of rtw_write8/16/32() down to the actual writes. For this purpose unify the four usb_write8/16/32/N() into the new usb_write(); make the latter parameterizable with 'size'; embed most of the code of usbctrl_vendorreq() into usb_write() and use in it the new usb_control_msg_send() API of USB Core. Suggested-by: Greg Kroah-Hartman Co-developed-by: Pavel Skripkin Signed-off-by: Pavel Skripkin Signed-off-by: Fabio M. De Francesco --- drivers/staging/r8188eu/hal/usb_ops_linux.c | 112 +++++++------------- 1 file changed, 41 insertions(+), 71 deletions(-) diff --git a/drivers/staging/r8188eu/hal/usb_ops_linux.c b/drivers/staging/r8188eu/hal/usb_ops_linux.c index ef35358cf2d3..656f3a774e48 100644 --- a/drivers/staging/r8188eu/hal/usb_ops_linux.c +++ b/drivers/staging/r8188eu/hal/usb_ops_linux.c @@ -8,88 +8,60 @@ #include "../include/recv_osdep.h" #include "../include/rtl8188e_hal.h" -static int usbctrl_vendorreq(struct intf_hdl *intfhdl, u16 value, void *data, u16 len, u8 requesttype) +static int usb_read(struct intf_hdl *intfhdl, u16 addr, void *data, u8 size) { struct adapter *adapt = intfhdl->padapter; struct dvobj_priv *dvobjpriv = adapter_to_dvobj(adapt); struct usb_device *udev = dvobjpriv->pusbdev; - int vendorreq_times = 0; - unsigned int pipe; - int status = 0; - u8 *io_buf; - - if ((adapt->bSurpriseRemoved) || (adapt->pwrctrlpriv.pnp_bstop_trx)) { - status = -EPERM; - goto exit; - } + int status; + u8 *io_buf; /* Pointer to I/O buffer */ - if (len > MAX_VENDOR_REQ_CMD_SIZE) { - DBG_88E("[%s] Buffer len error ,vendor request failed\n", __func__); - status = -EINVAL; - goto exit; - } + if (adapt->bSurpriseRemoved || adapt->pwrctrlpriv.pnp_bstop_trx) + return -EPERM; mutex_lock(&dvobjpriv->usb_vendor_req_mutex); - /* Acquire IO memory for vendorreq */ io_buf = dvobjpriv->usb_vendor_req_buf; - if (requesttype == REALTEK_USB_VENQT_READ) - /* read in */ - pipe = usb_rcvctrlpipe(udev, 0); - else - /* write out */ - pipe = usb_sndctrlpipe(udev, 0); - - while (++vendorreq_times <= MAX_USBCTRL_VENDORREQ_TIMES) { - if (requesttype == REALTEK_USB_VENQT_READ) - memset(io_buf, 0, len); - else - memcpy(io_buf, data, len); + status = usb_control_msg_recv(udev, 0, REALTEK_USB_VENQT_CMD_REQ, + REALTEK_USB_VENQT_READ, addr, + REALTEK_USB_VENQT_CMD_IDX, io_buf, + size, RTW_USB_CONTROL_MSG_TIMEOUT, + GFP_KERNEL); - status = usb_control_msg(udev, pipe, REALTEK_USB_VENQT_CMD_REQ, - requesttype, value, REALTEK_USB_VENQT_CMD_IDX, - io_buf, len, RTW_USB_CONTROL_MSG_TIMEOUT); + if (status == -ESHUTDOWN || + status == -ENODEV || + status == -ENOENT) { + /* + * device or controller has been disabled due to + * some problem that could not be worked around, + * device or bus doesn’t exist, endpoint does not + * exist or is not enabled. + */ + adapt->bSurpriseRemoved = true; + goto mutex_unlock; + } - if (status == len) { - /* success */ - rtw_reset_continual_urb_error(dvobjpriv); - if (requesttype == REALTEK_USB_VENQT_READ) - memcpy(data, io_buf, len); - } else { - /* errors */ - if (status < 0) { - if (status == -ESHUTDOWN || status == -ENODEV) { - adapt->bSurpriseRemoved = true; - } else { - struct hal_data_8188e *haldata = GET_HAL_DATA(adapt); - haldata->srestpriv.wifi_error_status = USB_VEN_REQ_CMD_FAIL; - } - } else { - /* status != len && status >= 0 */ - if (status > 0) { - if (requesttype == REALTEK_USB_VENQT_READ) - memcpy(data, io_buf, len); - } - } + if (status < 0) { + GET_HAL_DATA(adapt)->srestpriv.wifi_error_status = + USB_VEN_REQ_CMD_FAIL; - if (rtw_inc_and_chk_continual_urb_error(dvobjpriv)) { - adapt->bSurpriseRemoved = true; - break; - } + if (rtw_inc_and_chk_continual_urb_error(dvobjpriv)) + adapt->bSurpriseRemoved = true; - } - /* firmware download is checksummed, don't retry */ - if ((value >= FW_8188E_START_ADDRESS && value <= FW_8188E_END_ADDRESS) || status == len) - break; + goto mutex_unlock; } + rtw_reset_continual_urb_error(dvobjpriv); + memcpy(data, io_buf, size); + +mutex_unlock: mutex_unlock(&dvobjpriv->usb_vendor_req_mutex); -exit: + return status; } -static int usb_read(struct intf_hdl *intfhdl, u16 addr, void *data, u8 size) +static int usb_write(struct intf_hdl *intfhdl, u16 addr, void *data, u8 size) { struct adapter *adapt = intfhdl->padapter; struct dvobj_priv *dvobjpriv = adapter_to_dvobj(adapt); @@ -103,9 +75,10 @@ static int usb_read(struct intf_hdl *intfhdl, u16 addr, void *data, u8 size) mutex_lock(&dvobjpriv->usb_vendor_req_mutex); io_buf = dvobjpriv->usb_vendor_req_buf; + memcpy(io_buf, data, size); - status = usb_control_msg_recv(udev, 0, REALTEK_USB_VENQT_CMD_REQ, - REALTEK_USB_VENQT_READ, addr, + status = usb_control_msg_send(udev, 0, REALTEK_USB_VENQT_CMD_REQ, + REALTEK_USB_VENQT_WRITE, addr, REALTEK_USB_VENQT_CMD_IDX, io_buf, size, RTW_USB_CONTROL_MSG_TIMEOUT, GFP_KERNEL); @@ -134,7 +107,6 @@ static int usb_read(struct intf_hdl *intfhdl, u16 addr, void *data, u8 size) } rtw_reset_continual_urb_error(dvobjpriv); - memcpy(data, io_buf, size); mutex_unlock: mutex_unlock(&dvobjpriv->usb_vendor_req_mutex); @@ -185,7 +157,7 @@ int rtw_write8(struct adapter *adapter, u32 addr, u8 val) u16 address = addr & 0xffff; int ret; - ret = usbctrl_vendorreq(intfhdl, address, &val, 1, REALTEK_USB_VENQT_WRITE); + ret = usb_write(intfhdl, address, &val, 1); return RTW_STATUS_CODE(ret); } @@ -198,7 +170,7 @@ int rtw_write16(struct adapter *adapter, u32 addr, u16 val) u16 address = addr & 0xffff; int ret; - ret = usbctrl_vendorreq(intfhdl, address, &data, 2, REALTEK_USB_VENQT_WRITE); + ret = usb_write(intfhdl, address, &data, 2); return RTW_STATUS_CODE(ret); } @@ -211,7 +183,7 @@ int rtw_write32(struct adapter *adapter, u32 addr, u32 val) u16 address = addr & 0xffff; int ret; - ret = usbctrl_vendorreq(intfhdl, address, &data, 4, REALTEK_USB_VENQT_WRITE); + ret = usb_write(intfhdl, address, &data, 4); return RTW_STATUS_CODE(ret); } @@ -220,7 +192,6 @@ int rtw_writeN(struct adapter *adapter, u32 addr, u32 len, u8 *data) { struct io_priv *io_priv = &adapter->iopriv; struct intf_hdl *intfhdl = &io_priv->intf; - u8 buf[VENDOR_CMD_MAX_DATA_LEN] = {0}; u16 address = addr & 0xffff; u16 length = len & 0xffff; int ret; @@ -228,8 +199,7 @@ int rtw_writeN(struct adapter *adapter, u32 addr, u32 len, u8 *data) if (length > VENDOR_CMD_MAX_DATA_LEN) return _FAIL; - memcpy(buf, data, length); - ret = usbctrl_vendorreq(intfhdl, address, buf, length, REALTEK_USB_VENQT_WRITE); + ret = usb_write(intfhdl, address, data, length); return RTW_STATUS_CODE(ret); } -- 2.33.0