From: Greg KH <gregkh@linuxfoundation.org>
To: Hayes Wang <hayeswang@realtek.com>
Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-usb@vger.kernel.org, nic_swsd@realtek.com
Subject: Re: [PATCH v3 2/3] net/usb/r8152: replace USB buffer from stack to DMA-able
Date: Tue, 30 Jul 2013 07:01:52 -0700 [thread overview]
Message-ID: <20130730140152.GF27962@kroah.com> (raw)
In-Reply-To: <1375172936-4145-2-git-send-email-hayeswang@realtek.com>
On Tue, Jul 30, 2013 at 04:28:55PM +0800, Hayes Wang wrote:
> Allocate the required transfer buffer for usb_control_msg.
>
> Signed-off-by: Hayes Wang <hayeswang@realtek.com>
> ---
> drivers/net/usb/r8152.c | 91 +++++++++++++++++++++++++++++++++++--------------
> 1 file changed, 66 insertions(+), 25 deletions(-)
>
> diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c
> index ee13f9e..93a7baa 100644
> --- a/drivers/net/usb/r8152.c
> +++ b/drivers/net/usb/r8152.c
> @@ -282,6 +282,8 @@ enum rtl_register_content {
> #define RTL8152_RMS (VLAN_ETH_FRAME_LEN + VLAN_HLEN)
> #define RTL8152_TX_TIMEOUT (HZ)
>
> +#define RTL8152_MAX_TRANSFER_SIZE 8
> +
> /* rtl8152 flags */
> enum rtl8152_flags {
> RTL8152_UNPLUG = 0,
> @@ -324,8 +326,10 @@ struct r8152 {
> struct sk_buff *tx_skb, *rx_skb;
> struct delayed_work schedule;
> struct mii_if_info mii;
> + struct mutex transfer_mutex;
> u32 msg_enable;
> u16 ocp_base;
> + u8 *transfer_buf;
> u8 version;
> u8 speed;
> };
> @@ -344,17 +348,59 @@ static const int multicast_filter_limit = 32;
> static
> int get_registers(struct r8152 *tp, u16 value, u16 index, u16 size, void *data)
> {
> - return usb_control_msg(tp->udev, usb_rcvctrlpipe(tp->udev, 0),
> + int ret;
> + void *tmp;
> +
> + if (size > RTL8152_MAX_TRANSFER_SIZE || !tp->transfer_buf) {
> + tmp = kmalloc(size, GFP_KERNEL);
> + if (!tmp)
> + return -ENOMEM;
> + } else {
> + mutex_lock(&tp->transfer_mutex);
> + tmp = tp->transfer_buf;
> + }
> +
> + ret = usb_control_msg(tp->udev, usb_rcvctrlpipe(tp->udev, 0),
> RTL8152_REQ_GET_REGS, RTL8152_REQT_READ,
> - value, index, data, size, 500);
> + value, index, tmp, size, 500);
Same here, no need for your "transfer buf" structure, just always
kmalloc the data, copy it in, and make the call. It's _really_ slow
anyway, you will never notice any speed overhead by doing this.
thanks,
greg k-h
next prev parent reply other threads:[~2013-07-30 14:00 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-23 9:26 [PATCH 1/3] net/usb/r815x: replace USB buffer from stack to DMA-able hayeswang
2013-07-25 0:49 ` David Miller
2013-07-25 7:59 ` [PATCH v2 " Hayes Wang
2013-07-25 7:59 ` [PATCH v2 2/3] net/usb/r8152: make sure the USB buffer is DMA-able Hayes Wang
2013-07-25 7:59 ` [PATCH v2 3/3] net/usb/r8152: adjust relative ocp function Hayes Wang
[not found] ` <1374739144-732-1-git-send-email-hayeswang-Rasf1IRRPZFBDgjK7y7TUQ@public.gmane.org>
2013-07-28 3:21 ` [PATCH v2 1/3] net/usb/r815x: replace USB buffer from stack to DMA-able David Miller
2013-07-29 5:20 ` Oliver Neukum
2013-07-29 7:46 ` David Miller
2013-07-30 8:28 ` [PATCH v3 " Hayes Wang
2013-07-30 8:28 ` [PATCH v3 2/3] net/usb/r8152: " Hayes Wang
2013-07-30 14:01 ` Greg KH [this message]
2013-07-30 8:28 ` [PATCH v3 3/3] net/usb/r8152: adjust relative ocp function Hayes Wang
2013-07-30 13:58 ` [PATCH v3 1/3] net/usb/r815x: replace USB buffer from stack to DMA-able Greg KH
2013-07-30 15:17 ` [PATCH] MAINTAINERS: USB, remove F: drivers/net/usb/ pattern Joe Perches
2013-07-30 14:00 ` [PATCH v3 1/3] net/usb/r815x: replace USB buffer from stack to DMA-able Greg KH
2013-07-30 18:33 ` David Miller
2013-07-30 18:41 ` Joe Perches
2013-07-30 18:49 ` David Miller
2013-07-31 10:29 ` Ming Lei
2013-07-30 18:58 ` Greg KH
2013-07-30 14:29 ` Ming Lei
2013-07-31 9:21 ` [PATCH v4 1/5] " Hayes Wang
2013-07-31 9:21 ` [PATCH v4 2/5] net/usb/r815x: avoid to call mdio functions for runtime-suspended device Hayes Wang
2013-07-31 21:49 ` David Miller
2013-07-31 9:21 ` [PATCH v4 3/5] net/usb/r815x: change the return value for bind functions Hayes Wang
[not found] ` <1375262486-5373-3-git-send-email-hayeswang-Rasf1IRRPZFBDgjK7y7TUQ@public.gmane.org>
2013-07-31 21:49 ` David Miller
[not found] ` <1375262486-5373-1-git-send-email-hayeswang-Rasf1IRRPZFBDgjK7y7TUQ@public.gmane.org>
2013-07-31 9:21 ` [PATCH v4 4/5] net/usb/r8152: make sure the USB buffer is DMA-able Hayes Wang
2013-07-31 12:54 ` Greg KH
2013-07-31 21:50 ` David Miller
2013-07-31 9:21 ` [PATCH v4 5/5] net/usb/r8152: adjust relative ocp function Hayes Wang
2013-07-31 21:50 ` David Miller
2013-07-31 12:53 ` [PATCH v4 1/5] net/usb/r815x: replace USB buffer from stack to DMA-able Greg KH
2013-07-31 21:49 ` David Miller
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=20130730140152.GF27962@kroah.com \
--to=gregkh@linuxfoundation.org \
--cc=hayeswang@realtek.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=nic_swsd@realtek.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).