Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ddd0518c authored by Diana Wang's avatar Diana Wang Committed by Greg Kroah-Hartman
Browse files

nfp: checking parameter process for rx-usecs/tx-usecs is invalid 



[ 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: ce991ab6 ("nfp: read ME frequency from vNIC ctrl memory")
Signed-off-by: default avatarDiana Wang <na.wang@corigine.com>
Signed-off-by: default avatarSimon Horman <simon.horman@corigine.com>
Reviewed-by: default avatarJakub Kicinski <kuba@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent b638eb32

drivers/net/ethernet/netronome/nfp/nfp_net.h

+0 −3
Original line number Diff line number Diff line
@@ -557,7 +557,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
@@ -639,8 +638,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;

drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c

+1 −1
Original line number Diff line number Diff line
@@ -1269,7 +1269,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