* [PATCH] mmc: vub300: fix control-message timeouts
@ 2021-10-25 11:56 Johan Hovold
2021-10-26 15:40 ` Ulf Hansson
0 siblings, 1 reply; 2+ messages in thread
From: Johan Hovold @ 2021-10-25 11:56 UTC (permalink / raw)
To: Ulf Hansson; +Cc: linux-mmc, linux-usb, linux-kernel, Johan Hovold, stable
USB control-message timeouts are specified in milliseconds and should
specifically not vary with CONFIG_HZ.
Fixes: 88095e7b473a ("mmc: Add new VUB300 USB-to-SD/SDIO/MMC driver")
Cc: stable@vger.kernel.org # 3.0
Signed-off-by: Johan Hovold <johan@kernel.org>
---
drivers/mmc/host/vub300.c | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/drivers/mmc/host/vub300.c b/drivers/mmc/host/vub300.c
index 4950d10d3a19..97beece62fec 100644
--- a/drivers/mmc/host/vub300.c
+++ b/drivers/mmc/host/vub300.c
@@ -576,7 +576,7 @@ static void check_vub300_port_status(struct vub300_mmc_host *vub300)
GET_SYSTEM_PORT_STATUS,
USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
0x0000, 0x0000, &vub300->system_port_status,
- sizeof(vub300->system_port_status), HZ);
+ sizeof(vub300->system_port_status), 1000);
if (sizeof(vub300->system_port_status) == retval)
new_system_port_status(vub300);
}
@@ -1241,7 +1241,7 @@ static void __download_offload_pseudocode(struct vub300_mmc_host *vub300,
SET_INTERRUPT_PSEUDOCODE,
USB_DIR_OUT | USB_TYPE_VENDOR |
USB_RECIP_DEVICE, 0x0000, 0x0000,
- xfer_buffer, xfer_length, HZ);
+ xfer_buffer, xfer_length, 1000);
kfree(xfer_buffer);
if (retval < 0)
goto copy_error_message;
@@ -1284,7 +1284,7 @@ static void __download_offload_pseudocode(struct vub300_mmc_host *vub300,
SET_TRANSFER_PSEUDOCODE,
USB_DIR_OUT | USB_TYPE_VENDOR |
USB_RECIP_DEVICE, 0x0000, 0x0000,
- xfer_buffer, xfer_length, HZ);
+ xfer_buffer, xfer_length, 1000);
kfree(xfer_buffer);
if (retval < 0)
goto copy_error_message;
@@ -1991,7 +1991,7 @@ static void __set_clock_speed(struct vub300_mmc_host *vub300, u8 buf[8],
usb_control_msg(vub300->udev, usb_sndctrlpipe(vub300->udev, 0),
SET_CLOCK_SPEED,
USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
- 0x00, 0x00, buf, buf_array_size, HZ);
+ 0x00, 0x00, buf, buf_array_size, 1000);
if (retval != 8) {
dev_err(&vub300->udev->dev, "SET_CLOCK_SPEED"
" %dkHz failed with retval=%d\n", kHzClock, retval);
@@ -2013,14 +2013,14 @@ static void vub300_mmc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
usb_control_msg(vub300->udev, usb_sndctrlpipe(vub300->udev, 0),
SET_SD_POWER,
USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
- 0x0000, 0x0000, NULL, 0, HZ);
+ 0x0000, 0x0000, NULL, 0, 1000);
/* must wait for the VUB300 u-proc to boot up */
msleep(600);
} else if ((ios->power_mode == MMC_POWER_UP) && !vub300->card_powered) {
usb_control_msg(vub300->udev, usb_sndctrlpipe(vub300->udev, 0),
SET_SD_POWER,
USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
- 0x0001, 0x0000, NULL, 0, HZ);
+ 0x0001, 0x0000, NULL, 0, 1000);
msleep(600);
vub300->card_powered = 1;
} else if (ios->power_mode == MMC_POWER_ON) {
@@ -2275,14 +2275,14 @@ static int vub300_probe(struct usb_interface *interface,
GET_HC_INF0,
USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
0x0000, 0x0000, &vub300->hc_info,
- sizeof(vub300->hc_info), HZ);
+ sizeof(vub300->hc_info), 1000);
if (retval < 0)
goto error5;
retval =
usb_control_msg(vub300->udev, usb_sndctrlpipe(vub300->udev, 0),
SET_ROM_WAIT_STATES,
USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
- firmware_rom_wait_states, 0x0000, NULL, 0, HZ);
+ firmware_rom_wait_states, 0x0000, NULL, 0, 1000);
if (retval < 0)
goto error5;
dev_info(&vub300->udev->dev,
@@ -2297,7 +2297,7 @@ static int vub300_probe(struct usb_interface *interface,
GET_SYSTEM_PORT_STATUS,
USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
0x0000, 0x0000, &vub300->system_port_status,
- sizeof(vub300->system_port_status), HZ);
+ sizeof(vub300->system_port_status), 1000);
if (retval < 0) {
goto error4;
} else if (sizeof(vub300->system_port_status) == retval) {
--
2.32.0
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH] mmc: vub300: fix control-message timeouts
2021-10-25 11:56 [PATCH] mmc: vub300: fix control-message timeouts Johan Hovold
@ 2021-10-26 15:40 ` Ulf Hansson
0 siblings, 0 replies; 2+ messages in thread
From: Ulf Hansson @ 2021-10-26 15:40 UTC (permalink / raw)
To: Johan Hovold; +Cc: linux-mmc, linux-usb, linux-kernel, stable
On Mon, 25 Oct 2021 at 13:56, Johan Hovold <johan@kernel.org> wrote:
>
> USB control-message timeouts are specified in milliseconds and should
> specifically not vary with CONFIG_HZ.
>
> Fixes: 88095e7b473a ("mmc: Add new VUB300 USB-to-SD/SDIO/MMC driver")
> Cc: stable@vger.kernel.org # 3.0
> Signed-off-by: Johan Hovold <johan@kernel.org>
Applied for fixes, thanks!
Kind regards
Uffe
> ---
> drivers/mmc/host/vub300.c | 18 +++++++++---------
> 1 file changed, 9 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/mmc/host/vub300.c b/drivers/mmc/host/vub300.c
> index 4950d10d3a19..97beece62fec 100644
> --- a/drivers/mmc/host/vub300.c
> +++ b/drivers/mmc/host/vub300.c
> @@ -576,7 +576,7 @@ static void check_vub300_port_status(struct vub300_mmc_host *vub300)
> GET_SYSTEM_PORT_STATUS,
> USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
> 0x0000, 0x0000, &vub300->system_port_status,
> - sizeof(vub300->system_port_status), HZ);
> + sizeof(vub300->system_port_status), 1000);
> if (sizeof(vub300->system_port_status) == retval)
> new_system_port_status(vub300);
> }
> @@ -1241,7 +1241,7 @@ static void __download_offload_pseudocode(struct vub300_mmc_host *vub300,
> SET_INTERRUPT_PSEUDOCODE,
> USB_DIR_OUT | USB_TYPE_VENDOR |
> USB_RECIP_DEVICE, 0x0000, 0x0000,
> - xfer_buffer, xfer_length, HZ);
> + xfer_buffer, xfer_length, 1000);
> kfree(xfer_buffer);
> if (retval < 0)
> goto copy_error_message;
> @@ -1284,7 +1284,7 @@ static void __download_offload_pseudocode(struct vub300_mmc_host *vub300,
> SET_TRANSFER_PSEUDOCODE,
> USB_DIR_OUT | USB_TYPE_VENDOR |
> USB_RECIP_DEVICE, 0x0000, 0x0000,
> - xfer_buffer, xfer_length, HZ);
> + xfer_buffer, xfer_length, 1000);
> kfree(xfer_buffer);
> if (retval < 0)
> goto copy_error_message;
> @@ -1991,7 +1991,7 @@ static void __set_clock_speed(struct vub300_mmc_host *vub300, u8 buf[8],
> usb_control_msg(vub300->udev, usb_sndctrlpipe(vub300->udev, 0),
> SET_CLOCK_SPEED,
> USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
> - 0x00, 0x00, buf, buf_array_size, HZ);
> + 0x00, 0x00, buf, buf_array_size, 1000);
> if (retval != 8) {
> dev_err(&vub300->udev->dev, "SET_CLOCK_SPEED"
> " %dkHz failed with retval=%d\n", kHzClock, retval);
> @@ -2013,14 +2013,14 @@ static void vub300_mmc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
> usb_control_msg(vub300->udev, usb_sndctrlpipe(vub300->udev, 0),
> SET_SD_POWER,
> USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
> - 0x0000, 0x0000, NULL, 0, HZ);
> + 0x0000, 0x0000, NULL, 0, 1000);
> /* must wait for the VUB300 u-proc to boot up */
> msleep(600);
> } else if ((ios->power_mode == MMC_POWER_UP) && !vub300->card_powered) {
> usb_control_msg(vub300->udev, usb_sndctrlpipe(vub300->udev, 0),
> SET_SD_POWER,
> USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
> - 0x0001, 0x0000, NULL, 0, HZ);
> + 0x0001, 0x0000, NULL, 0, 1000);
> msleep(600);
> vub300->card_powered = 1;
> } else if (ios->power_mode == MMC_POWER_ON) {
> @@ -2275,14 +2275,14 @@ static int vub300_probe(struct usb_interface *interface,
> GET_HC_INF0,
> USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
> 0x0000, 0x0000, &vub300->hc_info,
> - sizeof(vub300->hc_info), HZ);
> + sizeof(vub300->hc_info), 1000);
> if (retval < 0)
> goto error5;
> retval =
> usb_control_msg(vub300->udev, usb_sndctrlpipe(vub300->udev, 0),
> SET_ROM_WAIT_STATES,
> USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
> - firmware_rom_wait_states, 0x0000, NULL, 0, HZ);
> + firmware_rom_wait_states, 0x0000, NULL, 0, 1000);
> if (retval < 0)
> goto error5;
> dev_info(&vub300->udev->dev,
> @@ -2297,7 +2297,7 @@ static int vub300_probe(struct usb_interface *interface,
> GET_SYSTEM_PORT_STATUS,
> USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
> 0x0000, 0x0000, &vub300->system_port_status,
> - sizeof(vub300->system_port_status), HZ);
> + sizeof(vub300->system_port_status), 1000);
> if (retval < 0) {
> goto error4;
> } else if (sizeof(vub300->system_port_status) == retval) {
> --
> 2.32.0
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-10-26 15:41 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-10-25 11:56 [PATCH] mmc: vub300: fix control-message timeouts Johan Hovold
2021-10-26 15:40 ` Ulf Hansson
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).