Commit 442d68eb authored by Alex Elder's avatar Alex Elder Committed by David S. Miller

net: ipa: kill the remaining conditional validation code

There are only a few remaining spots that validate IPA code
conditional on whether a symbol is defined at compile time.
The checks are not expensive, so just build them always.

This completes the removal of all CONFIG_VALIDATE/CONFIG_VALIDATION
IPA code.
Signed-off-by: default avatarAlex Elder <elder@linaro.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 546948bf
# Un-comment the next line if you want to validate configuration data
#ccflags-y += -DIPA_VALIDATE
obj-$(CONFIG_QCOM_IPA) += ipa.o obj-$(CONFIG_QCOM_IPA) += ipa.o
ipa-y := ipa_main.o ipa_clock.o ipa_reg.o ipa_mem.o \ ipa-y := ipa_main.o ipa_clock.o ipa_reg.o ipa_mem.o \
......
...@@ -1964,7 +1964,6 @@ static void gsi_evt_ring_init(struct gsi *gsi) ...@@ -1964,7 +1964,6 @@ static void gsi_evt_ring_init(struct gsi *gsi)
static bool gsi_channel_data_valid(struct gsi *gsi, static bool gsi_channel_data_valid(struct gsi *gsi,
const struct ipa_gsi_endpoint_data *data) const struct ipa_gsi_endpoint_data *data)
{ {
#ifdef IPA_VALIDATION
u32 channel_id = data->channel_id; u32 channel_id = data->channel_id;
struct device *dev = gsi->dev; struct device *dev = gsi->dev;
...@@ -2010,7 +2009,6 @@ static bool gsi_channel_data_valid(struct gsi *gsi, ...@@ -2010,7 +2009,6 @@ static bool gsi_channel_data_valid(struct gsi *gsi,
channel_id, data->channel.event_count); channel_id, data->channel.event_count);
return false; return false;
} }
#endif /* IPA_VALIDATION */
return true; return true;
} }
......
...@@ -90,14 +90,12 @@ int gsi_trans_pool_init(struct gsi_trans_pool *pool, size_t size, u32 count, ...@@ -90,14 +90,12 @@ int gsi_trans_pool_init(struct gsi_trans_pool *pool, size_t size, u32 count,
{ {
void *virt; void *virt;
#ifdef IPA_VALIDATE
if (!size) if (!size)
return -EINVAL; return -EINVAL;
if (count < max_alloc) if (count < max_alloc)
return -EINVAL; return -EINVAL;
if (!max_alloc) if (!max_alloc)
return -EINVAL; return -EINVAL;
#endif /* IPA_VALIDATE */
/* By allocating a few extra entries in our pool (one less /* By allocating a few extra entries in our pool (one less
* than the maximum number that will be requested in a * than the maximum number that will be requested in a
...@@ -140,14 +138,12 @@ int gsi_trans_pool_init_dma(struct device *dev, struct gsi_trans_pool *pool, ...@@ -140,14 +138,12 @@ int gsi_trans_pool_init_dma(struct device *dev, struct gsi_trans_pool *pool,
dma_addr_t addr; dma_addr_t addr;
void *virt; void *virt;
#ifdef IPA_VALIDATE
if (!size) if (!size)
return -EINVAL; return -EINVAL;
if (count < max_alloc) if (count < max_alloc)
return -EINVAL; return -EINVAL;
if (!max_alloc) if (!max_alloc)
return -EINVAL; return -EINVAL;
#endif /* IPA_VALIDATE */
/* Don't let allocations cross a power-of-two boundary */ /* Don't let allocations cross a power-of-two boundary */
size = __roundup_pow_of_two(size); size = __roundup_pow_of_two(size);
......
...@@ -207,8 +207,6 @@ bool ipa_cmd_table_valid(struct ipa *ipa, const struct ipa_mem *mem, bool route) ...@@ -207,8 +207,6 @@ bool ipa_cmd_table_valid(struct ipa *ipa, const struct ipa_mem *mem, bool route)
return true; return true;
} }
#ifdef IPA_VALIDATE
/* Validate the memory region that holds headers */ /* Validate the memory region that holds headers */
static bool ipa_cmd_header_valid(struct ipa *ipa) static bool ipa_cmd_header_valid(struct ipa *ipa)
{ {
...@@ -343,7 +341,6 @@ bool ipa_cmd_data_valid(struct ipa *ipa) ...@@ -343,7 +341,6 @@ bool ipa_cmd_data_valid(struct ipa *ipa)
return true; return true;
} }
#endif /* IPA_VALIDATE */
int ipa_cmd_pool_init(struct gsi_channel *channel, u32 tre_max) int ipa_cmd_pool_init(struct gsi_channel *channel, u32 tre_max)
{ {
......
...@@ -68,8 +68,6 @@ struct ipa_cmd_info { ...@@ -68,8 +68,6 @@ struct ipa_cmd_info {
bool ipa_cmd_table_valid(struct ipa *ipa, const struct ipa_mem *mem, bool ipa_cmd_table_valid(struct ipa *ipa, const struct ipa_mem *mem,
bool route); bool route);
#ifdef IPA_VALIDATE
/** /**
* ipa_cmd_data_valid() - Validate command-realted configuration is valid * ipa_cmd_data_valid() - Validate command-realted configuration is valid
* @ipa: - IPA pointer * @ipa: - IPA pointer
...@@ -78,15 +76,6 @@ bool ipa_cmd_table_valid(struct ipa *ipa, const struct ipa_mem *mem, ...@@ -78,15 +76,6 @@ bool ipa_cmd_table_valid(struct ipa *ipa, const struct ipa_mem *mem,
*/ */
bool ipa_cmd_data_valid(struct ipa *ipa); bool ipa_cmd_data_valid(struct ipa *ipa);
#else /* !IPA_VALIDATE */
static inline bool ipa_cmd_data_valid(struct ipa *ipa)
{
return true;
}
#endif /* !IPA_VALIDATE */
/** /**
* ipa_cmd_pool_init() - initialize command channel pools * ipa_cmd_pool_init() - initialize command channel pools
* @channel: AP->IPA command TX GSI channel pointer * @channel: AP->IPA command TX GSI channel pointer
......
...@@ -612,7 +612,6 @@ MODULE_DEVICE_TABLE(of, ipa_match); ...@@ -612,7 +612,6 @@ MODULE_DEVICE_TABLE(of, ipa_match);
* */ * */
static void ipa_validate_build(void) static void ipa_validate_build(void)
{ {
#ifdef IPA_VALIDATE
/* At one time we assumed a 64-bit build, allowing some do_div() /* At one time we assumed a 64-bit build, allowing some do_div()
* calls to be replaced by simple division or modulo operations. * calls to be replaced by simple division or modulo operations.
* We currently only perform divide and modulo operations on u32, * We currently only perform divide and modulo operations on u32,
...@@ -646,7 +645,6 @@ static void ipa_validate_build(void) ...@@ -646,7 +645,6 @@ static void ipa_validate_build(void)
BUILD_BUG_ON(!ipa_aggr_granularity_val(IPA_AGGR_GRANULARITY)); BUILD_BUG_ON(!ipa_aggr_granularity_val(IPA_AGGR_GRANULARITY));
BUILD_BUG_ON(ipa_aggr_granularity_val(IPA_AGGR_GRANULARITY) > BUILD_BUG_ON(ipa_aggr_granularity_val(IPA_AGGR_GRANULARITY) >
field_max(AGGR_GRANULARITY_FMASK)); field_max(AGGR_GRANULARITY_FMASK));
#endif /* IPA_VALIDATE */
} }
static bool ipa_version_valid(enum ipa_version version) static bool ipa_version_valid(enum ipa_version version)
......
...@@ -29,7 +29,6 @@ ...@@ -29,7 +29,6 @@
static bool ipa_resource_limits_valid(struct ipa *ipa, static bool ipa_resource_limits_valid(struct ipa *ipa,
const struct ipa_resource_data *data) const struct ipa_resource_data *data)
{ {
#ifdef IPA_VALIDATION
u32 group_count; u32 group_count;
u32 i; u32 i;
u32 j; u32 j;
...@@ -65,7 +64,7 @@ static bool ipa_resource_limits_valid(struct ipa *ipa, ...@@ -65,7 +64,7 @@ static bool ipa_resource_limits_valid(struct ipa *ipa,
if (resource->limits[j].min || resource->limits[j].max) if (resource->limits[j].min || resource->limits[j].max)
return false; return false;
} }
#endif /* !IPA_VALIDATION */
return true; return true;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment