lkml.org 
[lkml]   [2022]   [Nov]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v1 24/26] net: dsa: microchip: ksz8_w_sta_mac_table(): make use of error values provided by read/write functions
    Date
    Read/write operations may fail. So, make use of return values.

    Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de>
    ---
    drivers/net/dsa/microchip/ksz8795.c | 33 ++++++++++++++++-------------
    1 file changed, 18 insertions(+), 15 deletions(-)

    diff --git a/drivers/net/dsa/microchip/ksz8795.c b/drivers/net/dsa/microchip/ksz8795.c
    index 9c1450782314..ea08bdea193e 100644
    --- a/drivers/net/dsa/microchip/ksz8795.c
    +++ b/drivers/net/dsa/microchip/ksz8795.c
    @@ -358,19 +358,26 @@ static int ksz8_r_table(struct ksz_device *dev, int table, u16 addr, u64 *data)
    return ret;
    }

    -static void ksz8_w_table(struct ksz_device *dev, int table, u16 addr, u64 data)
    +static int ksz8_w_table(struct ksz_device *dev, int table, u16 addr, u64 data)
    {
    const u16 *regs;
    u16 ctrl_addr;
    + int ret;

    regs = dev->info->regs;

    ctrl_addr = IND_ACC_TABLE(table) | addr;

    mutex_lock(&dev->alu_mutex);
    - ksz_write64(dev, regs[REG_IND_DATA_HI], data);
    - ksz_write16(dev, regs[REG_IND_CTRL_0], ctrl_addr);
    + ret = ksz_write64(dev, regs[REG_IND_DATA_HI], data);
    + if (ret)
    + goto unlock_alu;
    +
    + ret = ksz_write16(dev, regs[REG_IND_CTRL_0], ctrl_addr);
    +unlock_alu:
    mutex_unlock(&dev->alu_mutex);
    +
    + return ret;
    }

    static int ksz8_valid_dyn_entry(struct ksz_device *dev, u8 *data)
    @@ -509,8 +516,8 @@ static int ksz8_r_sta_mac_table(struct ksz_device *dev, u16 addr,
    return 0;
    }

    -static void ksz8_w_sta_mac_table(struct ksz_device *dev, u16 addr,
    - struct alu_struct *alu)
    +static int ksz8_w_sta_mac_table(struct ksz_device *dev, u16 addr,
    + struct alu_struct *alu)
    {
    u32 data_hi, data_lo;
    const u8 *shifts;
    @@ -538,7 +545,8 @@ static void ksz8_w_sta_mac_table(struct ksz_device *dev, u16 addr,
    data_hi &= ~masks[STATIC_MAC_TABLE_OVERRIDE];

    data = (u64)data_hi << 32 | data_lo;
    - ksz8_w_table(dev, TABLE_STATIC_MAC, addr, data);
    +
    + return ksz8_w_table(dev, TABLE_STATIC_MAC, addr, data);
    }

    static void ksz8_from_vlan(struct ksz_device *dev, u32 vlan, u8 *fid,
    @@ -1065,9 +1073,8 @@ static int ksz8_add_sta_mac(struct ksz_device *dev, int port,
    /* Need a way to map VID to FID. */
    alu.fid = vid;
    }
    - ksz8_w_sta_mac_table(dev, index, &alu);

    - return 0;
    + return ksz8_w_sta_mac_table(dev, index, &alu);
    }

    static int ksz8_del_sta_mac(struct ksz_device *dev, int port,
    @@ -1091,16 +1098,14 @@ static int ksz8_del_sta_mac(struct ksz_device *dev, int port,

    /* no available entry */
    if (index == dev->info->num_statics)
    - goto exit;
    + return 0;

    /* clear port */
    alu.port_forward &= ~BIT(port);
    if (!alu.port_forward)
    alu.is_static = false;
    - ksz8_w_sta_mac_table(dev, index, &alu);

    -exit:
    - return 0;
    + return ksz8_w_sta_mac_table(dev, index, &alu);
    }

    int ksz8_mdb_add(struct ksz_device *dev, int port,
    @@ -1424,9 +1429,7 @@ int ksz8_enable_stp_addr(struct ksz_device *dev)
    alu.is_override = true;
    alu.port_forward = dev->info->cpu_ports;

    - ksz8_w_sta_mac_table(dev, 0, &alu);
    -
    - return 0;
    + return ksz8_w_sta_mac_table(dev, 0, &alu);
    }

    int ksz8_setup(struct dsa_switch *ds)
    --
    2.30.2
    \
     
     \ /
      Last update: 2022-11-28 13:05    [W:7.162 / U:0.024 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site