Re: [PATCH 3/6] ACPI: add 2 parameters to function acpi dma controller register

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Mon, Jan 4, 2016 at 7:31 AM, Wang Hongcheng <annie.wang@xxxxxxx> wrote:
> As CSRT table will not always work, 2 arguments, base_request_line
> and num are added to acpi dma controller register
> as another way to get device request line.

Please, check my comments below.

>
> Signed-off-by: Wang Hongcheng <annie.wang@xxxxxxx>
> ---
>  drivers/dma/acpi-dma.c    | 25 ++++++++++++++++++++-----
>  drivers/dma/dw/platform.c |  2 +-
>  include/linux/acpi_dma.h  |  6 ++++++
>  3 files changed, 27 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/dma/acpi-dma.c b/drivers/dma/acpi-dma.c
> index 16d0daa..e2c27c3 100644
> --- a/drivers/dma/acpi-dma.c
> +++ b/drivers/dma/acpi-dma.c
> @@ -105,7 +105,7 @@ static int acpi_dma_parse_resource_group(const struct acpi_csrt_group *grp,
>   * We are using this table to get the request line range of the specific DMA
>   * controller to be used later.
>   */
> -static void acpi_dma_parse_csrt(struct acpi_device *adev, struct acpi_dma *adma)
> +static int acpi_dma_parse_csrt(struct acpi_device *adev, struct acpi_dma *adma)
>  {
>         struct acpi_csrt_group *grp, *end;
>         struct acpi_table_csrt *csrt;
> @@ -117,7 +117,7 @@ static void acpi_dma_parse_csrt(struct acpi_device *adev, struct acpi_dma *adma)
>         if (ACPI_FAILURE(status)) {
>                 if (status != AE_NOT_FOUND)
>                         dev_warn(&adev->dev, "failed to get the CSRT table\n");
> -               return;
> +               return -ENOENT;
>         }
>
>         grp = (struct acpi_csrt_group *)(csrt + 1);
> @@ -128,11 +128,12 @@ static void acpi_dma_parse_csrt(struct acpi_device *adev, struct acpi_dma *adma)
>                 if (ret < 0) {
>                         dev_warn(&adev->dev,
>                                  "error in parsing resource group\n");
> -                       return;
> +                       return -EINVAL;
>                 }
>
>                 grp = (struct acpi_csrt_group *)((void *)grp + grp->length);
>         }
> +       return 0;
>  }
>

Good.

