Commit f05ede3a authored by Mike Frysinger's avatar Mike Frysinger

Blackfin: isram: add unlikely to sanity checks

Don't want the compiler assuming the rare sanity checks are the norm and
optimize for those paths.
Signed-off-by: default avatarMike Frysinger <vapier@gentoo.org>
parent 0ea19c64
...@@ -62,7 +62,7 @@ static void isram_write(const void *addr, uint64_t data) ...@@ -62,7 +62,7 @@ static void isram_write(const void *addr, uint64_t data)
uint32_t cmd; uint32_t cmd;
unsigned long flags; unsigned long flags;
if (addr >= (void *)(L1_CODE_START + L1_CODE_LENGTH)) if (unlikely(addr >= (void *)(L1_CODE_START + L1_CODE_LENGTH)))
return; return;
cmd = IADDR2DTEST(addr) | 2; /* write */ cmd = IADDR2DTEST(addr) | 2; /* write */
...@@ -93,7 +93,7 @@ static uint64_t isram_read(const void *addr) ...@@ -93,7 +93,7 @@ static uint64_t isram_read(const void *addr)
unsigned long flags; unsigned long flags;
uint64_t ret; uint64_t ret;
if (addr > (void *)(L1_CODE_START + L1_CODE_LENGTH)) if (unlikely(addr > (void *)(L1_CODE_START + L1_CODE_LENGTH)))
return 0; return 0;
cmd = IADDR2DTEST(addr) | 0; /* read */ cmd = IADDR2DTEST(addr) | 0; /* read */
...@@ -120,7 +120,7 @@ static bool isram_check_addr(const void *addr, size_t n) ...@@ -120,7 +120,7 @@ static bool isram_check_addr(const void *addr, size_t n)
{ {
if ((addr >= (void *)L1_CODE_START) && if ((addr >= (void *)L1_CODE_START) &&
(addr < (void *)(L1_CODE_START + L1_CODE_LENGTH))) { (addr < (void *)(L1_CODE_START + L1_CODE_LENGTH))) {
if ((addr + n) > (void *)(L1_CODE_START + L1_CODE_LENGTH)) { if (unlikely((addr + n) > (void *)(L1_CODE_START + L1_CODE_LENGTH))) {
show_stack(NULL, NULL); show_stack(NULL, NULL);
pr_err("copy involving %p length (%zu) too long\n", addr, n); pr_err("copy involving %p length (%zu) too long\n", addr, n);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment