smallsolar/u-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

powerpc: mpc8xxx: Extend find_law() to find_law_by_addr_id()

Browse Source 
The find_law() function searches for LAW just by physical address. This
is unsuitable for cases with overlapping LAWs. Extend it to
find_law_by_addr_id(), which searches for LAW by physical address and
target id.

Add a static inline definition of the original find_law() into fsl_law.h
header.

Signed-off-by: Pali Rohár <pali@kernel.org>
Signed-off-by: Marek Mojík <marek.mojik@nic.cz>
Reviewed-by: Marek Behún <kabel@kernel.org>
This commit is contained in:
Pali Rohár
2024-06-06 18:33:23 +02:00
committed by Tom Rini
parent 07928d4fec
commit 89b009dfdc
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
arch/powerpc/cpu/mpc8xxx/law.c
View File

@@ -130,7 +130,7 @@ int set_last_law(phys_addr_t addr, enum law_size sz, enum law_trgt_if id)
return idx;
}
struct law_entry find_law(phys_addr_t addr)
struct law_entry find_law_by_addr_id(phys_addr_t addr, enum law_trgt_if id)
{
struct law_entry entry;
int i;
@@ -146,6 +146,9 @@ struct law_entry find_law(phys_addr_t addr)
if (!get_law_entry(i, &entry))
continue;
if (id != -1 && id != entry.trgt_id)
continue;
upper = entry.addr + (2ull << entry.size);
if ((addr >= entry.addr) && (addr < upper)) {
entry.index = i;

8
arch/powerpc/include/asm/fsl_law.h
View File

@@ -130,7 +130,13 @@ extern void set_law(u8 idx, phys_addr_t addr, enum law_size sz, enum law_trgt_if
extern int set_next_law(phys_addr_t addr, enum law_size sz, enum law_trgt_if id);
extern int set_last_law(phys_addr_t addr, enum law_size sz, enum law_trgt_if id);
extern int set_ddr_laws(u64 start, u64 sz, enum law_trgt_if id);
extern struct law_entry find_law(phys_addr_t addr);
extern struct law_entry find_law_by_addr_id(phys_addr_t addr, enum law_trgt_if id);
static inline struct law_entry find_law(phys_addr_t addr)
{
return find_law_by_addr_id(addr, -1);
}
extern void disable_law(u8 idx);
extern void init_laws(void);
extern void print_laws(void);