erebion/coreboot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

acpi: Add _func suffix for callback functions

Browse source 
It causes some name clashes (and therefore overshadowing) of function
names defined in xeon SOC code in later patches of the patch train.

We don't really have a standard naming scheme for callback functions, so
I just added a _func suffix/postfix to indicate the function is a
callback function and to prevent name clashes.

Change-Id: I21811f75ef6e7642a7e4f69997737cd7b8b1cef9
Signed-off-by: Maximilian Brune <maximilian.brune@9elements.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/88033
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Anand Vaikar <a.vaikar2021@gmail.com>
This commit is contained in:
Maximilian Brune 2025-06-10 17:10:15 +02:00 • committed by Matt DeVillier
commit 35648dc37b
2 changed files with 22 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/acpi/acpi.c
View file

@ -386,7 +386,7 @@ int acpi_create_srat_gia_pci(acpi_srat_gia_t *gia, u32 proximity_domain,
/* http://www.microsoft.com/whdc/system/sysinternals/sratdwn.mspx */
void acpi_create_srat(acpi_srat_t *srat,
unsigned long (*acpi_fill_srat)(unsigned long current))
unsigned long (*acpi_fill_srat_func)(unsigned long current))
{
acpi_header_t *header = &(srat->header);
unsigned long current = (unsigned long)srat + sizeof(acpi_srat_t);
@ -398,7 +398,7 @@ void acpi_create_srat(acpi_srat_t *srat,
srat->resv = 1; /* Spec: Reserved to 1 for backwards compatibility. */
current = acpi_fill_srat(current);
current = acpi_fill_srat_func(current);
/* (Re)calculate length and checksum. */
header->length = current - (unsigned long)srat;
@ -462,7 +462,7 @@ int acpi_create_cedt_cfmws(acpi_cedt_cfmws_t *cfmws, u64 base_hpa, u64 window_si
return cfmws->length;
}
void acpi_create_cedt(acpi_cedt_t *cedt, unsigned long (*acpi_fill_cedt)(unsigned long current))
void acpi_create_cedt(acpi_cedt_t *cedt, unsigned long (*acpi_fill_cedt_func)(unsigned long current))
{
acpi_header_t *header = &(cedt->header);
unsigned long current = (unsigned long)cedt + sizeof(acpi_cedt_t);
@ -472,7 +472,7 @@ void acpi_create_cedt(acpi_cedt_t *cedt, unsigned long (*acpi_fill_cedt)(unsigne
if (acpi_fill_header(header, "CEDT", CEDT, sizeof(acpi_cedt_t)) != CB_SUCCESS)
return;
current = acpi_fill_cedt(current);
current = acpi_fill_cedt_func(current);
/* (Re)calculate length and checksum. */
header->length = current - (unsigned long)cedt;
@ -497,7 +497,7 @@ int acpi_create_hmat_mpda(acpi_hmat_mpda_t *mpda, u32 initiator, u32 memory)
}
void acpi_create_hmat(acpi_hmat_t *hmat,
unsigned long (*acpi_fill_hmat)(unsigned long current))
unsigned long (*acpi_fill_hmat_func)(unsigned long current))
{
acpi_header_t *header = &(hmat->header);
unsigned long current = (unsigned long)hmat + sizeof(acpi_hmat_t);
@ -507,7 +507,7 @@ void acpi_create_hmat(acpi_hmat_t *hmat,
if (acpi_fill_header(header, "HMAT", HMAT, sizeof(acpi_hmat_t)) != CB_SUCCESS)
return;
current = acpi_fill_hmat(current);
current = acpi_fill_hmat_func(current);
/* (Re)calculate length and checksum. */
header->length = current - (unsigned long)hmat;
@ -516,7 +516,7 @@ void acpi_create_hmat(acpi_hmat_t *hmat,
/* http://h21007.www2.hp.com/portal/download/files/unprot/Itanium/slit.pdf */
void acpi_create_slit(acpi_slit_t *slit,
unsigned long (*acpi_fill_slit)(unsigned long current))
unsigned long (*acpi_fill_slit_func)(unsigned long current))
{
acpi_header_t *header = &(slit->header);
unsigned long current = (unsigned long)slit + sizeof(acpi_slit_t);
@ -526,7 +526,7 @@ void acpi_create_slit(acpi_slit_t *slit,
if (acpi_fill_header(header, "SLIT", SLIT, sizeof(acpi_slit_t)) != CB_SUCCESS)
return;
current = acpi_fill_slit(current);
current = acpi_fill_slit_func(current);
/* (Re)calculate length and checksum. */
header->length = current - (unsigned long)slit;
@ -675,7 +675,7 @@ void acpi_create_einj(acpi_einj_t *einj, uintptr_t addr, u8 actions)
void acpi_create_vfct(const struct device *device,
acpi_vfct_t *vfct,
unsigned long (*acpi_fill_vfct)(const struct device *device,
unsigned long (*acpi_fill_vfct_func)(const struct device *device,
acpi_vfct_t *vfct_struct, unsigned long current))
{
acpi_header_t *header = &(vfct->header);
@ -686,7 +686,7 @@ void acpi_create_vfct(const struct device *device,
if (acpi_fill_header(header, "VFCT", VFCT, sizeof(acpi_vfct_t)) != CB_SUCCESS)
return;
current = acpi_fill_vfct(device, vfct, current);
current = acpi_fill_vfct_func(device, vfct, current);
/* If no BIOS image, return with header->length == 0. */
if (!vfct->VBIOSImageOffset)
@ -743,7 +743,7 @@ void acpi_create_ipmi(const struct device *device,
}
void acpi_create_ivrs(acpi_ivrs_t *ivrs,
unsigned long (*acpi_fill_ivrs)(acpi_ivrs_t *ivrs_struct,
unsigned long (*acpi_fill_ivrs_func)(acpi_ivrs_t *ivrs_struct,
unsigned long current))
{
acpi_header_t *header = &(ivrs->header);
@ -754,7 +754,7 @@ void acpi_create_ivrs(acpi_ivrs_t *ivrs,
if (acpi_fill_header(header, "IVRS", IVRS, sizeof(acpi_ivrs_t)) != CB_SUCCESS)
return;
current = acpi_fill_ivrs(ivrs, current);
current = acpi_fill_ivrs_func(ivrs, current);
/* (Re)calculate length and checksum. */
header->length = current - (unsigned long)ivrs;
@ -762,7 +762,7 @@ void acpi_create_ivrs(acpi_ivrs_t *ivrs,
}
void acpi_create_crat(struct acpi_crat_header *crat,
unsigned long (*acpi_fill_crat)(struct acpi_crat_header *crat_struct,
unsigned long (*acpi_fill_crat_func)(struct acpi_crat_header *crat_struct,
unsigned long current))
{
acpi_header_t *header = &(crat->header);
@ -773,7 +773,7 @@ void acpi_create_crat(struct acpi_crat_header *crat,
if (acpi_fill_header(header, "CRAT", CRAT, sizeof(struct acpi_crat_header)) != CB_SUCCESS)
return;
current = acpi_fill_crat(crat, current);
current = acpi_fill_crat_func(crat, current);
/* (Re)calculate length and checksum. */
header->length = current - (unsigned long)crat;

16
src/include/acpi/acpi.h
View file

@ -1762,7 +1762,7 @@ void acpi_add_table(acpi_rsdp_t *rsdp, void *table);
/* Create CXL Early Discovery Table */
void acpi_create_cedt(acpi_cedt_t *cedt,
unsigned long (*acpi_fill_cedt)(unsigned long current));
unsigned long (*acpi_fill_cedt_func)(unsigned long current));
/* Create a CXL Host Bridge Structure for CEDT */
int acpi_create_cedt_chbs(acpi_cedt_chbs_t *chbs, u32 uid, u32 cxl_ver, u64 base);
/* Create a CXL Fixed Memory Window Structure for CEDT */
@ -1796,10 +1796,10 @@ int acpi_create_srat_gia_pci(acpi_srat_gia_t *gia, u32 proximity_domain,
struct device *dev, u32 flags);
unsigned long acpi_create_srat_lapics(unsigned long current);
void acpi_create_srat(acpi_srat_t *srat,
unsigned long (*acpi_fill_srat)(unsigned long current));
unsigned long (*acpi_fill_srat_func)(unsigned long current));
void acpi_create_slit(acpi_slit_t *slit,
unsigned long (*acpi_fill_slit)(unsigned long current));
unsigned long (*acpi_fill_slit_func)(unsigned long current));
/*
* Create a Memory Proximity Domain Attributes structure for HMAT,
@ -1809,11 +1809,11 @@ void acpi_create_slit(acpi_slit_t *slit,
int acpi_create_hmat_mpda(acpi_hmat_mpda_t *mpda, u32 initiator, u32 memory);
/* Create Heterogeneous Memory Attribute Table */
void acpi_create_hmat(acpi_hmat_t *hmat,
unsigned long (*acpi_fill_hmat)(unsigned long current));
unsigned long (*acpi_fill_hmat_func)(unsigned long current));
void acpi_create_vfct(const struct device *device,
acpi_vfct_t *vfct,
unsigned long (*acpi_fill_vfct)(const struct device *device,
unsigned long (*acpi_fill_vfct_func)(const struct device *device,
acpi_vfct_t *vfct_struct,
unsigned long current));
@ -1827,11 +1827,11 @@ void acpi_create_ipmi(const struct device *device,
const u32 uid);
void acpi_create_ivrs(acpi_ivrs_t *ivrs,
unsigned long (*acpi_fill_ivrs)(acpi_ivrs_t *ivrs_struct,
unsigned long (*acpi_fill_ivrs_func)(acpi_ivrs_t *ivrs_struct,
unsigned long current));
void acpi_create_crat(struct acpi_crat_header *crat,
unsigned long (*acpi_fill_crat)(struct acpi_crat_header *crat_struct,
unsigned long (*acpi_fill_crat_func)(struct acpi_crat_header *crat_struct,
unsigned long current));
unsigned long acpi_write_hpet(const struct device *device, unsigned long start,
@ -1848,7 +1848,7 @@ unsigned long acpi_16550_mmio32_write_dbg2_uart(acpi_rsdp_t *rsdp, unsigned long
uint64_t base, const char *name);
void acpi_create_dmar(acpi_dmar_t *dmar, enum dmar_flags flags,
unsigned long (*acpi_fill_dmar)(unsigned long));
unsigned long (*acpi_fill_dmar_func)(unsigned long));
unsigned long acpi_create_dmar_drhd_4k(unsigned long current, u8 flags,
u16 segment, u64 bar);
unsigned long acpi_create_dmar_drhd(unsigned long current, u8 flags,