Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cbad9668 authored by Chris Brandt's avatar Chris Brandt Committed by Greg Kroah-Hartman
Browse files

usb: cdc-acm: Add DISABLE_ECHO for Renesas USB Download mode 



commit 6d853c9e4104b4fc8d55dc9cd3b99712aa347174 upstream.

Renesas R-Car and RZ/G SoCs have a firmware download mode over USB.
However, on reset a banner string is transmitted out which is not expected
to be echoed back and will corrupt the protocol.

Cc: stable <stable@vger.kernel.org>
Acked-by: default avatarOliver Neukum <oneukum@suse.com>
Signed-off-by: default avatarChris Brandt <chris.brandt@renesas.com>
Link: https://lore.kernel.org/r/20201111131209.3977903-1-chris.brandt@renesas.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f988e9c8

drivers/usb/class/cdc-acm.c

+9 −0
Original line number Diff line number Diff line
@@ -1706,6 +1706,15 @@ static const struct usb_device_id acm_ids[] = { 
	{ USB_DEVICE(0x0870, 0x0001), /* Metricom GS Modem */

	.driver_info = NO_UNION_NORMAL, /* has no union descriptor */

	},

	{ USB_DEVICE(0x045b, 0x023c),	/* Renesas USB Download mode */

	.driver_info = DISABLE_ECHO,	/* Don't echo banner */

	},

	{ USB_DEVICE(0x045b, 0x0248),	/* Renesas USB Download mode */

	.driver_info = DISABLE_ECHO,	/* Don't echo banner */

	},

	{ USB_DEVICE(0x045b, 0x024D),	/* Renesas USB Download mode */

	.driver_info = DISABLE_ECHO,	/* Don't echo banner */

	},

	{ USB_DEVICE(0x0e8d, 0x0003), /* FIREFLY, MediaTek Inc; andrey.arapov@gmail.com */

	.driver_info = NO_UNION_NORMAL, /* has no union descriptor */

	},