From: Ferruh Yigit <ferruh.yigit@amd.com>
To: Thomas Monjalon <thomas@monjalon.net>
Cc: <dev@dpdk.org>, David Marchand <david.marchand@redhat.com>,
Daxue Gao <daxuex.gao@intel.com>,
Christian Ehrhardt <christian.ehrhardt@canonical.com>
Subject: [PATCH dpdk-kmod] linux/igb_uio: fix build with kernel 5.18
Date: Fri, 16 Dec 2022 11:57:32 +0000 [thread overview]
Message-ID: <20221216115732.3552650-1-ferruh.yigit@amd.com> (raw)
In Linux kernel v5.18, "pci-dma-compat.h" wrapper file is removed [1].
Some APIs in that wrapper file were used by igb_uio kernel module and
kernel module build fails after mentioned commit.
Fixed build for v5.18 by replacing APIs in igb_uio.
Replaced APIs are available in Linux v4.4 (minimum Linux kernel version
supported by DPDK), so no Linux version check is needed.
[1]
Commit 7968778914e5 ("PCI: Remove the deprecated "pci-dma-compat.h" API")
Bugzilla ID: 1142
Signed-off-by: Ferruh Yigit <ferruh.yigit@amd.com>
---
Cc: Daxue Gao <daxuex.gao@intel.com>
Cc: Christian Ehrhardt <christian.ehrhardt@canonical.com>
This also needs to be backported to v19.11 LTS
---
linux/igb_uio/igb_uio.c | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/linux/igb_uio/igb_uio.c b/linux/igb_uio/igb_uio.c
index 33e0e0286b69..0045e0fb737a 100644
--- a/linux/igb_uio/igb_uio.c
+++ b/linux/igb_uio/igb_uio.c
@@ -512,18 +512,12 @@ igbuio_pci_probe(struct pci_dev *dev, const struct pci_device_id *id)
goto fail_release_iomem;
/* set 64-bit DMA mask */
- err = pci_set_dma_mask(dev, DMA_BIT_MASK(64));
+ err = dma_set_mask_and_coherent(&dev->dev, DMA_BIT_MASK(64));
if (err != 0) {
dev_err(&dev->dev, "Cannot set DMA mask\n");
goto fail_release_iomem;
}
- err = pci_set_consistent_dma_mask(dev, DMA_BIT_MASK(64));
- if (err != 0) {
- dev_err(&dev->dev, "Cannot set consistent DMA mask\n");
- goto fail_release_iomem;
- }
-
/* fill uio infos */
udev->info.name = "igb_uio";
udev->info.version = "0.1";
--
2.25.1
next reply other threads:[~2022-12-16 11:57 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-16 11:57 Ferruh Yigit [this message]
2022-12-16 17:33 ` Stephen Hemminger
2022-12-18 14:26 ` Ferruh Yigit
2022-12-22 15:35 ` Luca Boccassi
2023-02-05 17:41 ` Thomas Monjalon
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=20221216115732.3552650-1-ferruh.yigit@amd.com \
--to=ferruh.yigit@amd.com \
--cc=christian.ehrhardt@canonical.com \
--cc=david.marchand@redhat.com \
--cc=daxuex.gao@intel.com \
--cc=dev@dpdk.org \
--cc=thomas@monjalon.net \
/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).