lkml.org 
[lkml]   [2021]   [Nov]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.15 109/179] nfp: checking parameter process for rx-usecs/tx-usecs is invalid
    Date
    From: Diana Wang <na.wang@corigine.com>

    [ Upstream commit 3bd6b2a838ba6a3b86d41b077f570b1b61174def ]

    Use nn->tlv_caps.me_freq_mhz instead of nn->me_freq_mhz to check whether
    rx-usecs/tx-usecs is valid.

    This is because nn->tlv_caps.me_freq_mhz represents the clock_freq (MHz) of
    the flow processing cores (FPC) on the NIC. While nn->me_freq_mhz is not
    be set.

    Fixes: ce991ab6662a ("nfp: read ME frequency from vNIC ctrl memory")
    Signed-off-by: Diana Wang <na.wang@corigine.com>
    Signed-off-by: Simon Horman <simon.horman@corigine.com>
    Reviewed-by: Jakub Kicinski <kuba@kernel.org>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/net/ethernet/netronome/nfp/nfp_net.h | 3 ---
    drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c | 2 +-
    2 files changed, 1 insertion(+), 4 deletions(-)

    diff --git a/drivers/net/ethernet/netronome/nfp/nfp_net.h b/drivers/net/ethernet/netronome/nfp/nfp_net.h
    index df203738511bf..0b1865e9f0b59 100644
    --- a/drivers/net/ethernet/netronome/nfp/nfp_net.h
    +++ b/drivers/net/ethernet/netronome/nfp/nfp_net.h
    @@ -565,7 +565,6 @@ struct nfp_net_dp {
    * @exn_name: Name for Exception interrupt
    * @shared_handler: Handler for shared interrupts
    * @shared_name: Name for shared interrupt
    - * @me_freq_mhz: ME clock_freq (MHz)
    * @reconfig_lock: Protects @reconfig_posted, @reconfig_timer_active,
    * @reconfig_sync_present and HW reconfiguration request
    * regs/machinery from async requests (sync must take
    @@ -650,8 +649,6 @@ struct nfp_net {
    irq_handler_t shared_handler;
    char shared_name[IFNAMSIZ + 8];

    - u32 me_freq_mhz;
    -
    bool link_up;
    spinlock_t link_status_lock;

    diff --git a/drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c b/drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c
    index 0685ece1f155d..be1a358baadb9 100644
    --- a/drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c
    +++ b/drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c
    @@ -1343,7 +1343,7 @@ static int nfp_net_set_coalesce(struct net_device *netdev,
    * ME timestamp ticks. There are 16 ME clock cycles for each timestamp
    * count.
    */
    - factor = nn->me_freq_mhz / 16;
    + factor = nn->tlv_caps.me_freq_mhz / 16;

    /* Each pair of (usecs, max_frames) fields specifies that interrupts
    * should be coalesced until
    --
    2.33.0


    \
     
     \ /
      Last update: 2021-11-29 23:30    [W:2.136 / U:0.108 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site