At Tue, 10 Feb 2015 23:03:13 -0600, Chris Rorvick wrote:

The device indicates the result of a read/write operation by making the status available on a subsequent request from the driver. This is not ready immediately, though, so the driver is currently slamming the device with hundreds of pointless requests before getting the expected response. Add a two millisecond delay before each attempt. This is approximately the behavior observed with version 4.2.7.1 of the Windows driver.

Signed-off-by: Chris Rorvick chris@rorvick.com

Applied, thanks.

Takashi

---

sound/usb/line6/driver.c | 6 ++++++ 1 file changed, 6 insertions(+)

diff --git a/sound/usb/line6/driver.c b/sound/usb/line6/driver.c index aac1e35..222c14f 100644 --- a/sound/usb/line6/driver.c +++ b/sound/usb/line6/driver.c @@ -296,6 +296,8 @@ static void line6_data_received(struct urb *urb) line6_start_listen(line6); }

+#define LINE6_READ_WRITE_STATUS_DELAY 2 /* milliseconds */

/* Read data from device. */ @@ -319,6 +321,8 @@ int line6_read_data(struct usb_line6 *line6, u16 address, void *data,

/* Wait for data length. We'll get 0xff until length arrives. */ do {

• mdelay(LINE6_READ_WRITE_STATUS_DELAY);
  

• ret = usb_control_msg(usbdev, usb_rcvctrlpipe(usbdev, 0), 0x67, USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_DIR_IN,

@@ -376,6 +380,8 @@ int line6_write_data(struct usb_line6 *line6, u16 address, void *data, }

do {

• mdelay(LINE6_READ_WRITE_STATUS_DELAY);
  

• ret = usb_control_msg(usbdev, usb_rcvctrlpipe(usbdev, 0), 0x67, USB_TYPE_VENDOR | USB_RECIP_DEVICE |

-- 2.1.0

At Tue, 10 Feb 2015 23:03:14 -0600, Chris Rorvick wrote:

Put an upper bound on how long we will wait for the device to respond to a read/write request (i.e., 100 milliseconds) and return an error if this is reached.

Signed-off-by: Chris Rorvick chris@rorvick.com

Applied, thanks.

Takashi

---

sound/usb/line6/driver.c | 29 +++++++++++++++++++++++------ 1 file changed, 23 insertions(+), 6 deletions(-)

diff --git a/sound/usb/line6/driver.c b/sound/usb/line6/driver.c index 222c14f..2a33f3e 100644 --- a/sound/usb/line6/driver.c +++ b/sound/usb/line6/driver.c @@ -297,6 +297,7 @@ static void line6_data_received(struct urb *urb) }

#define LINE6_READ_WRITE_STATUS_DELAY 2 /* milliseconds */ +#define LINE6_READ_WRITE_MAX_RETRIES 50

/* Read data from device. @@ -307,6 +308,7 @@ int line6_read_data(struct usb_line6 *line6, u16 address, void *data, struct usb_device *usbdev = line6->usbdev; int ret; unsigned char len;

• unsigned count;

  /* query the serial number: */ ret = usb_control_msg(usbdev, usb_sndctrlpipe(usbdev, 0), 0x67,

@@ -320,7 +322,7 @@ int line6_read_data(struct usb_line6 *line6, u16 address, void *data, }

/* Wait for data length. We'll get 0xff until length arrives. */

• do {

• for (count = 0; count < LINE6_READ_WRITE_MAX_RETRIES; count++) { mdelay(LINE6_READ_WRITE_STATUS_DELAY);

  ret = usb_control_msg(usbdev, usb_rcvctrlpipe(usbdev, 0), 0x67,

@@ -333,9 +335,16 @@ int line6_read_data(struct usb_line6 *line6, u16 address, void *data, "receive length failed (error %d)\n", ret); return ret; }

• } while (len == 0xff);

• if (len != datalen) {

• if (len != 0xff)
  

• 	break;
  

• }
• if (len == 0xff) {

• dev_err(line6->ifcdev, "read failed after %d retries\n",
  

• 	count);
  

• return -EIO;
  

• } else if (len != datalen) { /* should be equal or something went wrong */ dev_err(line6->ifcdev, "length mismatch (expected %d, got %d)\n",

@@ -367,6 +376,7 @@ int line6_write_data(struct usb_line6 *line6, u16 address, void *data, struct usb_device *usbdev = line6->usbdev; int ret; unsigned char status;

• int count;

  ret = usb_control_msg(usbdev, usb_sndctrlpipe(usbdev, 0), 0x67, USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_DIR_OUT,

@@ -379,7 +389,7 @@ int line6_write_data(struct usb_line6 *line6, u16 address, void *data, return ret; }

• do {

• for (count = 0; count < LINE6_READ_WRITE_MAX_RETRIES; count++) { mdelay(LINE6_READ_WRITE_STATUS_DELAY);

  ret = usb_control_msg(usbdev, usb_rcvctrlpipe(usbdev, 0),

@@ -394,9 +404,16 @@ int line6_write_data(struct usb_line6 *line6, u16 address, void *data, "receiving status failed (error %d)\n", ret); return ret; }

• } while (status == 0xff);

• if (status != 0) {

• if (status != 0xff)
  

• 	break;
  

• }
• if (status == 0xff) {

• dev_err(line6->ifcdev, "write failed after %d retries\n",
  

• 	count);
  

• return -EIO;
  

• } else if (status != 0) { dev_err(line6->ifcdev, "write failed (error %d)\n", ret); return -EINVAL; }

-- 2.1.0

At Tue, 10 Feb 2015 23:03:15 -0600, Chris Rorvick wrote:

Signed-off-by: Chris Rorvick chris@rorvick.com

Applied, thanks.

Takashi

---

sound/usb/line6/driver.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sound/usb/line6/driver.c b/sound/usb/line6/driver.c index 2a33f3e..f8e2eb0 100644 --- a/sound/usb/line6/driver.c +++ b/sound/usb/line6/driver.c @@ -349,7 +349,7 @@ int line6_read_data(struct usb_line6 *line6, u16 address, void *data, dev_err(line6->ifcdev, "length mismatch (expected %d, got %d)\n", (int)datalen, (int)len);

• return -EINVAL;
  

• return -EIO;
  

  }

  /* receive the result: */

@@ -415,7 +415,7 @@ int line6_write_data(struct usb_line6 *line6, u16 address, void *data, return -EIO; } else if (status != 0) { dev_err(line6->ifcdev, "write failed (error %d)\n", ret);

• return -EINVAL;
  

• return -EIO;
  

  }

  return 0;

-- 2.1.0

At Tue, 10 Feb 2015 23:03:16 -0600, Chris Rorvick wrote:

The serial number (aka ESN) is a 32-bit value.

Signed-off-by: Chris Rorvick chris@rorvick.com

Applied, thanks.

Takashi

---

sound/usb/line6/driver.c | 2 +- sound/usb/line6/driver.h | 2 +- sound/usb/line6/pod.c | 4 ++-- sound/usb/line6/toneport.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/sound/usb/line6/driver.c b/sound/usb/line6/driver.c index f8e2eb0..d31ceb8 100644 --- a/sound/usb/line6/driver.c +++ b/sound/usb/line6/driver.c @@ -426,7 +426,7 @@ EXPORT_SYMBOL_GPL(line6_write_data); Read Line 6 device serial number. (POD, TonePort, GuitarPort) */ -int line6_read_serial_number(struct usb_line6 *line6, int *serial_number) +int line6_read_serial_number(struct usb_line6 *line6, u32 *serial_number) { return line6_read_data(line6, 0x80d0, serial_number, sizeof(*serial_number)); diff --git a/sound/usb/line6/driver.h b/sound/usb/line6/driver.h index 603bdc4..b281bff 100644 --- a/sound/usb/line6/driver.h +++ b/sound/usb/line6/driver.h @@ -150,7 +150,7 @@ extern char *line6_alloc_sysex_buffer(struct usb_line6 *line6, int code1, extern int line6_read_data(struct usb_line6 *line6, u16 address, void *data, u8 datalen); extern int line6_read_serial_number(struct usb_line6 *line6,

• 		    int *serial_number);
  

• 		    u32 *serial_number);
  

extern int line6_send_raw_message_async(struct usb_line6 *line6, const char *buffer, int size); extern int line6_send_sysex_message(struct usb_line6 *line6, diff --git a/sound/usb/line6/pod.c b/sound/usb/line6/pod.c index c4246ad..425d22d 100644 --- a/sound/usb/line6/pod.c +++ b/sound/usb/line6/pod.c @@ -73,7 +73,7 @@ struct usb_line6_pod { int startup_progress;

/* Serial number of device */

• int serial_number;

• u32 serial_number;

  /* Firmware version (x 100) */ int firmware_version;

@@ -247,7 +247,7 @@ static ssize_t serial_number_show(struct device *dev, struct usb_interface *interface = to_usb_interface(dev); struct usb_line6_pod *pod = usb_get_intfdata(interface);

• return sprintf(buf, "%d\n", pod->serial_number);

• return sprintf(buf, "%u\n", pod->serial_number);

}

/* diff --git a/sound/usb/line6/toneport.c b/sound/usb/line6/toneport.c index 1a0a485..ddf7368 100644 --- a/sound/usb/line6/toneport.c +++ b/sound/usb/line6/toneport.c @@ -49,7 +49,7 @@ struct usb_line6_toneport { int source;

/* Serial number of device */

• int serial_number;

• u32 serial_number;

  /* Firmware version (x 100) */ int firmware_version;

-- 2.1.0

At Tue, 10 Feb 2015 23:03:17 -0600, Chris Rorvick wrote:

The firmware version is a single byte so have the variable type agree. Since the address to this member is passed to the read function, using an int is not even portable.

Signed-off-by: Chris Rorvick chris@rorvick.com

Applied, thanks.

Takashi

---

sound/usb/line6/toneport.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sound/usb/line6/toneport.c b/sound/usb/line6/toneport.c index ddf7368..6d4c50c 100644 --- a/sound/usb/line6/toneport.c +++ b/sound/usb/line6/toneport.c @@ -52,7 +52,7 @@ struct usb_line6_toneport { u32 serial_number;

/* Firmware version (x 100) */

• int firmware_version;

• u8 firmware_version;

  /* Timer for delayed PCM startup */ struct timer_list timer;

-- 2.1.0