| From fd8a57b80e27f318f47051f9210934f5ab0f7eb1 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Thu, 16 Jan 2025 22:46:47 +0530 |
| Subject: PCI: endpoint: pci-epf-test: Fix check for DMA MEMCPY test |
| |
| From: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> |
| |
| [ Upstream commit 235c2b197a8de2887f13990094a3343d2392155b ] |
| |
| Currently, if DMA MEMCPY test is requested by the host, and if the endpoint |
| DMA controller supports DMA_PRIVATE, the test will fail. This is not |
| correct since there is no check for DMA_MEMCPY capability and the DMA |
| controller can support both DMA_PRIVATE and DMA_MEMCPY. |
| |
| Fix the check and also reword the error message. |
| |
| Link: https://lore.kernel.org/r/20250116171650.33585-2-manivannan.sadhasivam@linaro.org |
| Fixes: 8353813c88ef ("PCI: endpoint: Enable DMA tests for endpoints with DMA capabilities") |
| Reported-by: Niklas Cassel <cassel@kernel.org> |
| Closes: https://lore.kernel.org/linux-pci/Z3QtEihbiKIGogWA@ryzen |
| Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> |
| Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> |
| Tested-by: Niklas Cassel <cassel@kernel.org> |
| Reviewed-by: Niklas Cassel <cassel@kernel.org> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/pci/endpoint/functions/pci-epf-test.c | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| diff --git a/drivers/pci/endpoint/functions/pci-epf-test.c b/drivers/pci/endpoint/functions/pci-epf-test.c |
| index d90c8be7371e0..b2fdd8c82c438 100644 |
| --- a/drivers/pci/endpoint/functions/pci-epf-test.c |
| +++ b/drivers/pci/endpoint/functions/pci-epf-test.c |
| @@ -328,8 +328,8 @@ static void pci_epf_test_copy(struct pci_epf_test *epf_test, |
| void *copy_buf = NULL, *buf; |
| |
| if (reg->flags & FLAG_USE_DMA) { |
| - if (epf_test->dma_private) { |
| - dev_err(dev, "Cannot transfer data using DMA\n"); |
| + if (!dma_has_cap(DMA_MEMCPY, epf_test->dma_chan_tx->device->cap_mask)) { |
| + dev_err(dev, "DMA controller doesn't support MEMCPY\n"); |
| ret = -EINVAL; |
| goto set_status; |
| } |
| -- |
| 2.39.5 |
| |
