From patchwork Thu Mar 12 03:44:31 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Ji-Ze Hong (Peter Hong)" X-Patchwork-Id: 11433133 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 2758E161F for ; Thu, 12 Mar 2020 03:45:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E12A0206E2 for ; Thu, 12 Mar 2020 03:45:04 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="V63Y0iDP" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730968AbgCLDog (ORCPT ); Wed, 11 Mar 2020 23:44:36 -0400 Received: from mail-pf1-f195.google.com ([209.85.210.195]:34324 "EHLO mail-pf1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730913AbgCLDog (ORCPT ); Wed, 11 Mar 2020 23:44:36 -0400 Received: by mail-pf1-f195.google.com with SMTP id 23so2548872pfj.1; Wed, 11 Mar 2020 20:44:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=jMMct7tUQQWB8iUDuySP+3o6O1tWY9PIS8i1SeODJAg=; b=V63Y0iDPIUuhxDu2kj7HSi2AhBjQEIJYK3cNSLz9+QG+GPxRqw+Ec3NhPJ2FXbZRdN YJfckL1sWGPPKv2IpSn2c0UJEAj0U9ergd/K6cC4xGuo/QZyKaWK9/xW7Vsh8quYAj0j Lr6AYEPZPmLpWAVE1Ui/a/VafKf13M0F2RVxkRO7QWoUFxl9t8KFyheFmZjZoVB5FcHI uJxORWMhS+485Q1S4P7x33eQELx06bpt7pMUSiYQ2fcTnpxY8FwRJZVDL4HrBeSwgeHZ FWYw5xaNBbrU6/xDiBigXA2uLO1jzM0cWWA2Uhf/AQ7XjFjFMX1Wk59IvDM6bKXxqB8g yzrw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=jMMct7tUQQWB8iUDuySP+3o6O1tWY9PIS8i1SeODJAg=; b=MKASWYcPsEwiETy3ST3B/vTRpIFWDBoXaf037pTAuFSUTtHClm+NGT9TzDGOcDVhC5 26YqvSbIKovn5SqT1y7I0T8vat2QChRJqq9y2NW5PAi7/MUSEkWQeEP4t/rUwDCpOrEz p77rb9PDrU9k/YBwOZ8ePbeMVx5sRzABWKSoCpiq5SJPv4E+/xKViljfOf+bdtTTWhPs HDtstfiO0ywCx6YFeSV8U+HK/DQEup9Bnx6sX3Jyy96S6gGdqMlyHO0qBtPGPOG5PZtC kyu3e97aHsRN90L3LiZSBETJYl4B59DJVQgHmYzwe5ye7+0qrhUak+U6rVNCvFdvuOXO Ii7A== X-Gm-Message-State: ANhLgQ2pLsdVTJQzmlKb97Yu3ZCknPC+w/t1YJA6abCo/FHIjZ5lQ3Kq khmCAFYizGpOmvXTAFtUD0o= X-Google-Smtp-Source: ADFU+vv8C897PHCCLEufGT0SKCYRZQYtq4OUevbhoS5N21RKNZ+n88unDek0VnrJS9kEz4eLYFIxew== X-Received: by 2002:a62:cdcc:: with SMTP id o195mr3973409pfg.323.1583984675471; Wed, 11 Mar 2020 20:44:35 -0700 (PDT) Received: from localhost (59-120-186-245.HINET-IP.hinet.net. [59.120.186.245]) by smtp.gmail.com with ESMTPSA id d23sm2112738pfq.210.2020.03.11.20.44.34 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 11 Mar 2020 20:44:34 -0700 (PDT) From: "Ji-Ze Hong (Peter Hong)" X-Google-Original-From: "Ji-Ze Hong (Peter Hong)" To: johan@kernel.org Cc: gregkh@linuxfoundation.org, linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, peter_hong@fintek.com.tw, "Ji-Ze Hong (Peter Hong)" Subject: [PATCH V5 1/1] USB: serial: f81232: Add generator for F81534A Date: Thu, 12 Mar 2020 11:44:31 +0800 Message-Id: <20200312034431.21407-1-hpeter+linux_kernel@gmail.com> X-Mailer: git-send-email 2.17.1 Sender: linux-usb-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org The Fintek F81534A series is contains 1 HUB / 1 GPIO device / n UARTs, but the UART is default disable and need enabled by GPIO device(2c42/16F8). When F81534A plug to host, we can only see 1 HUB & 1 GPIO device and we write 0x8fff to GPIO device register F81534A_CTRL_CMD_ENABLE_PORT(116h) to enable all available serial ports. Signed-off-by: Ji-Ze Hong (Peter Hong) --- Changelog: v5: 1. Fix error handling in f81534a_ctrl_set_register(). 2. Change some output message from dev->dev to intf->dev. v4: 1. Remove unused define. 2. Remove usb_translate_errors() in f81534a_ctrl_set_register() with short transfer. 3. Replace dev_warn() with dev_err() in f81534a_ctrl_enable_all_ports() 4. Disable & remove all usb serial port device when disconnect(). v3: 1. Modify some define with prefix F81534A_CTRL_. 2. Use kmemdup() in f81534a_ctrl_set_register(). 3. Not accpet with short transfers in f81534a_ctrl_set_register(). 4. Add comment in f81534a_ctrl_enable_all_ports() to describe magic constants. 5. Remove non-need usb_get_dev()/usb_put_dev(). 6. Add F81534A_CTRL_ID in MODULE_DEVICE_TABLE(). v2: 1: Simplify the generator behavior. 2: Change multiply MODULE_DEVICE_TABLE() to 1 only. drivers/usb/serial/f81232.c | 135 +++++++++++++++++++++++++++++++++++- 1 file changed, 134 insertions(+), 1 deletion(-) diff --git a/drivers/usb/serial/f81232.c b/drivers/usb/serial/f81232.c index d27876e64e9d..e2a7b65218bb 100644 --- a/drivers/usb/serial/f81232.c +++ b/drivers/usb/serial/f81232.c @@ -36,6 +36,9 @@ { USB_DEVICE(0x2c42, 0x1635) }, /* 8 port UART device */ \ { USB_DEVICE(0x2c42, 0x1636) } /* 12 port UART device */ +#define F81534A_CTRL_ID \ + { USB_DEVICE(0x2c42, 0x16f8) } /* Global control device */ + static const struct usb_device_id f81232_id_table[] = { F81232_ID, { } /* Terminating entry */ @@ -46,9 +49,15 @@ static const struct usb_device_id f81534a_id_table[] = { { } /* Terminating entry */ }; +static const struct usb_device_id f81534a_ctrl_id_table[] = { + F81534A_CTRL_ID, + { } /* Terminating entry */ +}; + static const struct usb_device_id combined_id_table[] = { F81232_ID, F81534A_SERIES_ID, + F81534A_CTRL_ID, { } /* Terminating entry */ }; MODULE_DEVICE_TABLE(usb, combined_id_table); @@ -61,6 +70,7 @@ MODULE_DEVICE_TABLE(usb, combined_id_table); #define F81232_REGISTER_REQUEST 0xa0 #define F81232_GET_REGISTER 0xc0 #define F81232_SET_REGISTER 0x40 +#define F81534A_ACCESS_REG_RETRY 2 #define SERIAL_BASE_ADDRESS 0x0120 #define RECEIVE_BUFFER_REGISTER (0x00 + SERIAL_BASE_ADDRESS) @@ -101,6 +111,8 @@ MODULE_DEVICE_TABLE(usb, combined_id_table); #define F81534A_GPIO_MODE1_OUTPUT BIT(1) #define F81534A_GPIO_MODE0_OUTPUT BIT(0) +#define F81534A_CTRL_CMD_ENABLE_PORT 0x116 + struct f81232_private { struct mutex lock; u8 modem_control; @@ -848,6 +860,93 @@ static void f81232_lsr_worker(struct work_struct *work) dev_warn(&port->dev, "read LSR failed: %d\n", status); } +static int f81534a_ctrl_set_register(struct usb_interface *intf, u16 reg, + u16 size, void *val) +{ + struct usb_device *dev = interface_to_usbdev(intf); + int retry = F81534A_ACCESS_REG_RETRY; + int status; + u8 *tmp; + + tmp = kmemdup(val, size, GFP_KERNEL); + if (!tmp) + return -ENOMEM; + + while (retry--) { + status = usb_control_msg(dev, + usb_sndctrlpipe(dev, 0), + F81232_REGISTER_REQUEST, + F81232_SET_REGISTER, + reg, + 0, + tmp, + size, + USB_CTRL_SET_TIMEOUT); + if (status < 0) { + status = usb_translate_errors(status); + if (status == -EIO) + continue; + } else if (status != size) { + /* Retry on short transfers */ + status = -EIO; + continue; + } else { + status = 0; + } + + break; + } + + if (status) { + dev_err(&intf->dev, "set ctrl reg: %x, failed status: %d\n", + reg, status); + } + + kfree(tmp); + return status; +} + +static int f81534a_ctrl_enable_all_ports(struct usb_interface *intf, bool en) +{ + unsigned char enable[2] = {0}; + int status; + + /* + * Enable all available serial ports, define as following: + * bit 15 : Reset behavior (when HUB got soft reset) + * 0: maintain all serial port enabled state. + * 1: disable all serial port. + * bit 0~11 : Serial port enable bit. + */ + if (en) { + enable[0] = 0xff; + enable[1] = 0x8f; + } + + status = f81534a_ctrl_set_register(intf, F81534A_CTRL_CMD_ENABLE_PORT, + sizeof(enable), enable); + if (status) + dev_err(&intf->dev, "failed to enable ports: %d\n", status); + + return status; +} + +static int f81534a_ctrl_probe(struct usb_interface *intf, + const struct usb_device_id *id) +{ + return f81534a_ctrl_enable_all_ports(intf, true); +} + +static void f81534a_ctrl_disconnect(struct usb_interface *intf) +{ + f81534a_ctrl_enable_all_ports(intf, false); +} + +static int f81534a_ctrl_resume(struct usb_interface *intf) +{ + return f81534a_ctrl_enable_all_ports(intf, true); +} + static int f81232_port_probe(struct usb_serial_port *port) { struct f81232_private *priv; @@ -975,7 +1074,41 @@ static struct usb_serial_driver * const serial_drivers[] = { NULL, }; -module_usb_serial_driver(serial_drivers, combined_id_table); +static struct usb_driver f81534a_ctrl_driver = { + .name = "f81534a_ctrl", + .id_table = f81534a_ctrl_id_table, + .probe = f81534a_ctrl_probe, + .disconnect = f81534a_ctrl_disconnect, + .resume = f81534a_ctrl_resume, +}; + +static int __init f81232_init(void) +{ + int status; + + status = usb_register_driver(&f81534a_ctrl_driver, THIS_MODULE, + KBUILD_MODNAME); + if (status) + return status; + + status = usb_serial_register_drivers(serial_drivers, KBUILD_MODNAME, + combined_id_table); + if (status) { + usb_deregister(&f81534a_ctrl_driver); + return status; + } + + return 0; +} + +static void __exit f81232_exit(void) +{ + usb_serial_deregister_drivers(serial_drivers); + usb_deregister(&f81534a_ctrl_driver); +} + +module_init(f81232_init); +module_exit(f81232_exit); MODULE_DESCRIPTION("Fintek F81232/532A/534A/535/536 USB to serial driver"); MODULE_AUTHOR("Greg Kroah-Hartman ");