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

msm: eva: Reuse HFI/SFR memory after SSR

Browse Source 
Avoid realloc, remap HFI after SSR.

Change-Id: I6801b3cc33643f2936634c94cb5094fc91773348
Signed-off-by: George Shen <quic_sqiao@quicinc.com>
This commit is contained in:
George Shen
2022-04-01 11:25:17 -07:00
parent 30f964242d
commit 81fb7564e7
1 changed files with 103 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

168
msm/eva/cvp_hfi.c
View File

@@ -1397,6 +1397,7 @@ fail_dma_alloc:
static void __interface_queues_release(struct iris_hfi_device *device) static void __interface_queues_release(struct iris_hfi_device *device)
{ {
#ifdef CONFIG_EVA_LE
int i; int i;
struct cvp_hfi_mem_map_table *qdss; struct cvp_hfi_mem_map_table *qdss;
struct cvp_hfi_mem_map *mem_map; struct cvp_hfi_mem_map *mem_map;
@@ -1452,7 +1453,7 @@ static void __interface_queues_release(struct iris_hfi_device *device)
device->mem_addr.align_virtual_addr = NULL; device->mem_addr.align_virtual_addr = NULL;
device->mem_addr.align_device_addr = 0; device->mem_addr.align_device_addr = 0;
#endif
__interface_dsp_queues_release(device); __interface_dsp_queues_release(device);
} }
@@ -1526,47 +1527,24 @@ static void __setup_ucregion_memory_map(struct iris_hfi_device *device)
call_iris_op(device, setup_dsp_uc_memmap, device); call_iris_op(device, setup_dsp_uc_memmap, device);
} }
static int __interface_queues_init(struct iris_hfi_device *dev) static void __hfi_queue_init(struct iris_hfi_device *dev)
{ {
int i, offset = 0;
struct cvp_hfi_queue_table_header *q_tbl_hdr; struct cvp_hfi_queue_table_header *q_tbl_hdr;
struct cvp_hfi_queue_header *q_hdr;
u32 i;
int rc = 0;
struct cvp_hfi_mem_map_table *qdss;
struct cvp_hfi_mem_map *mem_map;
struct cvp_iface_q_info *iface_q; struct cvp_iface_q_info *iface_q;
struct cvp_hfi_sfr_struct *vsfr; struct cvp_hfi_queue_header *q_hdr;
struct cvp_mem_addr *mem_addr;
int offset = 0;
int num_entries = dev->res->qdss_addr_set.count;
phys_addr_t fw_bias = 0;
size_t q_size;
unsigned long mem_map_table_base_addr;
struct context_bank_info *cb;
q_size = SHARED_QSIZE - ALIGNED_SFR_SIZE - ALIGNED_QDSS_SIZE; if (!dev)
mem_addr = &dev->mem_addr; return;
if (!is_iommu_present(dev->res))
fw_bias = dev->cvp_hal_data->firmware_base;
rc = __smem_alloc(dev, mem_addr, q_size, 1, SMEM_UNCACHED);
if (rc) {
dprintk(CVP_ERR, "iface_q_table_alloc_fail\n");
goto fail_alloc_queue;
}
dev->iface_q_table.align_virtual_addr = mem_addr->align_virtual_addr;
dev->iface_q_table.align_device_addr = mem_addr->align_device_addr -
fw_bias;
dev->iface_q_table.mem_size = CVP_IFACEQ_TABLE_SIZE;
dev->iface_q_table.mem_data = mem_addr->mem_data;
offset += dev->iface_q_table.mem_size; offset += dev->iface_q_table.mem_size;
for (i = 0; i < CVP_IFACEQ_NUMQ; i++) { for (i = 0; i < CVP_IFACEQ_NUMQ; i++) {
iface_q = &dev->iface_queues[i]; iface_q = &dev->iface_queues[i];
iface_q->q_array.align_device_addr = mem_addr->align_device_addr iface_q->q_array.align_device_addr =
+ offset - fw_bias; dev->iface_q_table.align_device_addr + offset;
iface_q->q_array.align_virtual_addr = iface_q->q_array.align_virtual_addr =
mem_addr->align_virtual_addr + offset; dev->iface_q_table.align_virtual_addr + offset;
iface_q->q_array.mem_size = CVP_IFACEQ_QUEUE_SIZE; iface_q->q_array.mem_size = CVP_IFACEQ_QUEUE_SIZE;
offset += iface_q->q_array.mem_size; offset += iface_q->q_array.mem_size;
iface_q->q_hdr = CVP_IFACEQ_GET_QHDR_START_ADDR( iface_q->q_hdr = CVP_IFACEQ_GET_QHDR_START_ADDR(
@@ -1575,35 +1553,6 @@ static int __interface_queues_init(struct iris_hfi_device *dev)
spin_lock_init(&iface_q->hfi_lock); spin_lock_init(&iface_q->hfi_lock);
} }
if ((msm_cvp_fw_debug_mode & HFI_DEBUG_MODE_QDSS) && num_entries) {
rc = __smem_alloc(dev, mem_addr, ALIGNED_QDSS_SIZE, 1,
SMEM_UNCACHED);
if (rc) {
dprintk(CVP_WARN,
"qdss_alloc_fail: QDSS messages logging will not work\n");
dev->qdss.align_device_addr = 0;
} else {
dev->qdss.align_device_addr =
mem_addr->align_device_addr - fw_bias;
dev->qdss.align_virtual_addr =
mem_addr->align_virtual_addr;
dev->qdss.mem_size = ALIGNED_QDSS_SIZE;
dev->qdss.mem_data = mem_addr->mem_data;
}
}
rc = __smem_alloc(dev, mem_addr, ALIGNED_SFR_SIZE, 1, SMEM_UNCACHED);
if (rc) {
dprintk(CVP_WARN, "sfr_alloc_fail: SFR not will work\n");
dev->sfr.align_device_addr = 0;
} else {
dev->sfr.align_device_addr = mem_addr->align_device_addr -
fw_bias;
dev->sfr.align_virtual_addr = mem_addr->align_virtual_addr;
dev->sfr.mem_size = ALIGNED_SFR_SIZE;
dev->sfr.mem_data = mem_addr->mem_data;
}
q_tbl_hdr = (struct cvp_hfi_queue_table_header *) q_tbl_hdr = (struct cvp_hfi_queue_table_header *)
dev->iface_q_table.align_virtual_addr; dev->iface_q_table.align_virtual_addr;
q_tbl_hdr->qtbl_version = 0; q_tbl_hdr->qtbl_version = 0;
@@ -1636,6 +1585,98 @@ static int __interface_queues_init(struct iris_hfi_device *dev)
*/ */
q_hdr->qhdr_rx_req = 0; q_hdr->qhdr_rx_req = 0;
}
static void __sfr_init(struct iris_hfi_device *dev)
{
struct cvp_hfi_sfr_struct *vsfr;
if (!dev)
return;
vsfr = (struct cvp_hfi_sfr_struct *) dev->sfr.align_virtual_addr;
if (vsfr)
vsfr->bufSize = ALIGNED_SFR_SIZE;
}
static int __interface_queues_init(struct iris_hfi_device *dev)
{
int rc = 0;
struct cvp_hfi_mem_map_table *qdss;
struct cvp_hfi_mem_map *mem_map;
struct cvp_mem_addr *mem_addr;
int num_entries = dev->res->qdss_addr_set.count;
phys_addr_t fw_bias = 0;
size_t q_size;
unsigned long mem_map_table_base_addr;
struct context_bank_info *cb;
q_size = SHARED_QSIZE - ALIGNED_SFR_SIZE - ALIGNED_QDSS_SIZE;
mem_addr = &dev->mem_addr;
if (!is_iommu_present(dev->res))
fw_bias = dev->cvp_hal_data->firmware_base;
if (dev->iface_q_table.align_virtual_addr) {
memset((void *)dev->iface_q_table.align_virtual_addr,
0, q_size);
goto hfi_queue_init;
}
rc = __smem_alloc(dev, mem_addr, q_size, 1, SMEM_UNCACHED);
if (rc) {
dprintk(CVP_ERR, "iface_q_table_alloc_fail\n");
goto fail_alloc_queue;
}
dev->iface_q_table.align_virtual_addr = mem_addr->align_virtual_addr;
dev->iface_q_table.align_device_addr = mem_addr->align_device_addr -
fw_bias;
dev->iface_q_table.mem_size = CVP_IFACEQ_TABLE_SIZE;
dev->iface_q_table.mem_data = mem_addr->mem_data;
hfi_queue_init:
__hfi_queue_init(dev);
if (dev->sfr.align_virtual_addr) {
memset((void *)dev->sfr.align_virtual_addr,
0, ALIGNED_SFR_SIZE);
goto sfr_init;
}
rc = __smem_alloc(dev, mem_addr, ALIGNED_SFR_SIZE, 1, SMEM_UNCACHED);
if (rc) {
dprintk(CVP_WARN, "sfr_alloc_fail: SFR not will work\n");
dev->sfr.align_device_addr = 0;
} else {
dev->sfr.align_device_addr = mem_addr->align_device_addr -
fw_bias;
dev->sfr.align_virtual_addr = mem_addr->align_virtual_addr;
dev->sfr.mem_size = ALIGNED_SFR_SIZE;
dev->sfr.mem_data = mem_addr->mem_data;
}
sfr_init:
__sfr_init(dev);
if (dev->qdss.align_virtual_addr)
goto dsp_hfi_queue_init;
if ((msm_cvp_fw_debug_mode & HFI_DEBUG_MODE_QDSS) && num_entries) {
rc = __smem_alloc(dev, mem_addr, ALIGNED_QDSS_SIZE, 1,
SMEM_UNCACHED);
if (rc) {
dprintk(CVP_WARN,
"qdss_alloc_fail: QDSS messages logging will not work\n");
dev->qdss.align_device_addr = 0;
} else {
dev->qdss.align_device_addr =
mem_addr->align_device_addr - fw_bias;
dev->qdss.align_virtual_addr =
mem_addr->align_virtual_addr;
dev->qdss.mem_size = ALIGNED_QDSS_SIZE;
dev->qdss.mem_data = mem_addr->mem_data;
}
}
if (dev->qdss.align_virtual_addr) { if (dev->qdss.align_virtual_addr) {
qdss = qdss =
(struct cvp_hfi_mem_map_table *)dev->qdss.align_virtual_addr; (struct cvp_hfi_mem_map_table *)dev->qdss.align_virtual_addr;
@@ -1662,10 +1703,7 @@ static int __interface_queues_init(struct iris_hfi_device *dev)
} }
} }
vsfr = (struct cvp_hfi_sfr_struct *) dev->sfr.align_virtual_addr; dsp_hfi_queue_init:
if (vsfr)
vsfr->bufSize = ALIGNED_SFR_SIZE;
rc = __interface_dsp_queues_init(dev); rc = __interface_dsp_queues_init(dev);
if (rc) { if (rc) {
dprintk(CVP_ERR, "dsp_queues_init failed\n"); dprintk(CVP_ERR, "dsp_queues_init failed\n");