From 363ac8b6aef3fa252f06086db4956cb9d703b556 Mon Sep 17 00:00:00 2001 From: Felix Held Date: Thu, 11 Jan 2024 21:51:19 +0100 Subject: [PATCH] lib/smbios: rename segment group parameter of smbios_write_type41 Rename the segment group parameter of smbios_write_type41 from 'segment' to 'segment_group' to be in line with the PCI specification. Signed-off-by: Felix Held Change-Id: Ie6ca0ce8b6b3b0357df72bafa2b6069132d0937e Reviewed-on: https://review.coreboot.org/c/coreboot/+/79926 Reviewed-by: Patrick Rudolph Tested-by: build bot (Jenkins) --- src/include/smbios.h | 2 +- src/lib/smbios.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/include/smbios.h b/src/include/smbios.h index f82198002f..d4ae662c57 100644 --- a/src/include/smbios.h +++ b/src/include/smbios.h @@ -41,7 +41,7 @@ int smbios_write_type38(unsigned long *current, int *handle, const u64 base_addr, const u8 base_modifier, const u8 irq); int smbios_write_type41(unsigned long *current, int *handle, - const char *name, u8 instance, u16 segment, + const char *name, u8 instance, u16 segment_group, u8 bus, u8 device, u8 function, u8 device_type); enum smbios_temp_location; enum smbios_temp_status; diff --git a/src/lib/smbios.c b/src/lib/smbios.c index fb68b4f376..12fbdfa594 100644 --- a/src/lib/smbios.c +++ b/src/lib/smbios.c @@ -971,7 +971,7 @@ int smbios_write_type39(unsigned long *current, int *handle, } int smbios_write_type41(unsigned long *current, int *handle, - const char *name, u8 instance, u16 segment, + const char *name, u8 instance, u16 segment_group, u8 bus, u8 device, u8 function, u8 device_type) { struct smbios_type41 *t = smbios_carve_table(*current, @@ -982,7 +982,7 @@ int smbios_write_type41(unsigned long *current, int *handle, t->device_type = device_type; t->device_status = 1; t->device_type_instance = instance; - t->segment_group_number = segment; + t->segment_group_number = segment_group; t->bus_number = bus; t->device_number = device; t->function_number = function; @@ -1114,7 +1114,7 @@ static int smbios_generate_type41_from_devtree(struct device *dev, int *handle, return smbios_write_type41(current, handle, name, // name instance_id, // inst - 0, // segment + 0, // segment group dev->bus->secondary, //bus PCI_SLOT(dev->path.pci.devfn), // device PCI_FUNC(dev->path.pci.devfn), // func