From: "Fabio M. De Francesco" <fmdefrancesco@gmail.com>
To: Larry Finger <Larry.Finger@lwfinger.net>,
Phillip Potter <phil@philpotter.co.uk>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Pavel Skripkin <paskripkin@gmail.com>,
linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org,
David Laight <david.Laight@aculab.com>,
Dan Carpenter <dan.carpenter@oracle.com>
Cc: "Fabio M. De Francesco" <fmdefrancesco@gmail.com>
Subject: [PATCH v6 17/19] staging: r8188eu: Shorten calls chains of rtw_read*()
Date: Wed, 15 Sep 2021 23:11:01 +0200 [thread overview]
Message-ID: <20210915211103.18001-18-fmdefrancesco@gmail.com> (raw)
In-Reply-To: <20210915211103.18001-1-fmdefrancesco@gmail.com>
Shorten the calls chains 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 <gregkh@linuxfoundation.org>
Co-developed-by: Pavel Skripkin <paskripkin@gmail.com>
Signed-off-by: Pavel Skripkin <paskripkin@gmail.com>
Signed-off-by: Fabio M. De Francesco <fmdefrancesco@gmail.com>
---
drivers/staging/r8188eu/hal/usb_ops_linux.c | 60 +++++++++++++++++++--
1 file changed, 57 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/r8188eu/hal/usb_ops_linux.c b/drivers/staging/r8188eu/hal/usb_ops_linux.c
index d87da84eca07..ef35358cf2d3 100644
--- a/drivers/staging/r8188eu/hal/usb_ops_linux.c
+++ b/drivers/staging/r8188eu/hal/usb_ops_linux.c
@@ -89,13 +89,67 @@ 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)
+{
+ struct adapter *adapt = intfhdl->padapter;
+ struct dvobj_priv *dvobjpriv = adapter_to_dvobj(adapt);
+ struct usb_device *udev = dvobjpriv->pusbdev;
+ int status;
+ u8 *io_buf; /* Pointer to I/O buffer */
+
+ if (adapt->bSurpriseRemoved || adapt->pwrctrlpriv.pnp_bstop_trx)
+ return -EPERM;
+
+ 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 == -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 < 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;
+
+ goto mutex_unlock;
+ }
+
+ rtw_reset_continual_urb_error(dvobjpriv);
+ memcpy(data, io_buf, size);
+
+mutex_unlock:
+ mutex_unlock(&dvobjpriv->usb_vendor_req_mutex);
+
+ return status;
+}
+
u8 rtw_read8(struct adapter *adapter, u32 addr)
{
struct io_priv *io_priv = &adapter->iopriv;
struct intf_hdl *intfhdl = &io_priv->intf;
u16 address = addr & 0xffff;
u8 data;
- usbctrl_vendorreq(intfhdl, address, &data, 1, REALTEK_USB_VENQT_READ);
+
+ usb_read(intfhdl, address, &data, 1);
return data;
}
@@ -107,7 +161,7 @@ u16 rtw_read16(struct adapter *adapter, u32 addr)
u16 address = addr & 0xffff;
__le16 data;
- usbctrl_vendorreq(intfhdl, address, &data, 2, REALTEK_USB_VENQT_READ);
+ usb_read(intfhdl, address, &data, 2);
return le16_to_cpu(data);
}
@@ -119,7 +173,7 @@ u32 rtw_read32(struct adapter *adapter, u32 addr)
u16 address = addr & 0xffff;
__le32 data;
- usbctrl_vendorreq(intfhdl, address, &data, 4, REALTEK_USB_VENQT_READ);
+ usb_read(intfhdl, address, &data, 4);
return le32_to_cpu(data);
}
--
2.33.0
next prev parent reply other threads:[~2021-09-15 21:12 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-15 21:10 [PATCH v6 00/19] staging: r8188eu: Shorten and simplify calls chains Fabio M. De Francesco
2021-09-15 21:10 ` [PATCH v6 01/19] staging: r8188eu: remove usb_{read,write}_mem() Fabio M. De Francesco
2021-09-15 21:10 ` [PATCH v6 02/19] staging: r8188eu: remove the helpers of rtw_read8() Fabio M. De Francesco
2021-09-15 21:10 ` [PATCH v6 03/19] staging: r8188eu: remove the helpers of rtw_read16() Fabio M. De Francesco
2021-09-15 21:10 ` [PATCH v6 04/19] staging: r8188eu: remove the helpers of rtw_read32() Fabio M. De Francesco
2021-09-15 21:10 ` [PATCH v6 05/19] staging: r8188eu: remove the helpers of usb_write8() Fabio M. De Francesco
2021-09-15 21:10 ` [PATCH v6 06/19] staging: r8188eu: remove the helpers of usb_write16() Fabio M. De Francesco
2021-09-15 21:10 ` [PATCH v6 07/19] staging: r8188eu: remove the helpers of usb_write32() Fabio M. De Francesco
2021-09-15 21:10 ` [PATCH v6 08/19] staging: r8188eu: remove the helpers of usb_writeN() Fabio M. De Francesco
2021-09-15 21:10 ` [PATCH v6 09/19] staging: r8188eu: remove the helpers of usb_read_port() Fabio M. De Francesco
2021-09-15 21:10 ` [PATCH v6 10/19] staging: r8188eu: remove the helpers of usb_write_port() Fabio M. De Francesco
2021-09-15 21:10 ` [PATCH v6 11/19] staging: r8188eu: remove the helpers of usb_read_port_cancel() Fabio M. De Francesco
2021-09-15 21:10 ` [PATCH v6 12/19] staging: r8188eu: remove the helpers of usb_write_port_cancel() Fabio M. De Francesco
2021-09-15 21:10 ` [PATCH v6 13/19] staging: r8188eu: remove core/rtw_io.c Fabio M. De Francesco
2021-09-15 21:10 ` [PATCH v6 14/19] staging: remove struct _io_ops Fabio M. De Francesco
2021-09-16 12:52 ` Dan Carpenter
2021-09-16 13:28 ` Fabio M. De Francesco
2021-09-16 13:52 ` Greg Kroah-Hartman
2021-09-15 21:10 ` [PATCH v6 15/19] staging: r8188eu: Clean up usbctrl_vendorreq() Fabio M. De Francesco
2021-09-15 21:11 ` [PATCH v6 16/19] staging: r8188eu: Clean up rtw_read*() and rtw_write*() Fabio M. De Francesco
2021-09-16 11:36 ` Dan Carpenter
2021-09-16 12:14 ` Fabio M. De Francesco
2021-09-16 12:50 ` Dan Carpenter
2021-09-15 21:11 ` Fabio M. De Francesco [this message]
2021-09-15 21:11 ` [PATCH v6 18/19] staging: r8188eu: Shorten calls chains of rtw_write*() Fabio M. De Francesco
2021-09-15 21:11 ` [PATCH v6 19/19] staging: r8188eu: remove shared buffer for USB requests Fabio M. De Francesco
2021-09-16 11:49 ` Dan Carpenter
2021-09-16 11:51 ` Pavel Skripkin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210915211103.18001-18-fmdefrancesco@gmail.com \
--to=fmdefrancesco@gmail.com \
--cc=Larry.Finger@lwfinger.net \
--cc=dan.carpenter@oracle.com \
--cc=david.Laight@aculab.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-staging@lists.linux.dev \
--cc=paskripkin@gmail.com \
--cc=phil@philpotter.co.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).