diff options
| author | Ohad Sharabi <osharabi@habana.ai> | 2022-11-20 15:12:26 +0200 |
|---|---|---|
| committer | Oded Gabbay <ogabbay@kernel.org> | 2022-11-23 16:54:10 +0200 |
| commit | 19a17a9fb486b2961dbd7f3fff0d79a144c9a3b6 (patch) | |
| tree | 5ab48debf42f3572008377d86c2fa6b7188338e0 /drivers/misc | |
| parent | 5354a2a0018345774ab2517fc2fe107a6cd894fa (diff) | |
| download | linux-19a17a9fb486b2961dbd7f3fff0d79a144c9a3b6.tar.bz2 | |
habanalabs: fix VA range calculation
Current implementation is fixing the page size to PAGE_SIZE whereas the
input page size may be different.
Signed-off-by: Ohad Sharabi <osharabi@habana.ai>
Reviewed-by: Oded Gabbay <ogabbay@kernel.org>
Signed-off-by: Oded Gabbay <ogabbay@kernel.org>
Diffstat (limited to 'drivers/misc')
| -rw-r--r-- | drivers/misc/habanalabs/common/memory.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/drivers/misc/habanalabs/common/memory.c b/drivers/misc/habanalabs/common/memory.c index 541e1b6a2176..7c5c18be294a 100644 --- a/drivers/misc/habanalabs/common/memory.c +++ b/drivers/misc/habanalabs/common/memory.c @@ -2508,24 +2508,20 @@ static int va_range_init(struct hl_device *hdev, struct hl_va_range **va_ranges, /* * PAGE_SIZE alignment - * it is the callers responsibility to align the addresses if the + * it is the caller's responsibility to align the addresses if the * page size is not a power of 2 */ if (is_power_of_2(page_size)) { - if (start & (PAGE_SIZE - 1)) { - start &= PAGE_MASK; - start += PAGE_SIZE; - } + start = round_up(start, page_size); /* * The end of the range is inclusive, hence we need to align it * to the end of the last full page in the range. For example if * end = 0x3ff5 with page size 0x1000, we need to align it to - * 0x2fff. The remainig 0xff5 bytes do not form a full page. + * 0x2fff. The remaining 0xff5 bytes do not form a full page. */ - if ((end + 1) & (PAGE_SIZE - 1)) - end = ((end + 1) & PAGE_MASK) - 1; + end = round_down(end + 1, page_size) - 1; } if (start >= end) { |