gh0s7/mckernel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Tofu: fix phys addr calculation for contiguous pages in MBPT/BCH update

Browse Source 
Change-Id: I70def9d02bdd7e1e969dedfc277a20df6ed2dff8
This commit is contained in:
Balazs Gerofi
2020-12-21 20:31:48 +09:00
committed by Masamichi Takagi
parent a680395093
commit 1b106d825c
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
kernel/tofu/tof_utofu_main.c
View File

@@ -845,7 +845,8 @@ static int tof_utofu_update_mbpt_entries(struct tof_utofu_cq *ucq,
return -ENOMEM; return -ENOMEM;
} }
phys = pte_get_phys(ptep) + (va & (psize - 1)); phys = (pte_get_phys(ptep) & ~(psize - 1)) +
(va & (psize - 1));
//iova = tof_smmu_get_ipa_cq(ucq->tni, ucq->cqid, //iova = tof_smmu_get_ipa_cq(ucq->tni, ucq->cqid,
// pfn_to_kaddr(page_to_pfn(page)), pgsz); // pfn_to_kaddr(page_to_pfn(page)), pgsz);
@@ -2059,7 +2060,8 @@ static int tof_utofu_ioctl_enable_bch(struct tof_utofu_device *dev, unsigned lon
return -ENOMEM; return -ENOMEM;
} }
phys = pte_get_phys(ptep) + ((uint64_t)req.addr & (psize - 1)); phys = (pte_get_phys(ptep) & ~(psize - 1)) +
((uint64_t)req.addr & (psize - 1));
} }
ihk_rwspinlock_read_unlock_noirq(&vm->memory_range_lock); ihk_rwspinlock_read_unlock_noirq(&vm->memory_range_lock);