Skip to content

Commit

Permalink
r8169: rtl_csi_access_enable rename.
Browse files Browse the repository at this point in the history 
Newer 8168 needs a slightly different rtl_csi_access_enable.
This patch separates some noise from the real thing.

No functional change.

Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
Cc: Hayes <hayeswang@realtek.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
françois romieu authored and David S. Miller committed Jan 4, 2011
1 parent b646d90 commit 650e8d5
Showing 1 changed file with 16 additions and 11 deletions.
27 changes: 16 additions & 11 deletions drivers/net/r8169.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3310,12 +3310,17 @@ static void rtl_tx_performance_tweak(struct pci_dev *pdev, u16 force)
}
}

static void rtl_csi_access_enable(void __iomem *ioaddr)
static void rtl_csi_access_enable(void __iomem *ioaddr, u32 bits)
{
u32 csi;

csi = rtl_csi_read(ioaddr, 0x070c) & 0x00ffffff;
rtl_csi_write(ioaddr, 0x070c, csi | 0x27000000);
rtl_csi_write(ioaddr, 0x070c, csi | bits);
}

static void rtl_csi_access_enable_2(void __iomem *ioaddr)
{
rtl_csi_access_enable(ioaddr, 0x27000000);
}

struct ephy_info {
Expand Down Expand Up @@ -3403,7 +3408,7 @@ static void rtl_hw_start_8168cp_1(void __iomem *ioaddr, struct pci_dev *pdev)
{ 0x07, 0, 0x2000 }
};

rtl_csi_access_enable(ioaddr);
rtl_csi_access_enable_2(ioaddr);

rtl_ephy_init(ioaddr, e_info_8168cp, ARRAY_SIZE(e_info_8168cp));

Expand All @@ -3412,7 +3417,7 @@ static void rtl_hw_start_8168cp_1(void __iomem *ioaddr, struct pci_dev *pdev)

static void rtl_hw_start_8168cp_2(void __iomem *ioaddr, struct pci_dev *pdev)
{
rtl_csi_access_enable(ioaddr);
rtl_csi_access_enable_2(ioaddr);

RTL_W8(Config3, RTL_R8(Config3) & ~Beacon_en);

Expand All @@ -3423,7 +3428,7 @@ static void rtl_hw_start_8168cp_2(void __iomem *ioaddr, struct pci_dev *pdev)

static void rtl_hw_start_8168cp_3(void __iomem *ioaddr, struct pci_dev *pdev)
{
rtl_csi_access_enable(ioaddr);
rtl_csi_access_enable_2(ioaddr);

RTL_W8(Config3, RTL_R8(Config3) & ~Beacon_en);

Expand All @@ -3445,7 +3450,7 @@ static void rtl_hw_start_8168c_1(void __iomem *ioaddr, struct pci_dev *pdev)
{ 0x06, 0x0080, 0x0000 }
};

rtl_csi_access_enable(ioaddr);
rtl_csi_access_enable_2(ioaddr);

RTL_W8(DBG_REG, 0x06 | FIX_NAK_1 | FIX_NAK_2);

Expand All @@ -3461,7 +3466,7 @@ static void rtl_hw_start_8168c_2(void __iomem *ioaddr, struct pci_dev *pdev)
{ 0x03, 0x0400, 0x0220 }
};

rtl_csi_access_enable(ioaddr);
rtl_csi_access_enable_2(ioaddr);

rtl_ephy_init(ioaddr, e_info_8168c_2, ARRAY_SIZE(e_info_8168c_2));

Expand All @@ -3475,14 +3480,14 @@ static void rtl_hw_start_8168c_3(void __iomem *ioaddr, struct pci_dev *pdev)

static void rtl_hw_start_8168c_4(void __iomem *ioaddr, struct pci_dev *pdev)
{
rtl_csi_access_enable(ioaddr);
rtl_csi_access_enable_2(ioaddr);

__rtl_hw_start_8168cp(ioaddr, pdev);
}

static void rtl_hw_start_8168d(void __iomem *ioaddr, struct pci_dev *pdev)
{
rtl_csi_access_enable(ioaddr);
rtl_csi_access_enable_2(ioaddr);

rtl_disable_clock_request(pdev);

Expand Down Expand Up @@ -3611,7 +3616,7 @@ static void rtl_hw_start_8102e_1(void __iomem *ioaddr, struct pci_dev *pdev)
};
u8 cfg1;

rtl_csi_access_enable(ioaddr);
rtl_csi_access_enable_2(ioaddr);

RTL_W8(DBG_REG, FIX_NAK_1);

Expand All @@ -3632,7 +3637,7 @@ static void rtl_hw_start_8102e_1(void __iomem *ioaddr, struct pci_dev *pdev)

static void rtl_hw_start_8102e_2(void __iomem *ioaddr, struct pci_dev *pdev)
{
rtl_csi_access_enable(ioaddr);
rtl_csi_access_enable_2(ioaddr);

rtl_tx_performance_tweak(pdev, 0x5 << MAX_READ_REQUEST_SHIFT);

Expand Down

0 comments on commit 650e8d5

Please sign in to comment.