From patchwork Sun Jan 20 10:45:20 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 1028140 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="CKh1JAeh"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43jBCv0nhrz9sCh for ; Sun, 20 Jan 2019 21:45:31 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730475AbfATKp3 (ORCPT ); Sun, 20 Jan 2019 05:45:29 -0500 Received: from mail-wr1-f65.google.com ([209.85.221.65]:39721 "EHLO mail-wr1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728967AbfATKp3 (ORCPT ); Sun, 20 Jan 2019 05:45:29 -0500 Received: by mail-wr1-f65.google.com with SMTP id t27so20022924wra.6 for ; Sun, 20 Jan 2019 02:45:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=to:cc:from:subject:message-id:date:user-agent:mime-version :content-language:content-transfer-encoding; bh=qKCERR77xwsw7qx6JmyiCNe6plYIcQCmimRvedV2+iQ=; b=CKh1JAehLH7LMTj/l52CPPXmrl69hZnUw0gW8glBDrOCN2ei7xe/lcjN/SR0uQOKlw wQdEhGbc+V2N77m4d4YW6n/WYE9z6XUZa984YgmK4Kr+pdbLy1bBvCC7U4TQnLjbw6/A THsZCOd5I4NzQaMWm7kMuLA2MFbgh3LD9EIUvRuhjE9jw+pTmknLn2wRZkL+o72I5Hkt c6e2BRQxHN0REpeySorWVc+me0GkuuU2yYsEprGouk6psLEvfwFEfEv1peczV/96D1NY O2kW8h3MjHrzdWubcxV6kL8gTsLZ0Kc8fWIdv4GVoMgafzQkq/XQAeUYggzSOfL7AGkS x1Zw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:to:cc:from:subject:message-id:date:user-agent :mime-version:content-language:content-transfer-encoding; bh=qKCERR77xwsw7qx6JmyiCNe6plYIcQCmimRvedV2+iQ=; b=d/jst7b0yZq2v9e41ZbzvteeKLEG+xODCnaj7LAOOI0r5nS+ea5Oj4Z2vcVB1uyBPI dK1gBlOJgxQcwqK1tBHW+mG6T5xmUZDaeLHNrbmV2cBxfCdWELtLDEwMvC4lhQr8n2yq /Z6u+7WxpHDUWMLDtrxfMN6Ur0fcA7Ouag0WvFNV2+HTEwAAasjmUdGgsXnCtcs65TGX bucdR2kHS/WFeo5hfP6kZJj08ckkGdzmmr+lCVHLl/AJBZxS6kcD+fIhZKCTzczpqLqB cGWazKj5ELBQ4a2hv9qoq+CHy2SnoOB17Ai/g+eZfaCUaaZYrMCC+heh/zTAwYUZN/vK QvEw== X-Gm-Message-State: AJcUukcBskYUMBlIwnLIzfQRaKX08LJCOH5x+q225gtO+ME8JE/22iRK 0eR52tZhofQHjKuMMf5hFVzjwg6L X-Google-Smtp-Source: ALg8bN4FsuNnFalvcZZTFuyP3ylY3c9K4q45skgMvg+h75RgaoLm9+pETLiAYWuHz8UlzizUxgMJMA== X-Received: by 2002:a05:6000:108d:: with SMTP id y13mr22853621wrw.135.1547981126701; Sun, 20 Jan 2019 02:45:26 -0800 (PST) Received: from ?IPv6:2003:ea:8bf1:e200:dc25:cc52:f4a2:4f63? (p200300EA8BF1E200DC25CC52F4A24F63.dip0.t-ipconnect.de. [2003:ea:8bf1:e200:dc25:cc52:f4a2:4f63]) by smtp.googlemail.com with ESMTPSA id h131sm64401798wmd.17.2019.01.20.02.45.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 20 Jan 2019 02:45:26 -0800 (PST) To: David Miller , Realtek linux nic maintainers Cc: "netdev@vger.kernel.org" From: Heiner Kallweit Subject: [PATCH net-next] r8169: remove PCI DAC support Message-ID: Date: Sun, 20 Jan 2019 11:45:20 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:60.0) Gecko/20100101 Thunderbird/60.4.0 MIME-Version: 1.0 Content-Language: en-US Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The old non-PCIe chip versions support PCI DAC, however this feature seems to be fragile, see comment in the PCI error handler. Therefore it's disabled per default. I think meanwhile it's time remove support for this legacy feature. This helps to reduce complexity of the driver. Signed-off-by: Heiner Kallweit --- drivers/net/ethernet/realtek/r8169.c | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c index 970c82694..5480073e0 100644 --- a/drivers/net/ethernet/realtek/r8169.c +++ b/drivers/net/ethernet/realtek/r8169.c @@ -229,7 +229,6 @@ static const struct pci_device_id rtl8169_pci_tbl[] = { MODULE_DEVICE_TABLE(pci, rtl8169_pci_tbl); -static int use_dac = -1; static struct { u32 msg_enable; } debug = { -1 }; @@ -704,8 +703,6 @@ struct rtl8169_private { MODULE_AUTHOR("Realtek and the Linux r8169 crew "); MODULE_DESCRIPTION("RealTek RTL-8169 Gigabit Ethernet driver"); -module_param(use_dac, int, 0); -MODULE_PARM_DESC(use_dac, "Enable PCI DAC. Unsafe on 32 bit PCI slot."); module_param_named(debug, debug.msg_enable, int, 0); MODULE_PARM_DESC(debug, "Debug verbosity level (0=none, ..., 16=all)"); MODULE_SOFTDEP("pre: realtek"); @@ -6180,14 +6177,6 @@ static void rtl8169_pcierr_interrupt(struct net_device *dev) PCI_STATUS_SIG_SYSTEM_ERROR | PCI_STATUS_REC_MASTER_ABORT | PCI_STATUS_REC_TARGET_ABORT | PCI_STATUS_SIG_TARGET_ABORT)); - /* The infamous DAC f*ckup only happens at boot time */ - if ((tp->cp_cmd & PCIDAC) && !tp->cur_rx) { - netif_info(tp, intr, dev, "disabling PCI DAC\n"); - tp->cp_cmd &= ~PCIDAC; - RTL_W16(tp, CPlusCmd, tp->cp_cmd); - dev->features &= ~NETIF_F_HIGHDMA; - } - rtl_schedule_task(tp, RTL_FLAG_TASK_RESET_PENDING); } @@ -7241,13 +7230,8 @@ static int rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) tp->cp_cmd = RTL_R16(tp, CPlusCmd); - if (sizeof(dma_addr_t) > 4 && (use_dac == 1 || (use_dac == -1 && - tp->mac_version >= RTL_GIGA_MAC_VER_18)) && + if (sizeof(dma_addr_t) > 4 && tp->mac_version >= RTL_GIGA_MAC_VER_18 && !dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64))) { - - /* CPlusCmd Dual Access Cycle is only needed for non-PCIe */ - if (!pci_is_pcie(pdev)) - tp->cp_cmd |= PCIDAC; dev->features |= NETIF_F_HIGHDMA; } else { rc = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));