From patchwork Thu Oct 6 09:37:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Georg_M=C3=BCller?= X-Patchwork-Id: 117500 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id E6CA1A00C2; Thu, 6 Oct 2022 20:41:36 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8E03040DDC; Thu, 6 Oct 2022 20:41:36 +0200 (CEST) Received: from mout.gmx.net (mout.gmx.net [212.227.15.18]) by mails.dpdk.org (Postfix) with ESMTP id 7A04242BDA for ; Thu, 6 Oct 2022 11:38:29 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1665049109; bh=ts9IX6B/AS5IdqaYW+ADSFRD9xr/KAmc1CkGBYuQtsg=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date; b=MSMwowP7l1xDSLCsL7U1ew2S14etOpashitligmHFMBYWvPaxRblxWpcysarWu+WZ cehPipRuJmBVw6g7jftwUXchWejJjPsjQMvjLpsnDrdIzhROMzm3sgzFWcWgjjQOLs Nkcm9wk5MQ/3j7dZDQ/I/GNp+qcRrtK+eVoXqVT4= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from nb-georg.intra.allegro-packets.com ([87.167.92.237]) by mail.gmx.net (mrgmx005 [212.227.17.190]) with ESMTPSA (Nemesis) id 1N5G9n-1pNS0e0F2j-0118s5; Thu, 06 Oct 2022 11:38:29 +0200 From: =?utf-8?q?Georg_M=C3=BCller?= To: dev@dpdk.org Cc: =?utf-8?q?Georg_M=C3=BCller?= Subject: [PATCH] linux/igb_uio: fix build with kernel 5.18+ Date: Thu, 6 Oct 2022 11:37:30 +0200 Message-Id: <20221006093730.1602342-1-georgmueller@gmx.net> X-Mailer: git-send-email 2.37.3 MIME-Version: 1.0 X-Provags-ID: V03:K1:611vrCqWm75YcaeeRfy2CFdNqlkL42a5Y+gErlzC5PaDAHqMul3 i/yOt5wUlY/DVIP80ZKH4IJArnvB2HJcai511JfEiD4o9rmzBbVa9hFNG9fDxQ1QuKhK5vJ p3EGdTDBNdNL3sY9QZbR3pUFUVLioFi+mbxpUdMyAuop/mKrkimCr5C4BZaQPjSGsFZB7xR w6ypRVnSyl2MGuYBpomKQ== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:1aRwmAMxnH8=:SzjbjndZ2JxIa3sazhk9+G I3RcKI/8AjMz8yY6T5aVyxBe78tG7lL03lcDrnt3ohnuZFK8f+9UeH/1VxHPVJa7NiIqNpu7t qdHt7sDqMDu1vjQ2qHMzxZxTQhL/w09Ex2k8fzlF9p/uMYP+seEC1xJygd8PrA8PG9kIk7Nxj iB1jQZONMMbSsui/vsXZWvhSK0rAvr1T3E3Yhknp+oSx1zkRuIaYHoaPcXNmk1usvyJgt9lV2 p6HX1mjs1Z6Zdc1FcZfXpF6m5qyF86ESsNoFakzo+7HeqFb0Mdex0ot5Mmro+oPljmyxaAFqC mHC+F3nJxp/2SEo053IoaHIoeYfa9AQjR02+JG+Xltmh0DuGxGxs603T+iGRh3PlopoeBLqFC Q3BlKWyb3+/p9mp0Tv74zm7qu7cekJrouj31d9YkyGCkMc2vp2iwv/3C+jT+bYsgnSYA38fxO jZXKzY3UPx3H3l27BkBTKWHt1BzbcaR/fKgd0aolsjSbbwTvx5sIvuLyfiKhCD7epFBAdEyWE m9mwFWQtTtpfckHbpbu1oD6VcQZiAwloL6XgcgChd47cmE1gsRIx7iR+GgzeUTTpJgtw2yCyl XkSh5zHXtGUPxOqjCluHsKzn3ZZFENkqva2R4CGlnrCNeNDnwNXU7q/uAkqr6OKHJrTCU7tmA Mt00FHnUXRqMUBpRIoXugpnkYYmg/Zna5XMz9OYpTKrO/KzHlq/CpFWM5zfomC3J02rkfwjde UJLSYS8aH03mJb8Rcnzq+fhr4gw6JJ3AYqLL85Jhj5glEHHaTpIrE6sGXXuJHrNKfc5OuIxfF wQJfPBa4V5GLK4+z029mEqG0zAoi2+yagpNYETsbV+H82d9kP+Io2yWwaDHiQ8Cnz9FmXQ+fH bGV8G3cPxtIMX+H6adPxyEvIa8Yy9mUtQFWW1r2RE5etfk+iYY33QoiacGI75K6nU2WE1vhkM lqnHpxxENT+qFR/psK1Gr5udMwk5OZwYFzYBCWOQqRE+OzTr08/DMrq1nLrLgkAHTHd0It+05 VdWcXROZ+72/FOpwVCViIK3agHopydcFvNCDSZEf6f+d/WC7H7+0V3LgBGWH42V3NDWuf/nKl HllVoCoyNZ31GwAF/gJo42ncywswdpj8oECHwvo+izMuUIBqpRyVOJD51kV11Gn9qea50Ctgn 05Bpdpm/cXVjD3qcLTULCs+Mdf+XBkbYyfBGd9FTNJpyF5FARcLihHywvgr9+UVeQdyQCX+Ty vsEvLZRNjZxAvazWt8zYDgYWq0o7vYG5afXkoPmRmyefBrTb949GOHjxo695ocub6r0iXhfYg aMhCYLBGx8b+/GyVqx8OunJXBcnFlFRsqHj/DJikj2wGVMuNoxndMvpMbj3vGo3oERHXp7H9a S0tDWEepZDYjjpRlGLzcdwX/alYDU11SAdJ7ZOyeGrSH5G5AaG0jbdeXFLkIcrlxNto5Qgs0j /oMWiFMY22Tl4VRoakCMGupe8kF6z9Srvx9iYlZhoEINLUpnFtxAIMnIXN1/GGdAyW1POIAMz y9w5lJ7bPxl2Ptv0ejbLFaOJhOGULYql4drhpVLYf1TIb X-Mailman-Approved-At: Thu, 06 Oct 2022 20:41:35 +0200 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org pci_set_dma_mask() and pci_set_consistent_dma_mask() were removed with kernel 5.18. They both were just wrappers for dma_set_mask() and dma_set_coherent_mask(). Instead, use dma_set_mask_and_coherent(), which is a combination of dma_set_mask() and dma_set_coherent_mask(). dma_set_mask_and_coherent() exists since kernel 3.13. --- linux/igb_uio/igb_uio.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) -- 2.37.3 diff --git a/linux/igb_uio/igb_uio.c b/linux/igb_uio/igb_uio.c index 33e0e02..aea67da 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";