From nobody Tue Jun 30 21:26:31 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2A189C433EF for ; Sun, 9 Jan 2022 17:21:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236197AbiAIRVF (ORCPT ); Sun, 9 Jan 2022 12:21:05 -0500 Received: from smtp04.smtpout.orange.fr ([80.12.242.126]:60808 "EHLO smtp.smtpout.orange.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236191AbiAIRVA (ORCPT ); Sun, 9 Jan 2022 12:21:00 -0500 Received: from pop-os.home ([90.11.185.88]) by smtp.orange.fr with ESMTPA id 6bsInvYlrsoWh6bsInvx7T; Sun, 09 Jan 2022 18:20:59 +0100 X-ME-Helo: pop-os.home X-ME-Auth: YWZlNiIxYWMyZDliZWIzOTcwYTEyYzlhMmU3ZiQ1M2U2MzfzZDfyZTMxZTBkMTYyNDBjNDJlZmQ3ZQ== X-ME-Date: Sun, 09 Jan 2022 18:20:59 +0100 X-ME-IP: 90.11.185.88 From: Christophe JAILLET To: Jesse Brandeburg , Tony Nguyen , "David S. Miller" , Jakub Kicinski Cc: linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org, Christophe JAILLET , Christoph Hellwig , Alexander Lobakin , intel-wired-lan@lists.osuosl.org, netdev@vger.kernel.org Subject: [PATCH] ixgbe: Remove useless DMA-32 fallback configuration Date: Sun, 9 Jan 2022 18:20:57 +0100 Message-Id: X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" As stated in [1], dma_set_mask() with a 64-bit mask never fails if dev->dma_mask is non-NULL. So, if it fails, the 32 bits case will also fail for the same reason. So, if dma_set_mask_and_coherent() succeeds, 'pci_using_dac' is known to be 1. Simplify code and remove some dead code accordingly. [1]: https://lkml.org/lkml/2021/6/7/398 Signed-off-by: Christophe JAILLET Reviewed-by: Christoph Hellwig Reviewed-by: Alexander Lobakin Tested-by: Gurucharan G (A Contingent worker at I= ntel) --- drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 20 +++++++------------ 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/et= hernet/intel/ixgbe/ixgbe_main.c index 89b467006291..2c8a4a06f56a 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c @@ -10632,9 +10632,9 @@ static int ixgbe_probe(struct pci_dev *pdev, const = struct pci_device_id *ent) struct ixgbe_adapter *adapter =3D NULL; struct ixgbe_hw *hw; const struct ixgbe_info *ii =3D ixgbe_info_tbl[ent->driver_data]; - int i, err, pci_using_dac, expected_gts; unsigned int indices =3D MAX_TX_QUEUES; u8 part_str[IXGBE_PBANUM_LENGTH]; + int i, err, expected_gts; bool disable_dev =3D false; #ifdef IXGBE_FCOE u16 device_caps; @@ -10654,16 +10654,11 @@ static int ixgbe_probe(struct pci_dev *pdev, cons= t struct pci_device_id *ent) if (err) return err; =20 - if (!dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64))) { - pci_using_dac =3D 1; - } else { - err =3D dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32)); - if (err) { - dev_err(&pdev->dev, - "No usable DMA configuration, aborting\n"); - goto err_dma; - } - pci_using_dac =3D 0; + err =3D dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64)); + if (err) { + dev_err(&pdev->dev, + "No usable DMA configuration, aborting\n"); + goto err_dma; } =20 err =3D pci_request_mem_regions(pdev, ixgbe_driver_name); @@ -10861,8 +10856,7 @@ static int ixgbe_probe(struct pci_dev *pdev, const = struct pci_device_id *ent) netdev->hw_features |=3D NETIF_F_NTUPLE | NETIF_F_HW_TC; =20 - if (pci_using_dac) - netdev->features |=3D NETIF_F_HIGHDMA; + netdev->features |=3D NETIF_F_HIGHDMA; =20 netdev->vlan_features |=3D netdev->features | NETIF_F_TSO_MANGLEID; netdev->hw_enc_features |=3D netdev->vlan_features; --=20 2.32.0