[PATCH, net-next] r8169:Avoid to use I/O Space access on new design and others

[Corcodel Marian <corcodel.marian@gmail.com>]

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 <corcodel.marian@gmail.com>

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);
-- 
2.1.4