From nobody Tue Jun 30 21:25:02 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 01785C433FE for ; Sat, 8 Jan 2022 14:22:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234450AbiAHOWS (ORCPT ); Sat, 8 Jan 2022 09:22:18 -0500 Received: from smtp02.smtpout.orange.fr ([80.12.242.124]:56188 "EHLO smtp.smtpout.orange.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234433AbiAHOWQ (ORCPT ); Sat, 8 Jan 2022 09:22:16 -0500 Received: from pop-os.home ([90.11.185.88]) by smtp.orange.fr with ESMTPA id 6CbmnLdHIBazo6Cbmn7Pa3; Sat, 08 Jan 2022 15:22:15 +0100 X-ME-Helo: pop-os.home X-ME-Auth: YWZlNiIxYWMyZDliZWIzOTcwYTEyYzlhMmU3ZiQ1M2U2MzfzZDfyZTMxZTBkMTYyNDBjNDJlZmQ3ZQ== X-ME-Date: Sat, 08 Jan 2022 15:22:15 +0100 X-ME-IP: 90.11.185.88 From: Christophe JAILLET To: christopher.lee@cspi.com, davem@davemloft.net, kuba@kernel.org Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org, Christophe JAILLET Subject: [PATCH] myri10ge: Simplify DMA setting Date: Sat, 8 Jan 2022 15:22:13 +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 will never fail if dev->dma_mask is non-NULL. So, if it fails, the 32 bits case will also fail for the same reason. If dma_set_mask_and_coherent() succeeds, 'dac_enabled' 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 --- drivers/net/ethernet/myricom/myri10ge/myri10ge.c | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/drivers/net/ethernet/myricom/myri10ge/myri10ge.c b/drivers/net= /ethernet/myricom/myri10ge/myri10ge.c index 83a5e29c836a..50ac3ee2577a 100644 --- a/drivers/net/ethernet/myricom/myri10ge/myri10ge.c +++ b/drivers/net/ethernet/myricom/myri10ge/myri10ge.c @@ -3742,7 +3742,6 @@ static int myri10ge_probe(struct pci_dev *pdev, const= struct pci_device_id *ent) struct myri10ge_priv *mgp; struct device *dev =3D &pdev->dev; int status =3D -ENXIO; - int dac_enabled; unsigned hdr_offset, ss_offset; static int board_number; =20 @@ -3782,14 +3781,7 @@ static int myri10ge_probe(struct pci_dev *pdev, cons= t struct pci_device_id *ent) =20 myri10ge_mask_surprise_down(pdev); pci_set_master(pdev); - dac_enabled =3D 1; status =3D dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64)); - if (status !=3D 0) { - dac_enabled =3D 0; - dev_err(&pdev->dev, - "64-bit pci address mask was refused, trying 32-bit\n"); - status =3D dma_set_mask(&pdev->dev, DMA_BIT_MASK(32)); - } if (status !=3D 0) { dev_err(&pdev->dev, "Error %d setting DMA mask\n", status); goto abort_with_enabled; @@ -3874,10 +3866,7 @@ static int myri10ge_probe(struct pci_dev *pdev, cons= t struct pci_device_id *ent) /* fake NETIF_F_HW_VLAN_CTAG_RX for good GRO performance */ netdev->hw_features |=3D NETIF_F_HW_VLAN_CTAG_RX; =20 - netdev->features =3D netdev->hw_features; - - if (dac_enabled) - netdev->features |=3D NETIF_F_HIGHDMA; + netdev->features =3D netdev->hw_features | NETIF_F_HIGHDMA; =20 netdev->vlan_features |=3D mgp->features; if (mgp->fw_ver_tiny < 37) --=20 2.32.0