Commit 1910494e authored by Alex Elder's avatar Alex Elder Committed by David S. Miller
Browse files

net: ipa: move ipa_aggr_granularity_val() 



We only use ipa_aggr_granularity_val() inside "ipa_main.c", so it
doesn't really need to be defined in a header file.  It makes some
sense to be grouped with the register definitions, but it is unlike
the other inline functions now defined in "ipa_reg.h".  So move it
into "ipa_main.c" where it's used.  TIMER_FREQUENCY is used only
by that function, so move that definition as well.

Signed-off-by: default avatarAlex Elder <elder@linaro.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e6e49e43

drivers/net/ipa/ipa_main.c

+15 −0
Original line number Diff line number Diff line
@@ -287,6 +287,21 @@ ipa_hardware_config_qsb(struct ipa *ipa, const struct ipa_data *data) 
	iowrite32(val, ipa->reg_virt + IPA_REG_QSB_MAX_READS_OFFSET);

}



/* The internal inactivity timer clock is used for the aggregation timer */

#define TIMER_FREQUENCY	32000		/* 32 KHz inactivity timer clock */



/* Compute the value to use in the COUNTER_CFG register AGGR_GRANULARITY

 * field to represent the given number of microseconds.  The value is one

 * less than the number of timer ticks in the requested period.  0 is not

 * a valid granularity value.

 */

static u32 ipa_aggr_granularity_val(u32 usec)

{

	/* assert(usec != 0); */



	return DIV_ROUND_CLOSEST(usec * TIMER_FREQUENCY, USEC_PER_SEC) - 1;

}



/* IPA uses unified Qtime starting at IPA v4.5, implementing various

 * timestamps and timers independent of the IPA core clock rate.  The

 * Qtimer is based on a 56-bit timestamp incremented at each tick of

drivers/net/ipa/ipa_reg.h

+0 −12
Original line number Diff line number Diff line
@@ -237,18 +237,6 @@ static inline u32 proc_cntxt_base_addr_encoded(enum ipa_version version, 
#define IPA_REG_COUNTER_CFG_OFFSET			0x000001f0

#define AGGR_GRANULARITY_FMASK			GENMASK(8, 4)



/* The internal inactivity timer clock is used for the aggregation timer */

#define TIMER_FREQUENCY	32000		/* 32 KHz inactivity timer clock */



/* Compute the value to use in the AGGR_GRANULARITY field representing the

 * given number of microseconds.  The value is one less than the number of

 * timer ticks in the requested period.  0 not a valid granularity value.

 */

static inline u32 ipa_aggr_granularity_val(u32 usec)

{

	return DIV_ROUND_CLOSEST(usec * TIMER_FREQUENCY, USEC_PER_SEC) - 1;

}



/* The next register is not present for IPA v4.5 */

#define IPA_REG_TX_CFG_OFFSET				0x000001fc

/* The first three fields are present for IPA v3.5.1 only */