lkml.org 
[lkml]   [2023]   [Mar]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH v12 16/18] net: ethernet: mtk_eth_soc: rely on num_devs and remove MTK_MAC_COUNT
    From: Lorenzo Bianconi <lorenzo@kernel.org>

    Get rid of MTK_MAC_COUNT since it is a duplicated of eth->soc->num_devs.

    Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
    Signed-off-by: Daniel Golle <daniel@makrotopia.org>
    ---
    drivers/net/ethernet/mediatek/mtk_eth_soc.c | 30 ++++++++++-----------
    drivers/net/ethernet/mediatek/mtk_eth_soc.h | 1 -
    2 files changed, 15 insertions(+), 16 deletions(-)

    diff --git a/drivers/net/ethernet/mediatek/mtk_eth_soc.c b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
    index c858f21f603c..1f802330ff13 100644
    --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
    +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
    @@ -988,7 +988,7 @@ static void mtk_stats_update(struct mtk_eth *eth)
    {
    int i;

    - for (i = 0; i < MTK_MAC_COUNT; i++) {
    + for (i = 0; i < eth->soc->num_devs; i++) {
    if (!eth->mac[i] || !eth->mac[i]->hw_stats)
    continue;
    if (spin_trylock(&eth->mac[i]->hw_stats->stats_lock)) {
    @@ -1493,7 +1493,7 @@ static int mtk_queue_stopped(struct mtk_eth *eth)
    {
    int i;

    - for (i = 0; i < MTK_MAC_COUNT; i++) {
    + for (i = 0; i < eth->soc->num_devs; i++) {
    if (!eth->netdev[i])
    continue;
    if (netif_queue_stopped(eth->netdev[i]))
    @@ -1507,7 +1507,7 @@ static void mtk_wake_queue(struct mtk_eth *eth)
    {
    int i;

    - for (i = 0; i < MTK_MAC_COUNT; i++) {
    + for (i = 0; i < eth->soc->num_devs; i++) {
    if (!eth->netdev[i])
    continue;
    netif_tx_wake_all_queues(eth->netdev[i]);
    @@ -1968,7 +1968,7 @@ static int mtk_poll_rx(struct napi_struct *napi, int budget,
    !(trxd.rxd4 & RX_DMA_SPECIAL_TAG))
    mac = RX_DMA_GET_SPORT(trxd.rxd4) - 1;

    - if (unlikely(mac < 0 || mac >= MTK_MAC_COUNT ||
    + if (unlikely(mac < 0 || mac >= eth->soc->num_devs ||
    !eth->netdev[mac]))
    goto release_desc;

    @@ -2948,7 +2948,7 @@ static int mtk_set_features(struct net_device *dev, netdev_features_t features)
    MTK_CDMP_EG_CTRL);

    /* sync features with other MAC */
    - for (i = 0; i < MTK_MAC_COUNT; i++) {
    + for (i = 0; i < eth->soc->num_devs; i++) {
    if (!eth->netdev[i] || eth->netdev[i] == dev)
    continue;
    eth->netdev[i]->features &= ~NETIF_F_HW_VLAN_CTAG_RX;
    @@ -3038,7 +3038,7 @@ static void mtk_dma_free(struct mtk_eth *eth)
    const struct mtk_soc_data *soc = eth->soc;
    int i;

    - for (i = 0; i < MTK_MAC_COUNT; i++)
    + for (i = 0; i < soc->num_devs; i++)
    if (eth->netdev[i])
    netdev_reset_queue(eth->netdev[i]);
    if (eth->scratch_ring) {
    @@ -3192,7 +3192,7 @@ static void mtk_gdm_config(struct mtk_eth *eth, u32 config)
    if (MTK_HAS_CAPS(eth->soc->caps, MTK_SOC_MT7628))
    return;

    - for (i = 0; i < MTK_MAC_COUNT; i++) {
    + for (i = 0; i < eth->soc->num_devs; i++) {
    u32 val = mtk_r32(eth, MTK_GDMA_FWD_CFG(i));

    /* default setup the forward port to send frame to PDMA */
    @@ -3796,7 +3796,7 @@ static int mtk_hw_init(struct mtk_eth *eth, bool reset)
    * up with the more appropriate value when mtk_mac_config call is being
    * invoked.
    */
    - for (i = 0; i < MTK_MAC_COUNT; i++) {
    + for (i = 0; i < eth->soc->num_devs; i++) {
    struct net_device *dev = eth->netdev[i];

    mtk_w32(eth, MAC_MCR_FORCE_LINK_DOWN, MTK_MAC_MCR(i));
    @@ -4002,7 +4002,7 @@ static void mtk_pending_work(struct work_struct *work)
    mtk_prepare_for_reset(eth);

    /* stop all devices to make sure that dma is properly shut down */
    - for (i = 0; i < MTK_MAC_COUNT; i++) {
    + for (i = 0; i < eth->soc->num_devs; i++) {
    if (!eth->netdev[i] || !netif_running(eth->netdev[i]))
    continue;

    @@ -4018,7 +4018,7 @@ static void mtk_pending_work(struct work_struct *work)
    mtk_hw_init(eth, true);

    /* restart DMA and enable IRQs */
    - for (i = 0; i < MTK_MAC_COUNT; i++) {
    + for (i = 0; i < eth->soc->num_devs; i++) {
    if (!test_bit(i, &restart))
    continue;

    @@ -4046,7 +4046,7 @@ static int mtk_free_dev(struct mtk_eth *eth)
    {
    int i;

    - for (i = 0; i < MTK_MAC_COUNT; i++) {
    + for (i = 0; i < eth->soc->num_devs; i++) {
    if (!eth->netdev[i])
    continue;
    free_netdev(eth->netdev[i]);
    @@ -4065,7 +4065,7 @@ static int mtk_unreg_dev(struct mtk_eth *eth)
    {
    int i;

    - for (i = 0; i < MTK_MAC_COUNT; i++) {
    + for (i = 0; i < eth->soc->num_devs; i++) {
    struct mtk_mac *mac;
    if (!eth->netdev[i])
    continue;
    @@ -4370,7 +4370,7 @@ static int mtk_add_mac(struct mtk_eth *eth, struct device_node *np)
    }

    id = be32_to_cpup(_id);
    - if (id >= MTK_MAC_COUNT) {
    + if (id >= eth->soc->num_devs) {
    dev_err(eth->dev, "%d is not a valid mac id\n", id);
    return -EINVAL;
    }
    @@ -4506,7 +4506,7 @@ void mtk_eth_set_dma_device(struct mtk_eth *eth, struct device *dma_dev)

    rtnl_lock();

    - for (i = 0; i < MTK_MAC_COUNT; i++) {
    + for (i = 0; i < eth->soc->num_devs; i++) {
    dev = eth->netdev[i];

    if (!dev || !(dev->flags & IFF_UP))
    @@ -4830,7 +4830,7 @@ static int mtk_remove(struct platform_device *pdev)
    int i;

    /* stop all devices to make sure that dma is properly shut down */
    - for (i = 0; i < MTK_MAC_COUNT; i++) {
    + for (i = 0; i < eth->soc->num_devs; i++) {
    if (!eth->netdev[i])
    continue;
    mtk_stop(eth->netdev[i]);
    diff --git a/drivers/net/ethernet/mediatek/mtk_eth_soc.h b/drivers/net/ethernet/mediatek/mtk_eth_soc.h
    index f0c38c856cd0..8c5f72603604 100644
    --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.h
    +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.h
    @@ -33,7 +33,6 @@
    #define MTK_TX_DMA_BUF_LEN_V2 0xffff
    #define MTK_QDMA_RING_SIZE 2048
    #define MTK_DMA_SIZE 512
    -#define MTK_MAC_COUNT 2
    #define MTK_RX_ETH_HLEN (ETH_HLEN + ETH_FCS_LEN)
    #define MTK_RX_HLEN (NET_SKB_PAD + MTK_RX_ETH_HLEN + NET_IP_ALIGN)
    #define MTK_DMA_DUMMY_DESC 0xffffffff
    --
    2.39.2
    \
     
     \ /
      Last update: 2023-03-27 00:47    [W:2.195 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site