* [v2] USB:serial:pl2303:Add new PID to support PL2303HXN (TYPE_HXN)
@ 2019-04-29 12:12 ` Charles Yeh
0 siblings, 0 replies; 12+ messages in thread
From: Charles Yeh @ 2019-04-29 12:12 UTC (permalink / raw)
To: gregkh, johan, linux-usb; +Cc: charles-yeh, Charles Yeh
Prolific has developed a new USB to UART chip: PL2303HXN
PL2303HXN : PL2303GC/PL2303GS/PL2303GT/PL2303GL/PL2303GE/PL2303GB
The Vendor request used by the PL2303HXN (TYPE_HXN) is different from
the existing PL2303 series (TYPE_HX & TYPE_01).
Therefore, different Vendor requests are used to issue related commands.
1. Added a new TYPE_HXN type in pl2303_type_data, and then executes
new Vendor request,new flow control and other related instructions
if TYPE_HXN is recognized.
2. Because the new PL2303HXN only accept the new Vendor request,
the old Vendor request cannot be accepted (the error message
will be returned)
So first determine the TYPE_HX or TYPE_HXN through
PL2303_READ_TYPE_HX_STATUS in pl2303_startup.
2.1 If the return message is "1", then the PL2303 is the existing
TYPE_HX/ TYPE_01 series.
The other settings in pl2303_startup are to continue execution.
2.2 If the return message is "not 1", then the PL2303 is the new
TYPE_HXN series.
The other settings in pl2303_startup are ignored.
(PL2303HXN will directly use the default value in the hardware,
no need to add additional settings through the software)
3. In pl2303_open: Because TYPE_HXN is different from the instruction of reset
down/up stream used by TYPE_HX.
Therefore, we will also execute different instructions here.
4. In pl2303_set_termios: The UART flow control instructions used by
TYPE_HXN/TYPE_HX/TYPE_01 are different.
Therefore, we will also execute different instructions here.
5. In pl2303_vendor_read & pl2303_vendor_write, since TYPE_HXN is different
from the vendor request instruction used by TYPE_HX/TYPE_01,
it will also execute different instructions here.
Signed-off-by: Charles Yeh <charlesyeh522@gmail.com>
---
drivers/usb/serial/pl2303.c | 107 +++++++++++++++++++++++++++++-------
drivers/usb/serial/pl2303.h | 6 ++
2 files changed, 92 insertions(+), 21 deletions(-)
diff --git a/drivers/usb/serial/pl2303.c b/drivers/usb/serial/pl2303.c
index bb3f9aa4a909..d938091ba4cc 100644
--- a/drivers/usb/serial/pl2303.c
+++ b/drivers/usb/serial/pl2303.c
@@ -47,6 +47,12 @@ static const struct usb_device_id id_table[] = {
{ USB_DEVICE(PL2303_VENDOR_ID, PL2303_PRODUCT_ID_MOTOROLA) },
{ USB_DEVICE(PL2303_VENDOR_ID, PL2303_PRODUCT_ID_ZTEK) },
{ USB_DEVICE(PL2303_VENDOR_ID, PL2303_PRODUCT_ID_TB) },
+ { USB_DEVICE(PL2303_VENDOR_ID, PL2303_PRODUCT_ID_GC) },
+ { USB_DEVICE(PL2303_VENDOR_ID, PL2303_PRODUCT_ID_GB) },
+ { USB_DEVICE(PL2303_VENDOR_ID, PL2303_PRODUCT_ID_GT) },
+ { USB_DEVICE(PL2303_VENDOR_ID, PL2303_PRODUCT_ID_GL) },
+ { USB_DEVICE(PL2303_VENDOR_ID, PL2303_PRODUCT_ID_GE) },
+ { USB_DEVICE(PL2303_VENDOR_ID, PL2303_PRODUCT_ID_GS) },
{ USB_DEVICE(IODATA_VENDOR_ID, IODATA_PRODUCT_ID) },
{ USB_DEVICE(IODATA_VENDOR_ID, IODATA_PRODUCT_ID_RSAQ5) },
{ USB_DEVICE(ATEN_VENDOR_ID, ATEN_PRODUCT_ID),
@@ -129,9 +135,11 @@ MODULE_DEVICE_TABLE(usb, id_table);
#define VENDOR_WRITE_REQUEST_TYPE 0x40
#define VENDOR_WRITE_REQUEST 0x01
+#define VENDOR_WRITE_NREQUEST 0x80
#define VENDOR_READ_REQUEST_TYPE 0xc0
#define VENDOR_READ_REQUEST 0x01
+#define VENDOR_READ_NREQUEST 0x81
#define UART_STATE_INDEX 8
#define UART_STATE_MSR_MASK 0x8b
@@ -145,11 +153,19 @@ MODULE_DEVICE_TABLE(usb, id_table);
#define UART_OVERRUN_ERROR 0x40
#define UART_CTS 0x80
+#define PL2303_READ_TYPE_HX_STATUS 0x8080
+#define PL2303_TYPE_HXN_FLOW_CTRL 0x0A
+#define PL2303_TYPE_HXN_CTRL_RTS_CTS 0xFA
+#define PL2303_TYPE_HXN_CTRL_XON_XOFF 0xEE
+#define PL2303_TYPE_HXN_NONE_FLOW 0xFF
+#define PL2303_TYPE_HXN_RESET_DOWN_UPSTREAM 0x07
+
static void pl2303_set_break(struct usb_serial_port *port, bool enable);
enum pl2303_type {
TYPE_01, /* Type 0 and 1 (difference unknown) */
TYPE_HX, /* HX version of the pl2303 chip */
+ TYPE_HXN, /* HXN version of the pl2303 chip */
TYPE_COUNT
};
@@ -179,16 +195,26 @@ static const struct pl2303_type_data pl2303_type_data[TYPE_COUNT] = {
[TYPE_HX] = {
.max_baud_rate = 12000000,
},
+ [TYPE_HXN] = {
+ .max_baud_rate = 12000000,
+ },
};
static int pl2303_vendor_read(struct usb_serial *serial, u16 value,
unsigned char buf[1])
{
struct device *dev = &serial->interface->dev;
+ struct pl2303_serial_private *spriv = usb_get_serial_data(serial);
int res;
+ u8 request;
+
+ if (spriv->type == &pl2303_type_data[TYPE_HXN])
+ request = VENDOR_READ_NREQUEST;
+ else
+ request = VENDOR_READ_REQUEST;
res = usb_control_msg(serial->dev, usb_rcvctrlpipe(serial->dev, 0),
- VENDOR_READ_REQUEST, VENDOR_READ_REQUEST_TYPE,
+ request, VENDOR_READ_REQUEST_TYPE,
value, 0, buf, 1, 100);
if (res != 1) {
dev_err(dev, "%s - failed to read [%04x]: %d\n", __func__,
@@ -207,12 +233,19 @@ static int pl2303_vendor_read(struct usb_serial *serial, u16 value,
static int pl2303_vendor_write(struct usb_serial *serial, u16 value, u16 index)
{
struct device *dev = &serial->interface->dev;
+ struct pl2303_serial_private *spriv = usb_get_serial_data(serial);
int res;
+ u8 request;
dev_dbg(dev, "%s - [%04x] = %02x\n", __func__, value, index);
+ if (spriv->type == &pl2303_type_data[TYPE_HXN])
+ request = VENDOR_WRITE_NREQUEST;
+ else
+ request = VENDOR_WRITE_REQUEST;
+
res = usb_control_msg(serial->dev, usb_sndctrlpipe(serial->dev, 0),
- VENDOR_WRITE_REQUEST, VENDOR_WRITE_REQUEST_TYPE,
+ request, VENDOR_WRITE_REQUEST_TYPE,
value, index, NULL, 0, 100);
if (res) {
dev_err(dev, "%s - failed to write [%04x]: %d\n", __func__,
@@ -292,6 +325,7 @@ static int pl2303_startup(struct usb_serial *serial)
struct pl2303_serial_private *spriv;
enum pl2303_type type = TYPE_01;
unsigned char *buf;
+ int res;
spriv = kzalloc(sizeof(*spriv), GFP_KERNEL);
if (!spriv)
@@ -313,26 +347,37 @@ static int pl2303_startup(struct usb_serial *serial)
type = TYPE_01; /* type 1 */
dev_dbg(&serial->interface->dev, "device type: %d\n", type);
+ if (type == TYPE_HX) {
+ res = usb_control_msg(serial->dev,
+ usb_rcvctrlpipe(serial->dev, 0),
+ VENDOR_READ_REQUEST, VENDOR_READ_REQUEST_TYPE,
+ PL2303_READ_TYPE_HX_STATUS, 0, buf, 1, 100);
+ if (res != 1)
+ type = TYPE_HXN;
+ }
+
spriv->type = &pl2303_type_data[type];
spriv->quirks = (unsigned long)usb_get_serial_data(serial);
spriv->quirks |= spriv->type->quirks;
usb_set_serial_data(serial, spriv);
- pl2303_vendor_read(serial, 0x8484, buf);
- pl2303_vendor_write(serial, 0x0404, 0);
- pl2303_vendor_read(serial, 0x8484, buf);
- pl2303_vendor_read(serial, 0x8383, buf);
- pl2303_vendor_read(serial, 0x8484, buf);
- pl2303_vendor_write(serial, 0x0404, 1);
- pl2303_vendor_read(serial, 0x8484, buf);
- pl2303_vendor_read(serial, 0x8383, buf);
- pl2303_vendor_write(serial, 0, 1);
- pl2303_vendor_write(serial, 1, 0);
- if (spriv->quirks & PL2303_QUIRK_LEGACY)
- pl2303_vendor_write(serial, 2, 0x24);
- else
- pl2303_vendor_write(serial, 2, 0x44);
+ if (type != TYPE_HXN) {
+ pl2303_vendor_read(serial, 0x8484, buf);
+ pl2303_vendor_write(serial, 0x0404, 0);
+ pl2303_vendor_read(serial, 0x8484, buf);
+ pl2303_vendor_read(serial, 0x8383, buf);
+ pl2303_vendor_read(serial, 0x8484, buf);
+ pl2303_vendor_write(serial, 0x0404, 1);
+ pl2303_vendor_read(serial, 0x8484, buf);
+ pl2303_vendor_read(serial, 0x8383, buf);
+ pl2303_vendor_write(serial, 0, 1);
+ pl2303_vendor_write(serial, 1, 0);
+ if (spriv->quirks & PL2303_QUIRK_LEGACY)
+ pl2303_vendor_write(serial, 2, 0x24);
+ else
+ pl2303_vendor_write(serial, 2, 0x44);
+ }
kfree(buf);
@@ -679,13 +724,27 @@ static void pl2303_set_termios(struct tty_struct *tty,
if (C_CRTSCTS(tty)) {
if (spriv->quirks & PL2303_QUIRK_LEGACY)
pl2303_vendor_write(serial, 0x0, 0x41);
- else
+ else if (spriv->type == &pl2303_type_data[TYPE_HXN]) {
+ pl2303_vendor_write(serial, PL2303_TYPE_HXN_FLOW_CTRL,
+ PL2303_TYPE_HXN_CTRL_RTS_CTS);
+ } else {
pl2303_vendor_write(serial, 0x0, 0x61);
+ }
} else if (I_IXON(tty) && !I_IXANY(tty) && START_CHAR(tty) == 0x11 &&
STOP_CHAR(tty) == 0x13) {
- pl2303_vendor_write(serial, 0x0, 0xc0);
+ if (spriv->type == &pl2303_type_data[TYPE_HXN]) {
+ pl2303_vendor_write(serial, PL2303_TYPE_HXN_FLOW_CTRL,
+ PL2303_TYPE_HXN_CTRL_XON_XOFF);
+ } else {
+ pl2303_vendor_write(serial, 0x0, 0xc0);
+ }
} else {
- pl2303_vendor_write(serial, 0x0, 0x0);
+ if (spriv->type == &pl2303_type_data[TYPE_HXN]) {
+ pl2303_vendor_write(serial, PL2303_TYPE_HXN_FLOW_CTRL,
+ PL2303_TYPE_HXN_NONE_FLOW);
+ } else {
+ pl2303_vendor_write(serial, 0x0, 0x0);
+ }
}
kfree(buf);
@@ -726,8 +785,14 @@ static int pl2303_open(struct tty_struct *tty, struct usb_serial_port *port)
usb_clear_halt(serial->dev, port->read_urb->pipe);
} else {
/* reset upstream data pipes */
- pl2303_vendor_write(serial, 8, 0);
- pl2303_vendor_write(serial, 9, 0);
+ if (spriv->type == &pl2303_type_data[TYPE_HXN]) {
+ pl2303_vendor_write(serial,
+ PL2303_TYPE_HXN_RESET_DOWN_UPSTREAM,
+ 0);
+ } else {
+ pl2303_vendor_write(serial, 8, 0);
+ pl2303_vendor_write(serial, 9, 0);
+ }
}
/* Setup termios */
diff --git a/drivers/usb/serial/pl2303.h b/drivers/usb/serial/pl2303.h
index 559941ca884d..fb9dd2ba4456 100644
--- a/drivers/usb/serial/pl2303.h
+++ b/drivers/usb/serial/pl2303.h
@@ -20,6 +20,12 @@
#define PL2303_PRODUCT_ID_HCR331 0x331a
#define PL2303_PRODUCT_ID_MOTOROLA 0x0307
#define PL2303_PRODUCT_ID_ZTEK 0xe1f1
+#define PL2303_PRODUCT_ID_GC 0x23A3
+#define PL2303_PRODUCT_ID_GB 0x23B3
+#define PL2303_PRODUCT_ID_GT 0x23C3
+#define PL2303_PRODUCT_ID_GL 0x23D3
+#define PL2303_PRODUCT_ID_GE 0x23E3
+#define PL2303_PRODUCT_ID_GS 0x23F3
#define ATEN_VENDOR_ID 0x0557
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH] [PATCH v2] USB:serial:pl2303:Add new PID to support PL2303HXN (TYPE_HXN)
@ 2019-04-29 12:12 ` Charles Yeh
0 siblings, 0 replies; 12+ messages in thread
From: Charles Yeh @ 2019-04-29 12:12 UTC (permalink / raw)
To: gregkh, johan, linux-usb; +Cc: charles-yeh, Charles Yeh
Prolific has developed a new USB to UART chip: PL2303HXN
PL2303HXN : PL2303GC/PL2303GS/PL2303GT/PL2303GL/PL2303GE/PL2303GB
The Vendor request used by the PL2303HXN (TYPE_HXN) is different from
the existing PL2303 series (TYPE_HX & TYPE_01).
Therefore, different Vendor requests are used to issue related commands.
1. Added a new TYPE_HXN type in pl2303_type_data, and then executes
new Vendor request,new flow control and other related instructions
if TYPE_HXN is recognized.
2. Because the new PL2303HXN only accept the new Vendor request,
the old Vendor request cannot be accepted (the error message
will be returned)
So first determine the TYPE_HX or TYPE_HXN through
PL2303_READ_TYPE_HX_STATUS in pl2303_startup.
2.1 If the return message is "1", then the PL2303 is the existing
TYPE_HX/ TYPE_01 series.
The other settings in pl2303_startup are to continue execution.
2.2 If the return message is "not 1", then the PL2303 is the new
TYPE_HXN series.
The other settings in pl2303_startup are ignored.
(PL2303HXN will directly use the default value in the hardware,
no need to add additional settings through the software)
3. In pl2303_open: Because TYPE_HXN is different from the instruction of reset
down/up stream used by TYPE_HX.
Therefore, we will also execute different instructions here.
4. In pl2303_set_termios: The UART flow control instructions used by
TYPE_HXN/TYPE_HX/TYPE_01 are different.
Therefore, we will also execute different instructions here.
5. In pl2303_vendor_read & pl2303_vendor_write, since TYPE_HXN is different
from the vendor request instruction used by TYPE_HX/TYPE_01,
it will also execute different instructions here.
Signed-off-by: Charles Yeh <charlesyeh522@gmail.com>
---
drivers/usb/serial/pl2303.c | 107 +++++++++++++++++++++++++++++-------
drivers/usb/serial/pl2303.h | 6 ++
2 files changed, 92 insertions(+), 21 deletions(-)
diff --git a/drivers/usb/serial/pl2303.c b/drivers/usb/serial/pl2303.c
index bb3f9aa4a909..d938091ba4cc 100644
--- a/drivers/usb/serial/pl2303.c
+++ b/drivers/usb/serial/pl2303.c
@@ -47,6 +47,12 @@ static const struct usb_device_id id_table[] = {
{ USB_DEVICE(PL2303_VENDOR_ID, PL2303_PRODUCT_ID_MOTOROLA) },
{ USB_DEVICE(PL2303_VENDOR_ID, PL2303_PRODUCT_ID_ZTEK) },
{ USB_DEVICE(PL2303_VENDOR_ID, PL2303_PRODUCT_ID_TB) },
+ { USB_DEVICE(PL2303_VENDOR_ID, PL2303_PRODUCT_ID_GC) },
+ { USB_DEVICE(PL2303_VENDOR_ID, PL2303_PRODUCT_ID_GB) },
+ { USB_DEVICE(PL2303_VENDOR_ID, PL2303_PRODUCT_ID_GT) },
+ { USB_DEVICE(PL2303_VENDOR_ID, PL2303_PRODUCT_ID_GL) },
+ { USB_DEVICE(PL2303_VENDOR_ID, PL2303_PRODUCT_ID_GE) },
+ { USB_DEVICE(PL2303_VENDOR_ID, PL2303_PRODUCT_ID_GS) },
{ USB_DEVICE(IODATA_VENDOR_ID, IODATA_PRODUCT_ID) },
{ USB_DEVICE(IODATA_VENDOR_ID, IODATA_PRODUCT_ID_RSAQ5) },
{ USB_DEVICE(ATEN_VENDOR_ID, ATEN_PRODUCT_ID),
@@ -129,9 +135,11 @@ MODULE_DEVICE_TABLE(usb, id_table);
#define VENDOR_WRITE_REQUEST_TYPE 0x40
#define VENDOR_WRITE_REQUEST 0x01
+#define VENDOR_WRITE_NREQUEST 0x80
#define VENDOR_READ_REQUEST_TYPE 0xc0
#define VENDOR_READ_REQUEST 0x01
+#define VENDOR_READ_NREQUEST 0x81
#define UART_STATE_INDEX 8
#define UART_STATE_MSR_MASK 0x8b
@@ -145,11 +153,19 @@ MODULE_DEVICE_TABLE(usb, id_table);
#define UART_OVERRUN_ERROR 0x40
#define UART_CTS 0x80
+#define PL2303_READ_TYPE_HX_STATUS 0x8080
+#define PL2303_TYPE_HXN_FLOW_CTRL 0x0A
+#define PL2303_TYPE_HXN_CTRL_RTS_CTS 0xFA
+#define PL2303_TYPE_HXN_CTRL_XON_XOFF 0xEE
+#define PL2303_TYPE_HXN_NONE_FLOW 0xFF
+#define PL2303_TYPE_HXN_RESET_DOWN_UPSTREAM 0x07
+
static void pl2303_set_break(struct usb_serial_port *port, bool enable);
enum pl2303_type {
TYPE_01, /* Type 0 and 1 (difference unknown) */
TYPE_HX, /* HX version of the pl2303 chip */
+ TYPE_HXN, /* HXN version of the pl2303 chip */
TYPE_COUNT
};
@@ -179,16 +195,26 @@ static const struct pl2303_type_data pl2303_type_data[TYPE_COUNT] = {
[TYPE_HX] = {
.max_baud_rate = 12000000,
},
+ [TYPE_HXN] = {
+ .max_baud_rate = 12000000,
+ },
};
static int pl2303_vendor_read(struct usb_serial *serial, u16 value,
unsigned char buf[1])
{
struct device *dev = &serial->interface->dev;
+ struct pl2303_serial_private *spriv = usb_get_serial_data(serial);
int res;
+ u8 request;
+
+ if (spriv->type == &pl2303_type_data[TYPE_HXN])
+ request = VENDOR_READ_NREQUEST;
+ else
+ request = VENDOR_READ_REQUEST;
res = usb_control_msg(serial->dev, usb_rcvctrlpipe(serial->dev, 0),
- VENDOR_READ_REQUEST, VENDOR_READ_REQUEST_TYPE,
+ request, VENDOR_READ_REQUEST_TYPE,
value, 0, buf, 1, 100);
if (res != 1) {
dev_err(dev, "%s - failed to read [%04x]: %d\n", __func__,
@@ -207,12 +233,19 @@ static int pl2303_vendor_read(struct usb_serial *serial, u16 value,
static int pl2303_vendor_write(struct usb_serial *serial, u16 value, u16 index)
{
struct device *dev = &serial->interface->dev;
+ struct pl2303_serial_private *spriv = usb_get_serial_data(serial);
int res;
+ u8 request;
dev_dbg(dev, "%s - [%04x] = %02x\n", __func__, value, index);
+ if (spriv->type == &pl2303_type_data[TYPE_HXN])
+ request = VENDOR_WRITE_NREQUEST;
+ else
+ request = VENDOR_WRITE_REQUEST;
+
res = usb_control_msg(serial->dev, usb_sndctrlpipe(serial->dev, 0),
- VENDOR_WRITE_REQUEST, VENDOR_WRITE_REQUEST_TYPE,
+ request, VENDOR_WRITE_REQUEST_TYPE,
value, index, NULL, 0, 100);
if (res) {
dev_err(dev, "%s - failed to write [%04x]: %d\n", __func__,
@@ -292,6 +325,7 @@ static int pl2303_startup(struct usb_serial *serial)
struct pl2303_serial_private *spriv;
enum pl2303_type type = TYPE_01;
unsigned char *buf;
+ int res;
spriv = kzalloc(sizeof(*spriv), GFP_KERNEL);
if (!spriv)
@@ -313,26 +347,37 @@ static int pl2303_startup(struct usb_serial *serial)
type = TYPE_01; /* type 1 */
dev_dbg(&serial->interface->dev, "device type: %d\n", type);
+ if (type == TYPE_HX) {
+ res = usb_control_msg(serial->dev,
+ usb_rcvctrlpipe(serial->dev, 0),
+ VENDOR_READ_REQUEST, VENDOR_READ_REQUEST_TYPE,
+ PL2303_READ_TYPE_HX_STATUS, 0, buf, 1, 100);
+ if (res != 1)
+ type = TYPE_HXN;
+ }
+
spriv->type = &pl2303_type_data[type];
spriv->quirks = (unsigned long)usb_get_serial_data(serial);
spriv->quirks |= spriv->type->quirks;
usb_set_serial_data(serial, spriv);
- pl2303_vendor_read(serial, 0x8484, buf);
- pl2303_vendor_write(serial, 0x0404, 0);
- pl2303_vendor_read(serial, 0x8484, buf);
- pl2303_vendor_read(serial, 0x8383, buf);
- pl2303_vendor_read(serial, 0x8484, buf);
- pl2303_vendor_write(serial, 0x0404, 1);
- pl2303_vendor_read(serial, 0x8484, buf);
- pl2303_vendor_read(serial, 0x8383, buf);
- pl2303_vendor_write(serial, 0, 1);
- pl2303_vendor_write(serial, 1, 0);
- if (spriv->quirks & PL2303_QUIRK_LEGACY)
- pl2303_vendor_write(serial, 2, 0x24);
- else
- pl2303_vendor_write(serial, 2, 0x44);
+ if (type != TYPE_HXN) {
+ pl2303_vendor_read(serial, 0x8484, buf);
+ pl2303_vendor_write(serial, 0x0404, 0);
+ pl2303_vendor_read(serial, 0x8484, buf);
+ pl2303_vendor_read(serial, 0x8383, buf);
+ pl2303_vendor_read(serial, 0x8484, buf);
+ pl2303_vendor_write(serial, 0x0404, 1);
+ pl2303_vendor_read(serial, 0x8484, buf);
+ pl2303_vendor_read(serial, 0x8383, buf);
+ pl2303_vendor_write(serial, 0, 1);
+ pl2303_vendor_write(serial, 1, 0);
+ if (spriv->quirks & PL2303_QUIRK_LEGACY)
+ pl2303_vendor_write(serial, 2, 0x24);
+ else
+ pl2303_vendor_write(serial, 2, 0x44);
+ }
kfree(buf);
@@ -679,13 +724,27 @@ static void pl2303_set_termios(struct tty_struct *tty,
if (C_CRTSCTS(tty)) {
if (spriv->quirks & PL2303_QUIRK_LEGACY)
pl2303_vendor_write(serial, 0x0, 0x41);
- else
+ else if (spriv->type == &pl2303_type_data[TYPE_HXN]) {
+ pl2303_vendor_write(serial, PL2303_TYPE_HXN_FLOW_CTRL,
+ PL2303_TYPE_HXN_CTRL_RTS_CTS);
+ } else {
pl2303_vendor_write(serial, 0x0, 0x61);
+ }
} else if (I_IXON(tty) && !I_IXANY(tty) && START_CHAR(tty) == 0x11 &&
STOP_CHAR(tty) == 0x13) {
- pl2303_vendor_write(serial, 0x0, 0xc0);
+ if (spriv->type == &pl2303_type_data[TYPE_HXN]) {
+ pl2303_vendor_write(serial, PL2303_TYPE_HXN_FLOW_CTRL,
+ PL2303_TYPE_HXN_CTRL_XON_XOFF);
+ } else {
+ pl2303_vendor_write(serial, 0x0, 0xc0);
+ }
} else {
- pl2303_vendor_write(serial, 0x0, 0x0);
+ if (spriv->type == &pl2303_type_data[TYPE_HXN]) {
+ pl2303_vendor_write(serial, PL2303_TYPE_HXN_FLOW_CTRL,
+ PL2303_TYPE_HXN_NONE_FLOW);
+ } else {
+ pl2303_vendor_write(serial, 0x0, 0x0);
+ }
}
kfree(buf);
@@ -726,8 +785,14 @@ static int pl2303_open(struct tty_struct *tty, struct usb_serial_port *port)
usb_clear_halt(serial->dev, port->read_urb->pipe);
} else {
/* reset upstream data pipes */
- pl2303_vendor_write(serial, 8, 0);
- pl2303_vendor_write(serial, 9, 0);
+ if (spriv->type == &pl2303_type_data[TYPE_HXN]) {
+ pl2303_vendor_write(serial,
+ PL2303_TYPE_HXN_RESET_DOWN_UPSTREAM,
+ 0);
+ } else {
+ pl2303_vendor_write(serial, 8, 0);
+ pl2303_vendor_write(serial, 9, 0);
+ }
}
/* Setup termios */
diff --git a/drivers/usb/serial/pl2303.h b/drivers/usb/serial/pl2303.h
index 559941ca884d..fb9dd2ba4456 100644
--- a/drivers/usb/serial/pl2303.h
+++ b/drivers/usb/serial/pl2303.h
@@ -20,6 +20,12 @@
#define PL2303_PRODUCT_ID_HCR331 0x331a
#define PL2303_PRODUCT_ID_MOTOROLA 0x0307
#define PL2303_PRODUCT_ID_ZTEK 0xe1f1
+#define PL2303_PRODUCT_ID_GC 0x23A3
+#define PL2303_PRODUCT_ID_GB 0x23B3
+#define PL2303_PRODUCT_ID_GT 0x23C3
+#define PL2303_PRODUCT_ID_GL 0x23D3
+#define PL2303_PRODUCT_ID_GE 0x23E3
+#define PL2303_PRODUCT_ID_GS 0x23F3
#define ATEN_VENDOR_ID 0x0557
--
2.20.1
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [v2] USB:serial:pl2303:Add new PID to support PL2303HXN (TYPE_HXN)
@ 2019-05-03 7:11 ` Johan Hovold
0 siblings, 0 replies; 12+ messages in thread
From: Johan Hovold @ 2019-05-03 7:11 UTC (permalink / raw)
To: Charles Yeh; +Cc: gregkh, johan, linux-usb, charles-yeh
On Mon, Apr 29, 2019 at 08:12:37PM +0800, Charles Yeh wrote:
> Prolific has developed a new USB to UART chip: PL2303HXN
> PL2303HXN : PL2303GC/PL2303GS/PL2303GT/PL2303GL/PL2303GE/PL2303GB
> The Vendor request used by the PL2303HXN (TYPE_HXN) is different from
> the existing PL2303 series (TYPE_HX & TYPE_01).
> Therefore, different Vendor requests are used to issue related commands.
>
> 1. Added a new TYPE_HXN type in pl2303_type_data, and then executes
> new Vendor request,new flow control and other related instructions
> if TYPE_HXN is recognized.
>
> 2. Because the new PL2303HXN only accept the new Vendor request,
> the old Vendor request cannot be accepted (the error message
> will be returned)
> So first determine the TYPE_HX or TYPE_HXN through
> PL2303_READ_TYPE_HX_STATUS in pl2303_startup.
>
> 2.1 If the return message is "1", then the PL2303 is the existing
> TYPE_HX/ TYPE_01 series.
> The other settings in pl2303_startup are to continue execution.
> 2.2 If the return message is "not 1", then the PL2303 is the new
> TYPE_HXN series.
> The other settings in pl2303_startup are ignored.
> (PL2303HXN will directly use the default value in the hardware,
> no need to add additional settings through the software)
>
> 3. In pl2303_open: Because TYPE_HXN is different from the instruction of reset
> down/up stream used by TYPE_HX.
> Therefore, we will also execute different instructions here.
>
> 4. In pl2303_set_termios: The UART flow control instructions used by
> TYPE_HXN/TYPE_HX/TYPE_01 are different.
> Therefore, we will also execute different instructions here.
>
> 5. In pl2303_vendor_read & pl2303_vendor_write, since TYPE_HXN is different
> from the vendor request instruction used by TYPE_HX/TYPE_01,
> it will also execute different instructions here.
>
> Signed-off-by: Charles Yeh <charlesyeh522@gmail.com>
> ---
What changed in v2? You forgot to add a changelog here.
Looks like this one is not based on the current driver code (e.g. my
usb-next branch as we discussed), and also does not address some of the
issues raised so far (e.g. you're overwriting the entire flow control
register on updates).
I didn't have time to finish the prep work I promised to do, but don't
worry, I haven't forgotten.
Johan
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH] [PATCH v2] USB:serial:pl2303:Add new PID to support PL2303HXN (TYPE_HXN)
@ 2019-05-03 7:11 ` Johan Hovold
0 siblings, 0 replies; 12+ messages in thread
From: Johan Hovold @ 2019-05-03 7:11 UTC (permalink / raw)
To: Charles Yeh; +Cc: gregkh, johan, linux-usb, charles-yeh
On Mon, Apr 29, 2019 at 08:12:37PM +0800, Charles Yeh wrote:
> Prolific has developed a new USB to UART chip: PL2303HXN
> PL2303HXN : PL2303GC/PL2303GS/PL2303GT/PL2303GL/PL2303GE/PL2303GB
> The Vendor request used by the PL2303HXN (TYPE_HXN) is different from
> the existing PL2303 series (TYPE_HX & TYPE_01).
> Therefore, different Vendor requests are used to issue related commands.
>
> 1. Added a new TYPE_HXN type in pl2303_type_data, and then executes
> new Vendor request,new flow control and other related instructions
> if TYPE_HXN is recognized.
>
> 2. Because the new PL2303HXN only accept the new Vendor request,
> the old Vendor request cannot be accepted (the error message
> will be returned)
> So first determine the TYPE_HX or TYPE_HXN through
> PL2303_READ_TYPE_HX_STATUS in pl2303_startup.
>
> 2.1 If the return message is "1", then the PL2303 is the existing
> TYPE_HX/ TYPE_01 series.
> The other settings in pl2303_startup are to continue execution.
> 2.2 If the return message is "not 1", then the PL2303 is the new
> TYPE_HXN series.
> The other settings in pl2303_startup are ignored.
> (PL2303HXN will directly use the default value in the hardware,
> no need to add additional settings through the software)
>
> 3. In pl2303_open: Because TYPE_HXN is different from the instruction of reset
> down/up stream used by TYPE_HX.
> Therefore, we will also execute different instructions here.
>
> 4. In pl2303_set_termios: The UART flow control instructions used by
> TYPE_HXN/TYPE_HX/TYPE_01 are different.
> Therefore, we will also execute different instructions here.
>
> 5. In pl2303_vendor_read & pl2303_vendor_write, since TYPE_HXN is different
> from the vendor request instruction used by TYPE_HX/TYPE_01,
> it will also execute different instructions here.
>
> Signed-off-by: Charles Yeh <charlesyeh522@gmail.com>
> ---
What changed in v2? You forgot to add a changelog here.
Looks like this one is not based on the current driver code (e.g. my
usb-next branch as we discussed), and also does not address some of the
issues raised so far (e.g. you're overwriting the entire flow control
register on updates).
I didn't have time to finish the prep work I promised to do, but don't
worry, I haven't forgotten.
Johan
^ permalink raw reply [flat|nested] 12+ messages in thread
* [v2] USB:serial:pl2303:Add new PID to support PL2303HXN (TYPE_HXN)
@ 2019-05-03 7:28 ` Charles Yeh
0 siblings, 0 replies; 12+ messages in thread
From: Charles Yeh @ 2019-05-03 7:28 UTC (permalink / raw)
To: Johan Hovold; +Cc: Greg KH, linux-usb, Yeh.Charles [葉榮鑫]
Johan Hovold <johan@kernel.org> 於 2019年5月3日 週五 下午3:11寫道：
> What changed in v2? You forgot to add a changelog here.
>
> Looks like this one is not based on the current driver code (e.g. my
> usb-next branch as we discussed), and also does not address some of the
> issues raised so far (e.g. you're overwriting the entire flow control
> register on updates).
>
I used the Kernel tree:
git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git
but the pl2303.c inside does not have the "pl2303_update_reg" you mentioned.
Charles.
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH] [PATCH v2] USB:serial:pl2303:Add new PID to support PL2303HXN (TYPE_HXN)
@ 2019-05-03 7:28 ` Charles Yeh
0 siblings, 0 replies; 12+ messages in thread
From: Charles Yeh @ 2019-05-03 7:28 UTC (permalink / raw)
To: Johan Hovold; +Cc: Greg KH, linux-usb, Yeh.Charles [葉榮鑫]
Johan Hovold <johan@kernel.org> 於 2019年5月3日 週五 下午3:11寫道：
> What changed in v2? You forgot to add a changelog here.
>
> Looks like this one is not based on the current driver code (e.g. my
> usb-next branch as we discussed), and also does not address some of the
> issues raised so far (e.g. you're overwriting the entire flow control
> register on updates).
>
I used the Kernel tree:
git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git
but the pl2303.c inside does not have the "pl2303_update_reg" you mentioned.
Charles.
^ permalink raw reply [flat|nested] 12+ messages in thread
* [v2] USB:serial:pl2303:Add new PID to support PL2303HXN (TYPE_HXN)
@ 2019-05-03 7:41 ` Johan Hovold
0 siblings, 0 replies; 12+ messages in thread
From: Johan Hovold @ 2019-05-03 7:41 UTC (permalink / raw)
To: Charles Yeh
Cc: Johan Hovold, Greg KH, linux-usb, Yeh.Charles [葉榮鑫]
On Fri, May 03, 2019 at 03:28:04PM +0800, Charles Yeh wrote:
> Johan Hovold <johan@kernel.org> 於 2019年5月3日 週五 下午3:11寫道：
> > What changed in v2? You forgot to add a changelog here.
> >
> > Looks like this one is not based on the current driver code (e.g. my
> > usb-next branch as we discussed), and also does not address some of the
> > issues raised so far (e.g. you're overwriting the entire flow control
> > register on updates).
> >
>
> I used the Kernel tree:
> git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git
>
> but the pl2303.c inside does not have the "pl2303_update_reg" you mentioned.
Perhaps you did not use the usb-next branch? That branch has the following
commit:
https://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git/commit/?h=usb-next&id=f64c3ab230682e8395a7fbd01f3eb5140c837d4e
which adds the helper.
Johan
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH] [PATCH v2] USB:serial:pl2303:Add new PID to support PL2303HXN (TYPE_HXN)
@ 2019-05-03 7:41 ` Johan Hovold
0 siblings, 0 replies; 12+ messages in thread
From: Johan Hovold @ 2019-05-03 7:41 UTC (permalink / raw)
To: Charles Yeh
Cc: Johan Hovold, Greg KH, linux-usb, Yeh.Charles [葉榮鑫]
On Fri, May 03, 2019 at 03:28:04PM +0800, Charles Yeh wrote:
> Johan Hovold <johan@kernel.org> 於 2019年5月3日 週五 下午3:11寫道：
> > What changed in v2? You forgot to add a changelog here.
> >
> > Looks like this one is not based on the current driver code (e.g. my
> > usb-next branch as we discussed), and also does not address some of the
> > issues raised so far (e.g. you're overwriting the entire flow control
> > register on updates).
> >
>
> I used the Kernel tree:
> git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git
>
> but the pl2303.c inside does not have the "pl2303_update_reg" you mentioned.
Perhaps you did not use the usb-next branch? That branch has the following
commit:
https://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git/commit/?h=usb-next&id=f64c3ab230682e8395a7fbd01f3eb5140c837d4e
which adds the helper.
Johan
^ permalink raw reply [flat|nested] 12+ messages in thread
* [v2] USB:serial:pl2303:Add new PID to support PL2303HXN (TYPE_HXN)
@ 2019-05-03 8:22 ` Charles Yeh
0 siblings, 0 replies; 12+ messages in thread
From: Charles Yeh @ 2019-05-03 8:22 UTC (permalink / raw)
To: Johan Hovold; +Cc: Greg KH, linux-usb, Yeh.Charles [葉榮鑫]
Johan Hovold <johan@kernel.org> 於 2019年5月3日 週五 下午3:41寫道：
> Perhaps you did not use the usb-next branch? That branch has the following
> commit:
>
> https://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git/commit/?h=usb-next&id=f64c3ab230682e8395a7fbd01f3eb5140c837d4e
>
OK, I will do another patch witch
"https://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git/snapshot/usb-serial-f64c3ab230682e8395a7fbd01f3eb5140c837d4e.tar.gz"
I already have seen pl2303_update_reg in the pl2303.c file.
Charles.
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH] [PATCH v2] USB:serial:pl2303:Add new PID to support PL2303HXN (TYPE_HXN)
@ 2019-05-03 8:22 ` Charles Yeh
0 siblings, 0 replies; 12+ messages in thread
From: Charles Yeh @ 2019-05-03 8:22 UTC (permalink / raw)
To: Johan Hovold; +Cc: Greg KH, linux-usb, Yeh.Charles [葉榮鑫]
Johan Hovold <johan@kernel.org> 於 2019年5月3日 週五 下午3:41寫道：
> Perhaps you did not use the usb-next branch? That branch has the following
> commit:
>
> https://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git/commit/?h=usb-next&id=f64c3ab230682e8395a7fbd01f3eb5140c837d4e
>
OK, I will do another patch witch
"https://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git/snapshot/usb-serial-f64c3ab230682e8395a7fbd01f3eb5140c837d4e.tar.gz"
I already have seen pl2303_update_reg in the pl2303.c file.
Charles.
^ permalink raw reply [flat|nested] 12+ messages in thread
* [v2] USB:serial:pl2303:Add new PID to support PL2303HXN (TYPE_HXN)
@ 2019-05-03 8:59 ` Johan Hovold
0 siblings, 0 replies; 12+ messages in thread
From: Johan Hovold @ 2019-05-03 8:59 UTC (permalink / raw)
To: Charles Yeh
Cc: Johan Hovold, Greg KH, linux-usb, Yeh.Charles [葉榮鑫]
On Fri, May 03, 2019 at 04:22:01PM +0800, Charles Yeh wrote:
> Johan Hovold <johan@kernel.org> 於 2019年5月3日 週五 下午3:41寫道：
>
> > Perhaps you did not use the usb-next branch? That branch has the following
> > commit:
> >
> > https://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git/commit/?h=usb-next&id=f64c3ab230682e8395a7fbd01f3eb5140c837d4e
> >
>
> OK, I will do another patch witch
> "https://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git/snapshot/usb-serial-f64c3ab230682e8395a7fbd01f3eb5140c837d4e.tar.gz"
>
> I already have seen pl2303_update_reg in the pl2303.c file.
It's better if you use the full usb-next branch, e.g.
git clone https://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git
cd usb-serial
git checkout -b pl2303 usb-next
or similar. That way you can easily fetch any future changes.
Johan
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH] [PATCH v2] USB:serial:pl2303:Add new PID to support PL2303HXN (TYPE_HXN)
@ 2019-05-03 8:59 ` Johan Hovold
0 siblings, 0 replies; 12+ messages in thread
From: Johan Hovold @ 2019-05-03 8:59 UTC (permalink / raw)
To: Charles Yeh
Cc: Johan Hovold, Greg KH, linux-usb, Yeh.Charles [葉榮鑫]
On Fri, May 03, 2019 at 04:22:01PM +0800, Charles Yeh wrote:
> Johan Hovold <johan@kernel.org> 於 2019年5月3日 週五 下午3:41寫道：
>
> > Perhaps you did not use the usb-next branch? That branch has the following
> > commit:
> >
> > https://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git/commit/?h=usb-next&id=f64c3ab230682e8395a7fbd01f3eb5140c837d4e
> >
>
> OK, I will do another patch witch
> "https://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git/snapshot/usb-serial-f64c3ab230682e8395a7fbd01f3eb5140c837d4e.tar.gz"
>
> I already have seen pl2303_update_reg in the pl2303.c file.
It's better if you use the full usb-next branch, e.g.
git clone https://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git
cd usb-serial
git checkout -b pl2303 usb-next
or similar. That way you can easily fetch any future changes.
Johan
^ permalink raw reply [flat|nested] 12+ messages in thread
end of thread, other threads:[~2019-05-03 8:59 UTC | newest]
Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-05-03 8:22 [v2] USB:serial:pl2303:Add new PID to support PL2303HXN (TYPE_HXN) Charles Yeh
2019-05-03 8:22 ` [PATCH] [PATCH v2] " Charles Yeh
-- strict thread matches above, loose matches on Subject: below --
2019-05-03 8:59 [v2] " Johan Hovold
2019-05-03 8:59 ` [PATCH] [PATCH v2] " Johan Hovold
2019-05-03 7:41 [v2] " Johan Hovold
2019-05-03 7:41 ` [PATCH] [PATCH v2] " Johan Hovold
2019-05-03 7:28 [v2] " Charles Yeh
2019-05-03 7:28 ` [PATCH] [PATCH v2] " Charles Yeh
2019-05-03 7:11 [v2] " Johan Hovold
2019-05-03 7:11 ` [PATCH] [PATCH v2] " Johan Hovold
2019-04-29 12:12 [v2] " Charles Yeh
2019-04-29 12:12 ` [PATCH] [PATCH v2] " Charles Yeh
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.