shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-08 03:40:35 +09:00
Code Issues Packages Projects Releases Wiki Activity

pcie-dma-trx: update to version 0x3

Browse Source 
support reverse buffer address

if reverse
	buf_idx 0-7	rc <- ep
	buf_idx 8-15	rc -> ep
else
	buf_idx 0-7	rc -> ep
	buf_idx 8-15	rc <- ep

Should update test-pcie:

rc: ./test-pcie 2 1000 1024 0 0
ep: ./test-pcie 1 1000 1024 0 0

Change-Id: I73cd6cb3511068166d5681f44a7f53d46003775b
Signed-off-by: Simon Xue <xxm@rock-chips.com>
This commit is contained in:
Simon Xue
2021-11-24 17:59:46 +08:00
committed by Tao Huang
parent bf930ada8e
commit 889f7522e4
2 changed files with 32 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
drivers/pci/controller/rockchip-pcie-dma.c
View File

@@ -168,10 +168,18 @@ static void rk_pcie_prepare_dma(struct dma_trx_obj *obj,
bus = obj->remote_mem_start + bus_idx * obj->buffer_size;
virt = obj->local_mem_base + local_idx * obj->buffer_size;
if (!is_rc(obj)) {
local += obj->rd_buf_size;
virt += obj->rd_buf_size;
bus += obj->wr_buf_size;
if (obj->addr_reverse) {
if (is_rc(obj)) {
local += obj->rd_buf_size;
virt += obj->rd_buf_size;
bus += obj->wr_buf_size;
}
} else {
if (!is_rc(obj)) {
local += obj->rd_buf_size;
virt += obj->rd_buf_size;
bus += obj->wr_buf_size;
}
}
obj->begin = ktime_get();
@@ -315,11 +323,17 @@ static enum hrtimer_restart rk_pcie_scan_timer(struct hrtimer *timer)
for (i = 0; i < PCIE_DMA_BUF_CNT; i++) {
sda_base = obj->local_mem_base + obj->buffer_size * i;
if (is_rc(obj))
scan_data_addr = sda_base + obj->rd_buf_size;
else
scan_data_addr = sda_base;
if (obj->addr_reverse) {
if (is_rc(obj))
scan_data_addr = sda_base;
else
scan_data_addr = sda_base + obj->rd_buf_size;
} else {
if (is_rc(obj))
scan_data_addr = sda_base + obj->rd_buf_size;
else
scan_data_addr = sda_base;
}
sdv = readl(scan_data_addr + obj->set_data_check_pos);
idx = readl(scan_data_addr + obj->set_local_idx_pos);
@@ -815,6 +829,7 @@ struct dma_trx_obj *rk_pcie_dma_obj_probe(struct device *dev)
struct device_node *mem;
struct resource reg;
struct dma_trx_obj *obj;
int reverse;
obj = devm_kzalloc(dev, sizeof(struct dma_trx_obj), GFP_KERNEL);
if (!obj)
@@ -830,6 +845,12 @@ struct dma_trx_obj *rk_pcie_dma_obj_probe(struct device *dev)
obj->busno = busno;
ret = of_property_read_u32(np, "reverse", &reverse);
if (ret < 0)
obj->addr_reverse = 0;
else
obj->addr_reverse = reverse;
mem = of_parse_phandle(np, "memory-region", 0);
if (!mem) {
dev_err(dev, "missing \"memory-region\" property\n");
@@ -898,7 +919,7 @@ struct dma_trx_obj *rk_pcie_dma_obj_probe(struct device *dev)
obj->irq_num = 0;
obj->loop_count_threshold = 0;
obj->ref_count = 0;
obj->version = 0x2;
obj->version = 0x3;
init_completion(&obj->done);
mutex_init(&obj->count_mutex);

1
drivers/pci/controller/rockchip-pcie-dma.h
View File

@@ -203,6 +203,7 @@ struct dma_trx_obj {
u32 set_buf_size_pos;
u32 set_chk_sum_pos;
u32 version;
int addr_reverse;
};
#if IS_ENABLED(CONFIG_ROCKCHIP_PCIE_DMA_OBJ)