mirror of
https://github.com/Fishwaldo/Star64_linux.git
synced 2025-04-01 12:04:08 +00:00
omap iommu: Reject unaligned addresses at setting page table entry
This rejects unaligned device virtual address('da') and physical address('pa') and informs error to caller when a page table entry is set. Otherwise, a wrong address can be used by IO device. Signed-off-by: Hiroshi DOYU <Hiroshi.DOYU@nokia.com> Cc: Hari Kanigeri <h-kanigeri2@ti.com>
This commit is contained in:
parent
e0a42e4fcb
commit
4abb761749
1 changed files with 18 additions and 0 deletions
|
@ -516,6 +516,12 @@ static int iopgd_alloc_section(struct iommu *obj, u32 da, u32 pa, u32 prot)
|
||||||
{
|
{
|
||||||
u32 *iopgd = iopgd_offset(obj, da);
|
u32 *iopgd = iopgd_offset(obj, da);
|
||||||
|
|
||||||
|
if ((da | pa) & ~IOSECTION_MASK) {
|
||||||
|
dev_err(obj->dev, "%s: %08x:%08x should aligned on %08lx\n",
|
||||||
|
__func__, da, pa, IOSECTION_SIZE);
|
||||||
|
return -EINVAL;
|
||||||
|
}
|
||||||
|
|
||||||
*iopgd = (pa & IOSECTION_MASK) | prot | IOPGD_SECTION;
|
*iopgd = (pa & IOSECTION_MASK) | prot | IOPGD_SECTION;
|
||||||
flush_iopgd_range(iopgd, iopgd);
|
flush_iopgd_range(iopgd, iopgd);
|
||||||
return 0;
|
return 0;
|
||||||
|
@ -526,6 +532,12 @@ static int iopgd_alloc_super(struct iommu *obj, u32 da, u32 pa, u32 prot)
|
||||||
u32 *iopgd = iopgd_offset(obj, da);
|
u32 *iopgd = iopgd_offset(obj, da);
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
|
if ((da | pa) & ~IOSUPER_MASK) {
|
||||||
|
dev_err(obj->dev, "%s: %08x:%08x should aligned on %08lx\n",
|
||||||
|
__func__, da, pa, IOSUPER_SIZE);
|
||||||
|
return -EINVAL;
|
||||||
|
}
|
||||||
|
|
||||||
for (i = 0; i < 16; i++)
|
for (i = 0; i < 16; i++)
|
||||||
*(iopgd + i) = (pa & IOSUPER_MASK) | prot | IOPGD_SUPER;
|
*(iopgd + i) = (pa & IOSUPER_MASK) | prot | IOPGD_SUPER;
|
||||||
flush_iopgd_range(iopgd, iopgd + 15);
|
flush_iopgd_range(iopgd, iopgd + 15);
|
||||||
|
@ -555,6 +567,12 @@ static int iopte_alloc_large(struct iommu *obj, u32 da, u32 pa, u32 prot)
|
||||||
u32 *iopte = iopte_alloc(obj, iopgd, da);
|
u32 *iopte = iopte_alloc(obj, iopgd, da);
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
|
if ((da | pa) & ~IOLARGE_MASK) {
|
||||||
|
dev_err(obj->dev, "%s: %08x:%08x should aligned on %08lx\n",
|
||||||
|
__func__, da, pa, IOLARGE_SIZE);
|
||||||
|
return -EINVAL;
|
||||||
|
}
|
||||||
|
|
||||||
if (IS_ERR(iopte))
|
if (IS_ERR(iopte))
|
||||||
return PTR_ERR(iopte);
|
return PTR_ERR(iopte);
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue