lkml.org 
[lkml]   [2020]   [Jun]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.6 237/606] r8169: fix OCP access on RTL8117
    Date
    From: Heiner Kallweit <hkallweit1@gmail.com>

    [ Upstream commit 561535b0f23961ced071b82575d5e83e6351a814 ]

    According to r8168 vendor driver DASHv3 chips like RTL8168fp/RTL8117
    need a special addressing for OCP access.
    Fix is compile-tested only due to missing test hardware.

    Fixes: 1287723aa139 ("r8169: add support for RTL8117")
    Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/net/ethernet/realtek/r8169_main.c | 17 +++++++++++++++--
    1 file changed, 15 insertions(+), 2 deletions(-)

    diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c
    index 07a6b609f741..6e4fe2566f6b 100644
    --- a/drivers/net/ethernet/realtek/r8169_main.c
    +++ b/drivers/net/ethernet/realtek/r8169_main.c
    @@ -1044,6 +1044,13 @@ static u16 rtl_ephy_read(struct rtl8169_private *tp, int reg_addr)
    RTL_R32(tp, EPHYAR) & EPHYAR_DATA_MASK : ~0;
    }

    +static void r8168fp_adjust_ocp_cmd(struct rtl8169_private *tp, u32 *cmd, int type)
    +{
    + /* based on RTL8168FP_OOBMAC_BASE in vendor driver */
    + if (tp->mac_version == RTL_GIGA_MAC_VER_52 && type == ERIAR_OOB)
    + *cmd |= 0x7f0 << 18;
    +}
    +
    DECLARE_RTL_COND(rtl_eriar_cond)
    {
    return RTL_R32(tp, ERIAR) & ERIAR_FLAG;
    @@ -1052,9 +1059,12 @@ DECLARE_RTL_COND(rtl_eriar_cond)
    static void _rtl_eri_write(struct rtl8169_private *tp, int addr, u32 mask,
    u32 val, int type)
    {
    + u32 cmd = ERIAR_WRITE_CMD | type | mask | addr;
    +
    BUG_ON((addr & 3) || (mask == 0));
    RTL_W32(tp, ERIDR, val);
    - RTL_W32(tp, ERIAR, ERIAR_WRITE_CMD | type | mask | addr);
    + r8168fp_adjust_ocp_cmd(tp, &cmd, type);
    + RTL_W32(tp, ERIAR, cmd);

    rtl_udelay_loop_wait_low(tp, &rtl_eriar_cond, 100, 100);
    }
    @@ -1067,7 +1077,10 @@ static void rtl_eri_write(struct rtl8169_private *tp, int addr, u32 mask,

    static u32 _rtl_eri_read(struct rtl8169_private *tp, int addr, int type)
    {
    - RTL_W32(tp, ERIAR, ERIAR_READ_CMD | type | ERIAR_MASK_1111 | addr);
    + u32 cmd = ERIAR_READ_CMD | type | ERIAR_MASK_1111 | addr;
    +
    + r8168fp_adjust_ocp_cmd(tp, &cmd, type);
    + RTL_W32(tp, ERIAR, cmd);

    return rtl_udelay_loop_wait_high(tp, &rtl_eriar_cond, 100, 100) ?
    RTL_R32(tp, ERIDR) : ~0;
    --
    2.25.1
    \
     
     \ /
      Last update: 2020-06-09 02:25    [W:4.242 / U:0.092 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site