From: Amitkumar Karwar <amitkarwar@gmail.com>
To: Kalle Valo <kvalo@codeaurora.org>
Cc: linux-wireless@vger.kernel.org,
Amitkumar Karwar <amit.karwar@redpinesignals.com>,
Prameela Rani Garnepudi <prameela.j04cs@gmail.com>,
Karun Eagalapati <karun256@gmail.com>
Subject: [v3 07/21] rsi: USB tx headroom cleanup
Date: Thu, 6 Jul 2017 20:07:10 +0530 [thread overview]
Message-ID: <1499351844-2046-8-git-send-email-amitkarwar@gmail.com> (raw)
In-Reply-To: <1499351844-2046-1-git-send-email-amitkarwar@gmail.com>
From: Karun Eagalapati <karun256@gmail.com>
USB headroom is added while submitting the data to URB as per
firmware's requirement. This logic is moved to rsi_usb_card_write() so
that caller need not worry about it.
Signed-off-by: Karun Eagalapati <karun256@gmail.com>
Signed-off-by: Amitkumar Karwar <amit.karwar@redpinesignals.com>
---
drivers/net/wireless/rsi/rsi_91x_usb.c | 41 +++++++++++++++++-----------------
1 file changed, 21 insertions(+), 20 deletions(-)
diff --git a/drivers/net/wireless/rsi/rsi_91x_usb.c b/drivers/net/wireless/rsi/rsi_91x_usb.c
index 1d7bb9d..25f6195 100644
--- a/drivers/net/wireless/rsi/rsi_91x_usb.c
+++ b/drivers/net/wireless/rsi/rsi_91x_usb.c
@@ -29,19 +29,24 @@
* Return: status: 0 on success, a negative error code on failure.
*/
static int rsi_usb_card_write(struct rsi_hw *adapter,
- void *buf,
+ u8 *buf,
u16 len,
u8 endpoint)
{
struct rsi_91x_usbdev *dev = (struct rsi_91x_usbdev *)adapter->rsi_dev;
int status;
- s32 transfer;
+ u8 *seg = dev->tx_buffer;
+ int transfer;
+ int ep = dev->bulkout_endpoint_addr[endpoint - 1];
+ memset(seg, 0, len + RSI_USB_TX_HEAD_ROOM);
+ memcpy(seg + RSI_USB_TX_HEAD_ROOM, buf, len);
+ len += RSI_USB_TX_HEAD_ROOM;
+ transfer = len;
status = usb_bulk_msg(dev->usbdev,
- usb_sndbulkpipe(dev->usbdev,
- dev->bulkout_endpoint_addr[endpoint - 1]),
- buf,
- len,
+ usb_sndbulkpipe(dev->usbdev, ep),
+ (void *)seg,
+ (int)len,
&transfer,
HZ * 5);
@@ -68,23 +73,19 @@ static int rsi_write_multiple(struct rsi_hw *adapter,
u8 *data,
u32 count)
{
- struct rsi_91x_usbdev *dev = (struct rsi_91x_usbdev *)adapter->rsi_dev;
- u8 *seg = dev->tx_buffer;
+ struct rsi_91x_usbdev *dev =
+ (struct rsi_91x_usbdev *)adapter->rsi_dev;
- if (dev->write_fail)
- return 0;
+ if (!adapter)
+ return -ENODEV;
- if (endpoint == MGMT_EP) {
- memset(seg, 0, RSI_USB_TX_HEAD_ROOM);
- memcpy(seg + RSI_USB_TX_HEAD_ROOM, data, count);
- } else {
- seg = ((u8 *)data - RSI_USB_TX_HEAD_ROOM);
- }
+ if (endpoint == 0)
+ return -EINVAL;
+
+ if (dev->write_fail)
+ return -ENETDOWN;
- return rsi_usb_card_write(adapter,
- seg,
- count + RSI_USB_TX_HEAD_ROOM,
- endpoint);
+ return rsi_usb_card_write(adapter, data, count, endpoint);
}
/**
--
2.7.4
next prev parent reply other threads:[~2017-07-06 14:42 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-07-06 14:37 [v3 00/21] rsi driver enhancements Amitkumar Karwar
2017-07-06 14:37 ` [v3 01/21] rsi: use BUILD_BUG_ON check for fsm_state Amitkumar Karwar
2017-07-28 14:24 ` [v3,01/21] " Kalle Valo
2017-07-06 14:37 ` [v3 02/21] rsi: changes in eeprom read frame Amitkumar Karwar
2017-07-06 14:37 ` [v3 03/21] rsi: fix sdio card reset problem Amitkumar Karwar
2017-07-06 14:37 ` [v3 04/21] rsi: chip reset for SDIO interface Amitkumar Karwar
2017-07-06 14:37 ` [v3 05/21] rsi: correct SDIO disconnect path handling Amitkumar Karwar
2017-07-06 14:37 ` [v3 06/21] rsi: card reset for USB interface Amitkumar Karwar
2017-07-06 14:37 ` Amitkumar Karwar [this message]
2017-07-06 14:37 ` [v3 08/21] rsi: correct the logic of deriving queue number Amitkumar Karwar
2017-07-06 14:37 ` [v3 09/21] rsi: rename USB endpoint macros Amitkumar Karwar
2017-07-06 14:37 ` [v3 10/21] rsi: choose correct endpoint based on queue Amitkumar Karwar
2017-07-06 14:37 ` [v3 11/21] rsi: set immediate wakeup bit Amitkumar Karwar
2017-07-06 14:37 ` [v3 12/21] rsi: management frame descriptor preparation cleanup Amitkumar Karwar
2017-07-06 14:37 ` [v3 13/21] rsi: separate function for management packet descriptor Amitkumar Karwar
2017-07-06 14:37 ` [v3 14/21] rsi: data packet descriptor code cleanup Amitkumar Karwar
2017-07-06 14:37 ` [v3 15/21] rsi: data packet descriptor enhancements Amitkumar Karwar
2017-07-06 14:37 ` [v3 16/21] rsi: separate function for data packet descriptor Amitkumar Karwar
2017-07-06 14:37 ` [v3 17/21] rsi: rename variable in_sdio_litefi_irq Amitkumar Karwar
2017-07-06 14:37 ` [v3 18/21] rsi: Optimise sdio claim and release host Amitkumar Karwar
2017-07-06 14:37 ` [v3 19/21] rsi: SDIO Rx packet processing enhancement Amitkumar Karwar
2017-07-06 14:37 ` [v3 20/21] rsi: use separate mutex lock for receive thread Amitkumar Karwar
2017-07-06 14:37 ` [v3 21/21] rsi: Rename mutex tx_rxlock to the tx_lock Amitkumar Karwar
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=1499351844-2046-8-git-send-email-amitkarwar@gmail.com \
--to=amitkarwar@gmail.com \
--cc=amit.karwar@redpinesignals.com \
--cc=karun256@gmail.com \
--cc=kvalo@codeaurora.org \
--cc=linux-wireless@vger.kernel.org \
--cc=prameela.j04cs@gmail.com \
/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).