Commit 69cdfb53 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'ipa-versions-and-registers' 



Alex Elder says:

====================
net: ipa: versions and registers

Version 2 of this series adds kernel-doc descriptions for all
members of the ipa_version enumerated type in patch 2.

The original description of the series is below.

					-Alex

This series is sort of a mix of things, generally related to
updating IPA versions and register definitions.

The first patch fixes some version-related tests throughout the code
so the conditions are valid for IPA versions other than the two that
are currently supported.  Support for additional versions is
forthcoming, and this is a preparatory step.

The second patch adds to the set of defined IPA versions, to include
all versions between 3.0 and 4.11.

The next defines an endpoint initialization register that was
previously not being configured.  We now initialize that register
(so that NAT is explicitly disabled) on all AP endpoints.

The fourth adds support for an extra bit in a field in a register,
which is present starting at IPA v4.5.

The last two are sort of standalone.  One just moves a function
definition and makes it private.  The other increases the number of
GSI channels and events supported by the driver, sufficient for IPA
v4.5.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents d1c56880 810a2e1f

drivers/net/ipa/gsi.c

+4 −4
Original line number Diff line number Diff line
@@ -827,14 +827,14 @@ static void gsi_channel_program(struct gsi_channel *channel, bool doorbell) 


	/* Max prefetch is 1 segment (do not set MAX_PREFETCH_FMASK) */



	/* We enable the doorbell engine for IPA v3.5.1 */

	if (gsi->version == IPA_VERSION_3_5_1 && doorbell)

	/* No need to use the doorbell engine starting at IPA v4.0 */

	if (gsi->version < IPA_VERSION_4_0 && doorbell)

		val |= USE_DB_ENG_FMASK;



	/* v4.0 introduces an escape buffer for prefetch.  We use it

	 * on all but the AP command channel.

	 */

	if (gsi->version != IPA_VERSION_3_5_1 && !channel->command) {

	if (gsi->version >= IPA_VERSION_4_0 && !channel->command) {

		/* If not otherwise set, prefetch buffers are used */

		if (gsi->version < IPA_VERSION_4_5)

			val |= USE_ESCAPE_BUF_ONLY_FMASK;
@@ -973,7 +973,7 @@ void gsi_channel_reset(struct gsi *gsi, u32 channel_id, bool doorbell) 


	gsi_channel_reset_command(channel);

	/* Due to a hardware quirk we may need to reset RX channels twice. */

	if (gsi->version == IPA_VERSION_3_5_1 && !channel->toward_ipa)

	if (gsi->version < IPA_VERSION_4_0 && !channel->toward_ipa)

		gsi_channel_reset_command(channel);



	gsi_channel_program(channel, doorbell);

drivers/net/ipa/gsi.h

+2 −2
Original line number Diff line number Diff line
@@ -16,8 +16,8 @@ 
#include "ipa_version.h"



/* Maximum number of channels and event rings supported by the driver */

#define GSI_CHANNEL_COUNT_MAX	17

#define GSI_EVT_RING_COUNT_MAX	13

#define GSI_CHANNEL_COUNT_MAX	23

#define GSI_EVT_RING_COUNT_MAX	20



/* Maximum TLV FIFO size for a channel; 64 here is arbitrary (and high) */

#define GSI_TLV_MAX		64

drivers/net/ipa/ipa_cmd.c

+15 −11
Original line number Diff line number Diff line
@@ -71,13 +71,12 @@ struct ipa_cmd_hw_hdr_init_local { 


/* IPA_CMD_REGISTER_WRITE */



/* For IPA v4.0+, this opcode gets modified with pipeline clear options */



/* For IPA v4.0+, the pipeline clear options are encoded in the opcode */

#define REGISTER_WRITE_OPCODE_SKIP_CLEAR_FMASK		GENMASK(8, 8)

#define REGISTER_WRITE_OPCODE_CLEAR_OPTION_FMASK	GENMASK(10, 9)



struct ipa_cmd_register_write {

	__le16 flags;		/* Unused/reserved for IPA v3.5.1 */

	__le16 flags;		/* Unused/reserved prior to IPA v4.0 */

	__le16 offset;

	__le32 value;

	__le32 value_mask;
@@ -85,12 +84,12 @@ struct ipa_cmd_register_write { 
};



/* Field masks for ipa_cmd_register_write structure fields */

/* The next field is present for IPA v4.0 and above */

/* The next field is present for IPA v4.0+ */

#define REGISTER_WRITE_FLAGS_OFFSET_HIGH_FMASK		GENMASK(14, 11)

/* The next field is present for IPA v3.5.1 only */

/* The next field is not present for IPA v4.0+ */

#define REGISTER_WRITE_FLAGS_SKIP_CLEAR_FMASK		GENMASK(15, 15)



/* The next field and its values are present for IPA v3.5.1 only */

/* The next field and its values are not present for IPA v4.0+ */

#define REGISTER_WRITE_CLEAR_OPTIONS_FMASK		GENMASK(1, 0)



/* IPA_CMD_IP_PACKET_INIT */
@@ -123,7 +122,7 @@ struct ipa_cmd_hw_dma_mem_mem { 


/* Field masks for ipa_cmd_hw_dma_mem_mem structure fields */

#define DMA_SHARED_MEM_FLAGS_DIRECTION_FMASK		GENMASK(0, 0)

/* The next two fields are present for IPA v3.5.1 only. */

/* The next two fields are not present for IPA v4.0+ */

#define DMA_SHARED_MEM_FLAGS_SKIP_CLEAR_FMASK		GENMASK(1, 1)

#define DMA_SHARED_MEM_FLAGS_CLEAR_OPTIONS_FMASK	GENMASK(3, 2)
@@ -237,11 +236,12 @@ static bool ipa_cmd_register_write_offset_valid(struct ipa *ipa, 
	u32 bit_count;



	/* The maximum offset in a register_write immediate command depends

	 * on the version of IPA.  IPA v3.5.1 supports a 16 bit offset, but

	 * newer versions allow some additional high-order bits.

	 * on the version of IPA.  A 16 bit offset is always supported,

	 * but starting with IPA v4.0 some additional high-order bits are

	 * allowed.

	 */

	bit_count = BITS_PER_BYTE * sizeof(payload->offset);

	if (ipa->version != IPA_VERSION_3_5_1)

	if (ipa->version >= IPA_VERSION_4_0)

		bit_count += hweight32(REGISTER_WRITE_FLAGS_OFFSET_HIGH_FMASK);

	BUILD_BUG_ON(bit_count > 32);

	offset_max = ~0U >> (32 - bit_count);
@@ -440,7 +440,11 @@ void ipa_cmd_register_write_add(struct gsi_trans *trans, u32 offset, u32 value, 
	/* pipeline_clear_src_grp is not used */

	clear_option = clear_full ? pipeline_clear_full : pipeline_clear_hps;



	if (ipa->version != IPA_VERSION_3_5_1) {

	/* IPA v4.0+ represents the pipeline clear options in the opcode.  It

	 * also supports a larger offset by encoding additional high-order

	 * bits in the payload flags field.

	 */

	if (ipa->version >= IPA_VERSION_4_0) {

		u16 offset_high;

		u32 val;

drivers/net/ipa/ipa_endpoint.c

+30 −12
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0



/* Copyright (c) 2012-2018, The Linux Foundation. All rights reserved.

 * Copyright (C) 2019-2020 Linaro Ltd.

 * Copyright (C) 2019-2021 Linaro Ltd.

 */



#include <linux/types.h>
@@ -266,7 +266,7 @@ ipa_endpoint_init_ctrl(struct ipa_endpoint *endpoint, bool suspend_delay) 
	 * if (endpoint->toward_ipa)

	 * 	assert(ipa->version != IPA_VERSION_4.2);

	 * else

	 * 	assert(ipa->version == IPA_VERSION_3_5_1);

	 *	assert(ipa->version < IPA_VERSION_4_0);

	 */

	mask = endpoint->toward_ipa ? ENDP_DELAY_FMASK : ENDP_SUSPEND_FMASK;
@@ -347,7 +347,7 @@ ipa_endpoint_program_suspend(struct ipa_endpoint *endpoint, bool enable) 
{

	bool suspended;



	if (endpoint->ipa->version != IPA_VERSION_3_5_1)

	if (endpoint->ipa->version >= IPA_VERSION_4_0)

		return enable;	/* For IPA v4.0+, no change made */



	/* assert(!endpoint->toward_ipa); */
@@ -468,6 +468,20 @@ static void ipa_endpoint_init_cfg(struct ipa_endpoint *endpoint) 
	iowrite32(val, endpoint->ipa->reg_virt + offset);

}



static void ipa_endpoint_init_nat(struct ipa_endpoint *endpoint)

{

	u32 offset;

	u32 val;



	if (!endpoint->toward_ipa)

		return;



	offset = IPA_REG_ENDP_INIT_NAT_N_OFFSET(endpoint->endpoint_id);

	val = u32_encode_bits(IPA_NAT_BYPASS, NAT_EN_FMASK);



	iowrite32(val, endpoint->ipa->reg_virt + offset);

}



/**

 * ipa_endpoint_init_hdr() - Initialize HDR endpoint configuration register

 * @endpoint:	Endpoint pointer
@@ -515,7 +529,7 @@ static void ipa_endpoint_init_hdr(struct ipa_endpoint *endpoint) 
			/* Where IPA will write the length */

			offset = offsetof(struct rmnet_map_header, pkt_len);

			/* Upper bits are stored in HDR_EXT with IPA v4.5 */

			if (version == IPA_VERSION_4_5)

			if (version >= IPA_VERSION_4_5)

				offset &= field_mask(HDR_OFST_PKT_SIZE_FMASK);



			val |= HDR_OFST_PKT_SIZE_VALID_FMASK;
@@ -562,7 +576,7 @@ static void ipa_endpoint_init_hdr_ext(struct ipa_endpoint *endpoint) 
	/* IPA v4.5 adds some most-significant bits to a few fields,

	 * two of which are defined in the HDR (not HDR_EXT) register.

	 */

	if (ipa->version == IPA_VERSION_4_5) {

	if (ipa->version >= IPA_VERSION_4_5) {

		/* HDR_TOTAL_LEN_OR_PAD_OFFSET is 0, so MSB is 0 */

		if (endpoint->data->qmap && !endpoint->toward_ipa) {

			u32 offset;
@@ -776,7 +790,7 @@ static u32 hol_block_timer_val(struct ipa *ipa, u32 microseconds) 
	if (!microseconds)

		return 0;	/* Nothing to compute if timer period is 0 */



	if (ipa->version == IPA_VERSION_4_5)

	if (ipa->version >= IPA_VERSION_4_5)

		return hol_block_timer_qtime_val(ipa, microseconds);



	/* Use 64 bit arithmetic to avoid overflow... */
@@ -1468,8 +1482,7 @@ static void ipa_endpoint_reset(struct ipa_endpoint *endpoint) 
	 * is active, we need to handle things specially to recover.

	 * All other cases just need to reset the underlying GSI channel.

	 */

	special = ipa->version == IPA_VERSION_3_5_1 &&

			!endpoint->toward_ipa &&

	special = ipa->version < IPA_VERSION_4_0 && !endpoint->toward_ipa &&

			endpoint->data->aggregation;

	if (special && ipa_endpoint_aggr_active(endpoint))

		ret = ipa_endpoint_reset_rx_aggr(endpoint);
@@ -1489,6 +1502,7 @@ static void ipa_endpoint_program(struct ipa_endpoint *endpoint) 
	else

		(void)ipa_endpoint_program_suspend(endpoint, false);

	ipa_endpoint_init_cfg(endpoint);

	ipa_endpoint_init_nat(endpoint);

	ipa_endpoint_init_hdr(endpoint);

	ipa_endpoint_init_hdr_ext(endpoint);

	ipa_endpoint_init_hdr_metadata_mask(endpoint);
@@ -1567,8 +1581,10 @@ void ipa_endpoint_suspend_one(struct ipa_endpoint *endpoint) 
		(void)ipa_endpoint_program_suspend(endpoint, true);

	}



	/* IPA v3.5.1 doesn't use channel stop for suspend */

	stop_channel = endpoint->ipa->version != IPA_VERSION_3_5_1;

	/* Starting with IPA v4.0, endpoints are suspended by stopping the

	 * underlying GSI channel rather than using endpoint suspend mode.

	 */

	stop_channel = endpoint->ipa->version >= IPA_VERSION_4_0;

	ret = gsi_channel_suspend(gsi, endpoint->channel_id, stop_channel);

	if (ret)

		dev_err(dev, "error %d suspending channel %u\n", ret,
@@ -1588,8 +1604,10 @@ void ipa_endpoint_resume_one(struct ipa_endpoint *endpoint) 
	if (!endpoint->toward_ipa)

		(void)ipa_endpoint_program_suspend(endpoint, false);



	/* IPA v3.5.1 doesn't use channel start for resume */

	start_channel = endpoint->ipa->version != IPA_VERSION_3_5_1;

	/* Starting with IPA v4.0, the underlying GSI channel must be

	 * restarted for resume.

	 */

	start_channel = endpoint->ipa->version >= IPA_VERSION_4_0;

	ret = gsi_channel_resume(gsi, endpoint->channel_id, start_channel);

	if (ret)

		dev_err(dev, "error %d resuming channel %u\n", ret,

drivers/net/ipa/ipa_main.c

+18 −3
Original line number Diff line number Diff line
@@ -227,8 +227,8 @@ static void ipa_hardware_config_comp(struct ipa *ipa) 
{

	u32 val;



	/* Nothing to configure for IPA v3.5.1 */

	if (ipa->version == IPA_VERSION_3_5_1)

	/* Nothing to configure prior to IPA v4.0 */

	if (ipa->version < IPA_VERSION_4_0)

		return;



	val = ioread32(ipa->reg_virt + IPA_REG_COMP_CFG_OFFSET);
@@ -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
@@ -388,7 +403,7 @@ static void ipa_hardware_config(struct ipa *ipa, const struct ipa_data *data) 
	}



	/* Implement some hardware workarounds */

	if (version != IPA_VERSION_3_5_1 && version < IPA_VERSION_4_5) {

	if (version >= IPA_VERSION_4_0 && version < IPA_VERSION_4_5) {

		/* Enable open global clocks (not needed for IPA v4.5) */

		val = GLOBAL_FMASK;

		val |= GLOBAL_2X_CLK_FMASK;