From patchwork Thu Aug 20 12:28:32 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corcodel Marian X-Patchwork-Id: 509037 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 2F1A914028E for ; Thu, 20 Aug 2015 22:28:50 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=Mqtmlgxp; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751569AbbHTM2p (ORCPT ); Thu, 20 Aug 2015 08:28:45 -0400 Received: from mail-wi0-f169.google.com ([209.85.212.169]:34871 "EHLO mail-wi0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751463AbbHTM2p (ORCPT ); Thu, 20 Aug 2015 08:28:45 -0400 Received: by wicne3 with SMTP id ne3so144877588wic.0 for ; Thu, 20 Aug 2015 05:28:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=0tpZM5mO+fehRk/b7Du1J/q3k8ylk12JQPDwZ4PKAXI=; b=MqtmlgxpTtv5tSMcHXcFZmn0eWhAOeyAFGT3Qrv3S8/fRocQAr2FbSKHWbgE9TVJWD BNxPyyf1gF5DfS9uQFh9xarpAELc70UmJUV3vJwJ9R1UiVQO14dn0fBzWCEyj58NBbb/ 0UyEtbCb65Q/drJb17puva2tmpaiBNE+l0DUKjEKVX50JZKY1JF3Y4iam0YHVrnUS9vC J+iSZ5PnQphPd5yWiqVpr6/Q+hn541GCFeA7mY+XBLWRFVIszSS3Fpt9eEOiRl0Arw/Z tmUBDNR1ALKAE8JsvfL+q0+44MssSb04N/w0YLyGUxWsbzx6/7Ugf2zo+/JvnqAs/xRZ aTFw== X-Received: by 10.194.92.143 with SMTP id cm15mr5700496wjb.17.1440073723442; Thu, 20 Aug 2015 05:28:43 -0700 (PDT) Received: from 192-168-0-3.rdsnet.ro (5-14-229-57.residential.rdsnet.ro. [5.14.229.57]) by smtp.gmail.com with ESMTPSA id 4sm5342643wjt.46.2015.08.20.05.28.42 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 20 Aug 2015 05:28:42 -0700 (PDT) From: Corcodel Marian To: netdev@vger.kernel.org Cc: Corcodel Marian Subject: [PATCH, net-next] r8169:Avoid to use I/O Space access on new design and others Date: Thu, 20 Aug 2015 15:28:32 +0300 Message-Id: <1440073712-26826-1-git-send-email-corcodel.marian@gmail.com> X-Mailer: git-send-email 2.1.4 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Avoid to use on pci express interface I/O Space access and do not enable Bus Master is set on BIOS. Warning: Do not apply this patch must apply previously patch first. To: netdev@vger.kernel.org Signed-off-by: Corcodel Marian diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c index b1fb54f..6cd7226 100644 --- a/drivers/net/ethernet/realtek/r8169.c +++ b/drivers/net/ethernet/realtek/r8169.c @@ -8171,6 +8171,9 @@ static int rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) if (pci_is_pcie(pdev)) pci_intx(pdev, 0); + if (pci_is_pcie(pdev)) + pci_write_config_word(pdev, PCI_COMMAND, ~PCI_COMMAND_IO); + /* Identify chip attached to board */ rtl8169_get_mac_version(tp, dev, cfg->default_ver); @@ -8183,8 +8186,8 @@ static int rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) rtl_hw_reset(tp); rtl_ack_events(tp, 0xffff); - - pci_set_master(pdev); + if (!pci_is_pcie(pdev)) + pci_set_master(pdev); rtl_init_mdio_ops(tp); rtl_init_pll_power_ops(tp);