From patchwork Thu Jun 14 20:08:46 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Loic Poulain X-Patchwork-Id: 138633 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp2556964lji; Thu, 14 Jun 2018 13:08:52 -0700 (PDT) X-Google-Smtp-Source: ADUXVKJbJ+/h3kkHKTCUpy/U14xfyS4kg54EZ9qgwEfSj/47xQVtwVMtnQAErlbrG8CC5JH4jLKw X-Received: by 2002:a63:6ec1:: with SMTP id j184-v6mr3549381pgc.332.1529006932270; Thu, 14 Jun 2018 13:08:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529006932; cv=none; d=google.com; s=arc-20160816; b=ZX/o/12P1RtUq8eJgbC0WQZcTXXn8ZFii7xVdXwOaX44NkfqXUJYHZk2r9U6durqnM 7FngogWhKpqeBUEnxj6Obli+GD1K+h2qg5HYm4hPjD4JMQ9UPdHcmulCpJBu2+MdPTPh 5I+dYkBgFrU88sBCG4G4nC/ds6M36gFAhzaDxlRWhAmfB/0jNaRloJOfVBvFH23Dt2Gh wKLG2cEWVLJ58zMx0/PsfBVB/xDHnJTWoG+vDBcEMfRWrLelUu5lAs05LkDNaJSWqQ8R nLrwbs4R8QCXW0w6Rurl2XqEAyOqxzN2jC/PT7bySYuZwkZ478uWKvRkd98IBkgm5k6n 08HQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature:arc-authentication-results; bh=zhQ8IxmXCGAVoMLMSYG2MxpM/kBRzNpm9RpAY19Y8ZY=; b=xy+TKY0eO0L6oPI3hBdt4NIlT1hhlElNOVkoaLmvcuOMZuLSjACMNk3qWFjNlL3ztB 3wWepE8Mg83V5Xwn0v4vflWudU6+tMFKn/CJnkMuMW7WBfrjNc/vt397MOmcy/VHJHs3 +WmdBjEhVcti1ijMOPnjLptjbopYLQPmlqXi2MT3AJOicPqiCMilTukYhQBtFpgphUKv XhznF4rLt+Wl9R4GznkHMLYJPhMpAlxSdOkDGVkBGCYOWEiJaOWf3QD+RabS8Fv+Ijsa HI2s+oHXH4GKE5tGLTiuggqa2u3vVvomT9O9hr858wsZmjyEn34VoHsfDxx0ZeBajmXc GEvQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=LPoWVjsr; spf=pass (google.com: best guess record for domain of linux-usb-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-usb-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id k187-v6si5108180pge.421.2018.06.14.13.08.52; Thu, 14 Jun 2018 13:08:52 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-usb-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=LPoWVjsr; spf=pass (google.com: best guess record for domain of linux-usb-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-usb-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755343AbeFNUIu (ORCPT + 4 others); Thu, 14 Jun 2018 16:08:50 -0400 Received: from mail-wr0-f196.google.com ([209.85.128.196]:46939 "EHLO mail-wr0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755265AbeFNUIt (ORCPT ); Thu, 14 Jun 2018 16:08:49 -0400 Received: by mail-wr0-f196.google.com with SMTP id v13-v6so7671188wrp.13 for ; Thu, 14 Jun 2018 13:08:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=uFwr+xH9Cf/PHCbuJz0B6wjWlhkHkCcCm+uIUeCMTDE=; b=LPoWVjsrxg0aupe0kz2zu2CQbefFUQdk4W2IH5wiDnh2fkgprSXGP1QP3etgPlIa/A oSMJ667RqM6denZkZFVgIaLhda/W0iKfsVGKdwY6jRwEcESdL0w6HuAaNwefDIVu342X 4SAnTFKjNeTDebnC9RwYc9OcryqYfZYEl+imY= 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=uFwr+xH9Cf/PHCbuJz0B6wjWlhkHkCcCm+uIUeCMTDE=; b=Ar4tMRtiEfq25/0eH/g5JSQODZZY7esb5kLuICZigHvV7vgzg89ZCVbaZIlclqVm7K A3u4ZAn4e88FAe7blww5lszPJPs0HDv1xCUZ6hjQrDI8hejycl4CDoXhOdqVN2IlNe5v dQ1DYanzZlRACeTAlp3V+3QIYbsYP1LEy4vQr4EKKx13eGQrNRW8e6/L4Qm8ZyFRy0HX 47CiwRpivwJQi6OfJzw8Llaama9mlyetHazc3SVzK4eJZFpjy2W75u4guYPx1T06SZxz IKETDHhD+SGA7b1jKSqcvjvScIoi8WuQnGdUF4sHDQFF45nZBdslrwAZO/nffrVNbWTy dRwg== X-Gm-Message-State: APt69E1EAy6yZQ0VE85YP759+SNTA/30hLtsntz3QnAEmHRRjq3drawg /k4IbWQb0gDC2o5sqSRJXRfoKQ== X-Received: by 2002:adf:f112:: with SMTP id r18-v6mr3480830wro.134.1529006928558; Thu, 14 Jun 2018 13:08:48 -0700 (PDT) Received: from lpoulain-ThinkPad-T470p.home (LFbn-1-2080-109.w90-76.abo.wanadoo.fr. [90.76.145.109]) by smtp.gmail.com with ESMTPSA id h193-v6sm7638864wmd.25.2018.06.14.13.08.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 14 Jun 2018 13:08:47 -0700 (PDT) From: Loic Poulain To: johan@kernel.org Cc: linux-usb@vger.kernel.org, srinivas.kandagatla@linaro.org, daniel.thompson@linaro.org, Loic Poulain Subject: [PATCH] USB: serial: ftdi_sio: Add MTP NVM support Date: Thu, 14 Jun 2018 22:08:46 +0200 Message-Id: <1529006926-11401-1-git-send-email-loic.poulain@linaro.org> X-Mailer: git-send-email 2.7.4 Sender: linux-usb-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org Most of FTDI's devices have an EEPROM which records FTDI devices configuration setting (e.g. the VID, PID, I/O config...) and user data. FT230R chip integrates a 128-byte eeprom, FT230X a 2048-byte eeprom... This patch adds support for FTDI EEPROM read/write via USB control transfers and register a new nvm device to the nvmem core. This permits to expose the eeprom as a sysfs file, allowing userspace to read/modify FTDI configuration and its user data without having to rely on a specific userspace USB driver. Moreover, any upcoming new tentative to add CBUS GPIO support could integrate CBUS EEPROM configuration reading in order to determine which of the CBUS pins are available as GPIO. Signed-off-by: Loic Poulain --- drivers/usb/serial/Kconfig | 11 +++++ drivers/usb/serial/ftdi_sio.c | 108 ++++++++++++++++++++++++++++++++++++++++++ drivers/usb/serial/ftdi_sio.h | 28 +++++++++++ 3 files changed, 147 insertions(+) -- 2.7.4 -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/usb/serial/Kconfig b/drivers/usb/serial/Kconfig index 533f127..2dd2f5d 100644 --- a/drivers/usb/serial/Kconfig +++ b/drivers/usb/serial/Kconfig @@ -181,6 +181,17 @@ config USB_SERIAL_FTDI_SIO To compile this driver as a module, choose M here: the module will be called ftdi_sio. +config USB_SERIAL_FTDI_SIO_NVMEM + bool "FTDI MTP non-volatile memory support" + depends on USB_SERIAL_FTDI_SIO + select NVMEM + default y + help + Say yes here to add support for the MTP non-volatile memory + present on FTDI. Most of FTDI's devices have an EEPROM which + records FTDI device's configuration setting as well as user + data. + config USB_SERIAL_VISOR tristate "USB Handspring Visor / Palm m50x / Sony Clie Driver" help diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c index 7ea221d..03c9c75 100644 --- a/drivers/usb/serial/ftdi_sio.c +++ b/drivers/usb/serial/ftdi_sio.c @@ -40,6 +40,7 @@ #include #include #include +#include #include "ftdi_sio.h" #include "ftdi_sio_ids.h" @@ -73,6 +74,8 @@ struct ftdi_private { unsigned int latency; /* latency setting in use */ unsigned short max_packet_size; struct mutex cfg_lock; /* Avoid mess by parallel calls of config ioctl() and change_speed() */ + + struct nvmem_device *eeprom; }; /* struct ftdi_sio_quirk is used by devices requiring special attention. */ @@ -1529,6 +1532,104 @@ static int get_lsr_info(struct usb_serial_port *port, return 0; } +#if IS_ENABLED(CONFIG_USB_SERIAL_FTDI_SIO_NVMEM) + +static int write_eeprom(void *priv, unsigned int off, void *_val, size_t bytes) +{ + struct usb_serial_port *port = priv; + struct usb_serial *serial = port->serial; + struct usb_device *udev = serial->dev; + unsigned char *buf = _val; + + while (bytes) { + uint16_t val; + int rv; + + val = buf[0] + (buf[1] << 8); + + rv = usb_control_msg(udev, usb_sndctrlpipe(udev, 0), + FTDI_SIO_WRITE_EEPROM_REQUEST, + FTDI_SIO_WRITE_EEPROM_REQUEST_TYPE, + val, off / 2, NULL, 0, WDR_TIMEOUT); + if (rv < 0) + return rv; + + off += 2; + buf += 2; + bytes -= 2; + } + + return 0; +} + +static int read_eeprom(void *priv, unsigned int off, void *val, size_t bytes) +{ + struct usb_serial_port *port = priv; + struct usb_serial *serial = port->serial; + struct usb_device *udev = serial->dev; + unsigned char *buf = val; + + while (bytes) { + int rv; + + rv = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0), + FTDI_SIO_READ_EEPROM_REQUEST, + FTDI_SIO_READ_EEPROM_REQUEST_TYPE, + 0, off / 2, buf, 2, WDR_TIMEOUT); + if (rv < 0) + return rv; + + off += 2; + buf += 2; + bytes -= 2; + } + + return 0; +} + +static int register_eeprom(struct usb_serial_port *port) +{ + struct ftdi_private *priv = usb_get_serial_port_data(port); + struct nvmem_config nvmconf = {}; + + switch (priv->chip_type) { + case FTX: + nvmconf.size = 2048; + break; + case FT232RL: + nvmconf.size = 128; + break; + default: + return 0; + } + + nvmconf.word_size = 2; + nvmconf.stride = 2; + nvmconf.read_only = false; + nvmconf.priv = port; + nvmconf.dev = &port->dev; + nvmconf.reg_read = read_eeprom; + nvmconf.reg_write = write_eeprom; + nvmconf.owner = THIS_MODULE; + + priv->eeprom = nvmem_register(&nvmconf); + if (IS_ERR(priv->eeprom)) { + priv->eeprom = NULL; + return -ENOMEM; + } + + return 0; +} + +static void unregister_eeprom(struct usb_serial_port *port) +{ + struct ftdi_private *priv = usb_get_serial_port_data(port); + + if (priv->eeprom) + nvmem_unregister(priv->eeprom); +} + +#endif /* CONFIG_USB_SERIAL_FTDI_SIO_NVMEM */ /* Determine type of FTDI chip based on USB config and descriptor. */ static void ftdi_determine_type(struct usb_serial_port *port) @@ -1814,6 +1915,10 @@ static int ftdi_sio_port_probe(struct usb_serial_port *port) priv->latency = 16; write_latency_timer(port); create_sysfs_attrs(port); +#if IS_ENABLED(CONFIG_USB_SERIAL_FTDI_SIO_NVMEM) + register_eeprom(port); +#endif + return 0; } @@ -1931,6 +2036,9 @@ static int ftdi_sio_port_remove(struct usb_serial_port *port) { struct ftdi_private *priv = usb_get_serial_port_data(port); +#if IS_ENABLED(CONFIG_USB_SERIAL_FTDI_SIO_NVMEM) + unregister_eeprom(port); +#endif remove_sysfs_attrs(port); kfree(priv); diff --git a/drivers/usb/serial/ftdi_sio.h b/drivers/usb/serial/ftdi_sio.h index dcd0b6e..9eab961 100644 --- a/drivers/usb/serial/ftdi_sio.h +++ b/drivers/usb/serial/ftdi_sio.h @@ -36,6 +36,8 @@ #define FTDI_SIO_SET_ERROR_CHAR 7 /* Set the error character */ #define FTDI_SIO_SET_LATENCY_TIMER 9 /* Set the latency timer */ #define FTDI_SIO_GET_LATENCY_TIMER 10 /* Get the latency timer */ +#define FTDI_SIO_READ_EEPROM 0x90 /* Read eeprom */ +#define FTDI_SIO_WRITE_EEPROM 0x91 /* Write eeprom */ /* Interface indices for FT2232, FT2232H and FT4232H devices */ #define INTERFACE_A 1 @@ -400,6 +402,32 @@ enum ftdi_sio_baudrate { * */ + /* FTDI_SIO_READ_EEPROM */ +#define FTDI_SIO_READ_EEPROM_REQUEST_TYPE 0xc0 +#define FTDI_SIO_READ_EEPROM_REQUEST FTDI_SIO_READ_EEPROM +/* + * BmRequestType: 1100 0000b + * bRequest: FTDI_SIO_READ_EEPROM + * wValue: 0 + * wIndex: Word Index + * wLength: 2 + * Data: return data (a word) + * + */ + +/* FTDI_SIO_WRITE_EEPROM */ +#define FTDI_SIO_WRITE_EEPROM_REQUEST_TYPE 0x40 +#define FTDI_SIO_WRITE_EEPROM_REQUEST FTDI_SIO_WRITE_EEPROM +/* + * BmRequestType: 0100 0000b + * bRequest: FTDI_SIO_WRITE_EEPROM + * wValue: Data (word) + * wIndex: Word Index + * wLength: 0 + * Data: None + * + */ + /* FTDI_SIO_GET_MODEM_STATUS */ /* Retrieve the current value of the modem status register */