net: ipa: introduce ipa_cmd_init()
Currently, ipa_cmd_data_valid() is called by ipa_mem_config(). Nothing it does requires access to hardware though, so it can be done during the init phase of IPA driver startup. Create a new function ipa_cmd_init(), whose purpose is to do early initialization related to IPA immediate commands. It will call the build-time validation function, then will make the two calls made previously by ipa_cmd_data_valid(). This make ipa_cmd_data_valid() unnecessary, so get rid of it. Rename ipa_cmd_header_valid() to be ipa_cmd_header_init_local_valid(), so its name is clearer about which IPA immediate command it is associated with. Signed-off-by: Alex Elder <elder@linaro.org> Signed-off-by: Paolo Abeni <pabeni@redhat.com>
This commit is contained in:
Родитель
5444b0ea99
Коммит
7fd10a2aca
|
@ -202,7 +202,7 @@ bool ipa_cmd_table_init_valid(struct ipa *ipa, const struct ipa_mem *mem,
|
||||||
}
|
}
|
||||||
|
|
||||||
/* 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_init_local_valid(struct ipa *ipa)
|
||||||
{
|
{
|
||||||
struct device *dev = &ipa->pdev->dev;
|
struct device *dev = &ipa->pdev->dev;
|
||||||
const struct ipa_mem *mem;
|
const struct ipa_mem *mem;
|
||||||
|
@ -318,26 +318,11 @@ static bool ipa_cmd_register_write_valid(struct ipa *ipa)
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool ipa_cmd_data_valid(struct ipa *ipa)
|
|
||||||
{
|
|
||||||
if (!ipa_cmd_header_valid(ipa))
|
|
||||||
return false;
|
|
||||||
|
|
||||||
if (!ipa_cmd_register_write_valid(ipa))
|
|
||||||
return false;
|
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
int ipa_cmd_pool_init(struct gsi_channel *channel, u32 tre_max)
|
int ipa_cmd_pool_init(struct gsi_channel *channel, u32 tre_max)
|
||||||
{
|
{
|
||||||
struct gsi_trans_info *trans_info = &channel->trans_info;
|
struct gsi_trans_info *trans_info = &channel->trans_info;
|
||||||
struct device *dev = channel->gsi->dev;
|
struct device *dev = channel->gsi->dev;
|
||||||
|
|
||||||
/* This is as good a place as any to validate build constants */
|
|
||||||
ipa_cmd_validate_build();
|
|
||||||
|
|
||||||
/* Command payloads are allocated one at a time, but a single
|
/* Command payloads are allocated one at a time, but a single
|
||||||
* transaction can require up to the maximum supported by the
|
* transaction can require up to the maximum supported by the
|
||||||
* channel; treat them as if they were allocated all at once.
|
* channel; treat them as if they were allocated all at once.
|
||||||
|
@ -637,3 +622,17 @@ struct gsi_trans *ipa_cmd_trans_alloc(struct ipa *ipa, u32 tre_count)
|
||||||
return gsi_channel_trans_alloc(&ipa->gsi, endpoint->channel_id,
|
return gsi_channel_trans_alloc(&ipa->gsi, endpoint->channel_id,
|
||||||
tre_count, DMA_NONE);
|
tre_count, DMA_NONE);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Init function for immediate commands; there is no ipa_cmd_exit() */
|
||||||
|
int ipa_cmd_init(struct ipa *ipa)
|
||||||
|
{
|
||||||
|
ipa_cmd_validate_build();
|
||||||
|
|
||||||
|
if (!ipa_cmd_header_init_local_valid(ipa))
|
||||||
|
return -EINVAL;
|
||||||
|
|
||||||
|
if (!ipa_cmd_register_write_valid(ipa))
|
||||||
|
return -EINVAL;
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
|
@ -162,4 +162,14 @@ void ipa_cmd_pipeline_clear_wait(struct ipa *ipa);
|
||||||
*/
|
*/
|
||||||
struct gsi_trans *ipa_cmd_trans_alloc(struct ipa *ipa, u32 tre_count);
|
struct gsi_trans *ipa_cmd_trans_alloc(struct ipa *ipa, u32 tre_count);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* ipa_cmd_init() - Initialize IPA immediate commands
|
||||||
|
* @ipa: - IPA pointer
|
||||||
|
*
|
||||||
|
* Return: 0 if successful, or a negative error code
|
||||||
|
*
|
||||||
|
* There is no need for a matching ipa_cmd_exit() function.
|
||||||
|
*/
|
||||||
|
int ipa_cmd_init(struct ipa *ipa);
|
||||||
|
|
||||||
#endif /* _IPA_CMD_H_ */
|
#endif /* _IPA_CMD_H_ */
|
||||||
|
|
|
@ -370,10 +370,6 @@ int ipa_mem_config(struct ipa *ipa)
|
||||||
if (!ipa_table_valid(ipa))
|
if (!ipa_table_valid(ipa))
|
||||||
goto err_dma_free;
|
goto err_dma_free;
|
||||||
|
|
||||||
/* Validate memory-related properties relevant to immediate commands */
|
|
||||||
if (!ipa_cmd_data_valid(ipa))
|
|
||||||
goto err_dma_free;
|
|
||||||
|
|
||||||
/* Verify the microcontroller ring alignment (if defined) */
|
/* Verify the microcontroller ring alignment (if defined) */
|
||||||
mem = ipa_mem_find(ipa, IPA_MEM_UC_EVENT_RING);
|
mem = ipa_mem_find(ipa, IPA_MEM_UC_EVENT_RING);
|
||||||
if (mem && mem->offset % 1024) {
|
if (mem && mem->offset % 1024) {
|
||||||
|
|
Загрузка…
Ссылка в новой задаче