>  /**
> @@ -140,6 +141,8 @@ static void acpi_dma_parse_csrt(struct acpi_device *adev, struct acpi_dma *adma)
>   * @dev:               struct device of DMA controller
>   * @acpi_dma_xlate:    translation function which converts a dma specifier
>   *                     into a dma_chan structure
> + * @base_request_line:  device request line base
> + * @num:                device request line range

Not ok.

>   * @data               pointer to controller specific data to be used by
>   *                     translation function
>   *
> @@ -152,10 +155,13 @@ static void acpi_dma_parse_csrt(struct acpi_device *adev, struct acpi_dma *adma)
>  int acpi_dma_controller_register(struct device *dev,
>                 struct dma_chan *(*acpi_dma_xlate)
>                 (struct acpi_dma_spec *, struct acpi_dma *),
> +               unsigned short base_request_line,
> +               unsigned short num,

Add them after void *data

>                 void *data)

>  {
>         struct acpi_device *adev;
>         struct acpi_dma *adma;
> +       int ret;
>
>         if (!dev || !acpi_dma_xlate)
>                 return -EINVAL;
> @@ -173,7 +179,12 @@ int acpi_dma_controller_register(struct device *dev,
>         adma->acpi_dma_xlate = acpi_dma_xlate;
>         adma->data = data;
>
> -       acpi_dma_parse_csrt(adev, adma);
> +       ret = acpi_dma_parse_csrt(adev, adma);
> +

> +       if (ret < 0) {
> +               adma->base_request_line = base_request_line;
> +               adma->end_request_line = base_request_line + num;
> +       }

No need to assign parameters there.
Create a new function and call it as a fallback of acpi_dma_parse_csrt();

ret = acpi_dma_parse_csrt();
if (ret)
 acpi_dma_assign_request_line();

> @@ -236,6 +247,8 @@ static void devm_acpi_dma_release(struct device *dev, void *res)
>  int devm_acpi_dma_controller_register(struct device *dev,
>                 struct dma_chan *(*acpi_dma_xlate)
>                 (struct acpi_dma_spec *, struct acpi_dma *),
> +               unsigned short base_request_line,
> +               unsigned short num,

After *data.

>                 void *data)
>  {
>         void *res;
> @@ -245,7 +258,9 @@ int devm_acpi_dma_controller_register(struct device *dev,
>         if (!res)
>                 return -ENOMEM;
>
> -       ret = acpi_dma_controller_register(dev, acpi_dma_xlate, data);
> +       ret = acpi_dma_controller_register(dev, acpi_dma_xlate,
> +                                          base_request_line,
> +                                          num, data);

Ditto.

>         if (ret) {
>                 devres_free(res);
>                 return ret;
> diff --git a/drivers/dma/dw/platform.c b/drivers/dma/dw/platform.c
> index 68a4815..54b898d 100644
> --- a/drivers/dma/dw/platform.c
> +++ b/drivers/dma/dw/platform.c
> @@ -88,7 +88,7 @@ static void dw_dma_acpi_controller_register(struct dw_dma *dw)
>         info->filter_fn = dw_dma_acpi_filter;
>
>         ret = devm_acpi_dma_controller_register(dev, acpi_dma_simple_xlate,
> -                                               info);
> +                                               0, 0, info);

Ditto.

>         if (ret)
>                 dev_err(dev, "could not register acpi_dma_controller\n");
>  }
> diff --git a/include/linux/acpi_dma.h b/include/linux/acpi_dma.h
> index 329436d..d90febe 100644
> --- a/include/linux/acpi_dma.h
> +++ b/include/linux/acpi_dma.h
> @@ -62,11 +62,15 @@ struct acpi_dma_filter_info {
>  int acpi_dma_controller_register(struct device *dev,
>                 struct dma_chan *(*acpi_dma_xlate)
>                 (struct acpi_dma_spec *, struct acpi_dma *),
> +               unsigned short base_request_line,
> +               unsigned short num,

Ditto.

>                 void *data);
>  int acpi_dma_controller_free(struct device *dev);
>  int devm_acpi_dma_controller_register(struct device *dev,
>                 struct dma_chan *(*acpi_dma_xlate)
>                 (struct acpi_dma_spec *, struct acpi_dma *),
> +               unsigned short base_request_line,
> +               unsigned short num,

Ditto.

>                 void *data);
>  void devm_acpi_dma_controller_free(struct device *dev);
>
> @@ -82,6 +86,8 @@ struct dma_chan *acpi_dma_simple_xlate(struct acpi_dma_spec *dma_spec,
>  static inline int acpi_dma_controller_register(struct device *dev,
>                 struct dma_chan *(*acpi_dma_xlate)
>                 (struct acpi_dma_spec *, struct acpi_dma *),
> +               unsigned short base_request_line,
> +               unsigned short num,
>                 void *data)

Ditto.

>  {
>         return -ENODEV;
> --
> 1.9.1
>



-- 
With Best Regards,
Andy Shevchenko
--
To unsubscribe from this list: send the line "unsubscribe linux-serial" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html



[Index of Archives]     [Kernel Newbies]     [Security]     [Netfilter]     [Bugtraq]     [Linux PPP]     [Linux FS]     [Yosemite News]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Samba]     [Video 4 Linux]     [Linmodem]     [Device Mapper]     [Linux Kernel for ARM]

  Powered by Linux