Re: [PATCH 7/9] Serial:8250: New Port Type PORT_AMD_8250

[Andy Shevchenko]

On Fri, Dec 4, 2015 at 5:24 AM, Wang Hongcheng  wrote:
> Set a new port type for AMD Carrizo.  Add has_pl330_dma to 8250_dw's
> private data and init fcr,ier as well as dma rx size.
>
> Signed-off-by: Wang Hongcheng 
> ---
>  drivers/acpi/acpi_apd.c | 10 ++
>  drivers/tty/serial/8250/8250_dw.c   | 16 
>  drivers/tty/serial/8250/8250_port.c |  9 +
>  include/linux/serial_8250.h |  4 
>  include/uapi/linux/serial_core.h|  3 ++-
>  include/uapi/linux/serial_reg.h |  2 ++
>  6 files changed, 43 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/acpi/acpi_apd.c b/drivers/acpi/acpi_apd.c
> index 906a20f..787f477 100644
> --- a/drivers/acpi/acpi_apd.c
> +++ b/drivers/acpi/acpi_apd.c
> @@ -23,6 +23,7 @@
>  #include 
>  #include 
>  #include 
> +#include 
>
>  #include "internal.h"
>
> @@ -49,6 +50,10 @@ static struct dma_pl330_platdata amd_pl330 = {
> .acpi_xlate_filter = apd_acpi_xlate_filter,
>  };
>
> +static struct plat_dw8250_data amd_dw8250 = {
> +   .has_pl330_dma = 1,
> +};
> +
>  /**
>   * struct apd_device_desc - a descriptor for apd device.
>   * @flags: device flags like %ACPI_APD_SYSFS, %ACPI_APD_PM;
> @@ -164,6 +169,11 @@ static int acpi_apd_create_device(struct acpi_device 
> *adev,
> goto err_out;
>
> if (!strncmp(pdev->name, "AMD0020", 7)) {
> +   ret = platform_device_add_data(pdev, _dw8250,
> +  sizeof(amd_dw8250));
> +   if (ret)
> +   goto err_out;
> +
> memset(_quirks, 0, sizeof(amba_quirks));
> setup_quirks(pdev, _quirks);
>
> diff --git a/drivers/tty/serial/8250/8250_dw.c 
> b/drivers/tty/serial/8250/8250_dw.c
> index a5d319e..a5ae9b6 100644
> --- a/drivers/tty/serial/8250/8250_dw.c
> +++ b/drivers/tty/serial/8250/8250_dw.c
> @@ -66,6 +66,8 @@ struct dw8250_data {
>
> unsigned intskip_autocfg:1;
> unsigned intuart_16550_compatible:1;

> +

Remove this

> +   unsignedhas_pl330_dma:1;

Use unsigned int.

>  };
>
>  #define BYT_PRV_CLK0x800
> @@ -304,6 +306,7 @@ static void dw8250_setup_port(struct uart_port *p)
>  {
> struct uart_8250_port *up = up_to_u8250p(p);
> u32 reg;
> +   struct dw8250_data *d = p->private_data;

Rename d -> data and move the line to be second in the definition list.

>
> /*
>  * If the Component Version Register returns zero, we know that
> @@ -326,6 +329,16 @@ static void dw8250_setup_port(struct uart_port *p)
> p->flags |= UPF_FIXED_TYPE;
> p->fifosize = DW_UART_CPR_FIFO_SIZE(reg);
> up->capabilities = UART_CAP_FIFO;
> +   if (d->has_pl330_dma) {
> +   p->type = PORT_AMD_8250;

> +   p->flags |= UPF_SHARE_IRQ;

Isn't it a default?

> +
> +   up->ier |= UART_IER_PTIME | UART_IER_THRI |
> +   UART_IER_RLSI | UART_IER_RDI;
> +   up->fcr |= UART_FCR_R_TRIG_10 | UART_FCR_T_TRIG_11 |
> +   UART_FCR_DMA_SELECT;
> +   up->tx_loadsz = p->fifosize / 2;
> +   }
> }
>
> if (reg & DW_UART_CPR_AFCE_MODE)
> @@ -339,6 +352,7 @@ static int dw8250_probe(struct platform_device *pdev)
> int irq = platform_get_irq(pdev, 0);
> struct uart_port *p = 
> struct dw8250_data *data;
> +   struct plat_dw8250_data *pdata = dev_get_platdata(>dev);
> int err;
> u32 val;
>
> @@ -468,6 +482,7 @@ static int dw8250_probe(struct platform_device *pdev)
> p->handle_irq = NULL;
> }
>
> +   data->has_pl330_dma = pdata ? pdata->has_pl330_dma : 0;
> if (!data->skip_autocfg)
> dw8250_setup_port(p);
>
> @@ -475,6 +490,7 @@ static int dw8250_probe(struct platform_device *pdev)
> if (p->fifosize) {
> data->dma.rxconf.src_maxburst = p->fifosize / 4;
> data->dma.txconf.dst_maxburst = p->fifosize / 4;
> +   data->dma.rx_size = data->has_pl330_dma ? (p->fifosize / 2 + 
> 2) : 0;
> uart.dma = >dma;
> }
>
> diff --git a/drivers/tty/serial/8250/8250_port.c 
> b/drivers/tty/serial/8250/8250_port.c
> index 52d82d2..b258edc 100644
> --- a/drivers/tty/serial/8250/8250_port.c
> +++ b/drivers/tty/serial/8250/8250_port.c
> @@ -269,6 +269,15 @@ configured less than Maximum supported fifo bytes */
> .rxtrig_bytes   = {1, 4, 8, 14},
> .flags  = UART_CAP_FIFO,
> },
> +   [PORT_AMD_8250] = {
> +   .name   = "AMD_8250",
> +   .fifo_size  = 256,
> +   .tx_loadsz  = 128,
> +   .fcr= UART_FCR_ENABLE_FIFO | UART_FCR_R_TRIG_10 |
> +   

Re: [PATCH 7/9] Serial:8250: New Port Type PORT_AMD_8250

[Andy Shevchenko]

On Fri, Dec 4, 2015 at 5:24 AM, Wang Hongcheng  wrote:
> Set a new port type for AMD Carrizo.  Add has_pl330_dma to 8250_dw's
> private data and init fcr,ier as well as dma rx size.
>
> Signed-off-by: Wang Hongcheng 
> ---
>  drivers/acpi/acpi_apd.c | 10 ++
>  drivers/tty/serial/8250/8250_dw.c   | 16 
>  drivers/tty/serial/8250/8250_port.c |  9 +
>  include/linux/serial_8250.h |  4 
>  include/uapi/linux/serial_core.h|  3 ++-
>  include/uapi/linux/serial_reg.h |  2 ++
>  6 files changed, 43 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/acpi/acpi_apd.c b/drivers/acpi/acpi_apd.c
> index 906a20f..787f477 100644
> --- a/drivers/acpi/acpi_apd.c
> +++ b/drivers/acpi/acpi_apd.c
> @@ -23,6 +23,7 @@
>  #include 
>  #include 
>  #include 
> +#include 
>
>  #include "internal.h"
>
> @@ -49,6 +50,10 @@ static struct dma_pl330_platdata amd_pl330 = {
> .acpi_xlate_filter = apd_acpi_xlate_filter,
>  };
>
> +static struct plat_dw8250_data amd_dw8250 = {
> +   .has_pl330_dma = 1,
> +};
> +
>  /**
>   * struct apd_device_desc - a descriptor for apd device.
>   * @flags: device flags like %ACPI_APD_SYSFS, %ACPI_APD_PM;
> @@ -164,6 +169,11 @@ static int acpi_apd_create_device(struct acpi_device 
> *adev,
> goto err_out;
>
> if (!strncmp(pdev->name, "AMD0020", 7)) {
> +   ret = platform_device_add_data(pdev, _dw8250,
> +  sizeof(amd_dw8250));
> +   if (ret)
> +   goto err_out;
> +
> memset(_quirks, 0, sizeof(amba_quirks));
> setup_quirks(pdev, _quirks);
>
> diff --git a/drivers/tty/serial/8250/8250_dw.c 
> b/drivers/tty/serial/8250/8250_dw.c
> index a5d319e..a5ae9b6 100644
> --- a/drivers/tty/serial/8250/8250_dw.c
> +++ b/drivers/tty/serial/8250/8250_dw.c
> @@ -66,6 +66,8 @@ struct dw8250_data {
>
> unsigned intskip_autocfg:1;
> unsigned intuart_16550_compatible:1;

> +

Remove this

> +   unsignedhas_pl330_dma:1;

Use unsigned int.

>  };
>
>  #define BYT_PRV_CLK0x800
> @@ -304,6 +306,7 @@ static void dw8250_setup_port(struct uart_port *p)
>  {
> struct uart_8250_port *up = up_to_u8250p(p);
> u32 reg;
> +   struct dw8250_data *d = p->private_data;

Rename d -> data and move the line to be second in the definition list.

>
> /*
>  * If the Component Version Register returns zero, we know that
> @@ -326,6 +329,16 @@ static void dw8250_setup_port(struct uart_port *p)
> p->flags |= UPF_FIXED_TYPE;
> p->fifosize = DW_UART_CPR_FIFO_SIZE(reg);
> up->capabilities = UART_CAP_FIFO;
> +   if (d->has_pl330_dma) {
> +   p->type = PORT_AMD_8250;

> +   p->flags |= UPF_SHARE_IRQ;

Isn't it a default?

> +
> +   up->ier |= UART_IER_PTIME | UART_IER_THRI |
> +   UART_IER_RLSI | UART_IER_RDI;
> +   up->fcr |= UART_FCR_R_TRIG_10 | UART_FCR_T_TRIG_11 |
> +   UART_FCR_DMA_SELECT;
> +   up->tx_loadsz = p->fifosize / 2;
> +   }
> }
>
> if (reg & DW_UART_CPR_AFCE_MODE)
> @@ -339,6 +352,7 @@ static int dw8250_probe(struct platform_device *pdev)
> int irq = platform_get_irq(pdev, 0);
> struct uart_port *p = 
> struct dw8250_data *data;
> +   struct plat_dw8250_data *pdata = dev_get_platdata(>dev);
> int err;
> u32 val;
>
> @@ -468,6 +482,7 @@ static int dw8250_probe(struct platform_device *pdev)
> p->handle_irq = NULL;
> }
>
> +   data->has_pl330_dma = pdata ? pdata->has_pl330_dma : 0;
> if (!data->skip_autocfg)
> dw8250_setup_port(p);
>
> @@ -475,6 +490,7 @@ static int dw8250_probe(struct platform_device *pdev)
> if (p->fifosize) {
> data->dma.rxconf.src_maxburst = p->fifosize / 4;
> data->dma.txconf.dst_maxburst = p->fifosize / 4;
> +   data->dma.rx_size = data->has_pl330_dma ? (p->fifosize / 2 + 
> 2) : 0;
> uart.dma = >dma;
> }
>
> diff --git a/drivers/tty/serial/8250/8250_port.c 
> b/drivers/tty/serial/8250/8250_port.c
> index 52d82d2..b258edc 100644
> --- a/drivers/tty/serial/8250/8250_port.c
> +++ b/drivers/tty/serial/8250/8250_port.c
> @@ -269,6 +269,15 @@ configured less than Maximum supported fifo bytes */
> .rxtrig_bytes   = {1, 4, 8, 14},
> .flags  = UART_CAP_FIFO,
> },
> +   [PORT_AMD_8250] = {
> +   .name   = "AMD_8250",
> +   .fifo_size  = 256,
> +   .tx_loadsz  = 128,
> +   .fcr= UART_FCR_ENABLE_FIFO | UART_FCR_R_TRIG_10 |
>