samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge 3a2c76c725 on remote branch

Browse Source 
Change-Id: I8e3fa9b83a9fefcb3bdf0b8996cb2afb80f51a5e
This commit is contained in:
Linux Build Service Account
2024-07-21 14:11:52 -07:00
parent 241e23c6e5 3a2c76c725
commit 7ade50ae5e
3 changed files with 75 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/platform/msm/ipa/ipa_v3/ipa.c
View File

@@ -8301,9 +8301,18 @@ static int ipa3_post_init(const struct ipa3_plat_drv_res *resource_p,
}
/*
* Will enable synx_init API calls back when
* hw-fence is enabled by default in builds.
*/
* Here, synx_init API calls will be success only
* when hw-fence is enabled by default in builds.
*/
result = ipa3_create_hfi_send_uc();
if (result) {
IPAERR("HFI Creation failed %d\n", result);
ipa3_free_uc_temp_buffs(NO_OF_BUFFS);
ipa3_free_uc_pipes_er_tr();
result = -ENODEV;
IPA_ACTIVE_CLIENTS_DEC_SIMPLE();
goto fail_teth_bridge_driver_init;
}
IPA_ACTIVE_CLIENTS_DEC_SIMPLE();
}

30
drivers/platform/msm/ipa/ipa_v3/ipa_rtp_genl.c
View File

