From nobody Tue Jun 30 21:24:36 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 7071DC433FE for ; Sun, 9 Jan 2022 14:02:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235751AbiAIN7y (ORCPT ); Sun, 9 Jan 2022 08:59:54 -0500 Received: from smtp09.smtpout.orange.fr ([80.12.242.131]:65469 "EHLO smtp.smtpout.orange.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229922AbiAIN7w (ORCPT ); Sun, 9 Jan 2022 08:59:52 -0500 Received: from pop-os.home ([90.11.185.88]) by smtp.orange.fr with ESMTPA id 6YjenCh7DUujj6YjfnIYDW; Sun, 09 Jan 2022 14:59:51 +0100 X-ME-Helo: pop-os.home X-ME-Auth: YWZlNiIxYWMyZDliZWIzOTcwYTEyYzlhMmU3ZiQ1M2U2MzfzZDfyZTMxZTBkMTYyNDBjNDJlZmQ3ZQ== X-ME-Date: Sun, 09 Jan 2022 14:59:51 +0100 X-ME-IP: 90.11.185.88 From: Christophe JAILLET To: Raju Rangoju , "David S. Miller" , Jakub Kicinski Cc: linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org, Christophe JAILLET , netdev@vger.kernel.org Subject: [PATCH] cxgb4vf: Remove useless DMA-32 fallback configuration Date: Sun, 9 Jan 2022 14:59:48 +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 --- .../ethernet/chelsio/cxgb4vf/cxgb4vf_main.c | 20 +++++-------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c b/drivers/= net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c index acac2be0e3f0..7de3800437c9 100644 --- a/drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c +++ b/drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c @@ -2899,7 +2899,6 @@ static int cxgb4vf_pci_probe(struct pci_dev *pdev, struct net_device *netdev; struct port_info *pi; unsigned int pmask; - int pci_using_dac; int err, pidx; =20 /* @@ -2920,19 +2919,12 @@ static int cxgb4vf_pci_probe(struct pci_dev *pdev, } =20 /* - * Set up our DMA mask: try for 64-bit address masking first and - * fall back to 32-bit if we can't get 64 bits ... + * Set up our DMA mask */ err =3D dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64)); - if (err =3D=3D 0) { - pci_using_dac =3D 1; - } else { - err =3D dma_set_mask(&pdev->dev, DMA_BIT_MASK(32)); - if (err !=3D 0) { - dev_err(&pdev->dev, "no usable DMA configuration\n"); - goto err_release_regions; - } - pci_using_dac =3D 0; + if (err) { + dev_err(&pdev->dev, "no usable DMA configuration\n"); + goto err_release_regions; } =20 /* @@ -3078,9 +3070,7 @@ static int cxgb4vf_pci_probe(struct pci_dev *pdev, netdev->hw_features =3D NETIF_F_SG | TSO_FLAGS | NETIF_F_GRO | NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM | NETIF_F_RXCSUM | NETIF_F_HW_VLAN_CTAG_TX | NETIF_F_HW_VLAN_CTAG_RX; - netdev->features =3D netdev->hw_features; - if (pci_using_dac) - netdev->features |=3D NETIF_F_HIGHDMA; + netdev->features =3D netdev->hw_features | NETIF_F_HIGHDMA; netdev->vlan_features =3D netdev->features & VLAN_FEAT; =20 netdev->priv_flags |=3D IFF_UNICAST_FLT; --=20 2.32.0