mirror of
https://github.com/smaeul/u-boot.git
synced 2025-11-04 05:50:17 +00:00
94c8da2121
Remove test on CONFIG_LMB_MEMORY_REGIONS introduced by commit
7c1860fce4e3 ("lmb: Fix lmb property's defination under struct lmb").
This code in lmb_init() is strange, because if CONFIG_LMB_USE_MAX_REGIONS
and CONFIG_LMB_MEMORY_REGIONS are not defined, the implicit #else is empty
and the required initialization is not done:
lmb->memory.max = ?
lmb->reserved.max = ?
But this setting is not possible:
- CONFIG_LMB_USE_MAX_REGIONS not defined
- CONFIG_LMB_MEMORY_REGIONS not defined
because CONFIG_LMB_MEMORY_REGIONS and CONFIG_LMB_RESERVED_REGIONS are
defined as soon as the CONFIG_LMB_USE_MAX_REGIONS is not defined.
This patch removes this impossible case #elif and I add some
explanation in lmb.h to explain why in the struct lmb {} the lmb
property is defined if CONFIG_LMB_MEMORY_REGIONS is NOT defined.
This patch also removes CONFIG_LMB_XXX dependency on CONFIG_LMB as these
defines are used in API file lmb.h and not only in library file.
Fixes: 5e2548c1d6e03 ("lmb: Fix LMB_MEMORY_REGIONS flag usage")
Reported-by: Mark Millard <marklmi@yahoo.com>
Signed-off-by: Patrick Delaunay <patrick.delaunay@foss.st.com>
Acked-by: Michal Simek <michal.simek@amd.com>
141 lines
4.6 KiB
C
141 lines
4.6 KiB
C
/* SPDX-License-Identifier: GPL-2.0+ */
|
|
#ifndef _LINUX_LMB_H
|
|
#define _LINUX_LMB_H
|
|
#ifdef __KERNEL__
|
|
|
|
#include <asm/types.h>
|
|
#include <asm/u-boot.h>
|
|
|
|
/*
|
|
* Logical memory blocks.
|
|
*
|
|
* Copyright (C) 2001 Peter Bergner, IBM Corp.
|
|
*/
|
|
|
|
/**
|
|
* enum lmb_flags - definition of memory region attributes
|
|
* @LMB_NONE: no special request
|
|
* @LMB_NOMAP: don't add to mmu configuration
|
|
*/
|
|
enum lmb_flags {
|
|
LMB_NONE = 0x0,
|
|
LMB_NOMAP = 0x4,
|
|
};
|
|
|
|
/**
|
|
* struct lmb_property - Description of one region.
|
|
*
|
|
* @base: Base address of the region.
|
|
* @size: Size of the region
|
|
* @flags: memory region attributes
|
|
*/
|
|
struct lmb_property {
|
|
phys_addr_t base;
|
|
phys_size_t size;
|
|
enum lmb_flags flags;
|
|
};
|
|
|
|
/*
|
|
* For regions size management, see LMB configuration in KConfig
|
|
* all the #if test are done with CONFIG_LMB_USE_MAX_REGIONS (boolean)
|
|
*
|
|
* case 1. CONFIG_LMB_USE_MAX_REGIONS is defined (legacy mode)
|
|
* => CONFIG_LMB_MAX_REGIONS is used to configure the region size,
|
|
* directly in the array lmb_region.region[], with the same
|
|
* configuration for memory and reserved regions.
|
|
*
|
|
* case 2. CONFIG_LMB_USE_MAX_REGIONS is not defined, the size of each
|
|
* region is configurated *independently* with
|
|
* => CONFIG_LMB_MEMORY_REGIONS: struct lmb.memory_regions
|
|
* => CONFIG_LMB_RESERVED_REGIONS: struct lmb.reserved_regions
|
|
* lmb_region.region is only a pointer to the correct buffer,
|
|
* initialized in lmb_init(). This configuration is useful to manage
|
|
* more reserved memory regions with CONFIG_LMB_RESERVED_REGIONS.
|
|
*/
|
|
|
|
/**
|
|
* struct lmb_region - Description of a set of region.
|
|
*
|
|
* @cnt: Number of regions.
|
|
* @max: Size of the region array, max value of cnt.
|
|
* @region: Array of the region properties
|
|
*/
|
|
struct lmb_region {
|
|
unsigned long cnt;
|
|
unsigned long max;
|
|
#if IS_ENABLED(CONFIG_LMB_USE_MAX_REGIONS)
|
|
struct lmb_property region[CONFIG_LMB_MAX_REGIONS];
|
|
#else
|
|
struct lmb_property *region;
|
|
#endif
|
|
};
|
|
|
|
/**
|
|
* struct lmb - Logical memory block handle.
|
|
*
|
|
* Clients provide storage for Logical memory block (lmb) handles.
|
|
* The content of the structure is managed by the lmb library.
|
|
* A lmb struct is initialized by lmb_init() functions.
|
|
* The lmb struct is passed to all other lmb APIs.
|
|
*
|
|
* @memory: Description of memory regions.
|
|
* @reserved: Description of reserved regions.
|
|
* @memory_regions: Array of the memory regions (statically allocated)
|
|
* @reserved_regions: Array of the reserved regions (statically allocated)
|
|
*/
|
|
struct lmb {
|
|
struct lmb_region memory;
|
|
struct lmb_region reserved;
|
|
#if !IS_ENABLED(CONFIG_LMB_USE_MAX_REGIONS)
|
|
struct lmb_property memory_regions[CONFIG_LMB_MEMORY_REGIONS];
|
|
struct lmb_property reserved_regions[CONFIG_LMB_RESERVED_REGIONS];
|
|
#endif
|
|
};
|
|
|
|
void lmb_init(struct lmb *lmb);
|
|
void lmb_init_and_reserve(struct lmb *lmb, struct bd_info *bd, void *fdt_blob);
|
|
void lmb_init_and_reserve_range(struct lmb *lmb, phys_addr_t base,
|
|
phys_size_t size, void *fdt_blob);
|
|
long lmb_add(struct lmb *lmb, phys_addr_t base, phys_size_t size);
|
|
long lmb_reserve(struct lmb *lmb, phys_addr_t base, phys_size_t size);
|
|
/**
|
|
* lmb_reserve_flags - Reserve one region with a specific flags bitfield.
|
|
*
|
|
* @lmb: the logical memory block struct
|
|
* @base: base address of the memory region
|
|
* @size: size of the memory region
|
|
* @flags: flags for the memory region
|
|
* Return: 0 if OK, > 0 for coalesced region or a negative error code.
|
|
*/
|
|
long lmb_reserve_flags(struct lmb *lmb, phys_addr_t base,
|
|
phys_size_t size, enum lmb_flags flags);
|
|
phys_addr_t lmb_alloc(struct lmb *lmb, phys_size_t size, ulong align);
|
|
phys_addr_t lmb_alloc_base(struct lmb *lmb, phys_size_t size, ulong align,
|
|
phys_addr_t max_addr);
|
|
phys_addr_t __lmb_alloc_base(struct lmb *lmb, phys_size_t size, ulong align,
|
|
phys_addr_t max_addr);
|
|
phys_addr_t lmb_alloc_addr(struct lmb *lmb, phys_addr_t base, phys_size_t size);
|
|
phys_size_t lmb_get_free_size(struct lmb *lmb, phys_addr_t addr);
|
|
int lmb_is_reserved(struct lmb *lmb, phys_addr_t addr);
|
|
/**
|
|
* lmb_is_reserved_flags - test if tha address is in reserved region with a bitfield flag
|
|
*
|
|
* @lmb: the logical memory block struct
|
|
* @addr: address to be tested
|
|
* @flags: flags bitfied to be tested
|
|
* Return: if not reserved or reserved without the requested flag else 1
|
|
*/
|
|
int lmb_is_reserved_flags(struct lmb *lmb, phys_addr_t addr, int flags);
|
|
long lmb_free(struct lmb *lmb, phys_addr_t base, phys_size_t size);
|
|
|
|
void lmb_dump_all(struct lmb *lmb);
|
|
void lmb_dump_all_force(struct lmb *lmb);
|
|
|
|
void board_lmb_reserve(struct lmb *lmb);
|
|
void arch_lmb_reserve(struct lmb *lmb);
|
|
void arch_lmb_reserve_generic(struct lmb *lmb, ulong sp, ulong end, ulong align);
|
|
|
|
#endif /* __KERNEL__ */
|
|
|
|
#endif /* _LINUX_LMB_H */
|