@@ -412,7 +412,7 @@ int ipa_rtp_send_tuple_info_resp(struct genl_info *info,
return rc;
}
msg_head = genlmsg_put(skb, 0, info->snd_seq + 1,
msg_head = genlmsg_put(skb, 0, info->snd_seq,
&ipa_rtp_genl_family,
0, IPA_RTP_GENL_CMD_ASSIGN_STREAM_ID);
if (!msg_head) {
@@ -439,6 +439,7 @@ int ipa_rtp_send_tuple_info_resp(struct genl_info *info,
ipa3_ctx->rtp_stream_id_cnt++;
IPADBG("assigned stream-id is %u\n", tuple_info_resp->stream_id);
IPADBG_LOW("Exit\n");
return rc;
free_skb:
kfree(skb);
@@ -773,11 +774,10 @@ int ipa_rtp_add_bitstream_buff_req_hdlr(struct sk_buff *skb_2,
IPADBG_LOW("buff_cnt is %u\n", bs_buffer_req.buff_cnt);
IPADBG_LOW("cookie is 0x%x\n", bs_buffer_req.cookie);
/* If IPA C2 component is providing two buffers for meta data and bitstream buff,
* they need to fill meta_buff_offset and buff_offset as zero.
* If it is a single buffer for meta data and bitstream buff, then meta_buff_fd
* and buff_fd will be the same. And they need to fill meta_buff_offset as zero
* and fill the bitstream buff offset in buff_offset and it should be 4 byte aligned.
/* If IPA C2 component is providing two fd's for meta fd and bitstream buff fd then
* sizes need to be filled. If it is a single fd for both meta data and bitstream buff
* then meta_buff_fd and bitstream_buffer_fd will be the same. And they need to fill
* bitstream_buffer_size as actual size and meta_buff_size to zero.
*/
for (i = 0; i < bs_buffer_req.buff_cnt; i++) {
@@ -788,26 +788,16 @@ int ipa_rtp_add_bitstream_buff_req_hdlr(struct sk_buff *skb_2,
}
if (bs_buffer_req.bs_info[i].meta_buff_fd == bs_buffer_req.bs_info[i].buff_fd) {
if (bs_buffer_req.bs_info[i].meta_buff_offset ||
!bs_buffer_req.bs_info[i].buff_offset ||
bs_buffer_req.bs_info[i].meta_buff_size ||
if (bs_buffer_req.bs_info[i].meta_buff_size ||
!bs_buffer_req.bs_info[i].buff_size) {
IPAERR("invalid meta_buff_offset %u or bs_buff_offset %u\n",
bs_buffer_req.bs_info[i].meta_buff_offset,
bs_buffer_req.bs_info[i].buff_offset);
IPAERR("or meta_buff_size %u or bs_buff_size %u params\n",
bs_buffer_req.bs_info[i].meta_buff_size,
bs_buffer_req.bs_info[i].buff_size);
return rc;
}
} else {
if (bs_buffer_req.bs_info[i].meta_buff_offset ||
bs_buffer_req.bs_info[i].buff_offset ||
!bs_buffer_req.bs_info[i].meta_buff_size ||
if (!bs_buffer_req.bs_info[i].meta_buff_size ||
!bs_buffer_req.bs_info[i].buff_size) {
IPAERR("invalid meta_buff_offset %u or bs_buff_offset %u\n",
bs_buffer_req.bs_info[i].meta_buff_offset,
bs_buffer_req.bs_info[i].buff_offset);
IPAERR("or meta_buff_size %u or bs_buff_size %u params\n",
bs_buffer_req.bs_info[i].meta_buff_size,
bs_buffer_req.bs_info[i].buff_size);
@@ -869,8 +859,8 @@ int ipa_rtp_rmv_stream_id_req_hdlr(struct sk_buff *skb_2,
}
/* Call IPA driver/uC API's here */
if (is_req_valid && ipa3_uc_send_remove_stream_cmd(&rmv_sid_req)
&& ipa3_delete_rtp_hdr_proc_rt_flt_rules(rmv_sid_req.stream_id)) {
if (is_req_valid && (ipa3_uc_send_remove_stream_cmd(&rmv_sid_req)
|| ipa3_delete_rtp_hdr_proc_rt_flt_rules(rmv_sid_req.stream_id))) {
IPAERR("failed in removing stream-id, deleting hdr proc and flt rules\n");
return rc;
}

62
drivers/platform/msm/ipa/ipa_v3/ipa_uc_rtp.c
View File

@@ -5,8 +5,8 @@
#include "ipa_i.h"
#include <linux/delay.h>
#include <linux/soc/qcom/msm_hw_fence.h>
#include <synx_api.h>
#include <linux/sync_file.h>
/* ER ==> (16B * 512 entries ) * 4 frames = 8k *4 = 32k */
#define IPA_UC_PROD_EVENT_RING_SIZE 512
@@ -156,6 +156,7 @@ struct er_tr_to_free er_tr_cpu_addresses;
void *cpu_address[NO_OF_BUFFS];
struct uc_temp_buffer_info tb_info;
struct list_head mapped_bs_buff_lst[MAX_NUMBER_OF_STREAMS];
struct synx_session *glob_synx_session_ptr;
int ipa3_uc_send_tuple_info_cmd(struct traffic_tuple_info *data)
{
@@ -902,9 +903,13 @@ int ipa3_send_bitstream_buff_info(struct bitstream_buffers *data)
{
struct bitstream_buffers_to_uc tmp;
int index = 0;
int synx_result = 0;
struct dma_buf *dmab = NULL;
struct dma_address_map_table *map_table = NULL;
struct sg_table *sgt = NULL;
struct synx_import_params params = {0};
struct dma_fence *fence = NULL;
u32 handle;
if (!data || data->buff_cnt < 1) {
IPAERR("Invalid params.\n");
@@ -916,12 +921,46 @@ int ipa3_send_bitstream_buff_info(struct bitstream_buffers *data)
tmp.cookie = data->cookie;
for (index = 0; index < data->buff_cnt; index++) {
/*
* We need to get the underlying fence handle/hash on every
* fence fd received from IPA C2 and pass the handle to uC.
*/
params.type = SYNX_IMPORT_INDV_PARAMS;
params.indv.flags = SYNX_IMPORT_DMA_FENCE | SYNX_IMPORT_GLOBAL_FENCE;
fence = sync_file_get_fence(data->bs_info[index].fence_id);
if (!fence) {
IPAERR("sync_file_get_fence failure on %u fd\n",
data->bs_info[index].fence_id);
return -EFAULT;
}
params.indv.fence = fence;
params.indv.new_h_synx = &handle;
synx_result = synx_import(glob_synx_session_ptr, &params);
if (synx_result) {
IPAERR("synx_import is failed with %d\n", synx_result);
dma_fence_put(fence);
return -EFAULT;
}
tmp.bs_info[index].fence_id = handle;
/*
* Irrespective of whether bitstream_buffer cmd is sent to uC,
* we can call synx_release, dma_fence_put to put one refcnt
* taken by synx_import & sync_file_get_fence() respectively.
*/
if (synx_release(glob_synx_session_ptr, handle))
IPAERR("synx_release failed on this %u handle\n", handle);
dma_fence_put(fence);
tmp.bs_info[index].stream_id = data->bs_info[index].stream_id;
tmp.bs_info[index].fence_id = data->bs_info[index].fence_id;
tmp.bs_info[index].buff_fd = data->bs_info[index].buff_fd;
tmp.bs_info[index].buff_size = data->bs_info[index].buff_size;
tmp.bs_info[index].meta_buff_fd = data->bs_info[index].meta_buff_fd;
tmp.bs_info[index].meta_buff_size = data->bs_info[index].meta_buff_size;
dmab = dma_buf_get(tmp.bs_info[index].buff_fd);
if (IS_ERR_OR_NULL(dmab)) {
IPAERR("no dma handle for the fd.\n");
@@ -1008,12 +1047,12 @@ int ipa3_uc_send_hfi_cmd(struct hfi_queue_info *data)
int ipa3_create_hfi_send_uc(void)
{
int res = 0;
struct synx_session *synx_session_ptr = NULL;
struct synx_initialization_params params;
struct synx_queue_desc queue_desc;
char synx_session_name[MAX_SYNX_FENCE_SESSION_NAME];
struct hfi_queue_info data;
dma_addr_t hfi_queue_addr = 0;
struct ipa_smmu_cb_ctx *cb = NULL;
snprintf(synx_session_name, MAX_SYNX_FENCE_SESSION_NAME, "ipa synx fence");
queue_desc.vaddr = NULL;
@@ -1023,30 +1062,35 @@ int ipa3_create_hfi_send_uc(void)
params.name = (const char *)synx_session_name;
params.ptr = &queue_desc;
params.id = SYNX_CLIENT_HW_FENCE_VID_CTX0;
params.id = SYNX_CLIENT_HW_FENCE_IPA_CTX0;
params.flags = SYNX_INIT_MAX;
synx_session_ptr = synx_initialize(&params);
if (IS_ERR_OR_NULL(synx_session_ptr)) {
glob_synx_session_ptr = synx_initialize(&params);
if (IS_ERR_OR_NULL(glob_synx_session_ptr)) {
IPAERR("invalid synx fence session\n");
return -EFAULT;
}
res = iommu_map(iommu_get_domain_for_dev(ipa3_ctx->pdev),
cb = ipa3_get_smmu_ctx(IPA_SMMU_CB_UC);
res = ipa3_iommu_map(cb->iommu_domain,
queue_desc.dev_addr, queue_desc.dev_addr,
queue_desc.size, IOMMU_READ | IOMMU_WRITE);
if (res) {
IPAERR("HFI - smmu map failed\n");
synx_uninitialize(glob_synx_session_ptr);
return -EFAULT;
}
IPADBG("hfi queue addr is 0x%x and size is 0x%x\n",
queue_desc.dev_addr, queue_desc.size);
hfi_queue_addr = queue_desc.dev_addr;
data.hfi_queue_addr = hfi_queue_addr;
data.hfi_queue_size = queue_desc.size;
data.queue_header_start_addr = hfi_queue_addr +
sizeof(struct msm_hw_fence_hfi_queue_table_header);
sizeof(struct synx_hw_fence_hfi_queue_table_header);
data.queue_payload_start_addr = data.queue_header_start_addr +
sizeof(struct msm_hw_fence_hfi_queue_header);
sizeof(struct synx_hw_fence_hfi_queue_header);
res = ipa3_uc_send_hfi_cmd(&data);
return res;
}