[PATCH] Extend ns16550 to use two port serial cards (v2).

[PATCH] Extend ns16550 to use two port serial cards (v2).

[Konrad Rzeszutek Wilk]

Please take a look at the following patch. Jan had only one comment that
I believe I had addressed.

The patch just expands the list of PCIe cards we treat as serial cards
to include the two port variants of the Rosewill cards I seem to have
tons of.


 xen/drivers/char/ns16550.c |   23 +++++++++++++++++++++++
 1 files changed, 23 insertions(+), 0 deletions(-)

Konrad Rzeszutek Wilk (1):
      serial: Expand the PCIe params for an Oxford two port serial cards (v2).

Thanks!

[PATCH] serial: Expand the PCIe params for an Oxford two port serial cards (v2).

[Konrad Rzeszutek Wilk]

Which of course has a different model number and sports two
serial outputs.

Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
[v2: s/1/2/ for the comment, spotted by Jan]
---
 xen/drivers/char/ns16550.c |   23 +++++++++++++++++++++++
 1 files changed, 23 insertions(+), 0 deletions(-)

diff --git a/xen/drivers/char/ns16550.c b/xen/drivers/char/ns16550.c
index 14e20ef..0e4abe1 100644
--- a/xen/drivers/char/ns16550.c
+++ b/xen/drivers/char/ns16550.c
@@ -105,6 +105,7 @@ enum {
     param_default = 0,
     param_trumanage,
     param_oxford,
+    param_oxford_2port,
 };
 /*
  * Create lookup tables for specific MMIO devices..
@@ -130,6 +131,16 @@ static const struct ns16550_config_param __initconst uart_param[] = {
         .fifo_size = 16,
         .lsr_mask = UART_LSR_THRE,
         .max_bars = 1, /* It can do more, but we would need more custom code.*/
+    },
+    [param_oxford_2port] = {
+        .base_baud = 4000000,
+        .uart_offset = 0x200,
+        .first_offset = 0x1000,
+        .reg_width = 1,
+        .reg_shift = 0,
+        .fifo_size = 16,
+        .lsr_mask = UART_LSR_THRE,
+        .max_bars = 2,
     }
 };
 static const struct ns16550_config_mmio __initconst uart_config[] =
@@ -158,12 +169,24 @@ static const struct ns16550_config_mmio __initconst uart_config[] =
         .dev_id = 0xc138,
         .param = param_oxford,
     },
+    /* OXPCIe952 2 Native UART  */
+    {
+        .vendor_id = PCI_VENDOR_ID_OXSEMI,
+        .dev_id = 0xc158,
+        .param = param_oxford_2port,
+    },
     /* OXPCIe952 1 Native UART  */
     {
         .vendor_id = PCI_VENDOR_ID_OXSEMI,
         .dev_id = 0xc13d,
         .param = param_oxford,
     },
+    /* OXPCIe952 2 Native UART  */
+    {
+        .vendor_id = PCI_VENDOR_ID_OXSEMI,
+        .dev_id = 0xc15d,
+        .param = param_oxford_2port,
+    },
     /* OXPCIe952 1 Native UART  */
     {
         .vendor_id = PCI_VENDOR_ID_OXSEMI,
-- 
1.7.7.6

Re: [PATCH] serial: Expand the PCIe params for an Oxford two port serial cards (v2).

[Keir Fraser]

Konrad Rzeszutek Wilk wrote:
> Which of course has a different model number and sports two
> serial outputs.
>
> Signed-off-by: Konrad Rzeszutek Wilk<konrad.wilk@oracle.com>
> [v2: s/1/2/ for the comment, spotted by Jan]
Acked-by: Keir Fraser <keir@xen.org>