From: Johan Hovold <johan@kernel.org>
To: Oliver Neukum <oneukum@suse.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
linux-usb@vger.kernel.org,
Daniel Caujolle-Bert <f1rmb.daniel@gmail.com>,
Johan Hovold <johan@kernel.org>
Subject: [PATCH v2 4/4] USB: cdc-acm: clean up no-union-descriptor handling
Date: Mon, 21 Sep 2020 15:59:51 +0200 [thread overview]
Message-ID: <20200921135951.24045-5-johan@kernel.org> (raw)
In-Reply-To: <20200921135951.24045-1-johan@kernel.org>
For interfaces that lack a union descriptor, probe for a
"combined-interface" before falling back to the call-management
descriptor instead of the other way round.
This allows for the removal of the NO_DATA_INTERFACE quirk and makes the
probe algorithm somewhat easier to follow.
Signed-off-by: Johan Hovold <johan@kernel.org>
---
drivers/usb/class/cdc-acm.c | 32 ++++++++++----------------------
drivers/usb/class/cdc-acm.h | 11 +++++------
2 files changed, 15 insertions(+), 28 deletions(-)
diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c
index a361b937684a..357e896a4fc0 100644
--- a/drivers/usb/class/cdc-acm.c
+++ b/drivers/usb/class/cdc-acm.c
@@ -1218,26 +1218,19 @@ static int acm_probe(struct usb_interface *intf,
call_intf_num = cmgmd->bDataInterface;
if (!union_header) {
- if (call_intf_num > 0) {
+ if (intf->cur_altsetting->desc.bNumEndpoints == 3) {
+ dev_dbg(&intf->dev, "No union descriptor, assuming single interface\n");
+ combined_interfaces = 1;
+ control_interface = data_interface = intf;
+ goto look_for_collapsed_interface;
+ } else if (call_intf_num > 0) {
dev_dbg(&intf->dev, "No union descriptor, using call management descriptor\n");
- /* quirks for Droids MuIn LCD */
- if (quirks & NO_DATA_INTERFACE) {
- data_interface = usb_ifnum_to_if(usb_dev, 0);
- } else {
- data_intf_num = call_intf_num;
- data_interface = usb_ifnum_to_if(usb_dev, data_intf_num);
- }
+ data_intf_num = call_intf_num;
+ data_interface = usb_ifnum_to_if(usb_dev, data_intf_num);
control_interface = intf;
} else {
- if (intf->cur_altsetting->desc.bNumEndpoints != 3) {
- dev_dbg(&intf->dev,"No union descriptor, giving up\n");
- return -ENODEV;
- } else {
- dev_warn(&intf->dev,"No union descriptor, testing for castrated device\n");
- combined_interfaces = 1;
- control_interface = data_interface = intf;
- goto look_for_collapsed_interface;
- }
+ dev_dbg(&intf->dev, "No union descriptor, giving up\n");
+ return -ENODEV;
}
} else {
int class = -1;
@@ -1881,11 +1874,6 @@ static const struct usb_device_id acm_ids[] = {
/* NOTE: non-Nokia COMM/ACM/0xff is likely MSFT RNDIS... NOT a modem! */
- /* Support for Droids MuIn LCD */
- { USB_DEVICE(0x04d8, 0x000b),
- .driver_info = NO_DATA_INTERFACE,
- },
-
#if IS_ENABLED(CONFIG_INPUT_IMS_PCU)
{ USB_DEVICE(0x04d8, 0x0082), /* Application mode */
.driver_info = IGNORE_DEVICE,
diff --git a/drivers/usb/class/cdc-acm.h b/drivers/usb/class/cdc-acm.h
index b7174a0098a5..b2135095898f 100644
--- a/drivers/usb/class/cdc-acm.h
+++ b/drivers/usb/class/cdc-acm.h
@@ -135,9 +135,8 @@ struct acm {
#define NO_UNION_NORMAL BIT(0)
#define SINGLE_RX_URB BIT(1)
#define NO_CAP_LINE BIT(2)
-#define NO_DATA_INTERFACE BIT(4)
-#define IGNORE_DEVICE BIT(5)
-#define QUIRK_CONTROL_LINE_STATE BIT(6)
-#define CLEAR_HALT_CONDITIONS BIT(7)
-#define SEND_ZERO_PACKET BIT(8)
-#define DISABLE_ECHO BIT(9)
+#define IGNORE_DEVICE BIT(3)
+#define QUIRK_CONTROL_LINE_STATE BIT(4)
+#define CLEAR_HALT_CONDITIONS BIT(5)
+#define SEND_ZERO_PACKET BIT(6)
+#define DISABLE_ECHO BIT(7)
--
2.26.2
next prev parent reply other threads:[~2020-09-21 14:00 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-21 13:59 [PATCH v2 0/4] USB: cdc-acm: handle broken union descriptors Johan Hovold
2020-09-21 13:59 ` [PATCH v2 1/4] Revert "cdc-acm: hardening against malicious devices" Johan Hovold
2020-09-21 13:59 ` [PATCH v2 2/4] USB: cdc-acm: handle broken union descriptors Johan Hovold
2020-09-22 9:53 ` <Daniel Caujolle-Bert>
2020-09-21 13:59 ` [PATCH v2 3/4] USB: cdc-acm: use common data-class define Johan Hovold
2020-09-21 13:59 ` Johan Hovold [this message]
2020-09-21 14:16 ` [PATCH v2 4/4] USB: cdc-acm: clean up no-union-descriptor handling Oliver Neukum
2020-09-21 14:28 ` Johan Hovold
2020-09-21 15:04 ` Oliver Neukum
2020-09-21 15:16 ` Johan Hovold
2020-09-21 17:17 ` Oliver Neukum
2020-09-22 7:05 ` Johan Hovold
2020-09-22 10:40 ` Oliver Neukum
2020-09-22 10:54 ` Johan Hovold
2020-09-22 11:41 ` Oliver Neukum
2020-09-22 11:47 ` Johan Hovold
2020-09-21 14:21 ` [PATCH v2 0/4] USB: cdc-acm: handle broken union descriptors <Daniel Caujolle-Bert>
2020-09-21 16:19 ` <Daniel Caujolle-Bert>
2020-09-22 7:08 ` Johan Hovold
2020-09-22 9:56 ` <Daniel Caujolle-Bert>
2020-09-22 10:07 ` Johan Hovold
2020-09-22 12:10 ` Oliver Neukum
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=20200921135951.24045-5-johan@kernel.org \
--to=johan@kernel.org \
--cc=f1rmb.daniel@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-usb@vger.kernel.org \
--cc=oneukum@suse.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).