[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20220214100116.GK3494@thinkpad>
Date: Mon, 14 Feb 2022 15:32:32 +0530
From: Manivannan Sadhasivam <manivannan.sadhasivam@...aro.org>
To: Lad Prabhakar <prabhakar.mahadev-lad.rj@...renesas.com>
Cc: Kishon Vijay Abraham I <kishon@...com>,
Bjorn Helgaas <bhelgaas@...gle.com>,
Lorenzo Pieralisi <lorenzo.pieralisi@....com>,
Krzysztof WilczyĆski <kw@...ux.com>,
Arnd Bergmann <arnd@...db.de>,
Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
Marek Vasut <marek.vasut+renesas@...il.com>,
Yoshihiro Shimoda <yoshihiro.shimoda.uh@...esas.com>,
Rob Herring <robh@...nel.org>, linux-pci@...r.kernel.org,
linux-renesas-soc@...r.kernel.org, linux-kernel@...r.kernel.org,
Prabhakar <prabhakar.csengg@...il.com>,
Biju Das <biju.das.jz@...renesas.com>
Subject: Re: [RFC PATCH 3/5] misc: pci_endpoint_test: Add driver data for
Renesas RZ/G2{EHMN}
On Wed, Jan 26, 2022 at 07:50:41PM +0000, Lad Prabhakar wrote:
> Add "dmac_data_alignment" member (indicating the alignment requirement
> for internal DMAC for data transfers) to struct pci_endpoint_test_data
> and add driver_data to Renesas RZ/G2{EHMN}.
>
> Signed-off-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@...renesas.com>
> ---
> drivers/misc/pci_endpoint_test.c | 40 ++++++++++++++++++++++++++------
> 1 file changed, 33 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/misc/pci_endpoint_test.c b/drivers/misc/pci_endpoint_test.c
> index 8f786a225dcf..0a00d45830e9 100644
> --- a/drivers/misc/pci_endpoint_test.c
> +++ b/drivers/misc/pci_endpoint_test.c
> @@ -116,6 +116,7 @@ struct pci_endpoint_test {
> struct miscdevice miscdev;
> enum pci_barno test_reg_bar;
> size_t alignment;
> + size_t dmac_data_alignment;
Alignment is a generic requirement, so this could be "dma_alignment" or
"data_alignment". Eventhough the only current user is internal DMA, this can
also be used by others in the future.
Thanks,
Mani
> const char *name;
> };
>
> @@ -123,6 +124,7 @@ struct pci_endpoint_test_data {
> enum pci_barno test_reg_bar;
> size_t alignment;
> int irq_type;
> + size_t dmac_data_alignment;
> };
>
> static inline u32 pci_endpoint_test_readl(struct pci_endpoint_test *test,
> @@ -368,8 +370,11 @@ static bool pci_endpoint_test_copy(struct pci_endpoint_test *test,
> goto err;
>
> use_dma = !!(param.flags & PCITEST_FLAGS_USE_DMA);
> - if (use_dma)
> + if (use_dma) {
> flags |= FLAG_USE_DMA;
> + if (test->dmac_data_alignment)
> + size = ALIGN(size, test->dmac_data_alignment);
> + }
>
> if (irq_type < IRQ_TYPE_LEGACY || irq_type > IRQ_TYPE_MSIX) {
> dev_err(dev, "Invalid IRQ type option\n");
> @@ -502,8 +507,11 @@ static bool pci_endpoint_test_write(struct pci_endpoint_test *test,
> goto err;
>
> use_dma = !!(param.flags & PCITEST_FLAGS_USE_DMA);
> - if (use_dma)
> + if (use_dma) {
> flags |= FLAG_USE_DMA;
> + if (test->dmac_data_alignment)
> + size = ALIGN(size, test->dmac_data_alignment);
> + }
>
> if (irq_type < IRQ_TYPE_LEGACY || irq_type > IRQ_TYPE_MSIX) {
> dev_err(dev, "Invalid IRQ type option\n");
> @@ -600,8 +608,11 @@ static bool pci_endpoint_test_read(struct pci_endpoint_test *test,
> goto err;
>
> use_dma = !!(param.flags & PCITEST_FLAGS_USE_DMA);
> - if (use_dma)
> + if (use_dma) {
> flags |= FLAG_USE_DMA;
> + if (test->dmac_data_alignment)
> + size = ALIGN(size, test->dmac_data_alignment);
> + }
>
> if (irq_type < IRQ_TYPE_LEGACY || irq_type > IRQ_TYPE_MSIX) {
> dev_err(dev, "Invalid IRQ type option\n");
> @@ -787,6 +798,7 @@ static int pci_endpoint_test_probe(struct pci_dev *pdev,
> test->test_reg_bar = test_reg_bar;
> test->alignment = data->alignment;
> irq_type = data->irq_type;
> + test->dmac_data_alignment = data->dmac_data_alignment;
> }
>
> init_completion(&test->irq_raised);
> @@ -948,6 +960,12 @@ static const struct pci_endpoint_test_data j721e_data = {
> .irq_type = IRQ_TYPE_MSI,
> };
>
> +static const struct pci_endpoint_test_data renesas_rzg2x_data = {
> + .test_reg_bar = BAR_0,
> + .irq_type = IRQ_TYPE_MSI,
> + .dmac_data_alignment = 8,
> +};
> +
> static const struct pci_device_id pci_endpoint_test_tbl[] = {
> { PCI_DEVICE(PCI_VENDOR_ID_TI, PCI_DEVICE_ID_TI_DRA74x),
> .driver_data = (kernel_ulong_t)&default_data,
> @@ -965,10 +983,18 @@ static const struct pci_device_id pci_endpoint_test_tbl[] = {
> { PCI_DEVICE(PCI_VENDOR_ID_TI, PCI_DEVICE_ID_TI_AM654),
> .driver_data = (kernel_ulong_t)&am654_data
> },
> - { PCI_DEVICE(PCI_VENDOR_ID_RENESAS, PCI_DEVICE_ID_RENESAS_R8A774A1),},
> - { PCI_DEVICE(PCI_VENDOR_ID_RENESAS, PCI_DEVICE_ID_RENESAS_R8A774B1),},
> - { PCI_DEVICE(PCI_VENDOR_ID_RENESAS, PCI_DEVICE_ID_RENESAS_R8A774C0),},
> - { PCI_DEVICE(PCI_VENDOR_ID_RENESAS, PCI_DEVICE_ID_RENESAS_R8A774E1),},
> + { PCI_DEVICE(PCI_VENDOR_ID_RENESAS, PCI_DEVICE_ID_RENESAS_R8A774A1),
> + .driver_data = (kernel_ulong_t)&renesas_rzg2x_data,
> + },
> + { PCI_DEVICE(PCI_VENDOR_ID_RENESAS, PCI_DEVICE_ID_RENESAS_R8A774B1),
> + .driver_data = (kernel_ulong_t)&renesas_rzg2x_data,
> + },
> + { PCI_DEVICE(PCI_VENDOR_ID_RENESAS, PCI_DEVICE_ID_RENESAS_R8A774C0),
> + .driver_data = (kernel_ulong_t)&renesas_rzg2x_data,
> + },
> + { PCI_DEVICE(PCI_VENDOR_ID_RENESAS, PCI_DEVICE_ID_RENESAS_R8A774E1),
> + .driver_data = (kernel_ulong_t)&renesas_rzg2x_data,
> + },
> { PCI_DEVICE(PCI_VENDOR_ID_TI, PCI_DEVICE_ID_TI_J721E),
> .driver_data = (kernel_ulong_t)&j721e_data,
> },
> --
> 2.25.1
>
Powered by blists - more mailing lists