From: Damien Le Moal <damien.lemoal@opensource.wdc.com>
To: Bjorn Helgaas <bhelgaas@google.com>, linux-pci@vger.kernel.org
Cc: "Rick Wertenbroek" <rick.wertenbroek@gmail.com>,
"Lorenzo Pieralisi" <lpieralisi@kernel.org>,
"Krzysztof Wilczyński" <kw@linux.com>,
"Manivannan Sadhasivam" <mani@kernel.org>,
"Kishon Vijay Abraham I" <kishon@kernel.org>,
"Arnd Bergmann" <arnd@arndb.de>,
"Greg Kroah-Hartman" <gregkh@linuxfoundation.org>
Subject: [PATCH v3 11/16] PCI: epf-test: Simplify dma support checks
Date: Sat, 25 Mar 2023 16:02:21 +0900 [thread overview]
Message-ID: <20230325070226.511323-12-damien.lemoal@opensource.wdc.com> (raw)
In-Reply-To: <20230325070226.511323-1-damien.lemoal@opensource.wdc.com>
There is no need to have each read, write and copy test functions check
for the FLAG_USE_DMA flag against the dma support status indicated by
epf_test->dma_supported. Move this test to the command handler function
pci_epf_test_cmd_handler() to check once for all cases.
Reviewed-by: Manivannan Sadhasivam <mani@kernel.org>
Signed-off-by: Damien Le Moal <damien.lemoal@opensource.wdc.com>
---
drivers/pci/endpoint/functions/pci-epf-test.c | 45 +++++++------------
1 file changed, 15 insertions(+), 30 deletions(-)
diff --git a/drivers/pci/endpoint/functions/pci-epf-test.c b/drivers/pci/endpoint/functions/pci-epf-test.c
index c2a14f828bdf..abc50d5bff97 100644
--- a/drivers/pci/endpoint/functions/pci-epf-test.c
+++ b/drivers/pci/endpoint/functions/pci-epf-test.c
@@ -329,7 +329,6 @@ static int pci_epf_test_copy(struct pci_epf_test *epf_test,
struct pci_epf_test_reg *reg)
{
int ret;
- bool use_dma;
void __iomem *src_addr;
void __iomem *dst_addr;
phys_addr_t src_phys_addr;
@@ -372,14 +371,7 @@ static int pci_epf_test_copy(struct pci_epf_test *epf_test,
}
ktime_get_ts64(&start);
- use_dma = !!(reg->flags & FLAG_USE_DMA);
- if (use_dma) {
- if (!epf_test->dma_supported) {
- dev_err(dev, "Cannot transfer data using DMA\n");
- ret = -EINVAL;
- goto err_map_addr;
- }
-
+ if (reg->flags & FLAG_USE_DMA) {
if (epf_test->dma_private) {
dev_err(dev, "Cannot transfer data using DMA\n");
ret = -EINVAL;
@@ -405,7 +397,8 @@ static int pci_epf_test_copy(struct pci_epf_test *epf_test,
kfree(buf);
}
ktime_get_ts64(&end);
- pci_epf_test_print_rate("COPY", reg->size, &start, &end, use_dma);
+ pci_epf_test_print_rate("COPY", reg->size, &start, &end,
+ reg->flags & FLAG_USE_DMA);
err_map_addr:
pci_epc_unmap_addr(epc, epf->func_no, epf->vfunc_no, dst_phys_addr);
@@ -430,7 +423,6 @@ static int pci_epf_test_read(struct pci_epf_test *epf_test,
void __iomem *src_addr;
void *buf;
u32 crc32;
- bool use_dma;
phys_addr_t phys_addr;
phys_addr_t dst_phys_addr;
struct timespec64 start, end;
@@ -461,14 +453,7 @@ static int pci_epf_test_read(struct pci_epf_test *epf_test,
goto err_map_addr;
}
- use_dma = !!(reg->flags & FLAG_USE_DMA);
- if (use_dma) {
- if (!epf_test->dma_supported) {
- dev_err(dev, "Cannot transfer data using DMA\n");
- ret = -EINVAL;
- goto err_dma_map;
- }
-
+ if (reg->flags & FLAG_USE_DMA) {
dst_phys_addr = dma_map_single(dma_dev, buf, reg->size,
DMA_FROM_DEVICE);
if (dma_mapping_error(dma_dev, dst_phys_addr)) {
@@ -493,7 +478,8 @@ static int pci_epf_test_read(struct pci_epf_test *epf_test,
ktime_get_ts64(&end);
}
- pci_epf_test_print_rate("READ", reg->size, &start, &end, use_dma);
+ pci_epf_test_print_rate("READ", reg->size, &start, &end,
+ reg->flags & FLAG_USE_DMA);
crc32 = crc32_le(~0, buf, reg->size);
if (crc32 != reg->checksum)
@@ -518,7 +504,6 @@ static int pci_epf_test_write(struct pci_epf_test *epf_test,
int ret;
void __iomem *dst_addr;
void *buf;
- bool use_dma;
phys_addr_t phys_addr;
phys_addr_t src_phys_addr;
struct timespec64 start, end;
@@ -552,14 +537,7 @@ static int pci_epf_test_write(struct pci_epf_test *epf_test,
get_random_bytes(buf, reg->size);
reg->checksum = crc32_le(~0, buf, reg->size);
- use_dma = !!(reg->flags & FLAG_USE_DMA);
- if (use_dma) {
- if (!epf_test->dma_supported) {
- dev_err(dev, "Cannot transfer data using DMA\n");
- ret = -EINVAL;
- goto err_dma_map;
- }
-
+ if (reg->flags & FLAG_USE_DMA) {
src_phys_addr = dma_map_single(dma_dev, buf, reg->size,
DMA_TO_DEVICE);
if (dma_mapping_error(dma_dev, src_phys_addr)) {
@@ -586,7 +564,8 @@ static int pci_epf_test_write(struct pci_epf_test *epf_test,
ktime_get_ts64(&end);
}
- pci_epf_test_print_rate("WRITE", reg->size, &start, &end, use_dma);
+ pci_epf_test_print_rate("WRITE", reg->size, &start, &end,
+ reg->flags & FLAG_USE_DMA);
/*
* wait 1ms inorder for the write to complete. Without this delay L3
@@ -671,6 +650,12 @@ static void pci_epf_test_cmd_handler(struct work_struct *work)
WRITE_ONCE(reg->command, 0);
WRITE_ONCE(reg->status, 0);
+ if ((READ_ONCE(reg->flags) & FLAG_USE_DMA) &&
+ !epf_test->dma_supported) {
+ dev_err(dev, "Cannot transfer data using DMA\n");
+ goto reset_handler;
+ }
+
if (reg->irq_type > IRQ_TYPE_MSIX) {
dev_err(dev, "Failed to detect IRQ type\n");
goto reset_handler;
--
2.39.2
next prev parent reply other threads:[~2023-03-25 7:02 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-25 7:02 [PATCH v3 00/16] PCI endpoint fixes and improvements Damien Le Moal
2023-03-25 7:02 ` [PATCH v3 01/16] PCI: endpoint: Automatically create a function specific attributes group Damien Le Moal
2023-03-25 7:02 ` [PATCH v3 02/16] PCI: endpoint: Move pci_epf_type_add_cfs() code Damien Le Moal
2023-03-25 7:02 ` [PATCH v3 03/16] PCI: epf-test: Fix DMA transfer completion initialization Damien Le Moal
2023-03-25 7:02 ` [PATCH v3 04/16] PCI: epf-test: Fix DMA transfer completion detection Damien Le Moal
2023-03-25 7:02 ` [PATCH v3 05/16] PCI: epf-test: Use dmaengine_submit() to initiate DMA transfer Damien Le Moal
2023-03-25 7:02 ` [PATCH v3 06/16] PCI: epf-test: Simplify read/write/copy test functions Damien Le Moal
2023-03-25 7:02 ` [PATCH v3 07/16] PCI: epf-test: Simply pci_epf_test_raise_irq() Damien Le Moal
2023-03-25 7:02 ` [PATCH v3 08/16] PCI: epf-test: Simplify IRQ test commands execution Damien Le Moal
2023-03-25 7:02 ` [PATCH v3 09/16] PCI: epf-test: Improve handling of command and status registers Damien Le Moal
2023-03-25 7:02 ` [PATCH v3 10/16] PCI: epf-test: Cleanup pci_epf_test_cmd_handler() Damien Le Moal
2023-03-28 6:56 ` Rick Wertenbroek
2023-03-29 1:02 ` Damien Le Moal
2023-03-25 7:02 ` Damien Le Moal [this message]
2023-03-25 7:02 ` [PATCH v3 12/16] PCI: epf-test: Simplify transfers result print Damien Le Moal
2023-03-25 7:02 ` [PATCH v3 13/16] misc: pci_endpoint_test: Free IRQs before removing the device Damien Le Moal
2023-03-25 7:02 ` [PATCH v3 14/16] misc: pci_endpoint_test: Re-init completion for every test Damien Le Moal
2023-03-25 7:02 ` [PATCH v3 15/16] misc: pci_endpoint_test: Do not write status in IRQ handler Damien Le Moal
2023-03-25 7:02 ` [PATCH v3 16/16] misc: pci_endpoint_test: Simplify pci_endpoint_test_msi_irq() Damien Le Moal
2023-03-28 17:57 ` [PATCH v3 00/16] PCI endpoint fixes and improvements Bjorn Helgaas
2023-03-31 10:20 ` Kishon Vijay Abraham I
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230325070226.511323-12-damien.lemoal@opensource.wdc.com \
--to=damien.lemoal@opensource.wdc.com \
--cc=arnd@arndb.de \
--cc=bhelgaas@google.com \
--cc=gregkh@linuxfoundation.org \
--cc=kishon@kernel.org \
--cc=kw@linux.com \
--cc=linux-pci@vger.kernel.org \
--cc=lpieralisi@kernel.org \
--cc=mani@kernel.org \
--cc=rick.wertenbroek@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).