From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ej1-f41.google.com (mail-ej1-f41.google.com [209.85.218.41]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E57AC2FAF for ; Mon, 13 Sep 2021 18:13:18 +0000 (UTC) Received: by mail-ej1-f41.google.com with SMTP id n27so22981922eja.5 for ; Mon, 13 Sep 2021 11:13:18 -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=/OzfD5DtP7nTmC6Cj3TQwQWXv921Gqp47fsa9UuRvDg=; b=FPtjcKGEYMckLsOt4YDPafDyUNlqxGzVQt28MH7q9w+e0rShq7QPSSqclUARYdgDvf qhuk7cOK50Y3oSyQPh8q+T015GXKBOdAjdqlWsWCKv0GTtVhc6lUDJ3L0S4HaAOWrqZt o2KZjXwNNCGGCMaA8hER937nB+0VzuAILnVIxSEc8OZ75HXoHOxJn71Zivs93nhUCk3+ WTtqw8nvEVi9HtthnuDwCSlN48qbEVHep9P5rzFvMMDJb/+xO/Aw8J+Y8hWM3mee0w19 t20aQt2B6W5KVhKNaG1m6CyPKpas2+LIMlj9T3WG1QhXsIJWlqitf0tZ/j+a+Y6WrOll pnEw== 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=/OzfD5DtP7nTmC6Cj3TQwQWXv921Gqp47fsa9UuRvDg=; b=Gfi1db0iMyfLT8dN7YgukZj5nh0tKMFykDjbSBZQkAGiiizGaHmeXqT9Ey4a3sfk51 Yo8f+Qi84LHv+rpKK9TlU+P/ZGT1TxZLBNVDstj9c1d9/O7ubEub1HZmsIsOdVlxo7bC 3cZNuh0POvTVm1PvSzrVyS0HMsK66C3dMD0tsPuCUYczR04Oa4WqD9KtRNO2SK94zACn PaI9CQM7/lmApGK4tW+oPek+AvbbsTgGQr7gZ39zYVj5IvZQOwciGXJHUy4g43d2yoB0 NTbEbLvLg+hYp21Y1KxpitNZ9/ESGDOZ13SKYH44LY7OspKq7FrZd34kzZGLM52jZJ7e dO9w== X-Gm-Message-State: AOAM531Uf8AuN5pWcpv/fH4d78i//1oJNvFzDcBGMvoVnZsqGdr5qcSd gh6QbcyCN3ChjAQRKdA9yMA= X-Google-Smtp-Source: ABdhPJyM4d/Jyf/kqM/reTvqOIcKnAKqk26XziqBpwxmpb+uV+hZ7z4GdM9V2Ebo/ukTvyyIFryhhw== X-Received: by 2002:a17:906:9aca:: with SMTP id ah10mr6720113ejc.471.1631556797351; Mon, 13 Sep 2021 11:13:17 -0700 (PDT) Received: from localhost.localdomain.it (host-79-43-5-131.retail.telecomitalia.it. [79.43.5.131]) by smtp.gmail.com with ESMTPSA id d25sm4258999edt.33.2021.09.13.11.13.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Sep 2021 11:13:16 -0700 (PDT) From: "Fabio M. De Francesco" To: Larry Finger , Phillip Potter , Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Michael Straube Cc: "Fabio M. De Francesco" , Pavel Skripkin Subject: [PATCH v4 17/18] staging: r8188eu: Shorten calls chain of rtw_read8/16/32() Date: Mon, 13 Sep 2021 20:10:01 +0200 Message-Id: <20210913181002.16651-18-fmdefrancesco@gmail.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210913181002.16651-1-fmdefrancesco@gmail.com> References: <20210913181002.16651-1-fmdefrancesco@gmail.com> Precedence: bulk X-Mailing-List: linux-staging@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Shorten the calls chain of rtw_read8/16/32() down to the actual reads. For this purpose unify the three usb_read8/16/32 into the new usb_read(); make the latter parameterizable with 'size'; embed most of the code of usbctrl_vendorreq() into usb_read() and use in it the new usb_control_msg_recv() 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 --- v3->v4: Make some changes according to a first review of Greg Kroah-Hartman; remove unnecessary while loop and a couple of 'if' test; handle the errors returned by usb_control_msg_recv() v2->v3: No changes. v1->v2: No changes. drivers/staging/r8188eu/hal/usb_ops_linux.c | 56 +++++++++++++++++++-- 1 file changed, 53 insertions(+), 3 deletions(-) diff --git a/drivers/staging/r8188eu/hal/usb_ops_linux.c b/drivers/staging/r8188eu/hal/usb_ops_linux.c index 04402bab805e..75475b0083db 100644 --- a/drivers/staging/r8188eu/hal/usb_ops_linux.c +++ b/drivers/staging/r8188eu/hal/usb_ops_linux.c @@ -89,6 +89,56 @@ static int usbctrl_vendorreq(struct intf_hdl *intfhdl, u16 value, void *data, u1 return status; } +static int usb_read(struct intf_hdl *intfhdl, u16 addr, void *data, u8 size) +{ + int status; + u8 *io_buf; /* pointer to I/O buffer */ + struct adapter *adapt = intfhdl->padapter; + struct dvobj_priv *dvobjpriv = adapter_to_dvobj(adapt); + struct usb_device *udev = dvobjpriv->pusbdev; + + if (adapt->bSurpriseRemoved || adapt->pwrctrlpriv.pnp_bstop_trx) { + status = -EPERM; + goto exit; + } + + mutex_lock(&dvobjpriv->usb_vendor_req_mutex); + + io_buf = dvobjpriv->usb_vendor_req_buf; + + 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); + if (!status) { + /* Success this control transfer. */ + rtw_reset_continual_urb_error(dvobjpriv); + memcpy(data, io_buf, size); + goto mutex_unlock; + } + /* error cases */ + if (status == (-ESHUTDOWN || -ENODEV || -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; + } + 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; + goto mutex_unlock; + } +mutex_unlock: + mutex_unlock(&dvobjpriv->usb_vendor_req_mutex); +exit: + return status; +} + u8 rtw_read8(struct adapter *adapter, u32 addr) { u8 data; @@ -96,7 +146,7 @@ u8 rtw_read8(struct adapter *adapter, u32 addr) struct intf_hdl *intfhdl = &io_priv->intf; u16 address = (u16)(addr & 0xffff); - usbctrl_vendorreq(intfhdl, address, &data, 1, REALTEK_USB_VENQT_READ); + usb_read(intfhdl, address, &data, 1); return data; } @@ -108,7 +158,7 @@ u16 rtw_read16(struct adapter *adapter, u32 addr) struct io_priv *io_priv = &adapter->iopriv; struct intf_hdl *intfhdl = &io_priv->intf; - usbctrl_vendorreq(intfhdl, address, &data, 2, REALTEK_USB_VENQT_READ); + usb_read(intfhdl, address, &data, 2); return le16_to_cpu(data); } @@ -120,7 +170,7 @@ u32 rtw_read32(struct adapter *adapter, u32 addr) struct io_priv *io_priv = &adapter->iopriv; struct intf_hdl *intfhdl = &io_priv->intf; - usbctrl_vendorreq(intfhdl, address, &data, 4, REALTEK_USB_VENQT_READ); + usb_read(intfhdl, address, &data, 4); return le32_to_cpu(data); } -- 2.33.0