coreboot-gerrit January 2024

coreboot-gerrit@coreboot.org

1 participants
3043 discussions

[XS] Change in coreboot[main]: device/device.h: Fix spelling mistake
by Felix Held (Code Review) 31 Jan '24

31 Jan '24

Felix Held has submitted this change. ( https://review.coreboot.org/c/coreboot/+/80234?usp=email ) ( 2 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: device/device.h: Fix spelling mistake ...................................................................... device/device.h: Fix spelling mistake Fix spelling mistake added in 3e99ba0 "device: Add a helper function to add a downstream bus". Signed-off-by: Arthur Heymans <arthur(a)aheymans.xyz> Change-Id: I66ae5000f6f5c0e5bfe42bdfbbbcedec6df0c520 Reviewed-on: https://review.coreboot.org/c/coreboot/+/80234 Reviewed-by: Felix Held <felix-coreboot(a)felixheld.de> Reviewed-by: Lean Sheng Tan <sheng.tan(a)9elements.com> Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> --- M src/device/device.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Lean Sheng Tan: Looks good to me, approved build bot (Jenkins): Verified Felix Held: Looks good to me, approved diff --git a/src/device/device.c b/src/device/device.c index 72a408e..88085f7 100644 --- a/src/device/device.c +++ b/src/device/device.c @@ -133,7 +133,7 @@ * Allocate a new downstream bus structure below a device and attach it * to the device tree if the device doesn't already have a downstream bus. * - * @param parent Parent device the to be created bus should be attached to. + * @param parent Parent device the to-be-created bus should be attached to. * @return Pointer to the newly created bus structure or the existing bus. * */ -- To view, visit https://review.coreboot.org/c/coreboot/+/80234?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: main Gerrit-Change-Id: I66ae5000f6f5c0e5bfe42bdfbbbcedec6df0c520 Gerrit-Change-Number: 80234 Gerrit-PatchSet: 5 Gerrit-Owner: Arthur Heymans <arthur(a)aheymans.xyz> Gerrit-Reviewer: Felix Held <felix-coreboot(a)felixheld.de> Gerrit-Reviewer: Lean Sheng Tan <sheng.tan(a)9elements.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-MessageType: merged

1 0

[L] Change in coreboot[main]: device/device.h: Rename busses for clarity
by Felix Held (Code Review) 31 Jan '24

31 Jan '24

Felix Held has submitted this change. ( https://review.coreboot.org/c/coreboot/+/78330?usp=email ) Change subject: device/device.h: Rename busses for clarity ...................................................................... device/device.h: Rename busses for clarity This renames bus to upstream and link_list to downstream. Signed-off-by: Arthur Heymans <arthur(a)aheymans.xyz> Change-Id: I80a81b6b8606e450ff180add9439481ec28c2420 Reviewed-on: https://review.coreboot.org/c/coreboot/+/78330 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Felix Held <felix-coreboot(a)felixheld.de> --- M src/acpi/acpi.c M src/acpi/device.c M src/arch/x86/mpspec.c M src/cpu/intel/haswell/haswell_init.c M src/cpu/intel/model_2065x/model_2065x_init.c M src/cpu/intel/model_206ax/model_206ax_init.c M src/device/cardbus_device.c M src/device/device.c M src/device/device_const.c M src/device/device_util.c M src/device/i2c_bus.c M src/device/mdio.c M src/device/oprom/realmode/x86.c M src/device/oprom/realmode/x86_interrupts.c M src/device/oprom/yabel/device.c M src/device/oprom/yabel/interrupt.c M src/device/pci_device.c M src/device/pci_rom.c M src/device/pciexp_device.c M src/device/pcix_device.c M src/device/pnp_device.c M src/device/resource_allocator_v4.c M src/device/root_device.c M src/drivers/i2c/ptn3460/ptn3460.c M src/drivers/intel/dptf/dptf.c M src/drivers/intel/ish/ish.c M src/drivers/intel/mipi_camera/camera.c M src/drivers/intel/soundwire/soundwire.c M src/drivers/net/phy/m88e1512/m88e1512.c M src/drivers/net/r8168.c M src/drivers/nxp/uwb/uwb.c M src/drivers/pcie/generic/generic.c M src/drivers/spi/acpi/acpi.c M src/drivers/usb/hub/acpi.c M src/drivers/usb/pci_xhci/pci_xhci.c M src/drivers/wifi/generic/acpi.c M src/drivers/wifi/generic/smbios.c M src/drivers/wwan/fm/acpi_fm350gl.c M src/ec/google/chromeec/ec_acpi.c M src/include/device/device.h M src/include/device/pci_ops.h M src/lib/smbios.c M src/mainboard/aopen/dxplplusu/acpi_tables.c M src/mainboard/emulation/qemu-i440fx/northbridge.c M src/mainboard/google/brox/mainboard.c M src/mainboard/google/brya/mainboard.c M src/mainboard/google/kahlee/variants/careena/mainboard.c M src/mainboard/google/kahlee/variants/treeya/audio.c M src/mainboard/google/octopus/mainboard.c M src/mainboard/google/rex/mainboard.c M src/mainboard/google/zork/variants/baseboard/ramstage_common.c M src/mainboard/ibase/mb899/mptable.c M src/mainboard/kontron/986lcd-m/mptable.c M src/mainboard/pcengines/apu2/mainboard.c M src/mainboard/roda/rk9/ti_pci7xx1.c M src/mainboard/siemens/fa_ehl/mainboard.c M src/mainboard/siemens/mc_apl1/mainboard.c M src/mainboard/siemens/mc_apl1/variants/mc_apl3/mainboard.c M src/mainboard/siemens/mc_apl1/variants/mc_apl5/mainboard.c M src/mainboard/siemens/mc_apl1/variants/mc_apl6/mainboard.c M src/mainboard/siemens/mc_ehl/mainboard.c M src/northbridge/amd/pi/00730F01/northbridge.c M src/northbridge/intel/e7505/northbridge.c M src/northbridge/intel/gm45/northbridge.c M src/northbridge/intel/haswell/pcie.c M src/northbridge/intel/i440bx/northbridge.c M src/northbridge/intel/i945/northbridge.c M src/northbridge/intel/pineview/northbridge.c M src/northbridge/intel/sandybridge/pcie.c M src/northbridge/intel/x4x/northbridge.c M src/soc/amd/cezanne/xhci.c M src/soc/amd/common/block/acpi/ivrs.c M src/soc/amd/common/block/data_fabric/domain.c M src/soc/amd/common/block/lpc/lpc.c M src/soc/amd/genoa_poc/domain.c M src/soc/amd/glinda/xhci.c M src/soc/amd/mendocino/xhci.c M src/soc/amd/phoenix/xhci.c M src/soc/amd/picasso/xhci.c M src/soc/amd/stoneyridge/northbridge.c M src/soc/cavium/cn81xx/ecam0.c M src/soc/intel/apollolake/chip.c M src/soc/intel/braswell/southcluster.c M src/soc/intel/common/block/acpi/pep.c M src/soc/intel/common/block/lpc/lpc.c M src/soc/intel/common/block/pcie/rtd3/rtd3.c M src/soc/intel/common/block/usb4/pcie.c M src/soc/intel/common/block/xhci/xhci.c M src/soc/intel/denverton_ns/lpc.c M src/soc/intel/meteorlake/fsp_params.c M src/soc/intel/skylake/chip.c M src/soc/intel/xeon_sp/chip_common.c M src/soc/intel/xeon_sp/cpx/soc_acpi.c M src/soc/intel/xeon_sp/skx/soc_acpi.c M src/soc/intel/xeon_sp/spr/soc_acpi.c M src/soc/intel/xeon_sp/uncore.c M src/soc/intel/xeon_sp/uncore_acpi.c M src/southbridge/amd/pi/hudson/lpc.c M src/southbridge/intel/bd82x6x/pcie.c M src/superio/common/generic.c M src/superio/common/ssdt.c M src/superio/nuvoton/npcd378/superio.c M src/vendorcode/amd/opensil/genoa_poc/mpio/chip.c M util/sconfig/main.c 104 files changed, 343 insertions(+), 348 deletions(-) Approvals: Felix Held: Looks good to me, approved build bot (Jenkins): Verified diff --git a/src/acpi/acpi.c b/src/acpi/acpi.c index 0e4798c..6bf452e 100644 --- a/src/acpi/acpi.c +++ b/src/acpi/acpi.c @@ -700,8 +700,8 @@ if (device->path.type == DEVICE_PATH_PCI) { spmi->pci_device_flag = ACPI_IPMI_PCI_DEVICE_FLAG; - spmi->pci_segment_group = device->bus->segment_group; - spmi->pci_bus = device->bus->secondary; + spmi->pci_segment_group = device->upstream->segment_group; + spmi->pci_bus = device->upstream->secondary; spmi->pci_device = device->path.pci.devfn >> 3; spmi->pci_function = device->path.pci.devfn & 0x7; } else if (type != IPMI_INTERFACE_SSIF) { diff --git a/src/acpi/device.c b/src/acpi/device.c index 823cdbeb..368b86c 100644 --- a/src/acpi/device.c +++ b/src/acpi/device.c @@ -83,8 +83,8 @@ } /* Walk up the tree to find if any parent can identify this device */ - while (pdev->bus) { - pdev = pdev->bus->dev; + while (pdev->upstream) { + pdev = pdev->upstream->dev; if (!pdev) break; if (is_root_device(pdev)) @@ -147,8 +147,8 @@ return cur; /* Walk up the tree to the root device */ - if (!is_root_device(dev) && dev->bus && dev->bus->dev) - next = acpi_device_path_fill(dev->bus->dev, buf, buf_len, cur); + if (!is_root_device(dev) && dev->upstream && dev->upstream->dev) + next = acpi_device_path_fill(dev->upstream->dev, buf, buf_len, cur); if (next < 0) return next; @@ -182,10 +182,10 @@ { static char buf[DEVICE_PATH_MAX] = {}; - if (!dev || !dev->bus || !dev->bus->dev) + if (!dev || !dev->upstream || !dev->upstream->dev) return NULL; - if (acpi_device_path_fill(dev->bus->dev, buf, sizeof(buf), 0) <= 0) + if (acpi_device_path_fill(dev->upstream->dev, buf, sizeof(buf), 0) <= 0) return NULL; return buf; diff --git a/src/arch/x86/mpspec.c b/src/arch/x86/mpspec.c index 3ddee2f..b8bdb09 100644 --- a/src/arch/x86/mpspec.c +++ b/src/arch/x86/mpspec.c @@ -284,11 +284,11 @@ unsigned char dstirq_x[4]; - if (!dev->link_list) + if (!dev->downstream) return; - child = dev->link_list->children; - srcbus = dev->link_list->secondary; + child = dev->downstream->children; + srcbus = dev->downstream->secondary; while (child) { if (child->path.type != DEVICE_PATH_PCI) @@ -476,7 +476,7 @@ memset(buses, 0, sizeof(buses)); for (dev = all_devices; dev; dev = dev->next) { - struct bus *bus = dev->link_list; + struct bus *bus = dev->downstream; if (!bus) continue; if (bus->secondary > 255) { diff --git a/src/cpu/intel/haswell/haswell_init.c b/src/cpu/intel/haswell/haswell_init.c index 83d847cb..86dcbea 100644 --- a/src/cpu/intel/haswell/haswell_init.c +++ b/src/cpu/intel/haswell/haswell_init.c @@ -449,7 +449,7 @@ static void configure_thermal_target(struct device *dev) { /* Make sure your devicetree has the cpu_cluster below chip cpu/intel/haswell! */ - struct cpu_intel_haswell_config *conf = dev->bus->dev->chip_info; + struct cpu_intel_haswell_config *conf = dev->upstream->dev->chip_info; msr_t msr; /* Set TCC activation offset if supported */ diff --git a/src/cpu/intel/model_2065x/model_2065x_init.c b/src/cpu/intel/model_2065x/model_2065x_init.c index 3497ae0..cb74854 100644 --- a/src/cpu/intel/model_2065x/model_2065x_init.c +++ b/src/cpu/intel/model_2065x/model_2065x_init.c @@ -22,7 +22,7 @@ static void configure_thermal_target(struct device *dev) { - struct cpu_intel_model_2065x_config *conf = dev->bus->dev->chip_info; + struct cpu_intel_model_2065x_config *conf = dev->upstream->dev->chip_info; msr_t msr; /* Set TCC activation offset if supported */ diff --git a/src/cpu/intel/model_206ax/model_206ax_init.c b/src/cpu/intel/model_206ax/model_206ax_init.c index 372989c..d9340ff 100644 --- a/src/cpu/intel/model_206ax/model_206ax_init.c +++ b/src/cpu/intel/model_206ax/model_206ax_init.c @@ -223,7 +223,7 @@ static void configure_thermal_target(struct device *dev) { - struct cpu_intel_model_206ax_config *conf = dev->bus->dev->chip_info; + struct cpu_intel_model_206ax_config *conf = dev->upstream->dev->chip_info; msr_t msr; if (boot_cpu()) { diff --git a/src/device/cardbus_device.c b/src/device/cardbus_device.c index 23f24dd..2eb070e 100644 --- a/src/device/cardbus_device.c +++ b/src/device/cardbus_device.c @@ -119,7 +119,7 @@ u16 ctrl; ctrl = pci_read_config16(dev, PCI_CB_BRIDGE_CONTROL); - ctrl |= (dev->link_list->bridge_ctrl & ( + ctrl |= (dev->downstream->bridge_ctrl & ( PCI_BRIDGE_CTL_VGA | PCI_BRIDGE_CTL_MASTER_ABORT | PCI_BRIDGE_CTL_BUS_RESET)); diff --git a/src/device/device.c b/src/device/device.c index 743a3af..72a408e 100644 --- a/src/device/device.c +++ b/src/device/device.c @@ -101,7 +101,7 @@ dev->enabled = 1; /* Add the new device to the list of children of the bus. */ - dev->bus = parent; + dev->upstream = parent; if (child) child->sibling = dev; else @@ -139,13 +139,13 @@ */ static struct bus *__alloc_bus(struct device *parent) { - if (parent->link_list) - return parent->link_list; + if (parent->downstream) + return parent->downstream; struct bus *bus = calloc(1, sizeof(struct bus)); if (!bus) die("Couldn't allocate downstream bus!\n"); - parent->link_list = bus; + parent->downstream = bus; bus->dev = parent; return bus; @@ -205,8 +205,8 @@ curdev->ops->read_resources(curdev); /* Read in the resources behind the current device's links. */ - if (curdev->link_list) - read_resources(curdev->link_list); + if (curdev->downstream) + read_resources(curdev->downstream); } post_log_clear(); printk(BIOS_SPEW, "%s %s segment group %d bus %d done\n", @@ -236,7 +236,7 @@ continue; printk(BIOS_DEBUG, "found VGA at %s\n", dev_path(dev)); - if (dev->bus->no_vga16) { + if (dev->upstream->no_vga16) { printk(BIOS_WARNING, "A bridge on the path doesn't support 16-bit VGA decoding!"); } @@ -270,7 +270,7 @@ /* All legacy VGA cards have MEM & I/O space registers. */ vga->command |= (PCI_COMMAND_MEMORY | PCI_COMMAND_IO); vga_pri = vga; - bus = vga->bus; + bus = vga->upstream; } /* Now walk up the bridges setting the VGA enable. */ @@ -278,7 +278,7 @@ printk(BIOS_DEBUG, "Setting PCI_BRIDGE_CTL_VGA for bridge %s\n", dev_path(bus->dev)); bus->bridge_ctrl |= PCI_BRIDGE_CTL_VGA | PCI_BRIDGE_CTL_VGA16; - bus = (bus == bus->dev->bus) ? 0 : bus->dev->bus; + bus = (bus == bus->dev->upstream) ? 0 : bus->dev->upstream; } } @@ -343,8 +343,8 @@ } for (dev = link->children; dev; dev = dev->sibling) { - if (dev->link_list) - enable_resources(dev->link_list); + if (dev->downstream) + enable_resources(dev->downstream); } post_log_clear(); } @@ -391,7 +391,7 @@ do_scan_bus = 1; while (do_scan_bus) { - struct bus *link = busdev->link_list; + struct bus *link = busdev->downstream; busdev->ops->scan_bus(busdev); do_scan_bus = 0; if (!link || !link->reset_needed) @@ -399,7 +399,7 @@ if (reset_bus(link)) do_scan_bus = 1; else - busdev->bus->reset_needed = 1; + busdev->upstream->reset_needed = 1; } scan_time = stopwatch_duration_msecs(&sw); @@ -496,14 +496,14 @@ /* Read the resources for the entire tree. */ printk(BIOS_INFO, "Reading resources...\n"); - read_resources(root->link_list); + read_resources(root->downstream); printk(BIOS_INFO, "Done reading resources.\n"); print_resource_tree(root, BIOS_SPEW, "After reading."); allocate_resources(root); - assign_resources(root->link_list); + assign_resources(root->downstream); printk(BIOS_INFO, "Done setting resources.\n"); print_resource_tree(root, BIOS_SPEW, "After assigning values."); @@ -521,8 +521,8 @@ printk(BIOS_INFO, "Enabling resources...\n"); /* Now enable everything. */ - if (dev_root.link_list) - enable_resources(dev_root.link_list); + if (dev_root.downstream) + enable_resources(dev_root.downstream); printk(BIOS_INFO, "done.\n"); } @@ -546,7 +546,7 @@ long init_time; if (dev->path.type == DEVICE_PATH_I2C) { - printk(BIOS_DEBUG, "smbus: %s->", dev_path(dev->bus->dev)); + printk(BIOS_DEBUG, "smbus: %s->", dev_path(dev->upstream->dev)); } printk(BIOS_DEBUG, "%s init\n", dev_path(dev)); @@ -572,8 +572,8 @@ } for (dev = link->children; dev; dev = dev->sibling) - if (dev->link_list) - init_link(dev->link_list); + if (dev->downstream) + init_link(dev->downstream); } /** @@ -590,8 +590,8 @@ init_dev(&dev_root); /* Now initialize everything. */ - if (dev_root.link_list) - init_link(dev_root.link_list); + if (dev_root.downstream) + init_link(dev_root.downstream); post_log_clear(); printk(BIOS_INFO, "Devices initialized\n"); @@ -626,8 +626,8 @@ final_dev(dev); for (dev = link->children; dev; dev = dev->sibling) - if (dev->link_list) - final_link(dev->link_list); + if (dev->downstream) + final_link(dev->downstream); } /** * Finalize all devices in the global device tree. @@ -643,7 +643,7 @@ final_dev(&dev_root); /* Now finalize everything. */ - final_link(dev_root.link_list); + final_link(dev_root.downstream); printk(BIOS_INFO, "Devices finalized\n"); } diff --git a/src/device/device_const.c b/src/device/device_const.c index c91c009..0521c7e 100644 --- a/src/device/device_const.c +++ b/src/device/device_const.c @@ -34,8 +34,8 @@ result = 0; for (dev = all_devices; dev; dev = dev->next) { if ((dev->path.type == DEVICE_PATH_PCI) && - (dev->bus->secondary == bus) && - (dev->bus->segment_group == 0) && + (dev->upstream->secondary == bus) && + (dev->upstream->segment_group == 0) && (dev->path.pci.devfn == devfn)) { result = dev; break; @@ -210,7 +210,7 @@ if (nested_path_length == 1 || !child) return child; - return find_dev_nested_path(child->link_list, nested_path + 1, nested_path_length - 1); + return find_dev_nested_path(child->downstream, nested_path + 1, nested_path_length - 1); } DEVTREE_CONST struct device *pcidev_path_behind( @@ -234,8 +234,8 @@ dev = dev->next; continue; } - if (dev->bus->secondary == bus && dev->bus->segment_group == 0) - return pcidev_path_behind(dev->bus, devfn); + if (dev->upstream->secondary == bus && dev->upstream->segment_group == 0) + return pcidev_path_behind(dev->upstream, devfn); dev = dev->next; } return NULL; @@ -253,7 +253,7 @@ if (!pci_domain) return NULL; - pci_root = pci_domain->link_list; + pci_root = pci_domain->downstream; return pci_root; } @@ -277,7 +277,7 @@ return NULL; } - return pcidev_path_behind(bridge->link_list, devfn); + return pcidev_path_behind(bridge->downstream, devfn); } DEVTREE_CONST struct device *pcidev_path_on_root_debug(pci_devfn_t devfn, const char *func) @@ -317,7 +317,7 @@ result = 0; for (dev = all_devices; dev; dev = dev->next) { if ((dev->path.type == DEVICE_PATH_I2C) && - (dev->bus->secondary == bus) && + (dev->upstream->secondary == bus) && (dev->path.i2c.device == addr)) { result = dev; break; diff --git a/src/device/device_util.c b/src/device/device_util.c index ea4ef27..b5d0d98 100644 --- a/src/device/device_util.c +++ b/src/device/device_util.c @@ -97,7 +97,7 @@ case DEVICE_PATH_ROOT: break; case DEVICE_PATH_PCI: - ret |= dev->bus->segment_group << 16 | dev->bus->secondary << 8 | dev->path.pci.devfn; + ret |= dev->upstream->segment_group << 16 | dev->upstream->secondary << 8 | dev->path.pci.devfn; break; case DEVICE_PATH_PNP: ret |= dev->path.pnp.port << 8 | dev->path.pnp.device; @@ -169,8 +169,8 @@ case DEVICE_PATH_PCI: snprintf(buffer, sizeof(buffer), "PCI: %02x:%02x:%02x.%01x", - dev->bus->segment_group, - dev->bus->secondary, + dev->upstream->segment_group, + dev->upstream->secondary, PCI_SLOT(dev->path.pci.devfn), PCI_FUNC(dev->path.pci.devfn)); break; @@ -180,7 +180,7 @@ break; case DEVICE_PATH_I2C: snprintf(buffer, sizeof(buffer), "I2C: %02x:%02x", - dev->bus->secondary, + dev->upstream->secondary, dev->path.i2c.device); break; case DEVICE_PATH_APIC: @@ -253,8 +253,8 @@ struct device *dev_get_pci_domain(struct device *dev) { /* Walk up the tree up to the PCI domain */ - while (dev && dev->bus && !is_root_device(dev)) { - dev = dev->bus->dev; + while (dev && dev->upstream && !is_root_device(dev)) { + dev = dev->upstream->dev; if (dev->path.type == DEVICE_PATH_DOMAIN) return dev; } @@ -529,10 +529,10 @@ end = resource_end(resource); buf[0] = '\0'; - if (dev->link_list && (resource->flags & IORESOURCE_PCI_BRIDGE)) { + if (dev->downstream && (resource->flags & IORESOURCE_PCI_BRIDGE)) { snprintf(buf, sizeof(buf), - "seg %02x bus %02x ", dev->link_list->segment_group, - dev->link_list->secondary); + "seg %02x bus %02x ", dev->downstream->segment_group, + dev->downstream->secondary); } printk(BIOS_DEBUG, "%s %02lx <- [0x%016llx - 0x%016llx] size 0x%08llx " "gran 0x%02x %s%s%s\n", dev_path(dev), resource->index, @@ -560,8 +560,8 @@ /* If it is a subtractive resource recurse. */ if (res->flags & IORESOURCE_SUBTRACTIVE) { - if (curdev->link_list) - search_bus_resources(curdev->link_list, type_mask, type, + if (curdev->downstream) + search_bus_resources(curdev->downstream, type_mask, type, search, gp); continue; } @@ -617,8 +617,8 @@ struct device *child; for (child = bus->children; child; child = child->sibling) { - if (child->link_list) - disable_children(child->link_list); + if (child->downstream) + disable_children(child->downstream); dev_set_enabled(child, 0); } } @@ -634,10 +634,10 @@ if (!dev || !dev->enabled) return 0; - if (!dev->link_list || !dev->link_list->children) + if (!dev->downstream || !dev->downstream->children) return 0; - for (child = dev->link_list->children; child; child = child->sibling) { + for (child = dev->downstream->children; child; child = child->sibling) { if (child->path.type == DEVICE_PATH_NONE) continue; if (child->enabled) @@ -659,9 +659,9 @@ indent[i] = '\0'; printk(BIOS_DEBUG, "%s%s", indent, dev_path(root)); - if (root->link_list && root->link_list->children) + if (root->downstream && root->downstream->children) printk(BIOS_DEBUG, " child on link 0 %s", - dev_path(root->link_list->children)); + dev_path(root->downstream->children)); printk(BIOS_DEBUG, "\n"); for (res = root->resource_list; res; res = res->next) { @@ -672,10 +672,10 @@ res->index); } - if (!root->link_list) + if (!root->downstream) return; - for (child = root->link_list->children; child; child = child->sibling) + for (child = root->downstream->children; child; child = child->sibling) resource_tree(child, debug_level, depth + 1); } @@ -709,10 +709,10 @@ printk(debug_level, "%s%s: enabled %d\n", depth_str, dev_path(dev), dev->enabled); - if (!dev->link_list) + if (!dev->downstream) return; - for (sibling = dev->link_list->children; sibling; sibling = sibling->sibling) + for (sibling = dev->downstream->children; sibling; sibling = sibling->sibling) show_devs_tree(sibling, debug_level, depth + 1); } @@ -890,7 +890,7 @@ bool dev_path_hotplug(const struct device *dev) { - for (dev = dev->bus->dev; dev != dev->bus->dev; dev = dev->bus->dev) { + for (dev = dev->upstream->dev; dev != dev->upstream->dev; dev = dev->upstream->dev) { if (dev->hotplug_port) return true; } @@ -909,7 +909,7 @@ bool is_cpu(const struct device *cpu) { return cpu->path.type == DEVICE_PATH_APIC && - cpu->bus->dev->path.type == DEVICE_PATH_CPU_CLUSTER; + cpu->upstream->dev->path.type == DEVICE_PATH_CPU_CLUSTER; } bool is_enabled_cpu(const struct device *cpu) @@ -929,5 +929,6 @@ bool is_pci_dev_on_bus(const struct device *pci, unsigned int bus) { - return is_pci(pci) && pci->bus->segment_group == 0 && pci->bus->secondary == bus; + return is_pci(pci) && pci->upstream->segment_group == 0 + && pci->upstream->secondary == bus; } diff --git a/src/device/i2c_bus.c b/src/device/i2c_bus.c index 1d4aa2d..41ef14a 100644 --- a/src/device/i2c_bus.c +++ b/src/device/i2c_bus.c @@ -18,10 +18,10 @@ struct bus *i2c_link(const struct device *const dev) { - if (!dev || !dev->bus) + if (!dev || !dev->upstream) return NULL; - struct bus *link = dev->bus; + struct bus *link = dev->upstream; while (link) { struct device *const parent = link->dev; @@ -29,8 +29,8 @@ (parent->ops->ops_i2c_bus || parent->ops->ops_smbus_bus)) break; - if (parent && parent->bus && link != parent->bus) - link = parent->bus; + if (parent && parent->upstream && link != parent->upstream) + link = parent->upstream; else link = NULL; } diff --git a/src/device/mdio.c b/src/device/mdio.c index 39ac40b..89da60b 100644 --- a/src/device/mdio.c +++ b/src/device/mdio.c @@ -19,7 +19,7 @@ uint16_t mdio_read(struct device *dev, uint8_t offset) { const struct mdio_bus_operations *mdio_ops; - struct device *parent = dev->bus->dev; + struct device *parent = dev->upstream->dev; assert(dev->path.type == DEVICE_PATH_MDIO); mdio_ops = dev_get_mdio_ops(parent); @@ -30,7 +30,7 @@ void mdio_write(struct device *dev, uint8_t offset, uint16_t val) { const struct mdio_bus_operations *mdio_ops; - struct device *parent = dev->bus->dev; + struct device *parent = dev->upstream->dev; assert(dev->path.type == DEVICE_PATH_MDIO); mdio_ops = dev_get_mdio_ops(parent); diff --git a/src/device/oprom/realmode/x86.c b/src/device/oprom/realmode/x86.c index 367614d..c3adf40 100644 --- a/src/device/oprom/realmode/x86.c +++ b/src/device/oprom/realmode/x86.c @@ -415,7 +415,7 @@ void run_bios(struct device *dev, unsigned long addr) { - u32 num_dev = (dev->bus->secondary << 8) | dev->path.pci.devfn; + u32 num_dev = (dev->upstream->secondary << 8) | dev->path.pci.devfn; /* Setting up required hardware. * Removing this will cause random illegal instruction exceptions diff --git a/src/device/oprom/realmode/x86_interrupts.c b/src/device/oprom/realmode/x86_interrupts.c index 945052b..71fc1d5 100644 --- a/src/device/oprom/realmode/x86_interrupts.c +++ b/src/device/oprom/realmode/x86_interrupts.c @@ -138,7 +138,7 @@ X86_EAX |= PCIBIOS_SUCCESSFUL; // busnum is an unsigned char; // devfn is an int, so we mask it off. - busdevfn = (dev->bus->secondary << 8) + busdevfn = (dev->upstream->secondary << 8) | (dev->path.pci.devfn & 0xff); printk(BIOS_DEBUG, "0x%x: return 0x%x\n", func, busdevfn); X86_EBX = busdevfn; diff --git a/src/device/oprom/yabel/device.c b/src/device/oprom/yabel/device.c index 2c98578..d1dc801 100644 --- a/src/device/oprom/yabel/device.c +++ b/src/device/oprom/yabel/device.c @@ -65,7 +65,7 @@ { int taa_index = 0; struct resource *r; - u8 bus = bios_device.dev->bus->secondary; + u8 bus = bios_device.dev->upstream->secondary; u16 devfn = bios_device.dev->path.pci.devfn; bios_device.bus = bus; diff --git a/src/device/oprom/yabel/interrupt.c b/src/device/oprom/yabel/interrupt.c index 968e471..e78a3cb 100644 --- a/src/device/oprom/yabel/interrupt.c +++ b/src/device/oprom/yabel/interrupt.c @@ -375,7 +375,7 @@ } else if (CONFIG(YABEL_PCI_ACCESS_OTHER_DEVICES)) { dev = dev_find_device(M.x86.R_DX, M.x86.R_CX, 0); if (dev != NULL) { - M.x86.R_BH = dev->bus->secondary; + M.x86.R_BH = dev->upstream->secondary; M.x86.R_BL = dev->path.pci.devfn; DEBUG_PRINTF_INTR ("%s(): function %x: PCI Find Device --> 0x%04x\n", diff --git a/src/device/pci_device.c b/src/device/pci_device.c index 24b9523..8ead8a5 100644 --- a/src/device/pci_device.c +++ b/src/device/pci_device.c @@ -585,7 +585,7 @@ void pci_domain_set_resources(struct device *dev) { - assign_resources(dev->link_list); + assign_resources(dev->downstream); } static void pci_store_resource(const struct device *const dev, @@ -718,8 +718,8 @@ for (res = dev->resource_list; res; res = res->next) pci_set_resource(dev, res); - if (dev->link_list && dev->link_list->children) - assign_resources(dev->link_list); + if (dev->downstream && dev->downstream->children) + assign_resources(dev->downstream); /* Set a default latency timer. */ pci_write_config8(dev, PCI_LATENCY_TIMER, 0x40); @@ -782,10 +782,10 @@ * Enable I/O in command register if there is VGA card * connected with (even it does not claim I/O resource). */ - if (dev->link_list->bridge_ctrl & PCI_BRIDGE_CTL_VGA) + if (dev->downstream->bridge_ctrl & PCI_BRIDGE_CTL_VGA) dev->command |= PCI_COMMAND_IO; ctrl = pci_read_config16(dev, PCI_BRIDGE_CONTROL); - ctrl |= dev->link_list->bridge_ctrl; + ctrl |= dev->downstream->bridge_ctrl; ctrl |= (PCI_BRIDGE_CTL_PARITY | PCI_BRIDGE_CTL_SERR); /* Error check. */ printk(BIOS_DEBUG, "%s bridge ctrl <- %04x\n", dev_path(dev), ctrl); pci_write_config16(dev, PCI_BRIDGE_CONTROL, ctrl); @@ -843,7 +843,7 @@ { static int should_run = -1; - if (dev->bus->segment_group) { + if (dev->upstream->segment_group) { printk(BIOS_ERR, "Only option ROMs of devices in first PCI segment group can " "be run.\n"); return 0; @@ -990,7 +990,7 @@ pci_write_config16(bus->dev, PCI_BRIDGE_CONTROL, bridge_ctrl); /* If the upstream bridge doesn't support VGA16, we don't have to check */ - bus->no_vga16 |= bus->dev->bus->no_vga16; + bus->no_vga16 |= bus->dev->upstream->no_vga16; if (bus->no_vga16) return; @@ -1215,7 +1215,7 @@ if (!dev) { struct device dummy; - dummy.bus = bus; + dummy.upstream = bus; dummy.path.type = DEVICE_PATH_PCI; dummy.path.pci.devfn = devfn; @@ -1317,9 +1317,9 @@ */ unsigned int pci_match_simple_dev(struct device *dev, pci_devfn_t sdev) { - return dev->bus->secondary == PCI_DEV2BUS(sdev) && - dev->bus->segment_group == PCI_DEV2SEG(sdev) && - dev->path.pci.devfn == PCI_DEV2DEVFN(sdev); + return dev->upstream->secondary == PCI_DEV2BUS(sdev) && + dev->upstream->segment_group == PCI_DEV2SEG(sdev) && + dev->path.pci.devfn == PCI_DEV2DEVFN(sdev); } /** @@ -1333,14 +1333,14 @@ */ uint16_t pci_find_cap_recursive(const struct device *dev, uint16_t cap) { - assert(dev->bus); + assert(dev->upstream); uint16_t pos = pci_find_capability(dev, cap); - const struct device *bridge = dev->bus->dev; + const struct device *bridge = dev->upstream->dev; while (bridge && (bridge->path.type == DEVICE_PATH_PCI)) { - assert(bridge->bus); + assert(bridge->upstream); if (!pci_find_capability(bridge, cap)) return 0; - bridge = bridge->bus->dev; + bridge = bridge->upstream->dev; } return pos; } @@ -1546,7 +1546,7 @@ static void pci_bridge_route(struct bus *link, scan_state state) { struct device *dev = link->dev; - struct bus *parent = dev->bus; + struct bus *parent = dev->upstream; uint8_t primary, secondary, subordinate; if (state == PCI_ROUTE_SCAN) { @@ -1625,17 +1625,17 @@ printk(BIOS_SPEW, "%s for %s\n", __func__, dev_path(dev)); - if (dev->link_list == NULL) { + if (dev->downstream == NULL) { struct bus *link; link = malloc(sizeof(*link)); if (link == NULL) die("Couldn't allocate a link!\n"); memset(link, 0, sizeof(*link)); link->dev = dev; - dev->link_list = link; + dev->downstream = link; } - bus = dev->link_list; + bus = dev->downstream; pci_bridge_vga_compat(bus); @@ -1670,7 +1670,7 @@ */ void pci_host_bridge_scan_bus(struct device *dev) { - struct bus *link = dev->link_list; + struct bus *link = dev->downstream; pci_scan_bus(link, PCI_DEVFN(0, 0), 0xff); } @@ -1733,8 +1733,8 @@ /* While our current device has parent devices */ child = dev; - for (parent = child->bus->dev; parent; parent = parent->bus->dev) { - parent_bus = parent->bus->secondary; + for (parent = child->upstream->dev; parent; parent = parent->upstream->dev) { + parent_bus = parent->upstream->secondary; parent_devfn = parent->path.pci.devfn; child_devfn = child->path.pci.devfn; @@ -1798,7 +1798,7 @@ if (!(dev->enabled && (dev->path.type == DEVICE_PATH_PCI))) return -1; - bus = dev->bus->secondary; + bus = dev->upstream->secondary; devfn = dev->path.pci.devfn; /* Get and validate the interrupt pin used. Only 1-4 are allowed */ diff --git a/src/device/pci_rom.c b/src/device/pci_rom.c index cc1e5d1..1e212ab 100644 --- a/src/device/pci_rom.c +++ b/src/device/pci_rom.c @@ -230,7 +230,7 @@ printk(BIOS_ERR, "%s failed\n", __func__); return current; } - if (device->bus->segment_group) { + if (device->upstream->segment_group) { printk(BIOS_ERR, "VFCT only supports GPU in first PCI segment group.\n"); return current; } @@ -243,7 +243,7 @@ header->DeviceID = device->device; header->VendorID = device->vendor; - header->PCIBus = device->bus->secondary; + header->PCIBus = device->upstream->secondary; header->PCIFunction = PCI_FUNC(device->path.pci.devfn); header->PCIDevice = PCI_SLOT(device->path.pci.devfn); header->ImageLength = rom->size * 512; diff --git a/src/device/pciexp_device.c b/src/device/pciexp_device.c index ab8430f..969dbb00 100644 --- a/src/device/pciexp_device.c +++ b/src/device/pciexp_device.c @@ -302,7 +302,7 @@ struct device *parent = NULL; unsigned int parent_cap = 0; if (!dev->ops->ops_pci || !dev->ops->ops_pci->get_ltr_max_latencies) { - parent = dev->bus->dev; + parent = dev->upstream->dev; if (parent->path.type != DEVICE_PATH_PCI) return; parent_cap = pci_find_capability(parent, PCI_CAP_ID_PCIE); @@ -319,9 +319,9 @@ do { if (dev->ops->ops_pci && dev->ops->ops_pci->get_ltr_max_latencies) break; - if (dev->bus->dev == dev || dev->bus->dev->path.type != DEVICE_PATH_PCI) + if (dev->upstream->dev == dev || dev->upstream->dev->path.type != DEVICE_PATH_PCI) return false; - dev = dev->bus->dev; + dev = dev->upstream->dev; } while (true); dev->ops->ops_pci->get_ltr_max_latencies(max_snoop, max_nosnoop); @@ -627,7 +627,7 @@ static void pciexp_tune_dev(struct device *dev) { - struct device *root = dev->bus->dev; + struct device *root = dev->upstream->dev; unsigned int root_cap, cap; cap = pci_find_capability(dev, PCI_CAP_ID_PCIE); @@ -752,7 +752,7 @@ /* Add dummy slot to preserve resources, must happen after bus scan */ struct device *dummy; struct device_path dummy_path = { .type = DEVICE_PATH_NONE }; - dummy = alloc_dev(dev->link_list, &dummy_path); + dummy = alloc_dev(dev->downstream, &dummy_path); dummy->ops = &pciexp_hotplug_dummy_ops; } diff --git a/src/device/pcix_device.c b/src/device/pcix_device.c index e40ed3b..7ddc15d 100644 --- a/src/device/pcix_device.c +++ b/src/device/pcix_device.c @@ -107,11 +107,11 @@ sstatus = pci_read_config16(dev, pos + PCI_X_SEC_STATUS); if (PCI_X_SSTATUS_MFREQ(sstatus) != PCI_X_SSTATUS_CONVENTIONAL_PCI) - pcix_tune_bus(dev->link_list); + pcix_tune_bus(dev->downstream); /* Print the PCI-X bus speed. */ - printk(BIOS_DEBUG, "PCI: %02x:%02x: %s\n", dev->link_list->segment_group, - dev->link_list->secondary, pcix_speed(sstatus)); + printk(BIOS_DEBUG, "PCI: %02x:%02x: %s\n", dev->downstream->segment_group, + dev->downstream->secondary, pcix_speed(sstatus)); } /** Default device operations for PCI-X bridges */ diff --git a/src/device/pnp_device.c b/src/device/pnp_device.c index dad791c..f799530 100644 --- a/src/device/pnp_device.c +++ b/src/device/pnp_device.c @@ -384,7 +384,7 @@ continue; path.pnp.device = info[i].function; - dev = alloc_find_dev(base_dev->bus, &path); + dev = alloc_find_dev(base_dev->upstream, &path); /* Don't initialize a device multiple times. */ if (dev->ops) diff --git a/src/device/resource_allocator_v4.c b/src/device/resource_allocator_v4.c index 73ec9c1..c9630bb 100644 --- a/src/device/resource_allocator_v4.c +++ b/src/device/resource_allocator_v4.c @@ -78,7 +78,7 @@ static bool dev_has_children(const struct device *dev) { - const struct bus *bus = dev->link_list; + const struct bus *bus = dev->downstream; return bus && bus->children; } @@ -122,7 +122,7 @@ resource_t base; const unsigned long type_mask = IORESOURCE_TYPE_MASK | IORESOURCE_PREFETCH; const unsigned long type_match = bridge_res->flags & type_mask; - struct bus *bus = bridge->link_list; + struct bus *bus = bridge->downstream; child_res = NULL; @@ -208,7 +208,7 @@ { const struct device *child; struct resource *res; - struct bus *bus = bridge->link_list; + struct bus *bus = bridge->downstream; const unsigned long type_mask = IORESOURCE_TYPE_MASK | IORESOURCE_PREFETCH; for (res = bridge->resource_list; res; res = res->next) { @@ -256,10 +256,10 @@ const struct device *child; const int print_depth = 1; - if (domain->link_list == NULL) + if (domain->downstream == NULL) return; - for (child = domain->link_list->children; child; child = child->sibling) { + for (child = domain->downstream->children; child; child = child->sibling) { /* Skip if this is not a bridge or has no children under it. */ if (!dev_has_children(child)) @@ -299,7 +299,7 @@ memranges_create_hole(ranges, res->base, res->size); } - bus = dev->link_list; + bus = dev->downstream; if (bus == NULL) return; @@ -399,7 +399,7 @@ setup_resource_ranges(domain, type, &ranges); - while ((dev = largest_resource(domain->link_list, &res, type_mask, type))) { + while ((dev = largest_resource(domain->downstream, &res, type_mask, type))) { if (!res->size) continue; @@ -441,7 +441,7 @@ { const unsigned long type_mask = IORESOURCE_TYPE_MASK | IORESOURCE_PREFETCH | IORESOURCE_FIXED; - struct bus *const bus = bridge->link_list; + struct bus *const bus = bridge->downstream; struct resource *res; struct device *child; @@ -496,7 +496,7 @@ allocate_toplevel_resources(domain, IORESOURCE_MEM); struct device *child; - for (child = domain->link_list->children; child; child = child->sibling) { + for (child = domain->downstream->children; child; child = child->sibling) { if (!dev_has_children(child)) continue; @@ -553,10 +553,10 @@ { const struct device *child; - if ((root == NULL) || (root->link_list == NULL)) + if ((root == NULL) || (root->downstream == NULL)) return; - for (child = root->link_list->children; child; child = child->sibling) { + for (child = root->downstream->children; child; child = child->sibling) { if (child->path.type != DEVICE_PATH_DOMAIN) continue; diff --git a/src/device/root_device.c b/src/device/root_device.c index 54e82ea..0164b19 100644 --- a/src/device/root_device.c +++ b/src/device/root_device.c @@ -39,10 +39,10 @@ { struct device *child; - if (!bus->link_list) + if (!bus->downstream) return; - for (child = bus->link_list->children; child; child = child->sibling) + for (child = bus->downstream->children; child; child = child->sibling) enable_static_device(child); } @@ -53,12 +53,12 @@ printk(BIOS_SPEW, "%s for %s\n", __func__, dev_path(bus)); - if (bus->link_list) { - bus->link_list->secondary = ++bus_max; + if (bus->downstream) { + bus->downstream->secondary = ++bus_max; - for (child = bus->link_list->children; child; child = child->sibling) { + for (child = bus->downstream->children; child; child = child->sibling) { enable_static_device(child); - printk(BIOS_DEBUG, "bus: %s->", dev_path(child->bus->dev)); + printk(BIOS_DEBUG, "bus: %s->", dev_path(child->upstream->dev)); } } @@ -86,8 +86,8 @@ enable_static_devices(bus); - if (bus->link_list) - scan_bridges(bus->link_list); + if (bus->downstream) + scan_bridges(bus->downstream); printk(BIOS_SPEW, "%s for %s done\n", __func__, dev_path(bus)); } diff --git a/src/drivers/i2c/ptn3460/ptn3460.c b/src/drivers/i2c/ptn3460/ptn3460.c index 93acb18..76b3bc8 100644 --- a/src/drivers/i2c/ptn3460/ptn3460.c +++ b/src/drivers/i2c/ptn3460/ptn3460.c @@ -172,8 +172,8 @@ return; } /* Initialize the I2C controller before it is used. */ - if (ptn_dev->bus && ptn_dev->bus->dev->ops && ptn_dev->bus->dev->ops->init) - ptn_dev->bus->dev->ops->init(ptn_dev->bus->dev); + if (ptn_dev->upstream && ptn_dev->upstream->dev->ops && ptn_dev->upstream->dev->ops->init) + ptn_dev->upstream->dev->ops->init(ptn_dev->upstream->dev); ptn3460_init(ptn_dev); } diff --git a/src/drivers/intel/dptf/dptf.c b/src/drivers/intel/dptf/dptf.c index bceb0de..f313540 100644 --- a/src/drivers/intel/dptf/dptf.c +++ b/src/drivers/intel/dptf/dptf.c @@ -503,7 +503,7 @@ enum dptf_participant p; /* The CPU device gets an _ADR that matches the ACPI PCI address for 00:04.00 */ - parent = dev && dev->bus ? dev->bus->dev : NULL; + parent = dev && dev->upstream ? dev->upstream->dev : NULL; if (!parent || parent->path.type != DEVICE_PATH_PCI) { printk(BIOS_ERR, "%s: DPTF objects must live under 00:04.0 PCI device\n", __func__); diff --git a/src/drivers/intel/ish/ish.c b/src/drivers/intel/ish/ish.c index 6dba46a..0ad0bb8 100644 --- a/src/drivers/intel/ish/ish.c +++ b/src/drivers/intel/ish/ish.c @@ -12,7 +12,7 @@ static void ish_fill_ssdt_generator(const struct device *dev) { struct drivers_intel_ish_config *config = dev->chip_info; - struct device *root = dev->bus->dev; + struct device *root = dev->upstream->dev; struct acpi_dp *dsd; if (!config) diff --git a/src/drivers/intel/mipi_camera/camera.c b/src/drivers/intel/mipi_camera/camera.c index 77c86ea..4044a26 100644 --- a/src/drivers/intel/mipi_camera/camera.c +++ b/src/drivers/intel/mipi_camera/camera.c @@ -199,7 +199,7 @@ static uint32_t address_for_dev_type(const struct device *dev, uint8_t dev_type) { struct drivers_intel_mipi_camera_config *config = dev->chip_info; - uint16_t i2c_bus = dev->bus ? dev->bus->secondary : 0xFFFF; + uint16_t i2c_bus = dev->upstream ? dev->upstream->secondary : 0xFFFF; uint16_t i2c_addr; switch (dev_type) { @@ -416,7 +416,7 @@ .type = DEVICE_PATH_I2C, .i2c.device = config->vcm_address, }; - struct device *vcm_dev = find_dev_path(dev->bus, &path); + struct device *vcm_dev = find_dev_path(dev->upstream, &path); struct drivers_intel_mipi_camera_config *vcm_config; vcm_config = vcm_dev ? vcm_dev->chip_info : NULL; @@ -927,7 +927,7 @@ const struct device *pdev; if (config->has_power_resource) { - pdev = dev->bus->dev; + pdev = dev->upstream->dev; if (!pdev || !pdev->enabled) return; @@ -951,7 +951,7 @@ write_i2c_camera_device(dev, scope); break; case DEVICE_PATH_GENERIC: - pdev = dev->bus->dev; + pdev = dev->upstream->dev; scope = acpi_device_scope(pdev); if (!scope) return; diff --git a/src/drivers/intel/soundwire/soundwire.c b/src/drivers/intel/soundwire/soundwire.c index f9421fc..0137dad 100644 --- a/src/drivers/intel/soundwire/soundwire.c +++ b/src/drivers/intel/soundwire/soundwire.c @@ -21,7 +21,7 @@ { struct device *child; - for (child = dev->link_list->children; child; child = child->sibling) { + for (child = dev->downstream->children; child; child = child->sibling) { if (child->enabled && child->path.type == DEVICE_PATH_GENERIC && child->path.generic.id == link) return true; diff --git a/src/drivers/net/phy/m88e1512/m88e1512.c b/src/drivers/net/phy/m88e1512/m88e1512.c index 07110c6..7e67500 100644 --- a/src/drivers/net/phy/m88e1512/m88e1512.c +++ b/src/drivers/net/phy/m88e1512/m88e1512.c @@ -21,10 +21,10 @@ if (config->downshift_cnt) { if (config->downshift_cnt > DOWNSHIFT_CNT_MAX) { printk(BIOS_INFO, "%s: Downshift counter for %s is too large.\n", - dev_path(dev->bus->dev), dev->chip_ops->name); + dev_path(dev->upstream->dev), dev->chip_ops->name); } else { printk(BIOS_DEBUG, "%s: Enable downshift after %d attempts for %s.\n", - dev_path(dev->bus->dev), config->downshift_cnt, + dev_path(dev->upstream->dev), config->downshift_cnt, dev->chip_ops->name); reg = mdio_read(dev, COPPER_SPEC_CTRL_REG_1); @@ -42,7 +42,7 @@ /* Configure LEDs if requested. */ if (config->configure_leds) { printk(BIOS_DEBUG, "%s: Set a customized LED mode for %s.\n", - dev_path(dev->bus->dev), dev->chip_ops->name); + dev_path(dev->upstream->dev), dev->chip_ops->name); /* Select page 3 to access LED function control register. */ switch_page(dev, 3); @@ -57,7 +57,7 @@ /* INTn can be routed to LED[2] pin. */ if (config->enable_int) { printk(BIOS_DEBUG, "%s: INTn is routed to LED[2] pin %s.\n", - dev_path(dev->bus->dev), dev->chip_ops->name); + dev_path(dev->upstream->dev), dev->chip_ops->name); /* Select page 3 to access LED function control register. */ switch_page(dev, 3); @@ -70,7 +70,7 @@ /* Set RGMII output impedance manually. */ if (config->force_mos) { printk(BIOS_DEBUG, "%s: Set RGMII driver strength manually for %s.\n", - dev_path(dev->bus->dev), dev->chip_ops->name); + dev_path(dev->upstream->dev), dev->chip_ops->name); /* Select page 2 to access RGMII output impedance calibration override register. */ diff --git a/src/drivers/net/r8168.c b/src/drivers/net/r8168.c index 70a0f63..6d93ed2 100644 --- a/src/drivers/net/r8168.c +++ b/src/drivers/net/r8168.c @@ -364,7 +364,7 @@ static void r8168_net_fill_ssdt(const struct device *dev) { struct drivers_net_config *config = dev->chip_info; - const char *path = acpi_device_path(dev->bus->dev); + const char *path = acpi_device_path(dev->upstream->dev); u32 address; if (!path || !config) diff --git a/src/drivers/nxp/uwb/uwb.c b/src/drivers/nxp/uwb/uwb.c index 0f5ba47..b828657 100644 --- a/src/drivers/nxp/uwb/uwb.c +++ b/src/drivers/nxp/uwb/uwb.c @@ -15,10 +15,10 @@ struct device *spi_dev; struct device_operations *ops; - if (!dev->bus || !dev->bus->dev) + if (!dev->upstream || !dev->upstream->dev) return -1; - spi_dev = dev->bus->dev; + spi_dev = dev->upstream->dev; ops = spi_dev->ops; if (ops && ops->ops_spi_bus && ops->ops_spi_bus->dev_to_bus) diff --git a/src/drivers/pcie/generic/generic.c b/src/drivers/pcie/generic/generic.c index 1b7976e..e401261 100644 --- a/src/drivers/pcie/generic/generic.c +++ b/src/drivers/pcie/generic/generic.c @@ -27,13 +27,13 @@ pci_rom_ssdt(dev); config = dev->chip_info; - if (!config || !dev->bus || !dev->bus->dev) + if (!config || !dev->upstream || !dev->upstream->dev) return; const char *scope; const char *name; - scope = acpi_device_path(dev->bus->dev); + scope = acpi_device_path(dev->upstream->dev); name = acpi_device_name(dev); acpigen_write_scope(scope); diff --git a/src/drivers/spi/acpi/acpi.c b/src/drivers/spi/acpi/acpi.c index b58bc2d..537c377 100644 --- a/src/drivers/spi/acpi/acpi.c +++ b/src/drivers/spi/acpi/acpi.c @@ -15,10 +15,10 @@ struct device *spi_dev; struct device_operations *ops; - if (!dev->bus || !dev->bus->dev) + if (!dev->upstream || !dev->upstream->dev) return -1; - spi_dev = dev->bus->dev; + spi_dev = dev->upstream->dev; ops = spi_dev->ops; if (ops && ops->ops_spi_bus && diff --git a/src/drivers/usb/hub/acpi.c b/src/drivers/usb/hub/acpi.c index e26d584..3944952 100644 --- a/src/drivers/usb/hub/acpi.c +++ b/src/drivers/usb/hub/acpi.c @@ -41,7 +41,7 @@ struct device *port = NULL; unsigned int child_count = 0; - while ((port = dev_bus_each_child(dev->link_list, port)) != NULL) { + while ((port = dev_bus_each_child(dev->downstream, port)) != NULL) { if (child_count++ >= config->port_count) { printk(BIOS_WARNING, "%s cannot be added. Port Count limit reached.\n", dev_name(port)); diff --git a/src/drivers/usb/pci_xhci/pci_xhci.c b/src/drivers/usb/pci_xhci/pci_xhci.c index 398595d..47f69c0 100644 --- a/src/drivers/usb/pci_xhci/pci_xhci.c +++ b/src/drivers/usb/pci_xhci/pci_xhci.c @@ -76,7 +76,7 @@ if (is_root_device(dev)) return NULL; - dev = dev->bus->dev; + dev = dev->upstream->dev; } return dev; diff --git a/src/drivers/wifi/generic/acpi.c b/src/drivers/wifi/generic/acpi.c index f37a084..6abad83 100644 --- a/src/drivers/wifi/generic/acpi.c +++ b/src/drivers/wifi/generic/acpi.c @@ -610,7 +610,7 @@ if (!dev) return; - path = acpi_device_path(dev->bus->dev); + path = acpi_device_path(dev->upstream->dev); if (!path) return; diff --git a/src/drivers/wifi/generic/smbios.c b/src/drivers/wifi/generic/smbios.c index 82c96a5..e6ccd5d 100644 --- a/src/drivers/wifi/generic/smbios.c +++ b/src/drivers/wifi/generic/smbios.c @@ -38,5 +38,5 @@ int smbios_write_wifi_cnvi(struct device *dev, int *handle, unsigned long *current) { - return smbios_write_wifi_pcie(dev->bus->dev, handle, current); + return smbios_write_wifi_pcie(dev->upstream->dev, handle, current); } diff --git a/src/drivers/wwan/fm/acpi_fm350gl.c b/src/drivers/wwan/fm/acpi_fm350gl.c index 77ff085..564ac03 100644 --- a/src/drivers/wwan/fm/acpi_fm350gl.c +++ b/src/drivers/wwan/fm/acpi_fm350gl.c @@ -317,7 +317,7 @@ static void wwan_fm350gl_acpi_fill_ssdt(const struct device *dev) { const struct drivers_wwan_fm_config *config = config_of(dev); - const struct device *parent = dev->bus->dev; + const struct device *parent = dev->upstream->dev; const char *scope = acpi_device_path(parent); const struct soc_intel_common_block_pcie_rtd3_config *rtd3_config; diff --git a/src/ec/google/chromeec/ec_acpi.c b/src/ec/google/chromeec/ec_acpi.c index 3367cfa..cf29636 100644 --- a/src/ec/google/chromeec/ec_acpi.c +++ b/src/ec/google/chromeec/ec_acpi.c @@ -273,7 +273,7 @@ path.type = DEVICE_PATH_GENERIC; path.generic.id = 0; path.generic.subid = 0; - ec = alloc_find_dev(dev->bus, &path); + ec = alloc_find_dev(dev->upstream, &path); ec->ops = &ec_ops; if (CONFIG(DRIVERS_INTEL_DPTF)) diff --git a/src/include/device/device.h b/src/include/device/device.h index 7e52f41..27ef82a 100644 --- a/src/include/device/device.h +++ b/src/include/device/device.h @@ -95,8 +95,8 @@ */ struct device { - DEVTREE_CONST struct bus *bus; /* bus this device is on, for bridge - * devices, it is the up stream bus */ + DEVTREE_CONST struct bus *upstream; + DEVTREE_CONST struct bus *downstream; DEVTREE_CONST struct device *sibling; /* next device on this bus */ @@ -124,11 +124,6 @@ /* Base registers for this device. I/O, MEM and Expansion ROM */ DEVTREE_CONST struct resource *resource_list; - /* links are (downstream) buses attached to the device, usually a leaf - * device with no children has 0 buses attached and a bridge has 1 bus - */ - DEVTREE_CONST struct bus *link_list; - #if !DEVTREE_EARLY struct device_operations *ops; struct chip_operations *chip_ops; @@ -458,11 +453,11 @@ static inline bool is_root_device(const struct device *dev) { - if (!dev || !dev->bus) + if (!dev || !dev->upstream) return false; return (dev->path.type == DEVICE_PATH_ROOT) || - (dev->bus->dev == dev); + (dev->upstream->dev == dev); } void enable_static_device(struct device *dev); diff --git a/src/include/device/pci_ops.h b/src/include/device/pci_ops.h index de5f913..90c59fb 100644 --- a/src/include/device/pci_ops.h +++ b/src/include/device/pci_ops.h @@ -12,8 +12,8 @@ static __always_inline pci_devfn_t pcidev_bdf(const struct device *dev) { - return (dev->path.pci.devfn << 12) | (dev->bus->secondary << 20) | - (dev->bus->segment_group << 28); + return (dev->path.pci.devfn << 12) | (dev->upstream->secondary << 20) | + (dev->upstream->segment_group << 28); } static __always_inline pci_devfn_t pcidev_assert(const struct device *dev) diff --git a/src/lib/smbios.c b/src/lib/smbios.c index c6cfb05..449e4fd 100644 --- a/src/lib/smbios.c +++ b/src/lib/smbios.c @@ -1114,8 +1114,8 @@ return smbios_write_type41(current, handle, name, // name instance_id, // inst - dev->bus->segment_group, // segment group - dev->bus->secondary, //bus + dev->upstream->segment_group, // segment group + dev->upstream->secondary, //bus PCI_SLOT(dev->path.pci.devfn), // device PCI_FUNC(dev->path.pci.devfn), // func device_type); @@ -1167,8 +1167,8 @@ 0, 1, 0, - dev->bus->segment_group, - dev->bus->secondary, + dev->upstream->segment_group, + dev->upstream->secondary, dev->path.pci.devfn); } diff --git a/src/mainboard/aopen/dxplplusu/acpi_tables.c b/src/mainboard/aopen/dxplplusu/acpi_tables.c index e22b454..114068f 100644 --- a/src/mainboard/aopen/dxplplusu/acpi_tables.c +++ b/src/mainboard/aopen/dxplplusu/acpi_tables.c @@ -11,7 +11,7 @@ bdev = pcidev_on_root(2, 0); /* P64H2 Bus B IOAPIC */ if (bdev) - dev = pcidev_path_behind(bdev->link_list, PCI_DEVFN(28, 0)); + dev = pcidev_path_behind(bdev->downstream, PCI_DEVFN(28, 0)); if (dev) { res = find_resource(dev, PCI_BASE_ADDRESS_0); current += acpi_create_madt_ioapic_from_hw((acpi_madt_ioapic_t *)current, res->base); @@ -19,7 +19,7 @@ /* P64H2 Bus A IOAPIC */ if (bdev) - dev = pcidev_path_behind(bdev->link_list, PCI_DEVFN(30, 0)); + dev = pcidev_path_behind(bdev->downstream, PCI_DEVFN(30, 0)); if (dev) { res = find_resource(dev, PCI_BASE_ADDRESS_0); current += acpi_create_madt_ioapic_from_hw((acpi_madt_ioapic_t *)current, res->base); diff --git a/src/mainboard/emulation/qemu-i440fx/northbridge.c b/src/mainboard/emulation/qemu-i440fx/northbridge.c index 6c26366..609e389 100644 --- a/src/mainboard/emulation/qemu-i440fx/northbridge.c +++ b/src/mainboard/emulation/qemu-i440fx/northbridge.c @@ -39,7 +39,7 @@ static void cpu_pci_domain_set_resources(struct device *dev) { - assign_resources(dev->link_list); + assign_resources(dev->downstream); } static void cpu_pci_domain_read_resources(struct device *dev) diff --git a/src/mainboard/google/brox/mainboard.c b/src/mainboard/google/brox/mainboard.c index f892099..5820805 100644 --- a/src/mainboard/google/brox/mainboard.c +++ b/src/mainboard/google/brox/mainboard.c @@ -106,7 +106,7 @@ static void mainboard_generate_wwan_shutdown(const struct device *dev) { const struct drivers_wwan_fm_config *config = config_of(dev); - const struct device *parent = dev->bus->dev; + const struct device *parent = dev->upstream->dev; if (!config) return; @@ -126,7 +126,7 @@ static void mainboard_generate_dgpu_shutdown(const struct device *dev) { /* Call `_OFF` from the Power Resource associated with the dGPU's PEG port. */ - const struct device *parent = dev->bus->dev; + const struct device *parent = dev->upstream->dev; if (parent) acpigen_emit_namestring(acpi_device_path_join(parent, "PGPR._OFF")); diff --git a/src/mainboard/google/brya/mainboard.c b/src/mainboard/google/brya/mainboard.c index aa332cd..9cf56b2 100644 --- a/src/mainboard/google/brya/mainboard.c +++ b/src/mainboard/google/brya/mainboard.c @@ -106,7 +106,7 @@ static void mainboard_generate_wwan_shutdown(const struct device *dev) { const struct drivers_wwan_fm_config *config = config_of(dev); - const struct device *parent = dev->bus->dev; + const struct device *parent = dev->upstream->dev; if (!config) return; @@ -126,7 +126,7 @@ static void mainboard_generate_dgpu_shutdown(const struct device *dev) { /* Call `_OFF` from the Power Resource associated with the dGPU's PEG port. */ - const struct device *parent = dev->bus->dev; + const struct device *parent = dev->upstream->dev; if (parent) acpigen_emit_namestring(acpi_device_path_join(parent, "PGPR._OFF")); diff --git a/src/mainboard/google/kahlee/variants/careena/mainboard.c b/src/mainboard/google/kahlee/variants/careena/mainboard.c index 937a411..c54b530 100644 --- a/src/mainboard/google/kahlee/variants/careena/mainboard.c +++ b/src/mainboard/google/kahlee/variants/careena/mainboard.c @@ -26,7 +26,7 @@ if (mmio_dev == NULL) return; - while ((child = dev_bus_each_child(mmio_dev->link_list, child)) != NULL) { + while ((child = dev_bus_each_child(mmio_dev->downstream, child)) != NULL) { if (child->path.type != DEVICE_PATH_I2C) continue; if (child->path.i2c.device != 0x1a) diff --git a/src/mainboard/google/kahlee/variants/treeya/audio.c b/src/mainboard/google/kahlee/variants/treeya/audio.c index ac7f7a2..e7a20ea 100644 --- a/src/mainboard/google/kahlee/variants/treeya/audio.c +++ b/src/mainboard/google/kahlee/variants/treeya/audio.c @@ -25,7 +25,7 @@ } } while (mmio_dev->path.mmio.addr != APU_I2C0_BASE); - while ((child = dev_bus_each_child(mmio_dev->link_list, child)) != NULL) { + while ((child = dev_bus_each_child(mmio_dev->downstream, child)) != NULL) { if (child->path.type != DEVICE_PATH_I2C) continue; if (child->path.i2c.device != RT58_I2C_ADDRESS) diff --git a/src/mainboard/google/octopus/mainboard.c b/src/mainboard/google/octopus/mainboard.c index 92b1074..3392a3c 100644 --- a/src/mainboard/google/octopus/mainboard.c +++ b/src/mainboard/google/octopus/mainboard.c @@ -179,7 +179,7 @@ { struct device *audio_dev = NULL; struct bus *audio_i2c_bus = - pcidev_path_on_root(PCH_DEVFN_I2C5)->link_list; + pcidev_path_on_root(PCH_DEVFN_I2C5)->downstream; enum ssfc_audio_codec codec = ssfc_get_audio_codec(); while ((audio_dev = dev_bus_each_child(audio_i2c_bus, audio_dev))) { diff --git a/src/mainboard/google/rex/mainboard.c b/src/mainboard/google/rex/mainboard.c index 3ca85ff..bf489ff 100644 --- a/src/mainboard/google/rex/mainboard.c +++ b/src/mainboard/google/rex/mainboard.c @@ -82,7 +82,7 @@ static void mainboard_generate_wwan_shutdown(const struct device *dev) { const struct drivers_wwan_fm_config *config = config_of(dev); - const struct device *parent = dev->bus->dev; + const struct device *parent = dev->upstream->dev; if (!config) return; diff --git a/src/mainboard/google/zork/variants/baseboard/ramstage_common.c b/src/mainboard/google/zork/variants/baseboard/ramstage_common.c index 3c203f5..a544548 100644 --- a/src/mainboard/google/zork/variants/baseboard/ramstage_common.c +++ b/src/mainboard/google/zork/variants/baseboard/ramstage_common.c @@ -115,7 +115,7 @@ if (variant_uses_v3_6_schematics()) return; - while ((child = dev_bus_each_child(mmio_dev->link_list, child)) != NULL) { + while ((child = dev_bus_each_child(mmio_dev->downstream, child)) != NULL) { struct drivers_i2c_generic_config *cfg; if (child->chip_ops == &drivers_i2c_generic_ops) { diff --git a/src/mainboard/ibase/mb899/mptable.c b/src/mainboard/ibase/mb899/mptable.c index 4ec578a..a9ad7c7 100644 --- a/src/mainboard/ibase/mb899/mptable.c +++ b/src/mainboard/ibase/mb899/mptable.c @@ -19,7 +19,7 @@ firewire = dev_find_device(0x104c, 0x8023, 0); if (firewire) { - firewire_bus = firewire->bus->secondary; + firewire_bus = firewire->upstream->secondary; printk(BIOS_SPEW, "Firewire device is on bus %x\n", firewire_bus); } @@ -30,7 +30,7 @@ if (!riser) riser = dev_find_device(0x3388, 0x0022, 0); if (riser) { - riser_bus = riser->link_list->secondary; + riser_bus = riser->downstream->secondary; printk(BIOS_SPEW, "Riser bus is %x\n", riser_bus); } diff --git a/src/mainboard/kontron/986lcd-m/mptable.c b/src/mainboard/kontron/986lcd-m/mptable.c index 605b8d7..b0bfbe7 100644 --- a/src/mainboard/kontron/986lcd-m/mptable.c +++ b/src/mainboard/kontron/986lcd-m/mptable.c @@ -18,7 +18,7 @@ firewire = dev_find_device(0x104c, 0x8023, 0); if (firewire) { - firewire_bus = firewire->bus->secondary; + firewire_bus = firewire->upstream->secondary; } /* If a riser card is used, this riser is detected on bus 4, so its secondary bus is the */ @@ -27,7 +27,7 @@ if (!riser) riser = dev_find_device(0x3388, 0x0022, 0); if (riser) { - riser_bus = riser->link_list->secondary; + riser_bus = riser->downstream->secondary; } mptable_write_buses(mc, NULL, &isa_bus); diff --git a/src/mainboard/pcengines/apu2/mainboard.c b/src/mainboard/pcengines/apu2/mainboard.c index a09fa66..ac5c928 100644 --- a/src/mainboard/pcengines/apu2/mainboard.c +++ b/src/mainboard/pcengines/apu2/mainboard.c @@ -277,7 +277,7 @@ dev = pcidev_on_root(2, 2); if (dev) - dev = pcidev_path_behind(dev->link_list, PCI_DEVFN(0, 0)); + dev = pcidev_path_behind(dev->downstream, PCI_DEVFN(0, 0)); if (!dev) return serial; diff --git a/src/mainboard/roda/rk9/ti_pci7xx1.c b/src/mainboard/roda/rk9/ti_pci7xx1.c index 3ff339c..970e83d 100644 --- a/src/mainboard/roda/rk9/ti_pci7xx1.c +++ b/src/mainboard/roda/rk9/ti_pci7xx1.c @@ -19,7 +19,7 @@ u16 gcr = pci_read_config16(dev, 0x86); for (fn = 5; fn > 0; --fn) { const struct device *const d = - pcidev_path_behind(dev->bus, PCI_DEVFN(slot, fn)); + pcidev_path_behind(dev->upstream, PCI_DEVFN(slot, fn)); if (!d || d->enabled) continue; printk(BIOS_DEBUG, "%s: Hiding function #%d.\n", __func__, fn); diff --git a/src/mainboard/siemens/fa_ehl/mainboard.c b/src/mainboard/siemens/fa_ehl/mainboard.c index 7aa0d86..ac16346 100644 --- a/src/mainboard/siemens/fa_ehl/mainboard.c +++ b/src/mainboard/siemens/fa_ehl/mainboard.c @@ -42,7 +42,7 @@ */ enum cb_err mainboard_get_mac_address(struct device *dev, uint8_t mac[MAC_ADDR_LEN]) { - struct bus *parent = dev->bus; + struct bus *parent = dev->upstream; uint8_t buf[16], mapping[16], i = 0, chain_len = 0; memset(buf, 0, sizeof(buf)); @@ -51,10 +51,10 @@ /* The first entry in the tree is the device itself. */ buf[0] = dev->path.pci.devfn; chain_len = 1; - for (i = 1; i < MAX_PATH_DEPTH && parent->dev->bus->subordinate; i++) { + for (i = 1; i < MAX_PATH_DEPTH && parent->dev->upstream->subordinate; i++) { buf[i] = parent->dev->path.pci.devfn; chain_len++; - parent = parent->dev->bus; + parent = parent->dev->upstream; } if (i == MAX_PATH_DEPTH) { /* The path is deeper than MAX_PATH_DEPTH devices, error. */ diff --git a/src/mainboard/siemens/mc_apl1/mainboard.c b/src/mainboard/siemens/mc_apl1/mainboard.c index 0593797..51427be 100644 --- a/src/mainboard/siemens/mc_apl1/mainboard.c +++ b/src/mainboard/siemens/mc_apl1/mainboard.c @@ -55,7 +55,7 @@ */ enum cb_err mainboard_get_mac_address(struct device *dev, uint8_t mac[MAC_ADDR_LEN]) { - struct bus *parent = dev->bus; + struct bus *parent = dev->upstream; uint8_t buf[16], mapping[16], i = 0, chain_len = 0; memset(buf, 0, sizeof(buf)); @@ -64,10 +64,10 @@ /* The first entry in the tree is the device itself. */ buf[0] = dev->path.pci.devfn; chain_len = 1; - for (i = 1; i < MAX_PATH_DEPTH && parent->dev->bus->subordinate; i++) { + for (i = 1; i < MAX_PATH_DEPTH && parent->dev->upstream->subordinate; i++) { buf[i] = parent->dev->path.pci.devfn; chain_len++; - parent = parent->dev->bus; + parent = parent->dev->upstream; } if (i == MAX_PATH_DEPTH) { /* The path is deeper than MAX_PATH_DEPTH devices, error. */ diff --git a/src/mainboard/siemens/mc_apl1/variants/mc_apl3/mainboard.c b/src/mainboard/siemens/mc_apl1/variants/mc_apl3/mainboard.c index b61f32d..c6beff6 100644 --- a/src/mainboard/siemens/mc_apl1/variants/mc_apl3/mainboard.c +++ b/src/mainboard/siemens/mc_apl1/variants/mc_apl3/mainboard.c @@ -41,7 +41,7 @@ /* Disable clock outputs 0 and 2-4 (CLKOUT) for upstream XIO2001 PCIe to PCI Bridge. */ - struct device *parent = dev->bus->dev; + struct device *parent = dev->upstream->dev; if (parent && parent->device == PCI_DID_TI_XIO2001) pci_write_config8(parent, 0xd8, 0x1d); } @@ -50,7 +50,7 @@ mainboard. */ dev = dev_find_device(PCI_VID_SIEMENS, 0x403f, 0); if (dev) { - struct device *parent = dev->bus->dev; + struct device *parent = dev->upstream->dev; if (parent && parent->device == PCI_DID_TI_XIO2001) pci_write_config8(parent, 0xd8, 0x3c); } diff --git a/src/mainboard/siemens/mc_apl1/variants/mc_apl5/mainboard.c b/src/mainboard/siemens/mc_apl1/variants/mc_apl5/mainboard.c index 8eedce6..eda4b1b 100644 --- a/src/mainboard/siemens/mc_apl1/variants/mc_apl5/mainboard.c +++ b/src/mainboard/siemens/mc_apl1/variants/mc_apl5/mainboard.c @@ -51,7 +51,7 @@ /* Disable clock outputs 0-3 (CLKOUT) for upstream XIO2001 PCIe to PCI Bridge. */ - struct device *parent = dev->bus->dev; + struct device *parent = dev->upstream->dev; if (parent && parent->device == PCI_DID_TI_XIO2001) pci_write_config8(parent, 0xd8, 0x0f); } @@ -60,7 +60,7 @@ mainboard. */ dev = dev_find_device(PCI_VID_SIEMENS, 0x403f, 0); if (dev) { - struct device *parent = dev->bus->dev; + struct device *parent = dev->upstream->dev; if (parent && parent->device == PCI_DID_TI_XIO2001) pci_write_config8(parent, 0xd8, 0x3e); } diff --git a/src/mainboard/siemens/mc_apl1/variants/mc_apl6/mainboard.c b/src/mainboard/siemens/mc_apl1/variants/mc_apl6/mainboard.c index 1856a35..a5fe3d7 100644 --- a/src/mainboard/siemens/mc_apl1/variants/mc_apl6/mainboard.c +++ b/src/mainboard/siemens/mc_apl1/variants/mc_apl6/mainboard.c @@ -41,7 +41,7 @@ /* Disable clock outputs 0-3 (CLKOUT) for upstream XIO2001 PCIe to PCI Bridge. */ - struct device *parent = dev->bus->dev; + struct device *parent = dev->upstream->dev; if (parent && parent->device == PCI_DID_TI_XIO2001) pci_write_config8(parent, 0xd8, 0x0F); } @@ -50,7 +50,7 @@ mainboard. */ dev = dev_find_device(PCI_VID_SIEMENS, 0x403f, 0); if (dev) { - struct device *parent = dev->bus->dev; + struct device *parent = dev->upstream->dev; if (parent && parent->device == PCI_DID_TI_XIO2001) pci_write_config8(parent, 0xd8, 0x3c); } diff --git a/src/mainboard/siemens/mc_ehl/mainboard.c b/src/mainboard/siemens/mc_ehl/mainboard.c index 7aa0d86..ac16346 100644 --- a/src/mainboard/siemens/mc_ehl/mainboard.c +++ b/src/mainboard/siemens/mc_ehl/mainboard.c @@ -42,7 +42,7 @@ */ enum cb_err mainboard_get_mac_address(struct device *dev, uint8_t mac[MAC_ADDR_LEN]) { - struct bus *parent = dev->bus; + struct bus *parent = dev->upstream; uint8_t buf[16], mapping[16], i = 0, chain_len = 0; memset(buf, 0, sizeof(buf)); @@ -51,10 +51,10 @@ /* The first entry in the tree is the device itself. */ buf[0] = dev->path.pci.devfn; chain_len = 1; - for (i = 1; i < MAX_PATH_DEPTH && parent->dev->bus->subordinate; i++) { + for (i = 1; i < MAX_PATH_DEPTH && parent->dev->upstream->subordinate; i++) { buf[i] = parent->dev->path.pci.devfn; chain_len++; - parent = parent->dev->bus; + parent = parent->dev->upstream; } if (i == MAX_PATH_DEPTH) { /* The path is deeper than MAX_PATH_DEPTH devices, error. */ diff --git a/src/northbridge/amd/pi/00730F01/northbridge.c b/src/northbridge/amd/pi/00730F01/northbridge.c index 7e9cfd8..b318be0 100644 --- a/src/northbridge/amd/pi/00730F01/northbridge.c +++ b/src/northbridge/amd/pi/00730F01/northbridge.c @@ -186,7 +186,7 @@ ivrs_ivhd_generic_t *ivhd_entry = (ivrs_ivhd_generic_t *)*current; ivhd_entry->type = type; - ivhd_entry->dev_id = dev->path.pci.devfn | (dev->bus->secondary << 8); + ivhd_entry->dev_id = dev->path.pci.devfn | (dev->upstream->secondary << 8); ivhd_entry->dte_setting = data; *current += sizeof(ivrs_ivhd_generic_t); } else if (type == IVHD_DEV_8_BYTE_ALIAS_SELECT) { @@ -195,12 +195,12 @@ ivrs_ivhd_alias_t *ivhd_entry = (ivrs_ivhd_alias_t *)*current; ivhd_entry->type = type; - ivhd_entry->dev_id = dev->path.pci.devfn | (dev->bus->secondary << 8); + ivhd_entry->dev_id = dev->path.pci.devfn | (dev->upstream->secondary << 8); ivhd_entry->dte_setting = data; ivhd_entry->reserved1 = 0; ivhd_entry->reserved2 = 0; ivhd_entry->source_dev_id = parent->path.pci.devfn | - (parent->bus->secondary << 8); + (parent->upstream->secondary << 8); *current += sizeof(ivrs_ivhd_alias_t); } @@ -243,7 +243,7 @@ if (dev->path.type == DEVICE_PATH_PCI) { - if ((dev->bus->secondary == 0x0) && + if ((dev->upstream->secondary == 0x0) && (dev->path.pci.devfn == 0x0)) *root_level = depth; @@ -253,8 +253,8 @@ } } - if (dev->link_list) { - for (sibling = dev->link_list->children; sibling; sibling = sibling->sibling) + if (dev->downstream) { + for (sibling = dev->downstream->children; sibling; sibling = sibling->sibling) add_ivhd_device_entries(dev, sibling, depth + 1, depth, root_level, current, ivhd_length); } @@ -290,12 +290,12 @@ ivhd_11->flags = ivrs_agesa->ivhd.flags & 0x3f; ivhd_11->length = sizeof(struct acpi_ivrs_ivhd_11); /* BDF <bus>:00.2 */ - ivhd_11->device_id = 0x02 | (nb_dev->bus->secondary << 8); + ivhd_11->device_id = 0x02 | (nb_dev->upstream->secondary << 8); /* PCI Capability block 0x40 (type 0xf, "Secure device") */ ivhd_11->capability_offset = 0x40; ivhd_11->iommu_base_low = ivrs_agesa->ivhd.iommu_base_low; ivhd_11->iommu_base_high = ivrs_agesa->ivhd.iommu_base_high; - ivhd_11->pci_segment_group = nb_dev->bus->segment_group; + ivhd_11->pci_segment_group = nb_dev->upstream->segment_group; ivhd_11->iommu_info = ivrs_agesa->ivhd.iommu_info; ivhd_11->iommu_attributes.perf_counters = (IOMMU_MMIO32(ivhd_11->iommu_base_low + 0x4000) >> 7) & 0xf; @@ -358,12 +358,12 @@ ivrs->ivhd.flags = ivrs_agesa->ivhd.flags; ivrs->ivhd.length = sizeof(struct acpi_ivrs_ivhd); /* BDF <bus>:00.2 */ - ivrs->ivhd.device_id = 0x02 | (nb_dev->bus->secondary << 8); + ivrs->ivhd.device_id = 0x02 | (nb_dev->upstream->secondary << 8); /* PCI Capability block 0x40 (type 0xf, "Secure device") */ ivrs->ivhd.capability_offset = 0x40; ivrs->ivhd.iommu_base_low = ivrs_agesa->ivhd.iommu_base_low; ivrs->ivhd.iommu_base_high = ivrs_agesa->ivhd.iommu_base_high; - ivrs->ivhd.pci_segment_group = nb_dev->bus->segment_group; + ivrs->ivhd.pci_segment_group = nb_dev->upstream->segment_group; ivrs->ivhd.iommu_info = ivrs_agesa->ivhd.iommu_info; ivrs->ivhd.iommu_feature_info = ivrs_agesa->ivhd.iommu_feature_info; /* Enable EFR if supported */ diff --git a/src/northbridge/intel/e7505/northbridge.c b/src/northbridge/intel/e7505/northbridge.c index fa29ef5..23d60dc 100644 --- a/src/northbridge/intel/e7505/northbridge.c +++ b/src/northbridge/intel/e7505/northbridge.c @@ -52,7 +52,7 @@ static void mch_domain_set_resources(struct device *dev) { - assign_resources(dev->link_list); + assign_resources(dev->downstream); } struct device_operations e7505_pci_domain_ops = { diff --git a/src/northbridge/intel/gm45/northbridge.c b/src/northbridge/intel/gm45/northbridge.c index 50d0d89..dc18791 100644 --- a/src/northbridge/intel/gm45/northbridge.c +++ b/src/northbridge/intel/gm45/northbridge.c @@ -122,7 +122,7 @@ report_resource_stored(dev, resource, ""); } - assign_resources(dev->link_list); + assign_resources(dev->downstream); } static void mch_domain_init(struct device *dev) diff --git a/src/northbridge/intel/haswell/pcie.c b/src/northbridge/intel/haswell/pcie.c index 7fe57e9..4eeaa3f 100644 --- a/src/northbridge/intel/haswell/pcie.c +++ b/src/northbridge/intel/haswell/pcie.c @@ -20,8 +20,8 @@ if (dev->path.type != DEVICE_PATH_PCI) return NULL; - assert(dev->bus); - if (dev->bus->secondary == 0) + assert(dev->upstream); + if (dev->upstream->secondary == 0) switch (dev->path.pci.devfn) { case PCI_DEVFN(1, 0): return "PEGP"; @@ -31,12 +31,12 @@ return "PEG2"; }; - struct device *const port = dev->bus->dev; + struct device *const port = dev->upstream->dev; assert(port); - assert(port->bus); + assert(port->upstream); if (dev->path.pci.devfn == PCI_DEVFN(0, 0) && - port->bus->secondary == 0 && + port->upstream->secondary == 0 && (port->path.pci.devfn == PCI_DEVFN(1, 0) || port->path.pci.devfn == PCI_DEVFN(1, 1) || port->path.pci.devfn == PCI_DEVFN(1, 2))) diff --git a/src/northbridge/intel/i440bx/northbridge.c b/src/northbridge/intel/i440bx/northbridge.c index d588197..0a72cb7 100644 --- a/src/northbridge/intel/i440bx/northbridge.c +++ b/src/northbridge/intel/i440bx/northbridge.c @@ -34,8 +34,8 @@ pci_domain_read_resources(dev); - pci_tolm = find_pci_tolm(dev->link_list); - mc_dev = dev->link_list->children; + pci_tolm = find_pci_tolm(dev->downstream); + mc_dev = dev->downstream->children; if (mc_dev) { unsigned long tomk, tolmk; int idx; diff --git a/src/northbridge/intel/i945/northbridge.c b/src/northbridge/intel/i945/northbridge.c index 34ebcb2..79e9ee5 100644 --- a/src/northbridge/intel/i945/northbridge.c +++ b/src/northbridge/intel/i945/northbridge.c @@ -26,7 +26,7 @@ /* Can we find out how much memory we can use at most * this way? */ - pci_tolm = find_pci_tolm(dev->link_list); + pci_tolm = find_pci_tolm(dev->downstream); printk(BIOS_DEBUG, "pci_tolm: 0x%x\n", pci_tolm); tolud = pci_read_config8(d0f0, TOLUD) << 24; @@ -65,7 +65,7 @@ for (res = dev->resource_list; res; res = res->next) report_resource_stored(dev, res, ""); - assign_resources(dev->link_list); + assign_resources(dev->downstream); } static const char *northbridge_acpi_name(const struct device *dev) diff --git a/src/northbridge/intel/pineview/northbridge.c b/src/northbridge/intel/pineview/northbridge.c index d7a6c84..c24493a 100644 --- a/src/northbridge/intel/pineview/northbridge.c +++ b/src/northbridge/intel/pineview/northbridge.c @@ -108,7 +108,7 @@ for (res = dev->resource_list; res; res = res->next) report_resource_stored(dev, res, ""); - assign_resources(dev->link_list); + assign_resources(dev->downstream); } static void mch_domain_init(struct device *dev) diff --git a/src/northbridge/intel/sandybridge/pcie.c b/src/northbridge/intel/sandybridge/pcie.c index 96fb12f..244b0f5 100644 --- a/src/northbridge/intel/sandybridge/pcie.c +++ b/src/northbridge/intel/sandybridge/pcie.c @@ -13,8 +13,8 @@ if (dev->path.type != DEVICE_PATH_PCI) return NULL; - assert(dev->bus); - if (dev->bus->secondary == 0) + assert(dev->upstream); + if (dev->upstream->secondary == 0) switch (dev->path.pci.devfn) { case PCI_DEVFN(1, 0): return "PEGP"; @@ -26,12 +26,12 @@ return "PEG6"; }; - struct device *const port = dev->bus->dev; + struct device *const port = dev->upstream->dev; assert(port); - assert(port->bus); + assert(port->upstream); if (dev->path.pci.devfn == PCI_DEVFN(0, 0) && - port->bus->secondary == 0 && + port->upstream->secondary == 0 && (port->path.pci.devfn == PCI_DEVFN(1, 0) || port->path.pci.devfn == PCI_DEVFN(1, 1) || port->path.pci.devfn == PCI_DEVFN(1, 2) || diff --git a/src/northbridge/intel/x4x/northbridge.c b/src/northbridge/intel/x4x/northbridge.c index b037cf8..4987cae 100644 --- a/src/northbridge/intel/x4x/northbridge.c +++ b/src/northbridge/intel/x4x/northbridge.c @@ -72,7 +72,7 @@ for (res = dev->resource_list; res; res = res->next) report_resource_stored(dev, res, ""); - assign_resources(dev->link_list); + assign_resources(dev->downstream); } static void mch_domain_init(struct device *dev) diff --git a/src/soc/amd/cezanne/xhci.c b/src/soc/amd/cezanne/xhci.c index b0205c6..fc1c119 100644 --- a/src/soc/amd/cezanne/xhci.c +++ b/src/soc/amd/cezanne/xhci.c @@ -26,10 +26,10 @@ enum cb_err pci_xhci_get_wake_gpe(const struct device *dev, int *gpe) { - if (dev->bus->dev->path.type != DEVICE_PATH_PCI) + if (dev->upstream->dev->path.type != DEVICE_PATH_PCI) return CB_ERR_ARG; - if (dev->bus->dev->path.pci.devfn != PCIE_ABC_A_DEVFN) + if (dev->upstream->dev->path.pci.devfn != PCIE_ABC_A_DEVFN) return CB_ERR_ARG; if (dev->path.type != DEVICE_PATH_PCI) diff --git a/src/soc/amd/common/block/acpi/ivrs.c b/src/soc/amd/common/block/acpi/ivrs.c index 57b5974..bd52d7c 100644 --- a/src/soc/amd/common/block/acpi/ivrs.c +++ b/src/soc/amd/common/block/acpi/ivrs.c @@ -96,7 +96,7 @@ memset(ivhd_entry, 0, sizeof(*ivhd_entry)); ivhd_entry->type = type; - ivhd_entry->dev_id = dev->path.pci.devfn | (dev->bus->secondary << 8); + ivhd_entry->dev_id = dev->path.pci.devfn | (dev->upstream->secondary << 8); ivhd_entry->dte_setting = data; *current += sizeof(ivrs_ivhd_generic_t); } else if (type == IVHD_DEV_8_BYTE_ALIAS_SELECT) { @@ -104,12 +104,12 @@ memset(ivhd_entry, 0, sizeof(*ivhd_entry)); ivhd_entry->type = type; - ivhd_entry->dev_id = dev->path.pci.devfn | (dev->bus->secondary << 8); + ivhd_entry->dev_id = dev->path.pci.devfn | (dev->upstream->secondary << 8); ivhd_entry->dte_setting = data; ivhd_entry->reserved1 = 0; ivhd_entry->reserved2 = 0; ivhd_entry->source_dev_id = parent->path.pci.devfn | - (parent->bus->secondary << 8); + (parent->upstream->secondary << 8); *current += sizeof(ivrs_ivhd_alias_t); } @@ -145,7 +145,7 @@ return; if (dev->path.type == DEVICE_PATH_PCI) { - if ((dev->bus->secondary == nb_bus) && + if ((dev->upstream->secondary == nb_bus) && (dev->path.pci.devfn == 0x0)) *root_level = depth; @@ -154,9 +154,9 @@ ivrs_add_device_or_bridge(parent, dev, current); } - if (!dev->link_list) + if (!dev->downstream) return; - for (sibling = dev->link_list->children; sibling; sibling = sibling->sibling) + for (sibling = dev->downstream->children; sibling; sibling = sibling->sibling) add_ivhd_device_entries(dev, sibling, depth + 1, depth, root_level, current, nb_bus); } @@ -173,21 +173,21 @@ * Add all possible PCI devices in the domain that can generate transactions * processed by IOMMU. Start with device <bus>:01.0 */ - current = ivhd_dev_range(current, PCI_DEVFN(0, 3) | (dev->link_list->secondary << 8), - 0xff | (dev->link_list->subordinate << 8), 0); + current = ivhd_dev_range(current, PCI_DEVFN(0, 3) | (dev->downstream->secondary << 8), + 0xff | (dev->downstream->subordinate << 8), 0); add_ivhd_device_entries(NULL, dev, 0, -1, &root_level, - &current, dev->link_list->secondary); + &current, dev->downstream->secondary); res = probe_resource(dev, IOMMU_IOAPIC_IDX); if (res) { /* Describe IOAPIC associated with the IOMMU */ current = acpi_fill_ivrs_ioapic(current, (u8 *)(uintptr_t)res->base, - PCI_DEVFN(0, 1) | (dev->link_list->secondary << 8), 0); + PCI_DEVFN(0, 1) | (dev->downstream->secondary << 8), 0); } /* If the domain has secondary bus as zero then associate HPET & FCH IOAPIC */ - if (dev->link_list->secondary == 0) { + if (dev->downstream->secondary == 0) { /* Describe HPET */ current = ivhd_describe_hpet(current, 0x00, SMBUS_DEVFN); /* Describe FCH IOAPICs */ @@ -212,11 +212,11 @@ ivhd_40->flags = ivhd->flags & 0x3f; ivhd_40->length = sizeof(struct acpi_ivrs_ivhd_40); /* BDF <bus>:00.2 */ - ivhd_40->device_id = 0x02 | (nb_dev->bus->secondary << 8); + ivhd_40->device_id = 0x02 | (nb_dev->upstream->secondary << 8); ivhd_40->capability_offset = pci_find_capability(iommu_dev, IOMMU_CAP_ID); ivhd_40->iommu_base_low = ivhd->iommu_base_low; ivhd_40->iommu_base_high = ivhd->iommu_base_high; - ivhd_40->pci_segment_group = nb_dev->bus->segment_group; + ivhd_40->pci_segment_group = nb_dev->upstream->segment_group; ivhd_40->iommu_info = ivhd->iommu_info; /* For type 40h bits 31:28 and 12:0 are reserved */ ivhd_40->iommu_attributes = ivhd->iommu_feature_info & 0xfffe000; @@ -230,9 +230,9 @@ /* Now repeat all the device entries from type 10h */ current_backup = current; - current = acpi_ivhd_misc(current, nb_dev->bus->dev); + current = acpi_ivhd_misc(current, nb_dev->upstream->dev); - if (nb_dev->bus->secondary == 0) { + if (nb_dev->upstream->secondary == 0) { /* Describe EMMC */ if (CONFIG(SOC_AMD_COMMON_BLOCK_EMMC)) { /* PCI_DEVFN(0x13, 1) doesn't exist in the hardware, but it's what the @@ -269,11 +269,11 @@ ivhd_11->flags = ivhd->flags & 0x3f; ivhd_11->length = sizeof(struct acpi_ivrs_ivhd_11); /* BDF <bus>:00.2 */ - ivhd_11->device_id = 0x02 | (nb_dev->bus->secondary << 8); + ivhd_11->device_id = 0x02 | (nb_dev->upstream->secondary << 8); ivhd_11->capability_offset = pci_find_capability(iommu_dev, IOMMU_CAP_ID); ivhd_11->iommu_base_low = ivhd->iommu_base_low; ivhd_11->iommu_base_high = ivhd->iommu_base_high; - ivhd_11->pci_segment_group = nb_dev->bus->segment_group; + ivhd_11->pci_segment_group = nb_dev->upstream->segment_group; ivhd_11->iommu_info = ivhd->iommu_info; ivhd11_attr_ptr = (ivhd11_iommu_attr_t *)&ivhd->iommu_feature_info; ivhd_11->iommu_attributes.perf_counters = ivhd11_attr_ptr->perf_counters; @@ -289,7 +289,7 @@ /* Now repeat all the device entries from type 10h */ current_backup = current; - current = acpi_ivhd_misc(current, nb_dev->bus->dev); + current = acpi_ivhd_misc(current, nb_dev->upstream->dev); ivhd_11->length += (current - current_backup); return acpi_fill_ivrs40(current, ivhd, nb_dev, iommu_dev); @@ -317,8 +317,8 @@ while ((dev = dev_find_path(dev, DEVICE_PATH_DOMAIN)) != NULL) { - nb_dev = pcidev_path_behind(dev->link_list, PCI_DEVFN(0, 0)); - iommu_dev = pcidev_path_behind(dev->link_list, PCI_DEVFN(0, 2)); + nb_dev = pcidev_path_behind(dev->downstream, PCI_DEVFN(0, 0)); + iommu_dev = pcidev_path_behind(dev->downstream, PCI_DEVFN(0, 2)); if (!nb_dev) { printk(BIOS_WARNING, "%s: Northbridge device not present!\n", __func__); printk(BIOS_WARNING, "%s: IVRS table not generated...\n", __func__); @@ -334,7 +334,7 @@ ivhd->length = sizeof(struct acpi_ivrs_ivhd); /* BDF <bus>:00.2 */ - ivhd->device_id = 0x02 | (nb_dev->bus->secondary << 8); + ivhd->device_id = 0x02 | (nb_dev->upstream->secondary << 8); ivhd->capability_offset = pci_find_capability(iommu_dev, IOMMU_CAP_ID); ivhd->iommu_base_low = pci_read_config32(iommu_dev, IOMMU_CAP_BASE_LO) & 0xffffc000; ivhd->iommu_base_high = pci_read_config32(iommu_dev, IOMMU_CAP_BASE_HI); @@ -363,7 +363,7 @@ ivhd->flags |= ((mmio_x18_value & MMIO_CTRL_HT_TUN_EN) ? IVHD_FLAG_HT_TUN_EN : 0); - ivhd->pci_segment_group = nb_dev->bus->segment_group; + ivhd->pci_segment_group = nb_dev->upstream->segment_group; ivhd->iommu_info = pci_read_config16(iommu_dev, ivhd->capability_offset + 0x10) & 0x1F; diff --git a/src/soc/amd/common/block/data_fabric/domain.c b/src/soc/amd/common/block/data_fabric/domain.c index b827dd3..f17346f 100644 --- a/src/soc/amd/common/block/data_fabric/domain.c +++ b/src/soc/amd/common/block/data_fabric/domain.c @@ -34,12 +34,12 @@ limit = MIN(limit, PCI_BUSES_PER_SEGMENT_GROUP - 1); /* Set bus first number of PCI root */ - domain->link_list->secondary = bus; + domain->downstream->secondary = bus; /* subordinate needs to be the same as secondary before pci_host_bridge_scan_bus call. */ - domain->link_list->subordinate = bus; + domain->downstream->subordinate = bus; /* Tell allocator about maximum PCI bus number in domain */ - domain->link_list->max_subordinate = limit; - domain->link_list->segment_group = segment_group; + domain->downstream->max_subordinate = limit; + domain->downstream->segment_group = segment_group; pci_host_bridge_scan_bus(domain); } @@ -249,12 +249,12 @@ /* PCI bus number range in domain */ printk(BIOS_DEBUG, "%s _CRS: adding busses [%x-%x] in segment group %x\n", - acpi_device_name(domain), domain->link_list->secondary, - domain->link_list->max_subordinate, domain->link_list->segment_group); - acpigen_resource_producer_bus_number(domain->link_list->secondary, - domain->link_list->max_subordinate); + acpi_device_name(domain), domain->downstream->secondary, + domain->downstream->max_subordinate, domain->downstream->segment_group); + acpigen_resource_producer_bus_number(domain->downstream->secondary, + domain->downstream->max_subordinate); - if (domain->link_list->secondary == 0 && domain->link_list->segment_group == 0) { + if (domain->downstream->secondary == 0 && domain->downstream->segment_group == 0) { /* ACPI 6.4.2.5 I/O Port Descriptor */ acpigen_write_io16(PCI_IO_CONFIG_INDEX, PCI_IO_CONFIG_LAST_PORT, 1, PCI_IO_CONFIG_PORT_COUNT, 1); @@ -282,7 +282,7 @@ } } - if (domain->link_list->bridge_ctrl & PCI_BRIDGE_CTL_VGA) { + if (domain->downstream->bridge_ctrl & PCI_BRIDGE_CTL_VGA) { printk(BIOS_DEBUG, "%s _CRS: adding VGA resource\n", acpi_device_name(domain)); acpigen_resource_producer_mmio(VGA_MMIO_BASE, VGA_MMIO_LIMIT, MEM_RSRC_FLAG_MEM_READ_WRITE | MEM_RSRC_FLAG_MEM_ATTR_CACHE); @@ -290,9 +290,8 @@ acpigen_write_resourcetemplate_footer(); - acpigen_write_SEG(domain->link_list->segment_group); - acpigen_write_BBN(domain->link_list->secondary); - + acpigen_write_SEG(domain->downstream->segment_group); + acpigen_write_BBN(domain->downstream->secondary); /* Scope */ acpigen_pop_len(); } diff --git a/src/soc/amd/common/block/lpc/lpc.c b/src/soc/amd/common/block/lpc/lpc.c index c076361..a90fc3e 100644 --- a/src/soc/amd/common/block/lpc/lpc.c +++ b/src/soc/amd/common/block/lpc/lpc.c @@ -280,10 +280,10 @@ { struct device *child; - if (!dev->link_list) + if (!dev->downstream) return; - for (child = dev->link_list->children; child; child = child->sibling) { + for (child = dev->downstream->children; child; child = child->sibling) { if (!child->enabled) continue; if (child->path.type != DEVICE_PATH_PNP) diff --git a/src/soc/amd/genoa_poc/domain.c b/src/soc/amd/genoa_poc/domain.c index dc37450..57e020a 100644 --- a/src/soc/amd/genoa_poc/domain.c +++ b/src/soc/amd/genoa_poc/domain.c @@ -18,7 +18,7 @@ amd_pci_domain_read_resources(domain); // We only want to add the DRAM memory map once - if (domain->link_list->secondary == 0 && domain->link_list->segment_group == 0) { + if (domain->downstream->secondary == 0 && domain->downstream->segment_group == 0) { /* 0x1000 is a large enough first index to be sure to not overlap with the resources added by amd_pci_domain_read_resources */ add_opensil_memmap(domain, 0x1000); @@ -27,7 +27,7 @@ static void genoa_domain_set_resources(struct device *domain) { - if (domain->link_list->bridge_ctrl & PCI_BRIDGE_CTL_VGA) { + if (domain->downstream->bridge_ctrl & PCI_BRIDGE_CTL_VGA) { printk(BIOS_DEBUG, "Setting VGA decoding for domain 0x%x\n", domain->path.domain.domain); const union df_vga_en vga_en = { diff --git a/src/soc/amd/glinda/xhci.c b/src/soc/amd/glinda/xhci.c index dad5593..74e8816 100644 --- a/src/soc/amd/glinda/xhci.c +++ b/src/soc/amd/glinda/xhci.c @@ -34,13 +34,13 @@ enum cb_err pci_xhci_get_wake_gpe(const struct device *dev, int *gpe) { - if (dev->bus->dev->path.type != DEVICE_PATH_PCI) + if (dev->upstream->dev->path.type != DEVICE_PATH_PCI) return CB_ERR_ARG; if (dev->path.type != DEVICE_PATH_PCI) return CB_ERR_ARG; - if (dev->bus->dev->path.pci.devfn == PCIE_ABC_A_DEVFN) { + if (dev->upstream->dev->path.pci.devfn == PCIE_ABC_A_DEVFN) { if (dev->path.pci.devfn == XHCI0_DEVFN) { *gpe = xhci_sci_sources[0].gpe; return CB_SUCCESS; @@ -48,7 +48,7 @@ *gpe = xhci_sci_sources[1].gpe; return CB_SUCCESS; } - } else if (dev->bus->dev->path.pci.devfn == PCIE_ABC_C_DEVFN) { + } else if (dev->upstream->dev->path.pci.devfn == PCIE_ABC_C_DEVFN) { if (dev->path.pci.devfn == XHCI2_DEVFN && dev->device == PCI_DID_AMD_FAM17H_MODELA0H_XHCI2) { *gpe = xhci_sci_sources[2].gpe; diff --git a/src/soc/amd/mendocino/xhci.c b/src/soc/amd/mendocino/xhci.c index e564991..8f46374 100644 --- a/src/soc/amd/mendocino/xhci.c +++ b/src/soc/amd/mendocino/xhci.c @@ -35,13 +35,13 @@ enum cb_err pci_xhci_get_wake_gpe(const struct device *dev, int *gpe) { - if (dev->bus->dev->path.type != DEVICE_PATH_PCI) + if (dev->upstream->dev->path.type != DEVICE_PATH_PCI) return CB_ERR_ARG; if (dev->path.type != DEVICE_PATH_PCI) return CB_ERR_ARG; - if (dev->bus->dev->path.pci.devfn == PCIE_ABC_A_DEVFN) { + if (dev->upstream->dev->path.pci.devfn == PCIE_ABC_A_DEVFN) { if (dev->path.pci.devfn == XHCI0_DEVFN) { *gpe = xhci_sci_sources[0].gpe; return CB_SUCCESS; @@ -49,7 +49,7 @@ *gpe = xhci_sci_sources[1].gpe; return CB_SUCCESS; } - } else if (dev->bus->dev->path.pci.devfn == PCIE_ABC_C_DEVFN) { + } else if (dev->upstream->dev->path.pci.devfn == PCIE_ABC_C_DEVFN) { if (dev->path.pci.devfn == XHCI2_DEVFN && dev->device == PCI_DID_AMD_FAM17H_MODELA0H_XHCI2) { *gpe = xhci_sci_sources[2].gpe; diff --git a/src/soc/amd/phoenix/xhci.c b/src/soc/amd/phoenix/xhci.c index 99033f9..79d4d07 100644 --- a/src/soc/amd/phoenix/xhci.c +++ b/src/soc/amd/phoenix/xhci.c @@ -39,13 +39,13 @@ enum cb_err pci_xhci_get_wake_gpe(const struct device *dev, int *gpe) { - if (dev->bus->dev->path.type != DEVICE_PATH_PCI) + if (dev->upstream->dev->path.type != DEVICE_PATH_PCI) return CB_ERR_ARG; if (dev->path.type != DEVICE_PATH_PCI) return CB_ERR_ARG; - if (dev->bus->dev->path.pci.devfn == PCIE_ABC_A_DEVFN) { + if (dev->upstream->dev->path.pci.devfn == PCIE_ABC_A_DEVFN) { if (dev->path.pci.devfn == XHCI0_DEVFN) { *gpe = xhci_sci_sources[0].gpe; return CB_SUCCESS; @@ -55,7 +55,7 @@ } } - if (dev->bus->dev->path.pci.devfn == PCIE_ABC_C_DEVFN) { + if (dev->upstream->dev->path.pci.devfn == PCIE_ABC_C_DEVFN) { if (dev->path.pci.devfn == USB4_XHCI0_DEVFN) { *gpe = xhci_sci_sources[2].gpe; return CB_SUCCESS; diff --git a/src/soc/amd/picasso/xhci.c b/src/soc/amd/picasso/xhci.c index 84b3a2b..a238916 100644 --- a/src/soc/amd/picasso/xhci.c +++ b/src/soc/amd/picasso/xhci.c @@ -26,10 +26,10 @@ enum cb_err pci_xhci_get_wake_gpe(const struct device *dev, int *gpe) { - if (dev->bus->dev->path.type != DEVICE_PATH_PCI) + if (dev->upstream->dev->path.type != DEVICE_PATH_PCI) return CB_ERR_ARG; - if (dev->bus->dev->path.pci.devfn != PCIE_GPP_A_DEVFN) + if (dev->upstream->dev->path.pci.devfn != PCIE_GPP_A_DEVFN) return CB_ERR_ARG; if (dev->path.type != DEVICE_PATH_PCI) diff --git a/src/soc/amd/stoneyridge/northbridge.c b/src/soc/amd/stoneyridge/northbridge.c index b95c4cd..a92c3b5 100644 --- a/src/soc/amd/stoneyridge/northbridge.c +++ b/src/soc/amd/stoneyridge/northbridge.c @@ -52,9 +52,9 @@ static void create_vga_resource(struct device *dev) { - if (!dev->link_list) + if (!dev->downstream) return; - if (!(dev->link_list->bridge_ctrl & PCI_BRIDGE_CTL_VGA)) + if (!(dev->downstream->bridge_ctrl & PCI_BRIDGE_CTL_VGA)) return; printk(BIOS_DEBUG, "VGA: %s has VGA device\n", dev_path(dev)); @@ -67,8 +67,8 @@ /* do we need this? */ create_vga_resource(dev); - if (dev->link_list && dev->link_list->children) - assign_resources(dev->link_list); + if (dev->downstream && dev->downstream->children) + assign_resources(dev->downstream); } static void northbridge_init(struct device *dev) diff --git a/src/soc/cavium/cn81xx/ecam0.c b/src/soc/cavium/cn81xx/ecam0.c index d02e884..ff3e709 100644 --- a/src/soc/cavium/cn81xx/ecam0.c +++ b/src/soc/cavium/cn81xx/ecam0.c @@ -226,12 +226,12 @@ * Search for missing devices on BUS 1. * Only required for ARI capability programming. */ - ecam0_fix_missing_devices(bridge->link_list); + ecam0_fix_missing_devices(bridge->downstream); /* Program secure ARI capability on bus 1 */ child_last = NULL; for (i = 0; i <= PCI_DEVFN(0x1f, 7); i++) { - child = pcidev_path_behind(bridge->link_list, i); + child = pcidev_path_behind(bridge->downstream, i); if (!child || !child->enabled) continue; @@ -250,7 +250,7 @@ /* Program insecure ARI capability on bus 1 */ child_last = NULL; for (i = 0; i <= PCI_DEVFN(0x1f, 7); i++) { - child = pcidev_path_behind(bridge->link_list, i); + child = pcidev_path_behind(bridge->downstream, i); if (!child) continue; config = child->chip_info; @@ -281,7 +281,7 @@ /* Enable / disable devices and functions on bus 1 */ for (i = 0; i <= PCI_DEVFN(0x1f, 7); i++) { - child = pcidev_path_behind(bridge->link_list, i); + child = pcidev_path_behind(bridge->downstream, i); config = child ? child->chip_info : NULL; if (child && child->enabled && ((config && !config->secure) || !config)) @@ -293,7 +293,7 @@ /* Apply IRQ on PCI devices */ /* UUA */ for (i = 0; i < 4; i++) { - child = pcidev_path_behind(bridge->link_list, + child = pcidev_path_behind(bridge->downstream, PCI_DEVFN(8, i)); if (!child) continue; diff --git a/src/soc/intel/apollolake/chip.c b/src/soc/intel/apollolake/chip.c index 469b9be..15780d0 100644 --- a/src/soc/intel/apollolake/chip.c +++ b/src/soc/intel/apollolake/chip.c @@ -478,7 +478,7 @@ return; } /* Only disable bus 0 devices. */ - for (dev = dev->bus->children; dev; dev = dev->sibling) { + for (dev = dev->upstream->children; dev; dev = dev->sibling) { if (!dev->enabled) disable_dev(dev, silconfig); } diff --git a/src/soc/intel/braswell/southcluster.c b/src/soc/intel/braswell/southcluster.c index a0df97c..2e37280 100644 --- a/src/soc/intel/braswell/southcluster.c +++ b/src/soc/intel/braswell/southcluster.c @@ -117,7 +117,7 @@ continue; current_bdf = irq_dev->path.pci.devfn | - irq_dev->bus->secondary << 8; + irq_dev->upstream->secondary << 8; /* * Step 1: Get the INT_PIN and device structure to look for @@ -132,7 +132,7 @@ original_int_pin = pci_read_config8(irq_dev, PCI_INTERRUPT_PIN); parent_bdf = targ_dev->path.pci.devfn - | targ_dev->bus->secondary << 8; + | targ_dev->upstream->secondary << 8; device_num = PCI_SLOT(parent_bdf); if (ir->pcidev[device_num] == 0) { diff --git a/src/soc/intel/common/block/acpi/pep.c b/src/soc/intel/common/block/acpi/pep.c index 39f9542..a6ae454 100644 --- a/src/soc/intel/common/block/acpi/pep.c +++ b/src/soc/intel/common/block/acpi/pep.c @@ -144,7 +144,7 @@ case DEVICE_PATH_PCI: /* skip external buses*/ - if ((dev->bus->secondary != 0) || (!states_arr)) + if ((dev->upstream->secondary != 0) || (!states_arr)) return ACPI_DEVICE_SLEEP_NONE; for (size_t i = 0; i < size; i++) if (states_arr[i].pci_dev == dev->path.pci.devfn) diff --git a/src/soc/intel/common/block/lpc/lpc.c b/src/soc/intel/common/block/lpc/lpc.c index 994ef9b..dbd982b 100644 --- a/src/soc/intel/common/block/lpc/lpc.c +++ b/src/soc/intel/common/block/lpc/lpc.c @@ -102,10 +102,10 @@ { struct device *child; - if (!dev->link_list) + if (!dev->downstream) return; - for (child = dev->link_list->children; child; child = child->sibling) + for (child = dev->downstream->children; child; child = child->sibling) pch_lpc_loop_resources(child); } diff --git a/src/soc/intel/common/block/pcie/rtd3/rtd3.c b/src/soc/intel/common/block/pcie/rtd3/rtd3.c index 39c82b1..3a7c8b4 100644 --- a/src/soc/intel/common/block/pcie/rtd3/rtd3.c +++ b/src/soc/intel/common/block/pcie/rtd3/rtd3.c @@ -140,7 +140,7 @@ enum pcie_rp_type rp_type, const struct device *dev) { - const struct device *parent = dev->bus->dev; + const struct device *parent = dev->upstream->dev; acpigen_write_method_serialized("_ON", 0); @@ -224,7 +224,7 @@ const struct device *dev) { - const struct device *parent = dev->bus->dev; + const struct device *parent = dev->upstream->dev; acpigen_write_method_serialized("_OFF", 0); @@ -385,7 +385,7 @@ const struct soc_intel_common_block_pcie_rtd3_config *config = config_of(dev); static const char *const power_res_states[] = {"_PR0"}; - const struct device *parent = dev->bus->dev; + const struct device *parent = dev->upstream->dev; const char *scope = acpi_device_path(parent); const struct opregion opregion = OPREGION("PXCS", PCI_CONFIG, 0, 0xff); const struct fieldlist fieldlist[] = { diff --git a/src/soc/intel/common/block/usb4/pcie.c b/src/soc/intel/common/block/usb4/pcie.c index f2414cc..c066647 100644 --- a/src/soc/intel/common/block/usb4/pcie.c +++ b/src/soc/intel/common/block/usb4/pcie.c @@ -19,7 +19,7 @@ int port_id; /* Get parent PCI device */ - parent = dev->bus->dev; + parent = dev->upstream->dev; if (!parent) { printk(BIOS_ERR, "%s: Unable to find parent device\n", __func__); return; diff --git a/src/soc/intel/common/block/xhci/xhci.c b/src/soc/intel/common/block/xhci/xhci.c index ff6fbf0..03ed578 100644 --- a/src/soc/intel/common/block/xhci/xhci.c +++ b/src/soc/intel/common/block/xhci/xhci.c @@ -92,8 +92,8 @@ return; } - while ((hub = dev_bus_each_child(xhci->link_list, hub)) != NULL) { - while ((port = dev_bus_each_child(hub->link_list, port)) != NULL) { + while ((hub = dev_bus_each_child(xhci->downstream, hub)) != NULL) { + while ((port = dev_bus_each_child(hub->downstream, port)) != NULL) { enable = true; config = config_of(port); if (config->type == UPC_TYPE_INTERNAL) { diff --git a/src/soc/intel/denverton_ns/lpc.c b/src/soc/intel/denverton_ns/lpc.c index 7ebca1e..ae923d7 100644 --- a/src/soc/intel/denverton_ns/lpc.c +++ b/src/soc/intel/denverton_ns/lpc.c @@ -275,7 +275,7 @@ /* Swizzle this device if needed */ config = targ_dev->chip_info; - parent_bdf = targ_dev->path.pci.devfn | targ_dev->bus->secondary << 8; + parent_bdf = targ_dev->path.pci.devfn | targ_dev->upstream->secondary << 8; if (is_dnv_swizzled_rp(parent_bdf) && irq_dev != targ_dev) { swiz_int_pin = dnv_get_swizzled_pin(config, parent_bdf, new_int_pin); printk(BIOS_DEBUG, "%s: dnv swizzle %s from %c to %c\n", __func__, @@ -387,7 +387,7 @@ int_line = dnv_get_int_line(irq_dev); printk(BIOS_DEBUG, "%s: %02x:%02x.%d pin %d int line %d\n", __func__, - irq_dev->bus->secondary, devfn >> 3, devfn & 0x7, int_pin, int_line); + irq_dev->upstream->secondary, devfn >> 3, devfn & 0x7, int_pin, int_line); pci_write_config8(irq_dev, PCI_INTERRUPT_LINE, int_line); } diff --git a/src/soc/intel/meteorlake/fsp_params.c b/src/soc/intel/meteorlake/fsp_params.c index c3c47854..971fa33 100644 --- a/src/soc/intel/meteorlake/fsp_params.c +++ b/src/soc/intel/meteorlake/fsp_params.c @@ -760,7 +760,7 @@ for (dev = all_devices; dev; dev = dev->next) { if (!(is_dev_enabled(dev) && dev->path.type == DEVICE_PATH_PCI && - dev->bus->secondary == 0)) + dev->upstream->secondary == 0)) continue; if (dev->path.pci.devfn == PCI_DEVFN_ROOT) { diff --git a/src/soc/intel/skylake/chip.c b/src/soc/intel/skylake/chip.c index f471edb..ea091ce 100644 --- a/src/soc/intel/skylake/chip.c +++ b/src/soc/intel/skylake/chip.c @@ -94,7 +94,7 @@ return NULL; /* Match functions 0 and 1 for possible GPUs on a secondary bus */ - if (dev->bus && dev->bus->secondary > 0) { + if (dev->upstream && dev->upstream->secondary > 0) { switch (PCI_FUNC(dev->path.pci.devfn)) { case 0: return "DEV0"; case 1: return "DEV1"; diff --git a/src/soc/intel/xeon_sp/chip_common.c b/src/soc/intel/xeon_sp/chip_common.c index 845e968..144dba1 100644 --- a/src/soc/intel/xeon_sp/chip_common.c +++ b/src/soc/intel/xeon_sp/chip_common.c @@ -78,7 +78,7 @@ bus->max_subordinate = sr->BusLimit; printk(BIOS_SPEW, "Scanning IIO stack %d: busses %x-%x\n", dev->path.domain.domain, - dev->link_list->secondary, dev->link_list->max_subordinate); + dev->downstream->secondary, dev->downstream->max_subordinate); pci_host_bridge_scan_bus(dev); } @@ -116,14 +116,14 @@ if (!is_pcie_iio_stack_res(ri)) { if (CONFIG(HAVE_IOAT_DOMAINS)) - soc_create_ioat_domains(dn, dev->bus, ri); + soc_create_ioat_domains(dn, dev->upstream, ri); continue; } struct device_path path; path.type = DEVICE_PATH_DOMAIN; path.domain.domain = dn.domain_path; - struct device *iio_domain = alloc_dev(dev->bus, &path); + struct device *iio_domain = alloc_dev(dev->upstream, &path); if (iio_domain == NULL) die("%s: out of memory.\n", __func__); iio_domain->ops = &iio_pcie_domain_ops; diff --git a/src/soc/intel/xeon_sp/cpx/soc_acpi.c b/src/soc/intel/xeon_sp/cpx/soc_acpi.c index 2c19ed1..8b24ba2 100644 --- a/src/soc/intel/xeon_sp/cpx/soc_acpi.c +++ b/src/soc/intel/xeon_sp/cpx/soc_acpi.c @@ -46,7 +46,7 @@ struct iiostack_resource stack_info = {0}; /* Only add RTxx entries once. */ - if (device->bus->secondary != 0 || device->bus->segment_group != 0) + if (device->upstream->secondary != 0 || device->upstream->segment_group != 0) return; get_iiostack_info(&stack_info); diff --git a/src/soc/intel/xeon_sp/skx/soc_acpi.c b/src/soc/intel/xeon_sp/skx/soc_acpi.c index dfbd878..2e2b14a 100644 --- a/src/soc/intel/xeon_sp/skx/soc_acpi.c +++ b/src/soc/intel/xeon_sp/skx/soc_acpi.c @@ -59,7 +59,7 @@ const IIO_UDS *hob = get_iio_uds(); /* Only add RTxx entries once. */ - if (device->bus->secondary != 0) + if (device->upstream->secondary != 0) return; for (int socket = 0, iio = 0; iio < hob->PlatformData.numofIIO; ++socket) { diff --git a/src/soc/intel/xeon_sp/spr/soc_acpi.c b/src/soc/intel/xeon_sp/spr/soc_acpi.c index cb7fe1d..a48302c 100644 --- a/src/soc/intel/xeon_sp/spr/soc_acpi.c +++ b/src/soc/intel/xeon_sp/spr/soc_acpi.c @@ -341,7 +341,7 @@ bool stack_enabled; /* Only add RTxx entries once. */ - if (device->bus->secondary != 0) + if (device->upstream->secondary != 0) return; /* @@ -502,7 +502,7 @@ for (cpu = all_devices; cpu; cpu = cpu->next) { if ((cpu->path.type != DEVICE_PATH_APIC) - || (cpu->bus->dev->path.type != DEVICE_PATH_CPU_CLUSTER)) { + || (cpu->upstream->dev->path.type != DEVICE_PATH_CPU_CLUSTER)) { continue; } if (!cpu->enabled) diff --git a/src/soc/intel/xeon_sp/uncore.c b/src/soc/intel/xeon_sp/uncore.c index 1b232ea..ddc6e82 100644 --- a/src/soc/intel/xeon_sp/uncore.c +++ b/src/soc/intel/xeon_sp/uncore.c @@ -192,7 +192,7 @@ struct range_entry fsp_mem; /* Only add dram resources once. */ - if (dev->bus->secondary != 0 || dev->bus->segment_group != 0) + if (dev->upstream->secondary != 0 || dev->upstream->segment_group != 0) return; /* Read in the MAP registers and report their values. */ diff --git a/src/soc/intel/xeon_sp/uncore_acpi.c b/src/soc/intel/xeon_sp/uncore_acpi.c index e2b47329..75b281b 100644 --- a/src/soc/intel/xeon_sp/uncore_acpi.c +++ b/src/soc/intel/xeon_sp/uncore_acpi.c @@ -225,7 +225,7 @@ uint32_t pcie_seg, bool is_atsr, bool *first) { - const uint32_t bus = bridge_dev->bus->secondary; + const uint32_t bus = bridge_dev->upstream->secondary; const uint32_t dev = PCI_SLOT(bridge_dev->path.pci.devfn); const uint32_t func = PCI_FUNC(bridge_dev->path.pci.devfn); diff --git a/src/southbridge/amd/pi/hudson/lpc.c b/src/southbridge/amd/pi/hudson/lpc.c index 266d75c..66ec824 100644 --- a/src/southbridge/amd/pi/hudson/lpc.c +++ b/src/southbridge/amd/pi/hudson/lpc.c @@ -171,8 +171,8 @@ reg_var[0] = pci_read_config16(dev, 0x64); struct device *child; - if (dev->link_list) { - for (child = dev->link_list->children; child; child = child->sibling) { + if (dev->downstream) { + for (child = dev->downstream->children; child; child = child->sibling) { if (child->enabled && (child->path.type == DEVICE_PATH_PNP)) { struct resource *res; for (res = child->resource_list; res; res = res->next) { diff --git a/src/southbridge/intel/bd82x6x/pcie.c b/src/southbridge/intel/bd82x6x/pcie.c index 13f16f8..a1dd16e 100644 --- a/src/southbridge/intel/bd82x6x/pcie.c +++ b/src/southbridge/intel/bd82x6x/pcie.c @@ -145,8 +145,8 @@ * must be a static device from devicetree.cb. * If one is found assume it's an integrated device and not a PCIe slot. */ - if (dev->link_list) - child = pcidev_path_behind(dev->link_list, PCI_DEVFN(0, 0)); + if (dev->downstream) + child = pcidev_path_behind(dev->downstream, PCI_DEVFN(0, 0)); /* Set slot power limit as configured above */ reg32 = pci_read_config32(dev, cap + PCI_EXP_SLTCAP); diff --git a/src/superio/common/generic.c b/src/superio/common/generic.c index 1758acc..92d8357 100644 --- a/src/superio/common/generic.c +++ b/src/superio/common/generic.c @@ -13,8 +13,8 @@ if (!dev) return; - if (dev->link_list) - assign_resources(dev->link_list); + if (dev->downstream) + assign_resources(dev->downstream); for (res = dev->resource_list; res; res = res->next) { if (!(res->flags & IORESOURCE_ASSIGNED)) @@ -159,8 +159,8 @@ acpigen_write_acquire(mutex, 0xffff); /* Pick one of the children as the generic SIO doesn't have config mode */ - if (dev->link_list && dev->link_list->children) - pnp_ssdt_enter_conf_mode(dev->link_list->children, "^INDX", "^DATA"); + if (dev->downstream && dev->downstream->children) + pnp_ssdt_enter_conf_mode(dev->downstream->children, "^INDX", "^DATA"); /* Backup LDN */ acpigen_write_store(); @@ -178,8 +178,8 @@ acpigen_emit_namestring("^LDN"); /* Pick one of the children as the generic SIO doesn't have config mode */ - if (dev->link_list && dev->link_list->children) - pnp_ssdt_exit_conf_mode(dev->link_list->children, "^INDX", "^DATA"); + if (dev->downstream && dev->downstream->children) + pnp_ssdt_exit_conf_mode(dev->downstream->children, "^INDX", "^DATA"); acpigen_write_release(mutex); } diff --git a/src/superio/common/ssdt.c b/src/superio/common/ssdt.c index 47fbf0c..fd55792 100644 --- a/src/superio/common/ssdt.c +++ b/src/superio/common/ssdt.c @@ -161,7 +161,7 @@ void superio_common_fill_ssdt_generator(const struct device *dev) { - if (!dev || !dev->bus || !dev->bus->dev) { + if (!dev || !dev->upstream || !dev->upstream->dev) { printk(BIOS_CRIT, "BUG: Invalid argument in %s!\n", __func__); return; } @@ -174,11 +174,11 @@ /* Validate devicetree settings */ bool bug = false; - if (dev->bus->dev->path.type != DEVICE_PATH_PNP) { + if (dev->upstream->dev->path.type != DEVICE_PATH_PNP) { bug = true; printk(BIOS_CRIT, "BUG: Parent of device %s is not a PNP device\n", dev_path(dev)); - } else if (dev->bus->dev->path.pnp.port != dev->path.pnp.port) { + } else if (dev->upstream->dev->path.pnp.port != dev->path.pnp.port) { bug = true; printk(BIOS_CRIT, "BUG: Parent of device %s has wrong I/O port\n", dev_path(dev)); diff --git a/src/superio/nuvoton/npcd378/superio.c b/src/superio/nuvoton/npcd378/superio.c index a4759fb..ddf63cd 100644 --- a/src/superio/nuvoton/npcd378/superio.c +++ b/src/superio/nuvoton/npcd378/superio.c @@ -356,7 +356,7 @@ /* Method (SIOH, 0, NotSerialized) */ acpigen_write_method("_L08", 0); acpigen_emit_byte(AND_OP); - acpigen_emit_namestring(acpi_device_path_join(dev->bus->dev, "PMFG")); + acpigen_emit_namestring(acpi_device_path_join(dev->upstream->dev, "PMFG")); acpigen_write_integer(0xE8); acpigen_emit_byte(LOCAL0_OP); @@ -366,13 +366,13 @@ acpigen_emit_byte(ZERO_OP); acpigen_emit_byte(NOTIFY_OP); - acpigen_emit_namestring(acpi_device_path_join(dev->bus->dev, "L060")); + acpigen_emit_namestring(acpi_device_path_join(dev->upstream->dev, "L060")); acpigen_write_integer(2); acpigen_pop_len(); /* Pop If */ acpigen_emit_byte(AND_OP); - acpigen_emit_namestring(acpi_device_path_join(dev->bus->dev, "PMFG")); + acpigen_emit_namestring(acpi_device_path_join(dev->upstream->dev, "PMFG")); acpigen_write_integer(0x10); acpigen_emit_byte(LOCAL0_OP); @@ -382,7 +382,7 @@ acpigen_emit_byte(ZERO_OP); acpigen_emit_byte(NOTIFY_OP); - acpigen_emit_namestring(acpi_device_path_join(dev->bus->dev, "L050")); + acpigen_emit_namestring(acpi_device_path_join(dev->upstream->dev, "L050")); acpigen_write_integer(2); acpigen_pop_len(); /* Pop If */ diff --git a/src/vendorcode/amd/opensil/genoa_poc/mpio/chip.c b/src/vendorcode/amd/opensil/genoa_poc/mpio/chip.c index 9e9e886..50e96c9 100644 --- a/src/vendorcode/amd/opensil/genoa_poc/mpio/chip.c +++ b/src/vendorcode/amd/opensil/genoa_poc/mpio/chip.c @@ -129,7 +129,7 @@ struct vendorcode_amd_opensil_genoa_poc_mpio_config *const config) { static uint32_t slot_num; - const uint32_t domain = dev->bus->dev->path.domain.domain; + const uint32_t domain = dev->upstream->dev->path.domain.domain; const uint32_t devfn = dev->path.pci.devfn; printk(BIOS_DEBUG, "Setting MPIO port for domain 0x%x, PCI %d:%d\n", domain, PCI_SLOT(devfn), PCI_FUNC(devfn)); @@ -189,6 +189,6 @@ /* Find all devices with this chip that are directly below the chip */ for (struct device *dev = &dev_root; dev; dev = dev->next) if (dev->chip_ops == &vendorcode_amd_opensil_genoa_poc_mpio_ops && - dev->chip_info != dev->bus->dev->chip_info) - per_device_config(mpio_data, dev->bus->dev, dev->chip_info); + dev->chip_info != dev->upstream->dev->chip_info) + per_device_config(mpio_data, dev->upstream->dev, dev->chip_info); } diff --git a/util/sconfig/main.c b/util/sconfig/main.c index 533c9fb..04f78a4 100644 --- a/util/sconfig/main.c +++ b/util/sconfig/main.c @@ -1229,7 +1229,7 @@ else fprintf(fil, "\t.ops = NULL,\n"); fprintf(fil, "#endif\n"); - fprintf(fil, "\t.bus = &%s_bus,\n", ptr->parent->dev->name); + fprintf(fil, "\t.upstream = &%s_bus,\n", ptr->parent->dev->name); fprintf(fil, "\t.path = {"); fprintf(fil, ptr->path, ptr->path_a, ptr->path_b); fprintf(fil, "},\n"); @@ -1250,10 +1250,10 @@ ptr->name); } if (has_children) - fprintf(fil, "\t.link_list = &%s_bus,\n", + fprintf(fil, "\t.downstream = &%s_bus,\n", ptr->name); else - fprintf(fil, "\t.link_list = NULL,\n"); + fprintf(fil, "\t.downstream = NULL,\n"); if (ptr->sibling) fprintf(fil, "\t.sibling = &%s,\n", ptr->sibling->name); else -- To view, visit https://review.coreboot.org/c/coreboot/+/78330?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: main Gerrit-Change-Id: I80a81b6b8606e450ff180add9439481ec28c2420 Gerrit-Change-Number: 78330 Gerrit-PatchSet: 26 Gerrit-Owner: Arthur Heymans <arthur(a)aheymans.xyz> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Arthur Heymans <arthur(a)aheymans.xyz> Gerrit-Reviewer: Caveh Jalali <caveh(a)chromium.org> Gerrit-Reviewer: Chen, Gang C <gang.c.chen(a)intel.com> Gerrit-Reviewer: Christian Walter <christian.walter(a)9elements.com> Gerrit-Reviewer: Cliff Huang <cliff.huang(a)intel.com> Gerrit-Reviewer: Dinesh Gehlot <digehlot(a)google.com> Gerrit-Reviewer: Eran Mitrani <mitrani(a)google.com> Gerrit-Reviewer: Eric Lai <ericllai(a)google.com> Gerrit-Reviewer: Felix Held <felix-coreboot(a)felixheld.de> Gerrit-Reviewer: Forest Mittelberg <bmbm(a)google.com> Gerrit-Reviewer: Fred Reitberger <reitbergerfred(a)gmail.com> Gerrit-Reviewer: Jakub Czapiga <czapiga(a)google.com> Gerrit-Reviewer: Jason Glenesk <jason.glenesk(a)gmail.com> Gerrit-Reviewer: Jason Nien <jason.nien(a)amd.corp-partner.google.com> Gerrit-Reviewer: Jeff Daly <jeffd(a)silicom-usa.com> Gerrit-Reviewer: Jincheng Li <jincheng.li(a)intel.com> Gerrit-Reviewer: Johnny Lin <Johnny_Lin(a)wiwynn.com> Gerrit-Reviewer: Jérémy Compostella <jeremy.compostella(a)intel.com> Gerrit-Reviewer: Kapil Porwal <kapilporwal(a)google.com> Gerrit-Reviewer: Lance Zhao <lance.zhao(a)gmail.com> Gerrit-Reviewer: Martin L Roth <gaumless(a)gmail.com> Gerrit-Reviewer: Martin Roth <martin.roth(a)amd.corp-partner.google.com> Gerrit-Reviewer: Matt DeVillier <matt.devillier(a)amd.corp-partner.google.com> Gerrit-Reviewer: Michał Żygowski <michal.zygowski(a)3mdeb.com> Gerrit-Reviewer: Nick Vaccaro <nvaccaro(a)chromium.org> Gerrit-Reviewer: Piotr Król <piotr.krol(a)3mdeb.com> Gerrit-Reviewer: Sean Rhodes <sean(a)starlabs.systems> Gerrit-Reviewer: Shuo Liu <shuo.liu(a)intel.com> Gerrit-Reviewer: Subrata Banik <subratabanik(a)google.com> Gerrit-Reviewer: Tarun <tstuli(a)gmail.com> Gerrit-Reviewer: Tim Chu <Tim.Chu(a)quantatw.com> Gerrit-Reviewer: Tim Wawrzynczak <inforichland(a)gmail.com> Gerrit-Reviewer: Vanessa Eusebio <vanessa.f.eusebio(a)intel.com> Gerrit-Reviewer: Varshit Pandya <pandyavarshit(a)gmail.com> Gerrit-Reviewer: Werner Zeh <werner.zeh(a)siemens.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-MessageType: merged

1 0

[XS] Change in coreboot[main]: mb/google/rex/variants/deku: correct GPIO E08 and E22 configuration
by Felix Held (Code Review) 31 Jan '24

31 Jan '24

Felix Held has submitted this change. ( https://review.coreboot.org/c/coreboot/+/80238?usp=email ) Change subject: mb/google/rex/variants/deku: correct GPIO E08 and E22 configuration ...................................................................... mb/google/rex/variants/deku: correct GPIO E08 and E22 configuration GPP_E08 and GPP_E22 were set incorrectly previously. This CL corrects these settings according to schematics. BUG=b:305793886 TEST=Built FW image correctly. Signed-off-by: Eran Mitrani <mitrani(a)google.com> Change-Id: I8e427350e1ee564f9d6566bdfe1f42c92c87a711 Reviewed-on: https://review.coreboot.org/c/coreboot/+/80238 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Subrata Banik <subratabanik(a)google.com> --- M src/mainboard/google/rex/variants/deku/gpio.c 1 file changed, 4 insertions(+), 4 deletions(-) Approvals: Subrata Banik: Looks good to me, approved build bot (Jenkins): Verified diff --git a/src/mainboard/google/rex/variants/deku/gpio.c b/src/mainboard/google/rex/variants/deku/gpio.c index 7648f81..ba5bc17 100644 --- a/src/mainboard/google/rex/variants/deku/gpio.c +++ b/src/mainboard/google/rex/variants/deku/gpio.c @@ -206,8 +206,8 @@ PAD_NC(GPP_E06, NONE), /* GPP_E07 : net NC is not present in the given design */ PAD_NC(GPP_E07, NONE), - /* GPP_E08 : [] ==> SOC_GPP_E08 */ - PAD_NC(GPP_E08, NONE), + /* GPP_E08 : [] ==> USB_C0_AUX_DC_N */ + PAD_CFG_NF(GPP_E08, NONE, DEEP, NF6), /* GPP_E09 : [] ==> USB_C_OC_ODL */ PAD_CFG_NF_LOCK(GPP_E09, NONE, NF1, LOCK_CONFIG), /* GPP_E10 : net NC is not present in the given design */ @@ -226,8 +226,8 @@ PAD_NC(GPP_E16, NONE), /* GPP_E17 : net NC is not present in the given design */ PAD_NC(GPP_E17, NONE), - /* GPP_E22 : net NC is not present in the given design */ - PAD_NC(GPP_E22, NONE), + /* GPP_E22 : [] ==> USB_C0_AUX_DC_P */ + PAD_CFG_NF(GPP_E22, NONE, DEEP, NF6), /* GPP_F00 : [] ==> CNV_BRI_DT_R */ PAD_CFG_NF_IOSTANDBY_IGNORE(GPP_F00, NONE, DEEP, NF1), -- To view, visit https://review.coreboot.org/c/coreboot/+/80238?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: main Gerrit-Change-Id: I8e427350e1ee564f9d6566bdfe1f42c92c87a711 Gerrit-Change-Number: 80238 Gerrit-PatchSet: 2 Gerrit-Owner: Eran Mitrani <mitrani(a)google.com> Gerrit-Reviewer: Dinesh Gehlot <digehlot(a)google.com> Gerrit-Reviewer: Felix Held <felix-coreboot(a)felixheld.de> Gerrit-Reviewer: Jakub Czapiga <czapiga(a)google.com> Gerrit-Reviewer: Kapil Porwal <kapilporwal(a)google.com> Gerrit-Reviewer: Subrata Banik <subratabanik(a)google.com> Gerrit-Reviewer: Tarun <tstuli(a)gmail.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-MessageType: merged

1 0

[S] Change in coreboot[main]: soc/intel/alderlake: Add ADL N MCH ID 0x4618
by Sean Rhodes (Code Review) 31 Jan '24

31 Jan '24

Attention is currently required from: Subrata Banik. Sean Rhodes has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/80166?usp=email ) Change subject: soc/intel/alderlake: Add ADL N MCH ID 0x4618 ...................................................................... Set Ready For Review -- To view, visit https://review.coreboot.org/c/coreboot/+/80166?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: main Gerrit-Change-Id: I7b9fc64ccf8e2401dcd55607e8f09b348efb3182 Gerrit-Change-Number: 80166 Gerrit-PatchSet: 5 Gerrit-Owner: Sean Rhodes <sean(a)starlabs.systems> Gerrit-Reviewer: Subrata Banik <subratabanik(a)google.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Subrata Banik <subratabanik(a)google.com> Gerrit-Comment-Date: Wed, 31 Jan 2024 10:27:51 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[S] Change in coreboot[main]: i2c/drivers/generic: Add support for including a rotation matrix
by Sean Rhodes (Code Review) 31 Jan '24

31 Jan '24

Attention is currently required from: Matt DeVillier. Sean Rhodes has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/80179?usp=email ) Change subject: i2c/drivers/generic: Add support for including a rotation matrix ...................................................................... Set Ready For Review -- To view, visit https://review.coreboot.org/c/coreboot/+/80179?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: main Gerrit-Change-Id: Id4a940d999a0e300a6fe21269f18bab6e3c0523c Gerrit-Change-Number: 80179 Gerrit-PatchSet: 2 Gerrit-Owner: Sean Rhodes <sean(a)starlabs.systems> Gerrit-Reviewer: Matt DeVillier <matt.devillier(a)gmail.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Matt DeVillier <matt.devillier(a)gmail.com> Gerrit-Comment-Date: Wed, 31 Jan 2024 10:27:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[S] Change in coreboot[main]: cpu/x86: Add 1GiB pages for memory access up to 512GiB
by Arthur Heymans (Code Review) 31 Jan '24

31 Jan '24

Attention is currently required from: Ashish Kumar Mishra, Jérémy Compostella, Paul Menzel, Subrata Banik, Wonkyu Kim. Arthur Heymans has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/80088?usp=email ) Change subject: cpu/x86: Add 1GiB pages for memory access up to 512GiB ...................................................................... Patch Set 6: (1 comment) Patchset: PS5: > It looks implementation is same but using different macro and different coding style. If we using this coding style, is it ok? I agree to use same coding style to more readable and comparable for both tables. > > BTW, rept 32 will not work for our case for 42bit physical address. So, We need to more pages to access. Just make sure it work with https://review.coreboot.org/c/coreboot/+/56096 in bootblock and the one before which links the page tables into the stage rather than as a separate cbfs file. -- To view, visit https://review.coreboot.org/c/coreboot/+/80088?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: main Gerrit-Change-Id: Id569ae5b50abf5b72e4db33b5e4cd802399e76ec Gerrit-Change-Number: 80088 Gerrit-PatchSet: 6 Gerrit-Owner: Ashish Kumar Mishra <ashish.k.mishra(a)intel.com> Gerrit-Reviewer: Arthur Heymans <arthur(a)aheymans.xyz> Gerrit-Reviewer: Jérémy Compostella <jeremy.compostella(a)intel.com> Gerrit-Reviewer: Subrata Banik <subratabanik(a)google.com> Gerrit-Reviewer: Wonkyu Kim <wonkyu.kim(a)intel.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Haribalaraman Ramasubramanian <haribalaraman.r(a)intel.com> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-Attention: Ashish Kumar Mishra <ashish.k.mishra(a)intel.com> Gerrit-Attention: Wonkyu Kim <wonkyu.kim(a)intel.com> Gerrit-Attention: Subrata Banik <subratabanik(a)google.com> Gerrit-Attention: Jérémy Compostella <jeremy.compostella(a)intel.com> Gerrit-Attention: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-Comment-Date: Wed, 31 Jan 2024 10:12:43 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: Ashish Kumar Mishra <ashish.k.mishra(a)intel.com> Comment-In-Reply-To: Wonkyu Kim <wonkyu.kim(a)intel.com> Comment-In-Reply-To: Arthur Heymans <arthur(a)aheymans.xyz> Gerrit-MessageType: comment

1 0

[M] Change in coreboot[main]: mb/google/puff/var/*: Clean up SerialIO/I2C config in overridetree
by Felix Singer (Code Review) 31 Jan '24

31 Jan '24

Attention is currently required from: Matt DeVillier. Felix Singer has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/80164?usp=email ) Change subject: mb/google/puff/var/*: Clean up SerialIO/I2C config in overridetree ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://review.coreboot.org/c/coreboot/+/80164?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: main Gerrit-Change-Id: Ib9d0cf48e405be7c00c553646651fc6f28c4e3f0 Gerrit-Change-Number: 80164 Gerrit-PatchSet: 2 Gerrit-Owner: Matt DeVillier <matt.devillier(a)gmail.com> Gerrit-Reviewer: Felix Singer <service+coreboot-gerrit(a)felixsinger.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Matt DeVillier <matt.devillier(a)gmail.com> Gerrit-Comment-Date: Wed, 31 Jan 2024 10:01:58 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[L] Change in coreboot[main]: mb/google/puff/var/*: Drop redundant device entries in overridetree
by Felix Singer (Code Review) 31 Jan '24

31 Jan '24

Attention is currently required from: Matt DeVillier. Felix Singer has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/80163?usp=email ) Change subject: mb/google/puff/var/*: Drop redundant device entries in overridetree ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://review.coreboot.org/c/coreboot/+/80163?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: main Gerrit-Change-Id: Iada32111367fdc964d6126ee43e261c1feb123cf Gerrit-Change-Number: 80163 Gerrit-PatchSet: 2 Gerrit-Owner: Matt DeVillier <matt.devillier(a)gmail.com> Gerrit-Reviewer: Felix Singer <service+coreboot-gerrit(a)felixsinger.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Matt DeVillier <matt.devillier(a)gmail.com> Gerrit-Comment-Date: Wed, 31 Jan 2024 10:01:53 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[L] Change in coreboot[main]: include/device/device.h: Remove CHIP_NAME() macro
by Felix Singer (Code Review) 31 Jan '24

31 Jan '24

Felix Singer has submitted this change. ( https://review.coreboot.org/c/coreboot/+/80239?usp=email ) Change subject: include/device/device.h: Remove CHIP_NAME() macro ...................................................................... include/device/device.h: Remove CHIP_NAME() macro Macros can be confusing on their own; hiding commas make things worse. This can sometimes be downright misleading. A "good" example would be the code in soc/intel/xeon_sp/spr/chip.c: CHIP_NAME("Intel SapphireRapids-SP").enable_dev = chip_enable_dev, This appears as CHIP_NAME() being some struct when in fact these are defining 2 separate members of the same struct. It was decided to remove this macro altogether, as it does not do anything special and incurs a maintenance burden. Change-Id: Iaed6dfb144bddcf5c43634b0c955c19afce388f0 Signed-off-by: Nicholas Sudsgaard <devel+coreboot(a)nsudsgaard.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/80239 Reviewed-by: Yidi Lin <yidilin(a)google.com> Reviewed-by: Felix Singer <service+coreboot-gerrit(a)felixsinger.de> Reviewed-by: Jakub Czapiga <czapiga(a)google.com> Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Matt DeVillier <matt.devillier(a)amd.corp-partner.google.com> --- M src/cpu/amd/pi/00730F01/chip_name.c M src/cpu/intel/haswell/acpi.c M src/cpu/intel/model_1067x/model_1067x_init.c M src/cpu/intel/model_2065x/acpi.c M src/cpu/intel/model_206ax/acpi.c M src/cpu/intel/slot_1/slot_1.c M src/cpu/power9/power9.c M src/cpu/qemu-power8/qemu.c M src/cpu/qemu-x86/qemu.c M src/drivers/acpi/thermal_zone/thermal_zone.c M src/drivers/amd/i2s_machine_dev/i2s_machine_dev.c M src/drivers/crb/tis.c M src/drivers/generic/adau7002/adau7002.c M src/drivers/generic/alc1015/alc1015.c M src/drivers/generic/bayhub/bh720.c M src/drivers/generic/bayhub_lv2/lv2.c M src/drivers/generic/gpio_keys/gpio_keys.c M src/drivers/generic/max98357a/max98357a.c M src/drivers/generic/nau8315/nau8315.c M src/drivers/genesyslogic/gl9750/gl9750.c M src/drivers/genesyslogic/gl9755/gl9755.c M src/drivers/genesyslogic/gl9763e/gl9763e.c M src/drivers/gfx/generic/generic.c M src/drivers/i2c/at24rf08c/at24rf08c.c M src/drivers/i2c/ck505/ck505.c M src/drivers/i2c/cs35l53/cs35l53.c M src/drivers/i2c/cs42l42/cs42l42.c M src/drivers/i2c/da7219/da7219.c M src/drivers/i2c/generic/generic.c M src/drivers/i2c/gpiomux/bus/bus.c M src/drivers/i2c/gpiomux/mux/mux.c M src/drivers/i2c/hid/hid.c M src/drivers/i2c/lm96000/lm96000.c M src/drivers/i2c/max98373/max98373.c M src/drivers/i2c/max98390/max98390.c M src/drivers/i2c/max98396/max98396.c M src/drivers/i2c/max98927/max98927.c M src/drivers/i2c/nau8825/nau8825.c M src/drivers/i2c/nct7802y/nct7802y.c M src/drivers/i2c/pca9538/pca9538.c M src/drivers/i2c/pcf8523/pcf8523.c M src/drivers/i2c/pi608gp/pi608gp.c M src/drivers/i2c/ptn3460/ptn3460.c M src/drivers/i2c/rt1011/rt1011.c M src/drivers/i2c/rt5663/rt5663.c M src/drivers/i2c/rtd2132/rtd2132.c M src/drivers/i2c/rv3028c7/rv3028c7.c M src/drivers/i2c/rx6110sa/rx6110sa.c M src/drivers/i2c/sx9310/sx9310.c M src/drivers/i2c/sx9324/sx9324.c M src/drivers/i2c/sx9360/sx9360.c M src/drivers/i2c/tas5825m/tas5825m.c M src/drivers/i2c/tpm/chip.c M src/drivers/intel/dptf/dptf.c M src/drivers/intel/ish/ish.c M src/drivers/intel/mipi_camera/camera.c M src/drivers/intel/pmc_mux/conn/conn.c M src/drivers/intel/pmc_mux/mux.c M src/drivers/intel/soundwire/soundwire.c M src/drivers/intel/usb4/retimer/retimer.c M src/drivers/ipmi/ipmi_kcs_ops.c M src/drivers/ipmi/ocp/ipmi_ocp.c M src/drivers/lenovo/hybrid_graphics/hybrid_graphics.c M src/drivers/net/atl1e.c M src/drivers/net/phy/m88e1512/m88e1512.c M src/drivers/net/r8168.c M src/drivers/nxp/uwb/uwb.c M src/drivers/pc80/tpm/tis.c M src/drivers/pcie/generic/generic.c M src/drivers/pcie/rtd3/device/chip.c M src/drivers/ricoh/rce822/rce822.c M src/drivers/secunet/dmi/smbios.c M src/drivers/sof/sof.c M src/drivers/soundwire/alc1308/alc1308.c M src/drivers/soundwire/alc5682/alc5682.c M src/drivers/soundwire/alc711/alc711.c M src/drivers/soundwire/cs42l42/cs42l42.c M src/drivers/soundwire/max98363/max98363.c M src/drivers/soundwire/max98373/max98373.c M src/drivers/spi/acpi/acpi.c M src/drivers/uart/acpi/acpi.c M src/drivers/usb/acpi/usb_acpi.c M src/drivers/usb/hub/acpi.c M src/drivers/wifi/generic/generic.c M src/drivers/wwan/fm/acpi_fm350gl.c M src/ec/51nb/npce985la0dx/npce985la0dx.c M src/ec/clevo/it5570e/ec.c M src/ec/compal/ene932/ec.c M src/ec/dell/mec5035/mec5035.c M src/ec/google/chromeec/audio_codec/audio_codec.c M src/ec/google/chromeec/ec_lpc.c M src/ec/google/chromeec/i2c_tunnel/i2c_tunnel.c M src/ec/google/chromeec/mux/conn/conn.c M src/ec/google/chromeec/mux/mux.c M src/ec/google/wilco/chip.c M src/ec/hp/kbc1126/ec.c M src/ec/kontron/it8516e/ec.c M src/ec/kontron/kempld/kempld.c M src/ec/lenovo/h8/h8.c M src/ec/lenovo/pmh7/pmh7.c M src/ec/quanta/ene_kb3940q/ec.c M src/ec/quanta/it8518/ec.c M src/ec/roda/it8518/ec.c M src/ec/smsc/mec1308/ec.c M src/ec/starlabs/merlin/ite.c M src/ec/starlabs/merlin/nuvoton.c M src/include/device/device.h M src/mainboard/emulation/qemu-i440fx/northbridge.c M src/mainboard/supermicro/x10slm-f/mainboard.c M src/northbridge/amd/pi/00730F01/northbridge.c M src/northbridge/intel/e7505/northbridge.c M src/northbridge/intel/gm45/northbridge.c M src/northbridge/intel/haswell/northbridge.c M src/northbridge/intel/i440bx/northbridge.c M src/northbridge/intel/i945/northbridge.c M src/northbridge/intel/ironlake/northbridge.c M src/northbridge/intel/pineview/northbridge.c M src/northbridge/intel/sandybridge/northbridge.c M src/northbridge/intel/x4x/northbridge.c M src/soc/amd/cezanne/chip.c M src/soc/amd/genoa_poc/chip.c M src/soc/amd/glinda/chip.c M src/soc/amd/mendocino/chip.c M src/soc/amd/phoenix/chip.c M src/soc/amd/picasso/chip.c M src/soc/amd/stoneyridge/chip.c M src/soc/cavium/cn81xx/soc.c M src/soc/cavium/common/pci/uart.c M src/soc/intel/alderlake/chip.c M src/soc/intel/apollolake/chip.c M src/soc/intel/baytrail/chip.c M src/soc/intel/braswell/chip.c M src/soc/intel/broadwell/northbridge.c M src/soc/intel/broadwell/pch/pch.c M src/soc/intel/cannonlake/chip.c M src/soc/intel/common/block/pcie/rtd3/rtd3.c M src/soc/intel/common/block/uart/uart.c M src/soc/intel/common/block/usb4/pcie.c M src/soc/intel/denverton_ns/chip.c M src/soc/intel/elkhartlake/chip.c M src/soc/intel/jasperlake/chip.c M src/soc/intel/meteorlake/chip.c M src/soc/intel/skylake/chip.c M src/soc/intel/tigerlake/chip.c M src/soc/intel/xeon_sp/cpx/chip.c M src/soc/intel/xeon_sp/skx/chip.c M src/soc/intel/xeon_sp/spr/chip.c M src/soc/mediatek/mt8173/soc.c M src/soc/mediatek/mt8183/soc.c M src/soc/mediatek/mt8186/soc.c M src/soc/mediatek/mt8188/soc.c M src/soc/mediatek/mt8192/soc.c M src/soc/mediatek/mt8195/soc.c M src/soc/nvidia/tegra124/soc.c M src/soc/nvidia/tegra210/soc.c M src/soc/qualcomm/ipq40xx/soc.c M src/soc/qualcomm/ipq806x/soc.c M src/soc/qualcomm/qcs405/soc.c M src/soc/qualcomm/sc7180/soc.c M src/soc/qualcomm/sc7280/soc.c M src/soc/rockchip/rk3288/soc.c M src/soc/rockchip/rk3399/soc.c M src/soc/samsung/exynos5250/cpu.c M src/soc/samsung/exynos5420/cpu.c M src/soc/sifive/fu540/chip.c M src/soc/ti/am335x/soc.c M src/soc/ucb/riscv/chip.c M src/southbridge/amd/pi/hudson/hudson.c M src/southbridge/intel/bd82x6x/pch.c M src/southbridge/intel/i82371eb/i82371eb.c M src/southbridge/intel/i82801dx/i82801dx.c M src/southbridge/intel/i82801gx/i82801gx.c M src/southbridge/intel/i82801ix/i82801ix.c M src/southbridge/intel/i82801jx/i82801jx.c M src/southbridge/intel/i82870/pcibridge.c M src/southbridge/intel/ibexpeak/pch.c M src/southbridge/intel/lynxpoint/pch.c M src/southbridge/ricoh/rl5c476/rl5c476.c M src/southbridge/ti/pci1x2x/pci1x2x.c M src/southbridge/ti/pci7420/cardbus.c M src/superio/aspeed/ast2400/superio.c M src/superio/common/generic.c M src/superio/fintek/f71808a/superio.c M src/superio/fintek/f71859/superio.c M src/superio/fintek/f71863fg/superio.c M src/superio/fintek/f71869ad/superio.c M src/superio/fintek/f81803a/superio.c M src/superio/fintek/f81865f/superio.c M src/superio/fintek/f81866d/superio.c M src/superio/ite/it8528e/superio.c M src/superio/ite/it8613e/superio.c M src/superio/ite/it8623e/superio.c M src/superio/ite/it8712f/superio.c M src/superio/ite/it8718f/superio.c M src/superio/ite/it8720f/superio.c M src/superio/ite/it8721f/superio.c M src/superio/ite/it8728f/superio.c M src/superio/ite/it8772f/superio.c M src/superio/ite/it8783ef/superio.c M src/superio/ite/it8784e/superio.c M src/superio/ite/it8786e/superio.c M src/superio/nsc/pc87382/superio.c M src/superio/nsc/pc87384/superio.c M src/superio/nsc/pc87392/superio.c M src/superio/nsc/pc87417/superio.c M src/superio/nuvoton/nct5104d/superio.c M src/superio/nuvoton/nct5539d/superio.c M src/superio/nuvoton/nct5572d/superio.c M src/superio/nuvoton/nct6687d/superio.c M src/superio/nuvoton/nct6776/superio.c M src/superio/nuvoton/nct6779d/superio.c M src/superio/nuvoton/nct6791d/superio.c M src/superio/nuvoton/npcd378/superio.c M src/superio/nuvoton/wpcm450/superio.c M src/superio/renesas/m3885x/superio.c M src/superio/smsc/fdc37n972/superio.c M src/superio/smsc/kbc1100/superio.c M src/superio/smsc/lpc47m10x/superio.c M src/superio/smsc/lpc47m15x/superio.c M src/superio/smsc/lpc47n217/superio.c M src/superio/smsc/lpc47n227/superio.c M src/superio/smsc/mec1308/superio.c M src/superio/smsc/sch5545/superio.c M src/superio/smsc/sch555x/ramstage.c M src/superio/smsc/sio1036/superio.c M src/superio/smsc/sio10n268/superio.c M src/superio/smsc/smscsuperio/superio.c M src/superio/winbond/w83627dhg/superio.c M src/superio/winbond/w83627ehg/superio.c M src/superio/winbond/w83627hf/superio.c M src/superio/winbond/w83627thg/superio.c M src/superio/winbond/w83627uhg/superio.c M src/superio/winbond/w83667hg-a/superio.c M src/superio/winbond/w83977tf/superio.c M src/superio/winbond/wpcd376i/superio.c M src/vendorcode/amd/opensil/genoa_poc/mpio/chip.c 236 files changed, 239 insertions(+), 240 deletions(-) Approvals: Matt DeVillier: Looks good to me, approved build bot (Jenkins): Verified Jakub Czapiga: Looks good to me, approved Yidi Lin: Looks good to me, approved Felix Singer: Looks good to me, approved diff --git a/src/cpu/amd/pi/00730F01/chip_name.c b/src/cpu/amd/pi/00730F01/chip_name.c index d5955cc..592fcc0 100644 --- a/src/cpu/amd/pi/00730F01/chip_name.c +++ b/src/cpu/amd/pi/00730F01/chip_name.c @@ -3,5 +3,5 @@ #include <device/device.h> struct chip_operations cpu_amd_pi_00730F01_ops = { - CHIP_NAME("AMD CPU Family 16h Model 30h-3Fh") + .name = "AMD CPU Family 16h Model 30h-3Fh", }; diff --git a/src/cpu/intel/haswell/acpi.c b/src/cpu/intel/haswell/acpi.c index 3727d8a..c8f6a07 100644 --- a/src/cpu/intel/haswell/acpi.c +++ b/src/cpu/intel/haswell/acpi.c @@ -364,5 +364,5 @@ } struct chip_operations cpu_intel_haswell_ops = { - CHIP_NAME("Intel Haswell CPU") + .name = "Intel Haswell CPU", }; diff --git a/src/cpu/intel/model_1067x/model_1067x_init.c b/src/cpu/intel/model_1067x/model_1067x_init.c index 315e7c3..c2019ab 100644 --- a/src/cpu/intel/model_1067x/model_1067x_init.c +++ b/src/cpu/intel/model_1067x/model_1067x_init.c @@ -277,5 +277,5 @@ }; struct chip_operations cpu_intel_model_1067x_ops = { - CHIP_NAME("Intel Penryn CPU") + .name = "Intel Penryn CPU", }; diff --git a/src/cpu/intel/model_2065x/acpi.c b/src/cpu/intel/model_2065x/acpi.c index d8fef62..2dceba1 100644 --- a/src/cpu/intel/model_2065x/acpi.c +++ b/src/cpu/intel/model_2065x/acpi.c @@ -242,5 +242,5 @@ } struct chip_operations cpu_intel_model_2065x_ops = { - CHIP_NAME("Intel Arrandale CPU") + .name = "Intel Arrandale CPU", }; diff --git a/src/cpu/intel/model_206ax/acpi.c b/src/cpu/intel/model_206ax/acpi.c index f3bd67b..75e6755 100644 --- a/src/cpu/intel/model_206ax/acpi.c +++ b/src/cpu/intel/model_206ax/acpi.c @@ -380,5 +380,5 @@ } struct chip_operations cpu_intel_model_206ax_ops = { - CHIP_NAME("Intel SandyBridge/IvyBridge CPU") + .name = "Intel SandyBridge/IvyBridge CPU", }; diff --git a/src/cpu/intel/slot_1/slot_1.c b/src/cpu/intel/slot_1/slot_1.c index 0f5b157..ed8e88c 100644 --- a/src/cpu/intel/slot_1/slot_1.c +++ b/src/cpu/intel/slot_1/slot_1.c @@ -3,5 +3,5 @@ #include <device/device.h> struct chip_operations cpu_intel_slot_1_ops = { - CHIP_NAME("Slot 1 CPU") + .name = "Slot 1 CPU", }; diff --git a/src/cpu/power9/power9.c b/src/cpu/power9/power9.c index fd33ff2..4d68a5f 100644 --- a/src/cpu/power9/power9.c +++ b/src/cpu/power9/power9.c @@ -16,5 +16,5 @@ }; struct chip_operations cpu_power8_qemu_ops = { - CHIP_NAME("POWER9 CPU") + .name = "POWER9 CPU", }; diff --git a/src/cpu/qemu-power8/qemu.c b/src/cpu/qemu-power8/qemu.c index 2da3c9f..8cde9b3 100644 --- a/src/cpu/qemu-power8/qemu.c +++ b/src/cpu/qemu-power8/qemu.c @@ -21,5 +21,5 @@ }; struct chip_operations cpu_power8_qemu_ops = { - CHIP_NAME("QEMU POWER8 CPU") + .name = "QEMU POWER8 CPU", }; diff --git a/src/cpu/qemu-x86/qemu.c b/src/cpu/qemu-x86/qemu.c index 06696c8..289854a 100644 --- a/src/cpu/qemu-x86/qemu.c +++ b/src/cpu/qemu-x86/qemu.c @@ -22,5 +22,5 @@ }; struct chip_operations cpu_qemu_x86_ops = { - CHIP_NAME("QEMU x86 CPU") + .name = "QEMU x86 CPU", }; diff --git a/src/drivers/acpi/thermal_zone/thermal_zone.c b/src/drivers/acpi/thermal_zone/thermal_zone.c index 192e2e6..34fa1b8 100644 --- a/src/drivers/acpi/thermal_zone/thermal_zone.c +++ b/src/drivers/acpi/thermal_zone/thermal_zone.c @@ -126,6 +126,6 @@ } struct chip_operations drivers_acpi_thermal_zone_ops = { - CHIP_NAME("ACPI Thermal Zone") + .name = "ACPI Thermal Zone", .enable_dev = thermal_zone_enable_dev, }; diff --git a/src/drivers/amd/i2s_machine_dev/i2s_machine_dev.c b/src/drivers/amd/i2s_machine_dev/i2s_machine_dev.c index 7bd256d..16ae48d 100644 --- a/src/drivers/amd/i2s_machine_dev/i2s_machine_dev.c +++ b/src/drivers/amd/i2s_machine_dev/i2s_machine_dev.c @@ -95,6 +95,6 @@ } struct chip_operations drivers_amd_i2s_machine_dev_ops = { - CHIP_NAME("AMD I2S Machine Device") + .name = "AMD I2S Machine Device", .enable_dev = i2s_machine_dev_enable }; diff --git a/src/drivers/crb/tis.c b/src/drivers/crb/tis.c index 2c9128e..a5d7dcc 100644 --- a/src/drivers/crb/tis.c +++ b/src/drivers/crb/tis.c @@ -206,6 +206,6 @@ } struct chip_operations drivers_crb_ops = { - CHIP_NAME("CRB TPM") + .name = "CRB TPM", .enable_dev = enable_dev }; diff --git a/src/drivers/generic/adau7002/adau7002.c b/src/drivers/generic/adau7002/adau7002.c index 63510cd..5917f69 100644 --- a/src/drivers/generic/adau7002/adau7002.c +++ b/src/drivers/generic/adau7002/adau7002.c @@ -67,6 +67,6 @@ } struct chip_operations drivers_generic_adau7002_ops = { - CHIP_NAME("Analog Digital DMIC") + .name = "Analog Digital DMIC", .enable_dev = adau7002_enable }; diff --git a/src/drivers/generic/alc1015/alc1015.c b/src/drivers/generic/alc1015/alc1015.c index ca685d6..7245f0c 100644 --- a/src/drivers/generic/alc1015/alc1015.c +++ b/src/drivers/generic/alc1015/alc1015.c @@ -70,6 +70,6 @@ } struct chip_operations drivers_generic_alc1015_ops = { - CHIP_NAME("ASoC RT1015P Amplifier driver") + .name = "ASoC RT1015P Amplifier driver", .enable_dev = alc1015_enable }; diff --git a/src/drivers/generic/bayhub/bh720.c b/src/drivers/generic/bayhub/bh720.c index 02abc22..5104c35 100644 --- a/src/drivers/generic/bayhub/bh720.c +++ b/src/drivers/generic/bayhub/bh720.c @@ -166,5 +166,5 @@ }; struct chip_operations drivers_generic_bayhub_ops = { - CHIP_NAME("BayHub Technology BH720 PCI to eMMC 5.0 HS200 bridge") + .name = "BayHub Technology BH720 PCI to eMMC 5.0 HS200 bridge", }; diff --git a/src/drivers/generic/bayhub_lv2/lv2.c b/src/drivers/generic/bayhub_lv2/lv2.c index b8d4113..b2b85e1 100644 --- a/src/drivers/generic/bayhub_lv2/lv2.c +++ b/src/drivers/generic/bayhub_lv2/lv2.c @@ -81,5 +81,5 @@ }; struct chip_operations drivers_generic_bayhub_lv2_ops = { - CHIP_NAME("BayHub Technology LV2 PCIe to SD bridge") + .name = "BayHub Technology LV2 PCIe to SD bridge", }; diff --git a/src/drivers/generic/gpio_keys/gpio_keys.c b/src/drivers/generic/gpio_keys/gpio_keys.c index c0fd8de..28e5be5 100644 --- a/src/drivers/generic/gpio_keys/gpio_keys.c +++ b/src/drivers/generic/gpio_keys/gpio_keys.c @@ -120,6 +120,6 @@ } struct chip_operations drivers_generic_gpio_keys_ops = { - CHIP_NAME("GPIO Keys") + .name = "GPIO Keys", .enable_dev = gpio_keys_enable }; diff --git a/src/drivers/generic/max98357a/max98357a.c b/src/drivers/generic/max98357a/max98357a.c index 7a18b98..8ce80f1 100644 --- a/src/drivers/generic/max98357a/max98357a.c +++ b/src/drivers/generic/max98357a/max98357a.c @@ -93,6 +93,6 @@ } struct chip_operations drivers_generic_max98357a_ops = { - CHIP_NAME("Maxim Integrated 98357A Amplifier") + .name = "Maxim Integrated 98357A Amplifier", .enable_dev = max98357a_enable }; diff --git a/src/drivers/generic/nau8315/nau8315.c b/src/drivers/generic/nau8315/nau8315.c index ac2bfd1..8fe4e1f 100644 --- a/src/drivers/generic/nau8315/nau8315.c +++ b/src/drivers/generic/nau8315/nau8315.c @@ -71,6 +71,6 @@ } struct chip_operations drivers_generic_nau8315_ops = { - CHIP_NAME("Nuvoton NAU8315 Amplifier") + .name = "Nuvoton NAU8315 Amplifier", .enable_dev = nau8315_enable }; diff --git a/src/drivers/genesyslogic/gl9750/gl9750.c b/src/drivers/genesyslogic/gl9750/gl9750.c index 8c40c49..92d96be 100644 --- a/src/drivers/genesyslogic/gl9750/gl9750.c +++ b/src/drivers/genesyslogic/gl9750/gl9750.c @@ -50,5 +50,5 @@ }; struct chip_operations drivers_generic_genesyslogic_gl9750_ops = { - CHIP_NAME("Genesys Logic GL9750") + .name = "Genesys Logic GL9750", }; diff --git a/src/drivers/genesyslogic/gl9755/gl9755.c b/src/drivers/genesyslogic/gl9755/gl9755.c index bf4831c..6b8dd7d 100644 --- a/src/drivers/genesyslogic/gl9755/gl9755.c +++ b/src/drivers/genesyslogic/gl9755/gl9755.c @@ -58,5 +58,5 @@ }; struct chip_operations drivers_generic_genesyslogic_gl9755_ops = { - CHIP_NAME("Genesys Logic GL9755") + .name = "Genesys Logic GL9755", }; diff --git a/src/drivers/genesyslogic/gl9763e/gl9763e.c b/src/drivers/genesyslogic/gl9763e/gl9763e.c index a4842e8..140535d 100644 --- a/src/drivers/genesyslogic/gl9763e/gl9763e.c +++ b/src/drivers/genesyslogic/gl9763e/gl9763e.c @@ -66,5 +66,5 @@ }; struct chip_operations drivers_generic_genesyslogic_ops = { - CHIP_NAME("Genesys Logic GL9763E") + .name = "Genesys Logic GL9763E", }; diff --git a/src/drivers/gfx/generic/generic.c b/src/drivers/gfx/generic/generic.c index 0ab1676..e3ae62f 100644 --- a/src/drivers/gfx/generic/generic.c +++ b/src/drivers/gfx/generic/generic.c @@ -160,6 +160,6 @@ } struct chip_operations drivers_gfx_generic_ops = { - CHIP_NAME("Generic Graphics Device") + .name = "Generic Graphics Device", .enable_dev = gfx_enable }; diff --git a/src/drivers/i2c/at24rf08c/at24rf08c.c b/src/drivers/i2c/at24rf08c/at24rf08c.c index ce6aa86..99ea7a4 100644 --- a/src/drivers/i2c/at24rf08c/at24rf08c.c +++ b/src/drivers/i2c/at24rf08c/at24rf08c.c @@ -41,6 +41,6 @@ } struct chip_operations drivers_i2c_at24rf08c_ops = { - CHIP_NAME("AT24RF08C") + .name = "AT24RF08C", .enable_dev = enable_dev, }; diff --git a/src/drivers/i2c/ck505/ck505.c b/src/drivers/i2c/ck505/ck505.c index 58eaec6..db660fe 100644 --- a/src/drivers/i2c/ck505/ck505.c +++ b/src/drivers/i2c/ck505/ck505.c @@ -55,6 +55,6 @@ } struct chip_operations drivers_i2c_ck505_ops = { - CHIP_NAME("CK505 Clock generator") + .name = "CK505 Clock generator", .enable_dev = enable_dev, }; diff --git a/src/drivers/i2c/cs35l53/cs35l53.c b/src/drivers/i2c/cs35l53/cs35l53.c index 9857203..578e272 100644 --- a/src/drivers/i2c/cs35l53/cs35l53.c +++ b/src/drivers/i2c/cs35l53/cs35l53.c @@ -145,6 +145,6 @@ } struct chip_operations drivers_i2c_cs35l53_ops = { - CHIP_NAME("Cirrus Logic CS35L53 Audio Codec") + .name = "Cirrus Logic CS35L53 Audio Codec", .enable_dev = cs35l53_enable }; diff --git a/src/drivers/i2c/cs42l42/cs42l42.c b/src/drivers/i2c/cs42l42/cs42l42.c index dcf83e0..8ccfd77 100644 --- a/src/drivers/i2c/cs42l42/cs42l42.c +++ b/src/drivers/i2c/cs42l42/cs42l42.c @@ -118,6 +118,6 @@ } struct chip_operations drivers_i2c_cs42l42_ops = { - CHIP_NAME("Cirrus Logic CS42l42 Audio Codec") + .name = "Cirrus Logic CS42l42 Audio Codec", .enable_dev = cs42l42_enable }; diff --git a/src/drivers/i2c/da7219/da7219.c b/src/drivers/i2c/da7219/da7219.c index 80c5272..1a149ca 100644 --- a/src/drivers/i2c/da7219/da7219.c +++ b/src/drivers/i2c/da7219/da7219.c @@ -110,6 +110,6 @@ } struct chip_operations drivers_i2c_da7219_ops = { - CHIP_NAME("Dialog Semiconductor DA7219 Audio Codec") + .name = "Dialog Semiconductor DA7219 Audio Codec", .enable_dev = da7219_enable }; diff --git a/src/drivers/i2c/generic/generic.c b/src/drivers/i2c/generic/generic.c index 1a3ec40..2a4acb2 100644 --- a/src/drivers/i2c/generic/generic.c +++ b/src/drivers/i2c/generic/generic.c @@ -229,6 +229,6 @@ } struct chip_operations drivers_i2c_generic_ops = { - CHIP_NAME("I2C Device") + .name = "I2C Device", .enable_dev = i2c_generic_enable }; diff --git a/src/drivers/i2c/gpiomux/bus/bus.c b/src/drivers/i2c/gpiomux/bus/bus.c index 2bdb1030..a6c603a 100644 --- a/src/drivers/i2c/gpiomux/bus/bus.c +++ b/src/drivers/i2c/gpiomux/bus/bus.c @@ -55,6 +55,6 @@ } struct chip_operations drivers_i2c_gpiomux_bus_ops = { - CHIP_NAME("I2C GPIO MUX Bus Device") + .name = "I2C GPIO MUX Bus Device", .enable_dev = i2c_gpiomux_bus_enable }; diff --git a/src/drivers/i2c/gpiomux/mux/mux.c b/src/drivers/i2c/gpiomux/mux/mux.c index fa1b18c..5f79fe5 100644 --- a/src/drivers/i2c/gpiomux/mux/mux.c +++ b/src/drivers/i2c/gpiomux/mux/mux.c @@ -77,6 +77,6 @@ } struct chip_operations drivers_i2c_gpiomux_mux_ops = { - CHIP_NAME("I2C GPIO MUX Device") + .name = "I2C GPIO MUX Device", .enable_dev = i2c_gpiomux_mux_enable }; diff --git a/src/drivers/i2c/hid/hid.c b/src/drivers/i2c/hid/hid.c index 8705c1e..fb3a439 100644 --- a/src/drivers/i2c/hid/hid.c +++ b/src/drivers/i2c/hid/hid.c @@ -90,6 +90,6 @@ } struct chip_operations drivers_i2c_hid_ops = { - CHIP_NAME("I2C HID Device") + .name = "I2C HID Device", .enable_dev = i2c_hid_enable }; diff --git a/src/drivers/i2c/lm96000/lm96000.c b/src/drivers/i2c/lm96000/lm96000.c index a2b7a21..f17d8c0 100644 --- a/src/drivers/i2c/lm96000/lm96000.c +++ b/src/drivers/i2c/lm96000/lm96000.c @@ -215,6 +215,6 @@ } struct chip_operations drivers_i2c_lm96000_ops = { - CHIP_NAME("LM96000") + .name = "LM96000", .enable_dev = lm96000_enable }; diff --git a/src/drivers/i2c/max98373/max98373.c b/src/drivers/i2c/max98373/max98373.c index eb5590d..37a8864 100644 --- a/src/drivers/i2c/max98373/max98373.c +++ b/src/drivers/i2c/max98373/max98373.c @@ -90,6 +90,6 @@ } struct chip_operations drivers_i2c_max98373_ops = { - CHIP_NAME("Maxim MAX98373 Codec") + .name = "Maxim MAX98373 Codec", .enable_dev = max98373_enable }; diff --git a/src/drivers/i2c/max98390/max98390.c b/src/drivers/i2c/max98390/max98390.c index 11acd22..f4c4a70 100644 --- a/src/drivers/i2c/max98390/max98390.c +++ b/src/drivers/i2c/max98390/max98390.c @@ -129,6 +129,6 @@ } struct chip_operations drivers_i2c_max98390_ops = { - CHIP_NAME("Maxim MAX98390 Codec") + .name = "Maxim MAX98390 Codec", .enable_dev = max98390_enable }; diff --git a/src/drivers/i2c/max98396/max98396.c b/src/drivers/i2c/max98396/max98396.c index 5288c4f..6ad3931 100644 --- a/src/drivers/i2c/max98396/max98396.c +++ b/src/drivers/i2c/max98396/max98396.c @@ -96,6 +96,6 @@ } struct chip_operations drivers_i2c_max98396_ops = { - CHIP_NAME("Maxim MAX98396 Codec") + .name = "Maxim MAX98396 Codec", .enable_dev = max98396_enable }; diff --git a/src/drivers/i2c/max98927/max98927.c b/src/drivers/i2c/max98927/max98927.c index e80f569f..9935d10 100644 --- a/src/drivers/i2c/max98927/max98927.c +++ b/src/drivers/i2c/max98927/max98927.c @@ -86,6 +86,6 @@ } struct chip_operations drivers_i2c_max98927_ops = { - CHIP_NAME("Maxim MAX98927 Codec") + .name = "Maxim MAX98927 Codec", .enable_dev = max98927_enable }; diff --git a/src/drivers/i2c/nau8825/nau8825.c b/src/drivers/i2c/nau8825/nau8825.c index 060df7c..9e82538 100644 --- a/src/drivers/i2c/nau8825/nau8825.c +++ b/src/drivers/i2c/nau8825/nau8825.c @@ -103,6 +103,6 @@ } struct chip_operations drivers_i2c_nau8825_ops = { - CHIP_NAME("Nuvoton NAU8825 Codec") + .name = "Nuvoton NAU8825 Codec", .enable_dev = nau8825_enable }; diff --git a/src/drivers/i2c/nct7802y/nct7802y.c b/src/drivers/i2c/nct7802y/nct7802y.c index bb52a3f..f313ef7 100644 --- a/src/drivers/i2c/nct7802y/nct7802y.c +++ b/src/drivers/i2c/nct7802y/nct7802y.c @@ -45,6 +45,6 @@ } struct chip_operations drivers_i2c_nct7802y_ops = { - CHIP_NAME("NCT7802Y") + .name = "NCT7802Y", .enable_dev = nct7802y_enable }; diff --git a/src/drivers/i2c/pca9538/pca9538.c b/src/drivers/i2c/pca9538/pca9538.c index 1658b9e..f8933ec 100644 --- a/src/drivers/i2c/pca9538/pca9538.c +++ b/src/drivers/i2c/pca9538/pca9538.c @@ -49,6 +49,6 @@ } struct chip_operations drivers_i2c_pca9538_ops = { - CHIP_NAME("PCA9538") + .name = "PCA9538", .enable_dev = pca9538_enable }; diff --git a/src/drivers/i2c/pcf8523/pcf8523.c b/src/drivers/i2c/pcf8523/pcf8523.c index 8d368b2..717bc90 100644 --- a/src/drivers/i2c/pcf8523/pcf8523.c +++ b/src/drivers/i2c/pcf8523/pcf8523.c @@ -129,6 +129,6 @@ } struct chip_operations drivers_i2c_pcf8523_ops = { - CHIP_NAME("PCF8523") + .name = "PCF8523", .enable_dev = pcf8523_enable }; diff --git a/src/drivers/i2c/pi608gp/pi608gp.c b/src/drivers/i2c/pi608gp/pi608gp.c index 2c61a80..62d462e 100644 --- a/src/drivers/i2c/pi608gp/pi608gp.c +++ b/src/drivers/i2c/pi608gp/pi608gp.c @@ -188,5 +188,5 @@ }; struct chip_operations drivers_i2c_pi608gp_ops = { - CHIP_NAME("PI7C9X2G608GP") + .name = "PI7C9X2G608GP", }; diff --git a/src/drivers/i2c/ptn3460/ptn3460.c b/src/drivers/i2c/ptn3460/ptn3460.c index 7dee222..93acb18 100644 --- a/src/drivers/i2c/ptn3460/ptn3460.c +++ b/src/drivers/i2c/ptn3460/ptn3460.c @@ -148,7 +148,7 @@ } struct chip_operations drivers_i2c_ptn3460_ops = { - CHIP_NAME("PTN3460") + .name = "PTN3460", .enable_dev = ptn3460_enable }; diff --git a/src/drivers/i2c/rt1011/rt1011.c b/src/drivers/i2c/rt1011/rt1011.c index 9a21748..bf62a6f 100644 --- a/src/drivers/i2c/rt1011/rt1011.c +++ b/src/drivers/i2c/rt1011/rt1011.c @@ -103,6 +103,6 @@ } struct chip_operations drivers_i2c_rt1011_ops = { - CHIP_NAME("Realtek RT1011 Codec") + .name = "Realtek RT1011 Codec", .enable_dev = rt1011_enable }; diff --git a/src/drivers/i2c/rt5663/rt5663.c b/src/drivers/i2c/rt5663/rt5663.c index 9949566..e2341dd 100644 --- a/src/drivers/i2c/rt5663/rt5663.c +++ b/src/drivers/i2c/rt5663/rt5663.c @@ -84,6 +84,6 @@ } struct chip_operations drivers_i2c_rt5663_ops = { - CHIP_NAME("Realtek RT5663 Codec") + .name = "Realtek RT5663 Codec", .enable_dev = rt5663_enable }; diff --git a/src/drivers/i2c/rtd2132/rtd2132.c b/src/drivers/i2c/rtd2132/rtd2132.c index 41dd887..82b032e 100644 --- a/src/drivers/i2c/rtd2132/rtd2132.c +++ b/src/drivers/i2c/rtd2132/rtd2132.c @@ -235,6 +235,6 @@ } struct chip_operations drivers_i2c_rtd2132_ops = { - CHIP_NAME("Realtek RTD2132 LVDS Bridge") + .name = "Realtek RTD2132 LVDS Bridge", .enable_dev = enable_dev, }; diff --git a/src/drivers/i2c/rv3028c7/rv3028c7.c b/src/drivers/i2c/rv3028c7/rv3028c7.c index 87cbc24..0a1e4b6 100644 --- a/src/drivers/i2c/rv3028c7/rv3028c7.c +++ b/src/drivers/i2c/rv3028c7/rv3028c7.c @@ -251,6 +251,6 @@ } struct chip_operations drivers_i2c_rv3028c7_ops = { - CHIP_NAME("RV-3028-C7") + .name = "RV-3028-C7", .enable_dev = rtc_enable }; diff --git a/src/drivers/i2c/rx6110sa/rx6110sa.c b/src/drivers/i2c/rx6110sa/rx6110sa.c index 02b3d9f..ce5051d 100644 --- a/src/drivers/i2c/rx6110sa/rx6110sa.c +++ b/src/drivers/i2c/rx6110sa/rx6110sa.c @@ -239,6 +239,6 @@ } struct chip_operations drivers_i2c_rx6110sa_ops = { - CHIP_NAME("RX6110 SA") + .name = "RX6110 SA", .enable_dev = rx6110sa_enable }; diff --git a/src/drivers/i2c/sx9310/sx9310.c b/src/drivers/i2c/sx9310/sx9310.c index 68aea6c..5094608 100644 --- a/src/drivers/i2c/sx9310/sx9310.c +++ b/src/drivers/i2c/sx9310/sx9310.c @@ -131,6 +131,6 @@ } struct chip_operations drivers_i2c_sx9310_ops = { - CHIP_NAME(I2C_SX9310_ACPI_NAME) + .name = I2C_SX9310_ACPI_NAME, .enable_dev = i2c_sx9310_enable }; diff --git a/src/drivers/i2c/sx9324/sx9324.c b/src/drivers/i2c/sx9324/sx9324.c index 3678491..05aca00 100644 --- a/src/drivers/i2c/sx9324/sx9324.c +++ b/src/drivers/i2c/sx9324/sx9324.c @@ -115,6 +115,6 @@ } struct chip_operations drivers_i2c_sx9324_ops = { - CHIP_NAME(I2C_SX9324_CHIP_NAME) + .name = I2C_SX9324_CHIP_NAME, .enable_dev = i2c_sx9324_enable }; diff --git a/src/drivers/i2c/sx9360/sx9360.c b/src/drivers/i2c/sx9360/sx9360.c index 9ea4c8b..c9de0de 100644 --- a/src/drivers/i2c/sx9360/sx9360.c +++ b/src/drivers/i2c/sx9360/sx9360.c @@ -102,6 +102,6 @@ } struct chip_operations drivers_i2c_sx9360_ops = { - CHIP_NAME(I2C_SX9360_CHIP_NAME) + .name = I2C_SX9360_CHIP_NAME, .enable_dev = i2c_sx9360_enable }; diff --git a/src/drivers/i2c/tas5825m/tas5825m.c b/src/drivers/i2c/tas5825m/tas5825m.c index 39e5575..9f14059 100644 --- a/src/drivers/i2c/tas5825m/tas5825m.c +++ b/src/drivers/i2c/tas5825m/tas5825m.c @@ -75,6 +75,6 @@ } struct chip_operations drivers_i2c_tas5825m_ops = { - CHIP_NAME("TI TAS5825M Amplifier") + .name = "TI TAS5825M Amplifier", .enable_dev = tas5825m_enable_dev, }; diff --git a/src/drivers/i2c/tpm/chip.c b/src/drivers/i2c/tpm/chip.c index 07052f6..a1d7389 100644 --- a/src/drivers/i2c/tpm/chip.c +++ b/src/drivers/i2c/tpm/chip.c @@ -95,6 +95,6 @@ } struct chip_operations drivers_i2c_tpm_ops = { - CHIP_NAME("I2C TPM") + .name = "I2C TPM", .enable_dev = i2c_tpm_enable }; diff --git a/src/drivers/intel/dptf/dptf.c b/src/drivers/intel/dptf/dptf.c index 71a4ec3..bceb0de 100644 --- a/src/drivers/intel/dptf/dptf.c +++ b/src/drivers/intel/dptf/dptf.c @@ -636,6 +636,6 @@ } struct chip_operations drivers_intel_dptf_ops = { - CHIP_NAME("Intel DPTF") + .name = "Intel DPTF", .enable_dev = dptf_enable_dev, }; diff --git a/src/drivers/intel/ish/ish.c b/src/drivers/intel/ish/ish.c index 9711632..6dba46a 100644 --- a/src/drivers/intel/ish/ish.c +++ b/src/drivers/intel/ish/ish.c @@ -97,6 +97,6 @@ }; struct chip_operations drivers_intel_ish_ops = { - CHIP_NAME("Intel ISH Chip") + .name = "Intel ISH Chip", .enable_dev = intel_ish_enable, }; diff --git a/src/drivers/intel/mipi_camera/camera.c b/src/drivers/intel/mipi_camera/camera.c index 00c85a7..77c86ea 100644 --- a/src/drivers/intel/mipi_camera/camera.c +++ b/src/drivers/intel/mipi_camera/camera.c @@ -1033,6 +1033,6 @@ } struct chip_operations drivers_intel_mipi_camera_ops = { - CHIP_NAME("Intel MIPI Camera Device") + .name = "Intel MIPI Camera Device", .enable_dev = camera_enable }; diff --git a/src/drivers/intel/pmc_mux/conn/conn.c b/src/drivers/intel/pmc_mux/conn/conn.c index de8f2be..c2c7199 100644 --- a/src/drivers/intel/pmc_mux/conn/conn.c +++ b/src/drivers/intel/pmc_mux/conn/conn.c @@ -153,7 +153,7 @@ } struct chip_operations drivers_intel_pmc_mux_conn_ops = { - CHIP_NAME("Intel PMC MUX CONN Driver") + .name = "Intel PMC MUX CONN Driver", .enable_dev = conn_enable, }; diff --git a/src/drivers/intel/pmc_mux/mux.c b/src/drivers/intel/pmc_mux/mux.c index e209915..64669f6 100644 --- a/src/drivers/intel/pmc_mux/mux.c +++ b/src/drivers/intel/pmc_mux/mux.c @@ -43,6 +43,6 @@ } struct chip_operations drivers_intel_pmc_mux_ops = { - CHIP_NAME("Intel PMC MUX Driver") + .name = "Intel PMC MUX Driver", .enable_dev = mux_enable, }; diff --git a/src/drivers/intel/soundwire/soundwire.c b/src/drivers/intel/soundwire/soundwire.c index c7e84a5..f9421fc 100644 --- a/src/drivers/intel/soundwire/soundwire.c +++ b/src/drivers/intel/soundwire/soundwire.c @@ -94,6 +94,6 @@ } struct chip_operations drivers_intel_soundwire_ops = { - CHIP_NAME("Intel SoundWire Controller") + .name = "Intel SoundWire Controller", .enable_dev = intel_soundwire_enable }; diff --git a/src/drivers/intel/usb4/retimer/retimer.c b/src/drivers/intel/usb4/retimer/retimer.c index 7fb600d..9704139 100644 --- a/src/drivers/intel/usb4/retimer/retimer.c +++ b/src/drivers/intel/usb4/retimer/retimer.c @@ -460,7 +460,7 @@ } struct chip_operations drivers_intel_usb4_retimer_ops = { - CHIP_NAME("Intel USB4 Retimer") + .name = "Intel USB4 Retimer", .enable_dev = usb4_retimer_enable }; diff --git a/src/drivers/ipmi/ipmi_kcs_ops.c b/src/drivers/ipmi/ipmi_kcs_ops.c index 2e5378f..69db489 100644 --- a/src/drivers/ipmi/ipmi_kcs_ops.c +++ b/src/drivers/ipmi/ipmi_kcs_ops.c @@ -360,6 +360,6 @@ } struct chip_operations drivers_ipmi_ops = { - CHIP_NAME("IPMI KCS") + .name = "IPMI KCS", .enable_dev = enable_dev, }; diff --git a/src/drivers/ipmi/ocp/ipmi_ocp.c b/src/drivers/ipmi/ocp/ipmi_ocp.c index e75edca..0f003af 100644 --- a/src/drivers/ipmi/ocp/ipmi_ocp.c +++ b/src/drivers/ipmi/ocp/ipmi_ocp.c @@ -95,6 +95,6 @@ } struct chip_operations drivers_ipmi_ocp_ops = { - CHIP_NAME("IPMI OCP") + .name = "IPMI OCP", .enable_dev = enable_dev, }; diff --git a/src/drivers/lenovo/hybrid_graphics/hybrid_graphics.c b/src/drivers/lenovo/hybrid_graphics/hybrid_graphics.c index 7a5e20d..1fda1fd 100644 --- a/src/drivers/lenovo/hybrid_graphics/hybrid_graphics.c +++ b/src/drivers/lenovo/hybrid_graphics/hybrid_graphics.c @@ -53,6 +53,6 @@ } struct chip_operations drivers_lenovo_hybrid_graphics_ops = { - CHIP_NAME("Lenovo hybrid graphics driver") + .name = "Lenovo hybrid graphics driver", .enable_dev = lenovo_hybrid_graphics_enable }; diff --git a/src/drivers/net/atl1e.c b/src/drivers/net/atl1e.c index fb9bcde..fe85b83 100644 --- a/src/drivers/net/atl1e.c +++ b/src/drivers/net/atl1e.c @@ -153,5 +153,5 @@ }; struct chip_operations drivers_net_ops = { - CHIP_NAME("Atheros AR8121/AR8113/AR8114") + .name = "Atheros AR8121/AR8113/AR8114", }; diff --git a/src/drivers/net/phy/m88e1512/m88e1512.c b/src/drivers/net/phy/m88e1512/m88e1512.c index 2e8994c..07110c6 100644 --- a/src/drivers/net/phy/m88e1512/m88e1512.c +++ b/src/drivers/net/phy/m88e1512/m88e1512.c @@ -97,5 +97,5 @@ }; struct chip_operations drivers_net_phy_m88e1512_ops = { - CHIP_NAME("88E1512") + .name = "88E1512", }; diff --git a/src/drivers/net/r8168.c b/src/drivers/net/r8168.c index f21edd0..70a0f63 100644 --- a/src/drivers/net/r8168.c +++ b/src/drivers/net/r8168.c @@ -441,5 +441,5 @@ }; struct chip_operations drivers_net_ops = { - CHIP_NAME("Realtek r8168") + .name = "Realtek r8168", }; diff --git a/src/drivers/nxp/uwb/uwb.c b/src/drivers/nxp/uwb/uwb.c index 978edeb..0f5ba47 100644 --- a/src/drivers/nxp/uwb/uwb.c +++ b/src/drivers/nxp/uwb/uwb.c @@ -133,6 +133,6 @@ } struct chip_operations drivers_nxp_uwb_ops = { - CHIP_NAME("NXP UWB Device") + .name = "NXP UWB Device", .enable_dev = nxb_uwb_enable }; diff --git a/src/drivers/pc80/tpm/tis.c b/src/drivers/pc80/tpm/tis.c index 019e4a1..2099bb7 100644 --- a/src/drivers/pc80/tpm/tis.c +++ b/src/drivers/pc80/tpm/tis.c @@ -854,6 +854,6 @@ } struct chip_operations drivers_pc80_tpm_ops = { - CHIP_NAME("LPC TPM") + .name = "LPC TPM", .enable_dev = enable_dev }; diff --git a/src/drivers/pcie/generic/generic.c b/src/drivers/pcie/generic/generic.c index 1873e65..1b7976e 100644 --- a/src/drivers/pcie/generic/generic.c +++ b/src/drivers/pcie/generic/generic.c @@ -68,6 +68,6 @@ } struct chip_operations drivers_pcie_generic_ops = { - CHIP_NAME("PCIe Device") + .name = "PCIe Device", .enable_dev = pcie_generic_enable }; diff --git a/src/drivers/pcie/rtd3/device/chip.c b/src/drivers/pcie/rtd3/device/chip.c index 88b85f1..314aff8 100644 --- a/src/drivers/pcie/rtd3/device/chip.c +++ b/src/drivers/pcie/rtd3/device/chip.c @@ -150,6 +150,6 @@ } struct chip_operations drivers_pcie_rtd3_device_ops = { - CHIP_NAME("PCIe Device w/ Runtime D3") + .name = "PCIe Device w/ Runtime D3", .enable_dev = pcie_rtd3_device_enable }; diff --git a/src/drivers/ricoh/rce822/rce822.c b/src/drivers/ricoh/rce822/rce822.c index c85b4d1..f1cba75 100644 --- a/src/drivers/ricoh/rce822/rce822.c +++ b/src/drivers/ricoh/rce822/rce822.c @@ -58,5 +58,5 @@ }; struct chip_operations drivers_ricoh_rce822_ops = { - CHIP_NAME("RICOH RCE822") + .name = "RICOH RCE822", }; diff --git a/src/drivers/secunet/dmi/smbios.c b/src/drivers/secunet/dmi/smbios.c index f407b51..fb8d75a 100644 --- a/src/drivers/secunet/dmi/smbios.c +++ b/src/drivers/secunet/dmi/smbios.c @@ -91,6 +91,6 @@ } struct chip_operations drivers_secunet_dmi_ops = { - CHIP_NAME("secunet DMI") + .name = "secunet DMI", .enable_dev = enable_dev, }; diff --git a/src/drivers/sof/sof.c b/src/drivers/sof/sof.c index b353790..db945aa 100644 --- a/src/drivers/sof/sof.c +++ b/src/drivers/sof/sof.c @@ -85,6 +85,6 @@ } struct chip_operations drivers_sof_ops = { - CHIP_NAME("SOF") + .name = "SOF", .enable_dev = sof_enable }; diff --git a/src/drivers/soundwire/alc1308/alc1308.c b/src/drivers/soundwire/alc1308/alc1308.c index f16d3a2..5449fe8 100644 --- a/src/drivers/soundwire/alc1308/alc1308.c +++ b/src/drivers/soundwire/alc1308/alc1308.c @@ -146,6 +146,6 @@ } struct chip_operations drivers_soundwire_alc1308_ops = { - CHIP_NAME("Realtek ALC1308 SoundWire Codec") + .name = "Realtek ALC1308 SoundWire Codec", .enable_dev = soundwire_alc1308_enable }; diff --git a/src/drivers/soundwire/alc5682/alc5682.c b/src/drivers/soundwire/alc5682/alc5682.c index c1aaff6..0d8a3ab 100644 --- a/src/drivers/soundwire/alc5682/alc5682.c +++ b/src/drivers/soundwire/alc5682/alc5682.c @@ -174,6 +174,6 @@ } struct chip_operations drivers_soundwire_alc5682_ops = { - CHIP_NAME("Realtek ALC5682 SoundWire Codec") + .name = "Realtek ALC5682 SoundWire Codec", .enable_dev = soundwire_alc5682_enable }; diff --git a/src/drivers/soundwire/alc711/alc711.c b/src/drivers/soundwire/alc711/alc711.c index 34d55c7..cfe28ad 100644 --- a/src/drivers/soundwire/alc711/alc711.c +++ b/src/drivers/soundwire/alc711/alc711.c @@ -151,6 +151,6 @@ } struct chip_operations drivers_soundwire_alc711_ops = { - CHIP_NAME("Realtek ALC711 SoundWire Codec") + .name = "Realtek ALC711 SoundWire Codec", .enable_dev = soundwire_alc711_enable }; diff --git a/src/drivers/soundwire/cs42l42/cs42l42.c b/src/drivers/soundwire/cs42l42/cs42l42.c index 111844c..e7c14cc 100644 --- a/src/drivers/soundwire/cs42l42/cs42l42.c +++ b/src/drivers/soundwire/cs42l42/cs42l42.c @@ -226,6 +226,6 @@ } struct chip_operations drivers_soundwire_cs42l42_ops = { - CHIP_NAME("Cirrus Logic CS42L42 SoundWire Codec") + .name = "Cirrus Logic CS42L42 SoundWire Codec", .enable_dev = soundwire_cs42l42_enable }; diff --git a/src/drivers/soundwire/max98363/max98363.c b/src/drivers/soundwire/max98363/max98363.c index 2963cda..7b90d78 100644 --- a/src/drivers/soundwire/max98363/max98363.c +++ b/src/drivers/soundwire/max98363/max98363.c @@ -136,6 +136,6 @@ } struct chip_operations drivers_soundwire_max98363_ops = { - CHIP_NAME("Maxim MAX98363 SoundWire Codec") + .name = "Maxim MAX98363 SoundWire Codec", .enable_dev = soundwire_max98363_enable }; diff --git a/src/drivers/soundwire/max98373/max98373.c b/src/drivers/soundwire/max98373/max98373.c index fb202fe..e3107c4 100644 --- a/src/drivers/soundwire/max98373/max98373.c +++ b/src/drivers/soundwire/max98373/max98373.c @@ -160,6 +160,6 @@ } struct chip_operations drivers_soundwire_max98373_ops = { - CHIP_NAME("Maxim MAX98373 SoundWire Codec") + .name = "Maxim MAX98373 SoundWire Codec", .enable_dev = soundwire_max98373_enable }; diff --git a/src/drivers/spi/acpi/acpi.c b/src/drivers/spi/acpi/acpi.c index 9b6fd80..b58bc2d 100644 --- a/src/drivers/spi/acpi/acpi.c +++ b/src/drivers/spi/acpi/acpi.c @@ -200,6 +200,6 @@ } struct chip_operations drivers_spi_acpi_ops = { - CHIP_NAME("SPI Device") + .name = "SPI Device", .enable_dev = spi_acpi_enable }; diff --git a/src/drivers/uart/acpi/acpi.c b/src/drivers/uart/acpi/acpi.c index c43dc52..bcf896d 100644 --- a/src/drivers/uart/acpi/acpi.c +++ b/src/drivers/uart/acpi/acpi.c @@ -169,6 +169,6 @@ } struct chip_operations drivers_uart_acpi_ops = { - CHIP_NAME("ACPI UART Device") + .name = "ACPI UART Device", .enable_dev = uart_acpi_enable }; diff --git a/src/drivers/usb/acpi/usb_acpi.c b/src/drivers/usb/acpi/usb_acpi.c index b95ebc9..b463b3b 100644 --- a/src/drivers/usb/acpi/usb_acpi.c +++ b/src/drivers/usb/acpi/usb_acpi.c @@ -127,7 +127,7 @@ } struct chip_operations drivers_usb_acpi_ops = { - CHIP_NAME("USB ACPI Device") + .name = "USB ACPI Device", .enable_dev = usb_acpi_enable }; diff --git a/src/drivers/usb/hub/acpi.c b/src/drivers/usb/hub/acpi.c index 10e38fb6..e26d584 100644 --- a/src/drivers/usb/hub/acpi.c +++ b/src/drivers/usb/hub/acpi.c @@ -85,6 +85,6 @@ } struct chip_operations drivers_usb_hub_ops = { - CHIP_NAME("USB Hub") + .name = "USB Hub", .enable_dev = usb_hub_acpi_enable }; diff --git a/src/drivers/wifi/generic/generic.c b/src/drivers/wifi/generic/generic.c index 19d281f..283b45a 100644 --- a/src/drivers/wifi/generic/generic.c +++ b/src/drivers/wifi/generic/generic.c @@ -67,7 +67,7 @@ } struct chip_operations drivers_wifi_generic_ops = { - CHIP_NAME("WIFI Device") + .name = "WIFI Device", .enable_dev = wifi_generic_enable }; diff --git a/src/drivers/wwan/fm/acpi_fm350gl.c b/src/drivers/wwan/fm/acpi_fm350gl.c index 08f672f..77ff085 100644 --- a/src/drivers/wwan/fm/acpi_fm350gl.c +++ b/src/drivers/wwan/fm/acpi_fm350gl.c @@ -392,6 +392,6 @@ } struct chip_operations drivers_wwan_fm_ops = { - CHIP_NAME("Fibocom FM-350-GL") + .name = "Fibocom FM-350-GL", .enable_dev = wwan_fm350gl_acpi_enable }; diff --git a/src/ec/51nb/npce985la0dx/npce985la0dx.c b/src/ec/51nb/npce985la0dx/npce985la0dx.c index 06db530..d81ea90 100644 --- a/src/ec/51nb/npce985la0dx/npce985la0dx.c +++ b/src/ec/51nb/npce985la0dx/npce985la0dx.c @@ -17,6 +17,6 @@ } struct chip_operations ec_51nb_npce985la0dx_ops = { - CHIP_NAME("51NB EC") + .name = "51NB EC", .enable_dev = ec_51nb_npce985la0dx_ops_enable, }; diff --git a/src/ec/clevo/it5570e/ec.c b/src/ec/clevo/it5570e/ec.c index 4f10750..d49bf36 100644 --- a/src/ec/clevo/it5570e/ec.c +++ b/src/ec/clevo/it5570e/ec.c @@ -123,6 +123,6 @@ } struct chip_operations ec_clevo_it5570e_ops = { - CHIP_NAME("Clevo IT5570E EC") + .name = "Clevo IT5570E EC", .enable_dev = enable_dev, }; diff --git a/src/ec/compal/ene932/ec.c b/src/ec/compal/ene932/ec.c index 6389383..37f26b1 100644 --- a/src/ec/compal/ene932/ec.c +++ b/src/ec/compal/ene932/ec.c @@ -131,6 +131,6 @@ } struct chip_operations ec_compal_ene932_ops = { - CHIP_NAME("COMPAL ENE932 EC") + .name = "COMPAL ENE932 EC", .enable_dev = enable_dev }; diff --git a/src/ec/dell/mec5035/mec5035.c b/src/ec/dell/mec5035/mec5035.c index eec79fb..68b6b2f 100644 --- a/src/ec/dell/mec5035/mec5035.c +++ b/src/ec/dell/mec5035/mec5035.c @@ -131,6 +131,6 @@ } struct chip_operations ec_dell_mec5035_ops = { - CHIP_NAME("MEC5035 EC") + .name = "MEC5035 EC", .enable_dev = mec5035_enable, }; diff --git a/src/ec/google/chromeec/audio_codec/audio_codec.c b/src/ec/google/chromeec/audio_codec/audio_codec.c index 53037eb..a8def98 100644 --- a/src/ec/google/chromeec/audio_codec/audio_codec.c +++ b/src/ec/google/chromeec/audio_codec/audio_codec.c @@ -59,6 +59,6 @@ } struct chip_operations ec_google_chromeec_audio_codec_ops = { - CHIP_NAME("CrosEC Audio Codec Device") + .name = "CrosEC Audio Codec Device", .enable_dev = crosec_audio_codec_enable }; diff --git a/src/ec/google/chromeec/ec_lpc.c b/src/ec/google/chromeec/ec_lpc.c index 080b95d..2a9eabb 100644 --- a/src/ec/google/chromeec/ec_lpc.c +++ b/src/ec/google/chromeec/ec_lpc.c @@ -451,7 +451,7 @@ } struct chip_operations ec_google_chromeec_ops = { - CHIP_NAME("Google Chrome EC") + .name = "Google Chrome EC", .enable_dev = enable_dev, }; diff --git a/src/ec/google/chromeec/i2c_tunnel/i2c_tunnel.c b/src/ec/google/chromeec/i2c_tunnel/i2c_tunnel.c index e61ecfd8..64812d4 100644 --- a/src/ec/google/chromeec/i2c_tunnel/i2c_tunnel.c +++ b/src/ec/google/chromeec/i2c_tunnel/i2c_tunnel.c @@ -65,6 +65,6 @@ } struct chip_operations ec_google_chromeec_i2c_tunnel_ops = { - CHIP_NAME("CrosEC I2C Tunnel Device") + .name = "CrosEC I2C Tunnel Device", .enable_dev = crosec_i2c_tunnel_enable }; diff --git a/src/ec/google/chromeec/mux/conn/conn.c b/src/ec/google/chromeec/mux/conn/conn.c index e179c33..bb3129b 100644 --- a/src/ec/google/chromeec/mux/conn/conn.c +++ b/src/ec/google/chromeec/mux/conn/conn.c @@ -52,6 +52,6 @@ } struct chip_operations ec_google_chromeec_mux_conn_ops = { - CHIP_NAME("CrosEC Type C Mux device") + .name = "CrosEC Type C Mux device", .enable_dev = conn_enable, }; diff --git a/src/ec/google/chromeec/mux/mux.c b/src/ec/google/chromeec/mux/mux.c index 9324d2e..62be238 100644 --- a/src/ec/google/chromeec/mux/mux.c +++ b/src/ec/google/chromeec/mux/mux.c @@ -36,6 +36,6 @@ } struct chip_operations ec_google_chromeec_mux_ops = { - CHIP_NAME("CrosEC Type C Mux device") + .name = "CrosEC Type C Mux device", .enable_dev = mux_enable }; diff --git a/src/ec/google/wilco/chip.c b/src/ec/google/wilco/chip.c index 88d416d..3c70294 100644 --- a/src/ec/google/wilco/chip.c +++ b/src/ec/google/wilco/chip.c @@ -230,6 +230,6 @@ } struct chip_operations ec_google_wilco_ops = { - CHIP_NAME("Google Wilco EC") + .name = "Google Wilco EC", .enable_dev = wilco_ec_enable_dev, }; diff --git a/src/ec/hp/kbc1126/ec.c b/src/ec/hp/kbc1126/ec.c index 8035b94..2a71079 100644 --- a/src/ec/hp/kbc1126/ec.c +++ b/src/ec/hp/kbc1126/ec.c @@ -120,6 +120,6 @@ } struct chip_operations ec_hp_kbc1126_ops = { - CHIP_NAME("SMSC KBC1126 for HP laptops") + .name = "SMSC KBC1126 for HP laptops", .enable_dev = kbc1126_enable }; diff --git a/src/ec/kontron/it8516e/ec.c b/src/ec/kontron/it8516e/ec.c index 5288976..1d67808 100644 --- a/src/ec/kontron/it8516e/ec.c +++ b/src/ec/kontron/it8516e/ec.c @@ -239,6 +239,6 @@ } const struct chip_operations ec_kontron_it8516e_ops = { - CHIP_NAME("Kontron (Fintec/ITE) IT8516E EC") + .name = "Kontron (Fintec/ITE) IT8516E EC", .enable_dev = it8516e_enable }; diff --git a/src/ec/kontron/kempld/kempld.c b/src/ec/kontron/kempld/kempld.c index 9527429..7050ff4 100644 --- a/src/ec/kontron/kempld/kempld.c +++ b/src/ec/kontron/kempld/kempld.c @@ -105,6 +105,6 @@ } struct chip_operations ec_kontron_kempld_ops = { - CHIP_NAME("Kontron KEMPLD") + .name = "Kontron KEMPLD", .enable_dev = kempld_enable_dev, }; diff --git a/src/ec/lenovo/h8/h8.c b/src/ec/lenovo/h8/h8.c index 9b7bcc3..35ca1d9 100644 --- a/src/ec/lenovo/h8/h8.c +++ b/src/ec/lenovo/h8/h8.c @@ -325,6 +325,6 @@ } struct chip_operations ec_lenovo_h8_ops = { - CHIP_NAME("Lenovo H8 EC") + .name = "Lenovo H8 EC", .enable_dev = h8_enable, }; diff --git a/src/ec/lenovo/pmh7/pmh7.c b/src/ec/lenovo/pmh7/pmh7.c index fa24c68..95502f3 100644 --- a/src/ec/lenovo/pmh7/pmh7.c +++ b/src/ec/lenovo/pmh7/pmh7.c @@ -126,6 +126,6 @@ } struct chip_operations ec_lenovo_pmh7_ops = { - CHIP_NAME("Lenovo Power Management Hardware Hub 7") + .name = "Lenovo Power Management Hardware Hub 7", .enable_dev = enable_dev, }; diff --git a/src/ec/quanta/ene_kb3940q/ec.c b/src/ec/quanta/ene_kb3940q/ec.c index 4b4f532..50bdaa3 100644 --- a/src/ec/quanta/ene_kb3940q/ec.c +++ b/src/ec/quanta/ene_kb3940q/ec.c @@ -141,6 +141,6 @@ } struct chip_operations ec_quanta_ene_kb3940q_ops = { - CHIP_NAME("QUANTA EnE KB3940Q EC") + .name = "QUANTA EnE KB3940Q EC", .enable_dev = enable_dev }; diff --git a/src/ec/quanta/it8518/ec.c b/src/ec/quanta/it8518/ec.c index 80aaa5d..dfa8c50 100644 --- a/src/ec/quanta/it8518/ec.c +++ b/src/ec/quanta/it8518/ec.c @@ -154,6 +154,6 @@ } struct chip_operations ec_quanta_it8518_ops = { - CHIP_NAME("QUANTA IT8518 EC") + .name = "QUANTA IT8518 EC", .enable_dev = enable_dev }; diff --git a/src/ec/roda/it8518/ec.c b/src/ec/roda/it8518/ec.c index cbeb210..9f877f7 100644 --- a/src/ec/roda/it8518/ec.c +++ b/src/ec/roda/it8518/ec.c @@ -48,6 +48,6 @@ } struct chip_operations ec_roda_it8518_ops = { - CHIP_NAME("Roda IT8518 EC") + .name = "Roda IT8518 EC", .enable_dev = enable_dev }; diff --git a/src/ec/smsc/mec1308/ec.c b/src/ec/smsc/mec1308/ec.c index fb09aa5..39f3fbe 100644 --- a/src/ec/smsc/mec1308/ec.c +++ b/src/ec/smsc/mec1308/ec.c @@ -112,6 +112,6 @@ } struct chip_operations ec_smsc_mec1308_ops = { - CHIP_NAME("SMSC MEC1308 EC Mailbox Interface") + .name = "SMSC MEC1308 EC Mailbox Interface", .enable_dev = mec1308_enable }; diff --git a/src/ec/starlabs/merlin/ite.c b/src/ec/starlabs/merlin/ite.c index daf5873..dec9766 100644 --- a/src/ec/starlabs/merlin/ite.c +++ b/src/ec/starlabs/merlin/ite.c @@ -322,6 +322,6 @@ } struct chip_operations ec_starlabs_merlin_ops = { - CHIP_NAME("ITE EC") + .name = "ITE EC", .enable_dev = enable_dev }; diff --git a/src/ec/starlabs/merlin/nuvoton.c b/src/ec/starlabs/merlin/nuvoton.c index bad8d1b..d0b119f 100644 --- a/src/ec/starlabs/merlin/nuvoton.c +++ b/src/ec/starlabs/merlin/nuvoton.c @@ -297,6 +297,6 @@ } struct chip_operations ec_starlabs_merlin_ops = { - CHIP_NAME("NUVOTON EC") + .name = "NUVOTON EC", .enable_dev = enable_dev }; diff --git a/src/include/device/device.h b/src/include/device/device.h index b7917e3..7e52f41 100644 --- a/src/include/device/device.h +++ b/src/include/device/device.h @@ -34,8 +34,6 @@ const char *name; }; -#define CHIP_NAME(X) .name = X, - struct bus; struct acpi_rsdp; diff --git a/src/mainboard/emulation/qemu-i440fx/northbridge.c b/src/mainboard/emulation/qemu-i440fx/northbridge.c index 5fe12e7..6c26366 100644 --- a/src/mainboard/emulation/qemu-i440fx/northbridge.c +++ b/src/mainboard/emulation/qemu-i440fx/northbridge.c @@ -276,11 +276,11 @@ } struct chip_operations mainboard_emulation_qemu_i440fx_ops = { - CHIP_NAME("QEMU Northbridge i440fx") + .name = "QEMU Northbridge i440fx", .enable_dev = northbridge_enable, }; struct chip_operations mainboard_emulation_qemu_q35_ops = { - CHIP_NAME("QEMU Northbridge q35") + .name = "QEMU Northbridge q35", .enable_dev = northbridge_enable, }; diff --git a/src/mainboard/supermicro/x10slm-f/mainboard.c b/src/mainboard/supermicro/x10slm-f/mainboard.c index 98548e3..37c1eb4 100644 --- a/src/mainboard/supermicro/x10slm-f/mainboard.c +++ b/src/mainboard/supermicro/x10slm-f/mainboard.c @@ -35,6 +35,6 @@ } struct chip_operations mainboard_ops = { - CHIP_NAME("X10SLM+-F") + .name = "X10SLM+-F", .enable_dev = mainboard_enable, }; diff --git a/src/northbridge/amd/pi/00730F01/northbridge.c b/src/northbridge/amd/pi/00730F01/northbridge.c index 5e82ccd..7e9cfd8 100644 --- a/src/northbridge/amd/pi/00730F01/northbridge.c +++ b/src/northbridge/amd/pi/00730F01/northbridge.c @@ -692,7 +692,7 @@ }; struct chip_operations northbridge_amd_pi_00730F01_ops = { - CHIP_NAME("AMD FAM16 Root Complex") + .name = "AMD FAM16 Root Complex", .final = fam16_finalize, }; diff --git a/src/northbridge/intel/e7505/northbridge.c b/src/northbridge/intel/e7505/northbridge.c index 65a0212..fa29ef5 100644 --- a/src/northbridge/intel/e7505/northbridge.c +++ b/src/northbridge/intel/e7505/northbridge.c @@ -70,5 +70,5 @@ }; struct chip_operations northbridge_intel_e7505_ops = { - CHIP_NAME("Intel E7505 Northbridge") + .name = "Intel E7505 Northbridge", }; diff --git a/src/northbridge/intel/gm45/northbridge.c b/src/northbridge/intel/gm45/northbridge.c index 4bddf20..50d0d89 100644 --- a/src/northbridge/intel/gm45/northbridge.c +++ b/src/northbridge/intel/gm45/northbridge.c @@ -233,7 +233,7 @@ } struct chip_operations northbridge_intel_gm45_ops = { - CHIP_NAME("Intel GM45 Northbridge") + .name = "Intel GM45 Northbridge", .init = gm45_init, }; diff --git a/src/northbridge/intel/haswell/northbridge.c b/src/northbridge/intel/haswell/northbridge.c index ef5b9e9..c544ad3 100644 --- a/src/northbridge/intel/haswell/northbridge.c +++ b/src/northbridge/intel/haswell/northbridge.c @@ -542,5 +542,5 @@ }; struct chip_operations northbridge_intel_haswell_ops = { - CHIP_NAME("Intel Haswell integrated Northbridge") + .name = "Intel Haswell integrated Northbridge", }; diff --git a/src/northbridge/intel/i440bx/northbridge.c b/src/northbridge/intel/i440bx/northbridge.c index 0670f72..d588197 100644 --- a/src/northbridge/intel/i440bx/northbridge.c +++ b/src/northbridge/intel/i440bx/northbridge.c @@ -105,6 +105,6 @@ } struct chip_operations northbridge_intel_i440bx_ops = { - CHIP_NAME("Intel 82443BX (440BX) Northbridge") + .name = "Intel 82443BX (440BX) Northbridge", .enable_dev = enable_dev, }; diff --git a/src/northbridge/intel/i945/northbridge.c b/src/northbridge/intel/i945/northbridge.c index 1dfcc40..34ebcb2 100644 --- a/src/northbridge/intel/i945/northbridge.c +++ b/src/northbridge/intel/i945/northbridge.c @@ -134,7 +134,7 @@ }; struct chip_operations northbridge_intel_i945_ops = { - CHIP_NAME("Intel i945 Northbridge") + .name = "Intel i945 Northbridge", }; bool northbridge_support_slfm(void) diff --git a/src/northbridge/intel/ironlake/northbridge.c b/src/northbridge/intel/ironlake/northbridge.c index 74ddee2..e6bc375 100644 --- a/src/northbridge/intel/ironlake/northbridge.c +++ b/src/northbridge/intel/ironlake/northbridge.c @@ -217,6 +217,6 @@ }; struct chip_operations northbridge_intel_ironlake_ops = { - CHIP_NAME("Intel Ironlake integrated Northbridge") + .name = "Intel Ironlake integrated Northbridge", .init = ironlake_init, }; diff --git a/src/northbridge/intel/pineview/northbridge.c b/src/northbridge/intel/pineview/northbridge.c index a23a0d5..d7a6c84 100644 --- a/src/northbridge/intel/pineview/northbridge.c +++ b/src/northbridge/intel/pineview/northbridge.c @@ -159,6 +159,6 @@ } struct chip_operations northbridge_intel_pineview_ops = { - CHIP_NAME("Intel Pineview Northbridge") + .name = "Intel Pineview Northbridge", .enable_dev = enable_dev, }; diff --git a/src/northbridge/intel/sandybridge/northbridge.c b/src/northbridge/intel/sandybridge/northbridge.c index 6b89710..3db9086 100644 --- a/src/northbridge/intel/sandybridge/northbridge.c +++ b/src/northbridge/intel/sandybridge/northbridge.c @@ -407,5 +407,5 @@ }; struct chip_operations northbridge_intel_sandybridge_ops = { - CHIP_NAME("Intel SandyBridge/IvyBridge integrated Northbridge") + .name = "Intel SandyBridge/IvyBridge integrated Northbridge", }; diff --git a/src/northbridge/intel/x4x/northbridge.c b/src/northbridge/intel/x4x/northbridge.c index 12a7a40..b037cf8 100644 --- a/src/northbridge/intel/x4x/northbridge.c +++ b/src/northbridge/intel/x4x/northbridge.c @@ -154,7 +154,7 @@ } struct chip_operations northbridge_intel_x4x_ops = { - CHIP_NAME("Intel 4-Series Northbridge") + .name = "Intel 4-Series Northbridge", .init = x4x_init, }; diff --git a/src/soc/amd/cezanne/chip.c b/src/soc/amd/cezanne/chip.c index 4be0a82..ffbd94a 100644 --- a/src/soc/amd/cezanne/chip.c +++ b/src/soc/amd/cezanne/chip.c @@ -50,7 +50,7 @@ } struct chip_operations soc_amd_cezanne_ops = { - CHIP_NAME("AMD Cezanne SoC") + .name = "AMD Cezanne SoC", .init = soc_init, .final = soc_final }; diff --git a/src/soc/amd/genoa_poc/chip.c b/src/soc/amd/genoa_poc/chip.c index 83d2bc9..d397800 100644 --- a/src/soc/amd/genoa_poc/chip.c +++ b/src/soc/amd/genoa_poc/chip.c @@ -21,7 +21,7 @@ } struct chip_operations soc_amd_genoa_poc_ops = { - CHIP_NAME("AMD Genoa SoC Proof of Concept") + .name = "AMD Genoa SoC Proof of Concept", .init = soc_init, .final = soc_final, }; diff --git a/src/soc/amd/glinda/chip.c b/src/soc/amd/glinda/chip.c index 0f49f6a..13933c7 100644 --- a/src/soc/amd/glinda/chip.c +++ b/src/soc/amd/glinda/chip.c @@ -52,7 +52,7 @@ } struct chip_operations soc_amd_glinda_ops = { - CHIP_NAME("AMD Glinda SoC") + .name = "AMD Glinda SoC", .init = soc_init, .final = soc_final }; diff --git a/src/soc/amd/mendocino/chip.c b/src/soc/amd/mendocino/chip.c index f724e20..0bb9637 100644 --- a/src/soc/amd/mendocino/chip.c +++ b/src/soc/amd/mendocino/chip.c @@ -50,7 +50,7 @@ } struct chip_operations soc_amd_mendocino_ops = { - CHIP_NAME("AMD Mendocino SoC") + .name = "AMD Mendocino SoC", .init = soc_init, .final = soc_final }; diff --git a/src/soc/amd/phoenix/chip.c b/src/soc/amd/phoenix/chip.c index 173b220..72652ba 100644 --- a/src/soc/amd/phoenix/chip.c +++ b/src/soc/amd/phoenix/chip.c @@ -52,7 +52,7 @@ } struct chip_operations soc_amd_phoenix_ops = { - CHIP_NAME("AMD Phoenix SoC") + .name = "AMD Phoenix SoC", .init = soc_init, .final = soc_final }; diff --git a/src/soc/amd/picasso/chip.c b/src/soc/amd/picasso/chip.c index 4f30582..d896a83 100644 --- a/src/soc/amd/picasso/chip.c +++ b/src/soc/amd/picasso/chip.c @@ -50,7 +50,7 @@ } struct chip_operations soc_amd_picasso_ops = { - CHIP_NAME("AMD Picasso SOC") + .name = "AMD Picasso SOC", .init = soc_init, .final = soc_final }; diff --git a/src/soc/amd/stoneyridge/chip.c b/src/soc/amd/stoneyridge/chip.c index 09cede3..05beaff 100644 --- a/src/soc/amd/stoneyridge/chip.c +++ b/src/soc/amd/stoneyridge/chip.c @@ -100,7 +100,7 @@ } struct chip_operations soc_amd_stoneyridge_ops = { - CHIP_NAME("AMD StoneyRidge SOC") + .name = "AMD StoneyRidge SOC", .init = soc_init, .final = soc_final }; diff --git a/src/soc/cavium/cn81xx/soc.c b/src/soc/cavium/cn81xx/soc.c index ed1441b..5e606d3 100644 --- a/src/soc/cavium/cn81xx/soc.c +++ b/src/soc/cavium/cn81xx/soc.c @@ -394,6 +394,6 @@ } struct chip_operations soc_cavium_cn81xx_ops = { - CHIP_NAME("SOC Cavium CN81XX") + .name = "SOC Cavium CN81XX", .enable_dev = enable_soc_dev, }; diff --git a/src/soc/cavium/common/pci/uart.c b/src/soc/cavium/common/pci/uart.c index 4ee1cdf..af59e2b 100644 --- a/src/soc/cavium/common/pci/uart.c +++ b/src/soc/cavium/common/pci/uart.c @@ -26,5 +26,5 @@ }; struct chip_operations soc_cavium_common_pci_ops = { - CHIP_NAME("Cavium ThunderX UART") + .name = "Cavium ThunderX UART", }; diff --git a/src/soc/intel/alderlake/chip.c b/src/soc/intel/alderlake/chip.c index 0639157..45fb39f 100644 --- a/src/soc/intel/alderlake/chip.c +++ b/src/soc/intel/alderlake/chip.c @@ -286,7 +286,7 @@ } struct chip_operations soc_intel_alderlake_ops = { - CHIP_NAME("Intel Alderlake") + .name = "Intel Alderlake", .enable_dev = &soc_enable, .init = &soc_init_pre_device, }; diff --git a/src/soc/intel/apollolake/chip.c b/src/soc/intel/apollolake/chip.c index 07c2637..469b9be 100644 --- a/src/soc/intel/apollolake/chip.c +++ b/src/soc/intel/apollolake/chip.c @@ -759,7 +759,7 @@ } struct chip_operations soc_intel_apollolake_ops = { - CHIP_NAME("Intel Apollolake SOC") + .name = "Intel Apollolake SOC", .enable_dev = &enable_dev, .init = &soc_init, .final = &soc_final diff --git a/src/soc/intel/baytrail/chip.c b/src/soc/intel/baytrail/chip.c index 592e178..fdfd129 100644 --- a/src/soc/intel/baytrail/chip.c +++ b/src/soc/intel/baytrail/chip.c @@ -43,7 +43,7 @@ } struct chip_operations soc_intel_baytrail_ops = { - CHIP_NAME("Intel BayTrail SoC") + .name = "Intel BayTrail SoC", .enable_dev = enable_dev, .init = soc_init, }; diff --git a/src/soc/intel/braswell/chip.c b/src/soc/intel/braswell/chip.c index d3c41f8..407b6ea 100644 --- a/src/soc/intel/braswell/chip.c +++ b/src/soc/intel/braswell/chip.c @@ -294,7 +294,7 @@ } struct chip_operations soc_intel_braswell_ops = { - CHIP_NAME("Intel Braswell SoC") + .name = "Intel Braswell SoC", .enable_dev = enable_dev, .init = soc_init, }; diff --git a/src/soc/intel/broadwell/northbridge.c b/src/soc/intel/broadwell/northbridge.c index 6525275..3d2574b 100644 --- a/src/soc/intel/broadwell/northbridge.c +++ b/src/soc/intel/broadwell/northbridge.c @@ -419,6 +419,6 @@ } struct chip_operations soc_intel_broadwell_ops = { - CHIP_NAME("Intel Broadwell") + .name = "Intel Broadwell", .init = &broadwell_init_pre_device, }; diff --git a/src/soc/intel/broadwell/pch/pch.c b/src/soc/intel/broadwell/pch/pch.c index 98fbc46..ddb51cc 100644 --- a/src/soc/intel/broadwell/pch/pch.c +++ b/src/soc/intel/broadwell/pch/pch.c @@ -196,7 +196,7 @@ } struct chip_operations soc_intel_broadwell_pch_ops = { - CHIP_NAME("Intel Broadwell PCH") + .name = "Intel Broadwell PCH", .enable_dev = &broadwell_pch_enable_dev, }; diff --git a/src/soc/intel/cannonlake/chip.c b/src/soc/intel/cannonlake/chip.c index 0da6e40..bda66bd 100644 --- a/src/soc/intel/cannonlake/chip.c +++ b/src/soc/intel/cannonlake/chip.c @@ -206,7 +206,7 @@ } struct chip_operations soc_intel_cannonlake_ops = { - CHIP_NAME("Intel Cannonlake") + .name = "Intel Cannonlake", .enable_dev = &soc_enable, .init = &soc_init_pre_device, }; diff --git a/src/soc/intel/common/block/pcie/rtd3/rtd3.c b/src/soc/intel/common/block/pcie/rtd3/rtd3.c index abd7e466..39c82b1 100644 --- a/src/soc/intel/common/block/pcie/rtd3/rtd3.c +++ b/src/soc/intel/common/block/pcie/rtd3/rtd3.c @@ -567,6 +567,6 @@ } struct chip_operations soc_intel_common_block_pcie_rtd3_ops = { - CHIP_NAME("Intel PCIe Runtime D3") + .name = "Intel PCIe Runtime D3", .enable_dev = pcie_rtd3_acpi_enable }; diff --git a/src/soc/intel/common/block/uart/uart.c b/src/soc/intel/common/block/uart/uart.c index 533fbee..c03f5a9 100644 --- a/src/soc/intel/common/block/uart/uart.c +++ b/src/soc/intel/common/block/uart/uart.c @@ -433,7 +433,7 @@ } struct chip_operations soc_intel_common_block_uart_ops = { - CHIP_NAME("LPSS UART in ACPI mode") + .name = "LPSS UART in ACPI mode", .enable_dev = uart_enable }; diff --git a/src/soc/intel/common/block/usb4/pcie.c b/src/soc/intel/common/block/usb4/pcie.c index 0139647..f2414cc 100644 --- a/src/soc/intel/common/block/usb4/pcie.c +++ b/src/soc/intel/common/block/usb4/pcie.c @@ -81,6 +81,6 @@ } struct chip_operations soc_intel_common_block_usb4_ops = { - CHIP_NAME("Intel USB4 PCIe Root Port") + .name = "Intel USB4 PCIe Root Port", .enable_dev = usb4_pcie_acpi_enable }; diff --git a/src/soc/intel/denverton_ns/chip.c b/src/soc/intel/denverton_ns/chip.c index 1a4341e..1016460 100644 --- a/src/soc/intel/denverton_ns/chip.c +++ b/src/soc/intel/denverton_ns/chip.c @@ -187,7 +187,7 @@ } struct chip_operations soc_intel_denverton_ns_ops = { - CHIP_NAME("Intel Denverton-NS SOC") + .name = "Intel Denverton-NS SOC", .enable_dev = soc_enable_dev, .init = soc_init, .final = soc_final diff --git a/src/soc/intel/elkhartlake/chip.c b/src/soc/intel/elkhartlake/chip.c index 194591d..f9e4e0e 100644 --- a/src/soc/intel/elkhartlake/chip.c +++ b/src/soc/intel/elkhartlake/chip.c @@ -159,7 +159,7 @@ } struct chip_operations soc_intel_elkhartlake_ops = { - CHIP_NAME("Intel Elkhartlake") + .name = "Intel Elkhartlake", .enable_dev = &soc_enable, .init = &soc_init_pre_device, }; diff --git a/src/soc/intel/jasperlake/chip.c b/src/soc/intel/jasperlake/chip.c index c049163f..7b185c3 100644 --- a/src/soc/intel/jasperlake/chip.c +++ b/src/soc/intel/jasperlake/chip.c @@ -170,7 +170,7 @@ } struct chip_operations soc_intel_jasperlake_ops = { - CHIP_NAME("Intel Jasperlake") + .name = "Intel Jasperlake", .enable_dev = &soc_enable, .init = &soc_init_pre_device, }; diff --git a/src/soc/intel/meteorlake/chip.c b/src/soc/intel/meteorlake/chip.c index be957cc..03adfdb 100644 --- a/src/soc/intel/meteorlake/chip.c +++ b/src/soc/intel/meteorlake/chip.c @@ -276,7 +276,7 @@ } struct chip_operations soc_intel_meteorlake_ops = { - CHIP_NAME("Intel Meteorlake") + .name = "Intel Meteorlake", .enable_dev = &soc_enable, .init = &soc_init_pre_device, .final = &soc_init_final_device, diff --git a/src/soc/intel/skylake/chip.c b/src/soc/intel/skylake/chip.c index 8df1ad3..f471edb 100644 --- a/src/soc/intel/skylake/chip.c +++ b/src/soc/intel/skylake/chip.c @@ -212,7 +212,7 @@ } struct chip_operations soc_intel_skylake_ops = { - CHIP_NAME("Intel 6th Gen") + .name = "Intel 6th Gen", .enable_dev = &soc_enable, .init = &soc_init_pre_device, }; diff --git a/src/soc/intel/tigerlake/chip.c b/src/soc/intel/tigerlake/chip.c index dd24679..c94e727 100644 --- a/src/soc/intel/tigerlake/chip.c +++ b/src/soc/intel/tigerlake/chip.c @@ -222,7 +222,7 @@ } struct chip_operations soc_intel_tigerlake_ops = { - CHIP_NAME("Intel Tigerlake") + .name = "Intel Tigerlake", .enable_dev = &soc_enable, .init = &soc_init_pre_device, }; diff --git a/src/soc/intel/xeon_sp/cpx/chip.c b/src/soc/intel/xeon_sp/cpx/chip.c index 39a7eba..1e84dd5 100644 --- a/src/soc/intel/xeon_sp/cpx/chip.c +++ b/src/soc/intel/xeon_sp/cpx/chip.c @@ -186,7 +186,7 @@ } struct chip_operations soc_intel_xeon_sp_cpx_ops = { - CHIP_NAME("Intel Cooper Lake-SP") + .name = "Intel Cooper Lake-SP", .enable_dev = chip_enable_dev, .init = chip_init, .final = chip_final, diff --git a/src/soc/intel/xeon_sp/skx/chip.c b/src/soc/intel/xeon_sp/skx/chip.c index b468842..68737ed 100644 --- a/src/soc/intel/xeon_sp/skx/chip.c +++ b/src/soc/intel/xeon_sp/skx/chip.c @@ -89,7 +89,7 @@ } struct chip_operations soc_intel_xeon_sp_skx_ops = { - CHIP_NAME("Intel Skylake-SP") + .name = "Intel Skylake-SP", .enable_dev = soc_enable_dev, .init = soc_init, .final = soc_final diff --git a/src/soc/intel/xeon_sp/spr/chip.c b/src/soc/intel/xeon_sp/spr/chip.c index 3b3c65e..abab0d2 100644 --- a/src/soc/intel/xeon_sp/spr/chip.c +++ b/src/soc/intel/xeon_sp/spr/chip.c @@ -159,7 +159,8 @@ } struct chip_operations soc_intel_xeon_sp_spr_ops = { - CHIP_NAME("Intel SapphireRapids-SP").enable_dev = chip_enable_dev, + .name = "Intel SapphireRapids-SP", + .enable_dev = chip_enable_dev, .init = chip_init, .final = chip_final, }; diff --git a/src/soc/mediatek/mt8173/soc.c b/src/soc/mediatek/mt8173/soc.c index ebdf4e5..f6ee122 100644 --- a/src/soc/mediatek/mt8173/soc.c +++ b/src/soc/mediatek/mt8173/soc.c @@ -45,6 +45,6 @@ } struct chip_operations soc_mediatek_mt8173_ops = { - CHIP_NAME("SOC Mediatek MT8173") + .name = "SOC Mediatek MT8173", .enable_dev = enable_soc_dev, }; diff --git a/src/soc/mediatek/mt8183/soc.c b/src/soc/mediatek/mt8183/soc.c index 32ec4e4..38323f7 100644 --- a/src/soc/mediatek/mt8183/soc.c +++ b/src/soc/mediatek/mt8183/soc.c @@ -33,6 +33,6 @@ } struct chip_operations soc_mediatek_mt8183_ops = { - CHIP_NAME("SOC Mediatek MT8183") + .name = "SOC Mediatek MT8183", .enable_dev = enable_soc_dev, }; diff --git a/src/soc/mediatek/mt8186/soc.c b/src/soc/mediatek/mt8186/soc.c index a55e2ee..ada794f 100644 --- a/src/soc/mediatek/mt8186/soc.c +++ b/src/soc/mediatek/mt8186/soc.c @@ -50,6 +50,6 @@ } struct chip_operations soc_mediatek_mt8186_ops = { - CHIP_NAME("SOC Mediatek MT8186") + .name = "SOC Mediatek MT8186", .enable_dev = enable_soc_dev, }; diff --git a/src/soc/mediatek/mt8188/soc.c b/src/soc/mediatek/mt8188/soc.c index d0a29c5..35071d5 100644 --- a/src/soc/mediatek/mt8188/soc.c +++ b/src/soc/mediatek/mt8188/soc.c @@ -65,6 +65,6 @@ } struct chip_operations soc_mediatek_mt8188_ops = { - CHIP_NAME("SOC Mediatek MT8188") + .name = "SOC Mediatek MT8188", .enable_dev = enable_soc_dev, }; diff --git a/src/soc/mediatek/mt8192/soc.c b/src/soc/mediatek/mt8192/soc.c index 74d2579..a84cf4a 100644 --- a/src/soc/mediatek/mt8192/soc.c +++ b/src/soc/mediatek/mt8192/soc.c @@ -47,6 +47,6 @@ } struct chip_operations soc_mediatek_mt8192_ops = { - CHIP_NAME("SOC Mediatek MT8192") + .name = "SOC Mediatek MT8192", .enable_dev = enable_soc_dev, }; diff --git a/src/soc/mediatek/mt8195/soc.c b/src/soc/mediatek/mt8195/soc.c index 5425695..20a9811 100644 --- a/src/soc/mediatek/mt8195/soc.c +++ b/src/soc/mediatek/mt8195/soc.c @@ -70,6 +70,6 @@ } struct chip_operations soc_mediatek_mt8195_ops = { - CHIP_NAME("SOC Mediatek MT8195") + .name = "SOC Mediatek MT8195", .enable_dev = enable_soc_dev, }; diff --git a/src/soc/nvidia/tegra124/soc.c b/src/soc/nvidia/tegra124/soc.c index 64fb868..1de8ab3 100644 --- a/src/soc/nvidia/tegra124/soc.c +++ b/src/soc/nvidia/tegra124/soc.c @@ -47,6 +47,6 @@ } struct chip_operations soc_nvidia_tegra124_ops = { - CHIP_NAME("SOC Nvidia Tegra124") + .name = "SOC Nvidia Tegra124", .enable_dev = enable_tegra124_dev, }; diff --git a/src/soc/nvidia/tegra210/soc.c b/src/soc/nvidia/tegra210/soc.c index b037bdf..e207da6 100644 --- a/src/soc/nvidia/tegra210/soc.c +++ b/src/soc/nvidia/tegra210/soc.c @@ -80,7 +80,7 @@ } struct chip_operations soc_nvidia_tegra210_ops = { - CHIP_NAME("SOC Nvidia Tegra210") + .name = "SOC Nvidia Tegra210", .init = tegra210_init, .enable_dev = enable_tegra210_dev, }; diff --git a/src/soc/qualcomm/ipq40xx/soc.c b/src/soc/qualcomm/ipq40xx/soc.c index f482cff..ff074b7 100644 --- a/src/soc/qualcomm/ipq40xx/soc.c +++ b/src/soc/qualcomm/ipq40xx/soc.c @@ -49,6 +49,6 @@ } struct chip_operations soc_qualcomm_ipq40xx_ops = { - CHIP_NAME("SOC QCA 40xx") + .name = "SOC QCA 40xx", .enable_dev = enable_soc_dev, }; diff --git a/src/soc/qualcomm/ipq806x/soc.c b/src/soc/qualcomm/ipq806x/soc.c index ad0510f..b0c05c9 100644 --- a/src/soc/qualcomm/ipq806x/soc.c +++ b/src/soc/qualcomm/ipq806x/soc.c @@ -39,6 +39,6 @@ } struct chip_operations soc_qualcomm_ipq806x_ops = { - CHIP_NAME("SOC Qualcomm 8064") + .name = "SOC Qualcomm 8064", .enable_dev = enable_soc_dev, }; diff --git a/src/soc/qualcomm/qcs405/soc.c b/src/soc/qualcomm/qcs405/soc.c index f1a2def..18bf698 100644 --- a/src/soc/qualcomm/qcs405/soc.c +++ b/src/soc/qualcomm/qcs405/soc.c @@ -27,6 +27,6 @@ } struct chip_operations soc_qualcomm_qcs405_ops = { - CHIP_NAME("SOC Qualcomm QCS405") + .name = "SOC Qualcomm QCS405", .enable_dev = enable_soc_dev, }; diff --git a/src/soc/qualcomm/sc7180/soc.c b/src/soc/qualcomm/sc7180/soc.c index cef7e8f..f81eeea 100644 --- a/src/soc/qualcomm/sc7180/soc.c +++ b/src/soc/qualcomm/sc7180/soc.c @@ -36,6 +36,6 @@ } struct chip_operations soc_qualcomm_sc7180_ops = { - CHIP_NAME("SOC Qualcomm SC7180") + .name = "SOC Qualcomm SC7180", .enable_dev = enable_soc_dev, }; diff --git a/src/soc/qualcomm/sc7280/soc.c b/src/soc/qualcomm/sc7280/soc.c index 783c557..8dd53cc 100644 --- a/src/soc/qualcomm/sc7280/soc.c +++ b/src/soc/qualcomm/sc7280/soc.c @@ -53,6 +53,6 @@ } struct chip_operations soc_qualcomm_sc7280_ops = { - CHIP_NAME("SOC Qualcomm SC7280") + .name = "SOC Qualcomm SC7280", .enable_dev = enable_soc_dev, }; diff --git a/src/soc/rockchip/rk3288/soc.c b/src/soc/rockchip/rk3288/soc.c index 20f5cec..8704d16 100644 --- a/src/soc/rockchip/rk3288/soc.c +++ b/src/soc/rockchip/rk3288/soc.c @@ -33,6 +33,6 @@ } struct chip_operations soc_rockchip_rk3288_ops = { - CHIP_NAME("SOC Rockchip 3288") + .name = "SOC Rockchip 3288", .enable_dev = enable_rk3288_dev, }; diff --git a/src/soc/rockchip/rk3399/soc.c b/src/soc/rockchip/rk3399/soc.c index 03c39a9..0937e8f 100644 --- a/src/soc/rockchip/rk3399/soc.c +++ b/src/soc/rockchip/rk3399/soc.c @@ -46,6 +46,6 @@ } struct chip_operations soc_rockchip_rk3399_ops = { - CHIP_NAME("SOC Rockchip RK3399") - .enable_dev = enable_soc_dev, + .name = "SOC Rockchip RK3399", + .enable_dev = enable_soc_dev, }; diff --git a/src/soc/samsung/exynos5250/cpu.c b/src/soc/samsung/exynos5250/cpu.c index 06c9423..bbf04d9 100644 --- a/src/soc/samsung/exynos5250/cpu.c +++ b/src/soc/samsung/exynos5250/cpu.c @@ -128,7 +128,7 @@ } struct chip_operations soc_samsung_exynos5250_ops = { - CHIP_NAME("SOC Samsung Exynos 5250") + .name = "SOC Samsung Exynos 5250", .enable_dev = enable_exynos5250_dev, }; diff --git a/src/soc/samsung/exynos5420/cpu.c b/src/soc/samsung/exynos5420/cpu.c index 7869ab8..b55cb34 100644 --- a/src/soc/samsung/exynos5420/cpu.c +++ b/src/soc/samsung/exynos5420/cpu.c @@ -156,6 +156,6 @@ } struct chip_operations soc_samsung_exynos5420_ops = { - CHIP_NAME("SOC Samsung Exynos 5420") + .name = "SOC Samsung Exynos 5420", .enable_dev = enable_exynos5420_dev, }; diff --git a/src/soc/sifive/fu540/chip.c b/src/soc/sifive/fu540/chip.c index 6eab45c..e33b4a3 100644 --- a/src/soc/sifive/fu540/chip.c +++ b/src/soc/sifive/fu540/chip.c @@ -3,5 +3,5 @@ #include <device/device.h> struct chip_operations soc_sifive_fu540_ops = { - CHIP_NAME("SIFIVE FU540") + .name = "SIFIVE FU540", }; diff --git a/src/soc/ti/am335x/soc.c b/src/soc/ti/am335x/soc.c index 410b2d7..b409ab0 100644 --- a/src/soc/ti/am335x/soc.c +++ b/src/soc/ti/am335x/soc.c @@ -10,6 +10,6 @@ } struct chip_operations soc_ti_am335x_ops = { - CHIP_NAME("TI AM335X") + .name = "TI AM335X", .enable_dev = soc_enable, }; diff --git a/src/soc/ucb/riscv/chip.c b/src/soc/ucb/riscv/chip.c index 187e96d..2e0f528 100644 --- a/src/soc/ucb/riscv/chip.c +++ b/src/soc/ucb/riscv/chip.c @@ -3,5 +3,5 @@ #include <device/device.h> struct chip_operations soc_ucb_riscv_ops = { - CHIP_NAME("UCB RISC-V") + .name = "UCB RISC-V", }; diff --git a/src/southbridge/amd/pi/hudson/hudson.c b/src/southbridge/amd/pi/hudson/hudson.c index 59e293f..26fb258 100644 --- a/src/southbridge/amd/pi/hudson/hudson.c +++ b/src/southbridge/amd/pi/hudson/hudson.c @@ -92,7 +92,7 @@ } struct chip_operations southbridge_amd_pi_hudson_ops = { - CHIP_NAME("ATI HUDSON") + .name = "ATI HUDSON", .enable_dev = hudson_enable, .init = hudson_init, .final = hudson_final diff --git a/src/southbridge/intel/bd82x6x/pch.c b/src/southbridge/intel/bd82x6x/pch.c index 32ed5cd..1a9c2ae 100644 --- a/src/southbridge/intel/bd82x6x/pch.c +++ b/src/southbridge/intel/bd82x6x/pch.c @@ -358,6 +358,6 @@ } struct chip_operations southbridge_intel_bd82x6x_ops = { - CHIP_NAME("Intel Series 6/7 (Cougar Point/Panther Point) Southbridge") + .name = "Intel Series 6/7 (Cougar Point/Panther Point) Southbridge", .enable_dev = pch_enable, }; diff --git a/src/southbridge/intel/i82371eb/i82371eb.c b/src/southbridge/intel/i82371eb/i82371eb.c index ce07152..7c96fc3 100644 --- a/src/southbridge/intel/i82371eb/i82371eb.c +++ b/src/southbridge/intel/i82371eb/i82371eb.c @@ -35,5 +35,5 @@ #include <device/device.h> const struct chip_operations southbridge_intel_i82371eb_ops = { - CHIP_NAME("Intel 82371FB/SB/MX/AB/EB/MB Southbridge") + .name = "Intel 82371FB/SB/MX/AB/EB/MB Southbridge", }; diff --git a/src/southbridge/intel/i82801dx/i82801dx.c b/src/southbridge/intel/i82801dx/i82801dx.c index ea90656..7a70902 100644 --- a/src/southbridge/intel/i82801dx/i82801dx.c +++ b/src/southbridge/intel/i82801dx/i82801dx.c @@ -64,6 +64,6 @@ } struct chip_operations southbridge_intel_i82801dx_ops = { - CHIP_NAME("Intel ICH4/ICH4-M (82801Dx) Series Southbridge") - .enable_dev = i82801dx_enable, + .name = "Intel ICH4/ICH4-M (82801Dx) Series Southbridge", + .enable_dev = i82801dx_enable, }; diff --git a/src/southbridge/intel/i82801gx/i82801gx.c b/src/southbridge/intel/i82801gx/i82801gx.c index 4783099..86db048 100644 --- a/src/southbridge/intel/i82801gx/i82801gx.c +++ b/src/southbridge/intel/i82801gx/i82801gx.c @@ -83,7 +83,7 @@ } struct chip_operations southbridge_intel_i82801gx_ops = { - CHIP_NAME("Intel ICH7/ICH7-M (82801Gx) Series Southbridge") + .name = "Intel ICH7/ICH7-M (82801Gx) Series Southbridge", .enable_dev = i82801gx_enable, .init = i82801gx_init, }; diff --git a/src/southbridge/intel/i82801ix/i82801ix.c b/src/southbridge/intel/i82801ix/i82801ix.c index 846c9d8..3d56594 100644 --- a/src/southbridge/intel/i82801ix/i82801ix.c +++ b/src/southbridge/intel/i82801ix/i82801ix.c @@ -203,7 +203,7 @@ } struct chip_operations southbridge_intel_i82801ix_ops = { - CHIP_NAME("Intel ICH9/ICH9-M (82801Ix) Series Southbridge") + .name = "Intel ICH9/ICH9-M (82801Ix) Series Southbridge", .enable_dev = i82801ix_enable_device, .init = i82801ix_init, }; diff --git a/src/southbridge/intel/i82801jx/i82801jx.c b/src/southbridge/intel/i82801jx/i82801jx.c index 6f903014..6f10be0 100644 --- a/src/southbridge/intel/i82801jx/i82801jx.c +++ b/src/southbridge/intel/i82801jx/i82801jx.c @@ -194,7 +194,7 @@ } struct chip_operations southbridge_intel_i82801jx_ops = { - CHIP_NAME("Intel ICH10 (82801Jx) Series Southbridge") + .name = "Intel ICH10 (82801Jx) Series Southbridge", .enable_dev = i82801jx_enable_device, .init = i82801jx_init, }; diff --git a/src/southbridge/intel/i82870/pcibridge.c b/src/southbridge/intel/i82870/pcibridge.c index 00bf6bb..4ca8010 100644 --- a/src/southbridge/intel/i82870/pcibridge.c +++ b/src/southbridge/intel/i82870/pcibridge.c @@ -38,5 +38,5 @@ }; struct chip_operations southbridge_intel_i82870_ops = { - CHIP_NAME("Intel 82870") + .name = "Intel 82870", }; diff --git a/src/southbridge/intel/ibexpeak/pch.c b/src/southbridge/intel/ibexpeak/pch.c index 23768ed..f77dc62 100644 --- a/src/southbridge/intel/ibexpeak/pch.c +++ b/src/southbridge/intel/ibexpeak/pch.c @@ -84,6 +84,6 @@ } struct chip_operations southbridge_intel_ibexpeak_ops = { - CHIP_NAME("Intel Series 5 (Ibexpeak) Southbridge") + .name = "Intel Series 5 (Ibexpeak) Southbridge", .enable_dev = pch_enable, }; diff --git a/src/southbridge/intel/lynxpoint/pch.c b/src/southbridge/intel/lynxpoint/pch.c index 8b037a9..ae4e714 100644 --- a/src/southbridge/intel/lynxpoint/pch.c +++ b/src/southbridge/intel/lynxpoint/pch.c @@ -199,7 +199,7 @@ } struct chip_operations southbridge_intel_lynxpoint_ops = { - CHIP_NAME("Intel Series 8 (Lynx Point) Southbridge") + .name = "Intel Series 8 (Lynx Point) Southbridge", .enable_dev = pch_enable, }; diff --git a/src/southbridge/ricoh/rl5c476/rl5c476.c b/src/southbridge/ricoh/rl5c476/rl5c476.c index 23476ec..f78f816 100644 --- a/src/southbridge/ricoh/rl5c476/rl5c476.c +++ b/src/southbridge/ricoh/rl5c476/rl5c476.c @@ -215,6 +215,6 @@ } struct chip_operations southbridge_ricoh_rl5c476_ops = { - CHIP_NAME("Ricoh RL5C476 CardBus Controller") + .name = "Ricoh RL5C476 CardBus Controller", .enable_dev = southbridge_init, }; diff --git a/src/southbridge/ti/pci1x2x/pci1x2x.c b/src/southbridge/ti/pci1x2x/pci1x2x.c index ccd3ce9..55d37af 100644 --- a/src/southbridge/ti/pci1x2x/pci1x2x.c +++ b/src/southbridge/ti/pci1x2x/pci1x2x.c @@ -73,5 +73,5 @@ }; struct chip_operations southbridge_ti_pci1x2x_ops = { - CHIP_NAME("TI PCI1x2x Cardbus controller") + .name = "TI PCI1x2x Cardbus controller", }; diff --git a/src/southbridge/ti/pci7420/cardbus.c b/src/southbridge/ti/pci7420/cardbus.c index 6ef08a3..16fdf44 100644 --- a/src/southbridge/ti/pci7420/cardbus.c +++ b/src/southbridge/ti/pci7420/cardbus.c @@ -80,5 +80,5 @@ }; struct chip_operations southbridge_ti_pci7420_ops = { - CHIP_NAME("Texas Instruments PCI7420/7620 Cardbus Controller") + .name = "Texas Instruments PCI7420/7620 Cardbus Controller", }; diff --git a/src/superio/aspeed/ast2400/superio.c b/src/superio/aspeed/ast2400/superio.c index 4510c21..51c6464 100644 --- a/src/superio/aspeed/ast2400/superio.c +++ b/src/superio/aspeed/ast2400/superio.c @@ -103,6 +103,6 @@ } struct chip_operations superio_aspeed_ast2400_ops = { - CHIP_NAME("ASpeed AST2400/AST2500 Super I/O") + .name = "ASpeed AST2400/AST2500 Super I/O", .enable_dev = enable_dev, }; diff --git a/src/superio/common/generic.c b/src/superio/common/generic.c index c690340..1758acc 100644 --- a/src/superio/common/generic.c +++ b/src/superio/common/generic.c @@ -324,6 +324,6 @@ } struct chip_operations superio_common_ops = { - CHIP_NAME("Generic Super I/O") + .name = "Generic Super I/O", .enable_dev = enable_dev, }; diff --git a/src/superio/fintek/f71808a/superio.c b/src/superio/fintek/f71808a/superio.c index 17fa379..885d3f7 100644 --- a/src/superio/fintek/f71808a/superio.c +++ b/src/superio/fintek/f71808a/superio.c @@ -51,6 +51,6 @@ } struct chip_operations superio_fintek_f71808a_ops = { - CHIP_NAME("Fintek F71808A Super I/O") + .name = "Fintek F71808A Super I/O", .enable_dev = enable_dev }; diff --git a/src/superio/fintek/f71859/superio.c b/src/superio/fintek/f71859/superio.c index 1f44249..628d4c9 100644 --- a/src/superio/fintek/f71859/superio.c +++ b/src/superio/fintek/f71859/superio.c @@ -33,6 +33,6 @@ } struct chip_operations superio_fintek_f71859_ops = { - CHIP_NAME("Fintek F71859 Super I/O") + .name = "Fintek F71859 Super I/O", .enable_dev = enable_dev }; diff --git a/src/superio/fintek/f71863fg/superio.c b/src/superio/fintek/f71863fg/superio.c index c4e8dc9..6f1735d 100644 --- a/src/superio/fintek/f71863fg/superio.c +++ b/src/superio/fintek/f71863fg/superio.c @@ -50,6 +50,6 @@ } struct chip_operations superio_fintek_f71863fg_ops = { - CHIP_NAME("Fintek F71863FG Super I/O") + .name = "Fintek F71863FG Super I/O", .enable_dev = enable_dev }; diff --git a/src/superio/fintek/f71869ad/superio.c b/src/superio/fintek/f71869ad/superio.c index 3cfd387..a4affee 100644 --- a/src/superio/fintek/f71869ad/superio.c +++ b/src/superio/fintek/f71869ad/superio.c @@ -107,6 +107,6 @@ } struct chip_operations superio_fintek_f71869ad_ops = { - CHIP_NAME("Fintek F71869AD Super I/O") + .name = "Fintek F71869AD Super I/O", .enable_dev = enable_dev }; diff --git a/src/superio/fintek/f81803a/superio.c b/src/superio/fintek/f81803a/superio.c index 5304f9e..4d4e8bc 100644 --- a/src/superio/fintek/f81803a/superio.c +++ b/src/superio/fintek/f81803a/superio.c @@ -57,6 +57,6 @@ } struct chip_operations superio_fintek_f81803a_ops = { - CHIP_NAME("Fintek F81803A Super I/O") + .name = "Fintek F81803A Super I/O", .enable_dev = enable_dev }; diff --git a/src/superio/fintek/f81865f/superio.c b/src/superio/fintek/f81865f/superio.c index 9181bad..70fefe5 100644 --- a/src/superio/fintek/f81865f/superio.c +++ b/src/superio/fintek/f81865f/superio.c @@ -48,6 +48,6 @@ } struct chip_operations superio_fintek_f81865f_ops = { - CHIP_NAME("Fintek F81865F Super I/O") + .name = "Fintek F81865F Super I/O", .enable_dev = enable_dev }; diff --git a/src/superio/fintek/f81866d/superio.c b/src/superio/fintek/f81866d/superio.c index 3803230..6bcf311 100644 --- a/src/superio/fintek/f81866d/superio.c +++ b/src/superio/fintek/f81866d/superio.c @@ -73,6 +73,6 @@ } struct chip_operations superio_fintek_f81866d_ops = { - CHIP_NAME("Fintek F81866AD-I Super I/O") + .name = "Fintek F81866AD-I Super I/O", .enable_dev = enable_dev }; diff --git a/src/superio/ite/it8528e/superio.c b/src/superio/ite/it8528e/superio.c index d135c0b..97d8850 100644 --- a/src/superio/ite/it8528e/superio.c +++ b/src/superio/ite/it8528e/superio.c @@ -49,6 +49,6 @@ } struct chip_operations superio_ite_it8528e_ops = { - CHIP_NAME("ITE IT8528E Super I/O") + .name = "ITE IT8528E Super I/O", .enable_dev = enable_dev, }; diff --git a/src/superio/ite/it8613e/superio.c b/src/superio/ite/it8613e/superio.c index c18c3ec..78241b2 100644 --- a/src/superio/ite/it8613e/superio.c +++ b/src/superio/ite/it8613e/superio.c @@ -63,6 +63,6 @@ } struct chip_operations superio_ite_it8613e_ops = { - CHIP_NAME("ITE IT8613E Super I/O") + .name = "ITE IT8613E Super I/O", .enable_dev = enable_dev, }; diff --git a/src/superio/ite/it8623e/superio.c b/src/superio/ite/it8623e/superio.c index 15e0071..7800a34 100644 --- a/src/superio/ite/it8623e/superio.c +++ b/src/superio/ite/it8623e/superio.c @@ -60,6 +60,6 @@ } struct chip_operations superio_ite_it8623e_ops = { - CHIP_NAME("ITE IT8623E Super I/O") + .name = "ITE IT8623E Super I/O", .enable_dev = enable_dev, }; diff --git a/src/superio/ite/it8712f/superio.c b/src/superio/ite/it8712f/superio.c index 17a1976..03127b5 100644 --- a/src/superio/ite/it8712f/superio.c +++ b/src/superio/ite/it8712f/superio.c @@ -65,6 +65,6 @@ } struct chip_operations superio_ite_it8712f_ops = { - CHIP_NAME("ITE IT8712F Super I/O") + .name = "ITE IT8712F Super I/O", .enable_dev = enable_dev, }; diff --git a/src/superio/ite/it8718f/superio.c b/src/superio/ite/it8718f/superio.c index 1243e75..fafe30d 100644 --- a/src/superio/ite/it8718f/superio.c +++ b/src/superio/ite/it8718f/superio.c @@ -71,6 +71,6 @@ } struct chip_operations superio_ite_it8718f_ops = { - CHIP_NAME("ITE IT8718F Super I/O") + .name = "ITE IT8718F Super I/O", .enable_dev = enable_dev, }; diff --git a/src/superio/ite/it8720f/superio.c b/src/superio/ite/it8720f/superio.c index 75d0be9..4491c10 100644 --- a/src/superio/ite/it8720f/superio.c +++ b/src/superio/ite/it8720f/superio.c @@ -112,6 +112,6 @@ } struct chip_operations superio_ite_it8720f_ops = { - CHIP_NAME("ITE IT8720F Super I/O") + .name = "ITE IT8720F Super I/O", .enable_dev = enable_dev, }; diff --git a/src/superio/ite/it8721f/superio.c b/src/superio/ite/it8721f/superio.c index f69e1b0..801e27b 100644 --- a/src/superio/ite/it8721f/superio.c +++ b/src/superio/ite/it8721f/superio.c @@ -63,6 +63,6 @@ } struct chip_operations superio_ite_it8721f_ops = { - CHIP_NAME("ITE IT8721F Super I/O") + .name = "ITE IT8721F Super I/O", .enable_dev = enable_dev, }; diff --git a/src/superio/ite/it8728f/superio.c b/src/superio/ite/it8728f/superio.c index 67ef218..5e4c2fd 100644 --- a/src/superio/ite/it8728f/superio.c +++ b/src/superio/ite/it8728f/superio.c @@ -60,6 +60,6 @@ } struct chip_operations superio_ite_it8728f_ops = { - CHIP_NAME("ITE IT8728F Super I/O") + .name = "ITE IT8728F Super I/O", .enable_dev = enable_dev }; diff --git a/src/superio/ite/it8772f/superio.c b/src/superio/ite/it8772f/superio.c index 82f30fa..1771368 100644 --- a/src/superio/ite/it8772f/superio.c +++ b/src/superio/ite/it8772f/superio.c @@ -268,6 +268,6 @@ } struct chip_operations superio_ite_it8772f_ops = { - CHIP_NAME("ITE IT8772F Super I/O") + .name = "ITE IT8772F Super I/O", .enable_dev = enable_dev, }; diff --git a/src/superio/ite/it8783ef/superio.c b/src/superio/ite/it8783ef/superio.c index d90ae5f..618ea3f 100644 --- a/src/superio/ite/it8783ef/superio.c +++ b/src/superio/ite/it8783ef/superio.c @@ -88,6 +88,6 @@ } struct chip_operations superio_ite_it8783ef_ops = { - CHIP_NAME("ITE IT8783E/F Super I/O") + .name = "ITE IT8783E/F Super I/O", .enable_dev = enable_dev, }; diff --git a/src/superio/ite/it8784e/superio.c b/src/superio/ite/it8784e/superio.c index 85fc42e..1caa837 100644 --- a/src/superio/ite/it8784e/superio.c +++ b/src/superio/ite/it8784e/superio.c @@ -82,6 +82,6 @@ } struct chip_operations superio_ite_it8784e_ops = { - CHIP_NAME("ITE IT8784E Super I/O") + .name = "ITE IT8784E Super I/O", .enable_dev = enable_dev, }; diff --git a/src/superio/ite/it8786e/superio.c b/src/superio/ite/it8786e/superio.c index 8d9ec14..f610fdf 100644 --- a/src/superio/ite/it8786e/superio.c +++ b/src/superio/ite/it8786e/superio.c @@ -98,6 +98,6 @@ } struct chip_operations superio_ite_it8786e_ops = { - CHIP_NAME("ITE IT8786E Super I/O") + .name = "ITE IT8786E Super I/O", .enable_dev = enable_dev, }; diff --git a/src/superio/nsc/pc87382/superio.c b/src/superio/nsc/pc87382/superio.c index 355aca4..c60e845 100644 --- a/src/superio/nsc/pc87382/superio.c +++ b/src/superio/nsc/pc87382/superio.c @@ -41,6 +41,6 @@ } struct chip_operations superio_nsc_pc87382_ops = { - CHIP_NAME("NSC PC87382 Docking LPC Switch") + .name = "NSC PC87382 Docking LPC Switch", .enable_dev = enable_dev, }; diff --git a/src/superio/nsc/pc87384/superio.c b/src/superio/nsc/pc87384/superio.c index 88d4d36..60e0994 100644 --- a/src/superio/nsc/pc87384/superio.c +++ b/src/superio/nsc/pc87384/superio.c @@ -25,6 +25,6 @@ } struct chip_operations superio_nsc_pc87384_ops = { - CHIP_NAME("NSC PC87384 Super I/O") + .name = "NSC PC87384 Super I/O", .enable_dev = enable_dev, }; diff --git a/src/superio/nsc/pc87392/superio.c b/src/superio/nsc/pc87392/superio.c index e65afea..551249d 100644 --- a/src/superio/nsc/pc87392/superio.c +++ b/src/superio/nsc/pc87392/superio.c @@ -35,6 +35,6 @@ } struct chip_operations superio_nsc_pc87392_ops = { - CHIP_NAME("NSC PC87392 Super I/O") + .name = "NSC PC87392 Super I/O", .enable_dev = enable_dev, }; diff --git a/src/superio/nsc/pc87417/superio.c b/src/superio/nsc/pc87417/superio.c index be99f7f..ac01c46 100644 --- a/src/superio/nsc/pc87417/superio.c +++ b/src/superio/nsc/pc87417/superio.c @@ -46,6 +46,6 @@ } struct chip_operations superio_nsc_pc87417_ops = { - CHIP_NAME("NSC PC87417 Super I/O") + .name = "NSC PC87417 Super I/O", .enable_dev = enable_dev, }; diff --git a/src/superio/nuvoton/nct5104d/superio.c b/src/superio/nuvoton/nct5104d/superio.c index cfa2228..3353369 100644 --- a/src/superio/nuvoton/nct5104d/superio.c +++ b/src/superio/nuvoton/nct5104d/superio.c @@ -232,6 +232,6 @@ } struct chip_operations superio_nuvoton_nct5104d_ops = { - CHIP_NAME("Nuvoton NCT5104D Super I/O") + .name = "Nuvoton NCT5104D Super I/O", .enable_dev = enable_dev, }; diff --git a/src/superio/nuvoton/nct5539d/superio.c b/src/superio/nuvoton/nct5539d/superio.c index ff37f5c..cef40a5 100644 --- a/src/superio/nuvoton/nct5539d/superio.c +++ b/src/superio/nuvoton/nct5539d/superio.c @@ -95,6 +95,6 @@ } struct chip_operations superio_nuvoton_nct5539d_ops = { - CHIP_NAME("NUVOTON NCT5539D Super I/O") + .name = "NUVOTON NCT5539D Super I/O", .enable_dev = enable_dev, }; diff --git a/src/superio/nuvoton/nct5572d/superio.c b/src/superio/nuvoton/nct5572d/superio.c index 7e893ee..34fa016 100644 --- a/src/superio/nuvoton/nct5572d/superio.c +++ b/src/superio/nuvoton/nct5572d/superio.c @@ -104,6 +104,6 @@ } struct chip_operations superio_nuvoton_nct5572d_ops = { - CHIP_NAME("NUVOTON NCT5572D Super I/O") + .name = "NUVOTON NCT5572D Super I/O", .enable_dev = enable_dev, }; diff --git a/src/superio/nuvoton/nct6687d/superio.c b/src/superio/nuvoton/nct6687d/superio.c index a2eea8c..c280927 100644 --- a/src/superio/nuvoton/nct6687d/superio.c +++ b/src/superio/nuvoton/nct6687d/superio.c @@ -87,6 +87,6 @@ } struct chip_operations superio_nuvoton_nct6687d_ops = { - CHIP_NAME("NUVOTON NCT6687D Super I/O") + .name = "NUVOTON NCT6687D Super I/O", .enable_dev = enable_dev, }; diff --git a/src/superio/nuvoton/nct6776/superio.c b/src/superio/nuvoton/nct6776/superio.c index 4197d54..d98e303 100644 --- a/src/superio/nuvoton/nct6776/superio.c +++ b/src/superio/nuvoton/nct6776/superio.c @@ -67,6 +67,6 @@ } struct chip_operations superio_nuvoton_nct6776_ops = { - CHIP_NAME("NUVOTON NCT6776 Super I/O") + .name = "NUVOTON NCT6776 Super I/O", .enable_dev = enable_dev, }; diff --git a/src/superio/nuvoton/nct6779d/superio.c b/src/superio/nuvoton/nct6779d/superio.c index 77058b0..1360476 100644 --- a/src/superio/nuvoton/nct6779d/superio.c +++ b/src/superio/nuvoton/nct6779d/superio.c @@ -62,6 +62,6 @@ } struct chip_operations superio_nuvoton_nct6779d_ops = { - CHIP_NAME("NUVOTON NCT6779D Super I/O") + .name = "NUVOTON NCT6779D Super I/O", .enable_dev = enable_dev, }; diff --git a/src/superio/nuvoton/nct6791d/superio.c b/src/superio/nuvoton/nct6791d/superio.c index 3244e05..91a3908 100644 --- a/src/superio/nuvoton/nct6791d/superio.c +++ b/src/superio/nuvoton/nct6791d/superio.c @@ -102,6 +102,6 @@ } struct chip_operations superio_nuvoton_nct6791d_ops = { - CHIP_NAME("NUVOTON NCT6791D Super I/O") + .name = "NUVOTON NCT6791D Super I/O", .enable_dev = enable_dev, }; diff --git a/src/superio/nuvoton/npcd378/superio.c b/src/superio/nuvoton/npcd378/superio.c index 615bae5..a4759fb 100644 --- a/src/superio/nuvoton/npcd378/superio.c +++ b/src/superio/nuvoton/npcd378/superio.c @@ -460,6 +460,6 @@ } struct chip_operations superio_nuvoton_npcd378_ops = { - CHIP_NAME("NUVOTON NPCD378 Super I/O") + .name = "NUVOTON NPCD378 Super I/O", .enable_dev = enable_dev, }; diff --git a/src/superio/nuvoton/wpcm450/superio.c b/src/superio/nuvoton/wpcm450/superio.c index 45c2e93..863ad2b 100644 --- a/src/superio/nuvoton/wpcm450/superio.c +++ b/src/superio/nuvoton/wpcm450/superio.c @@ -40,6 +40,6 @@ } struct chip_operations superio_nuvoton_wpcm450_ops = { - CHIP_NAME("Nuvoton WPCM450 Super I/O") + .name = "Nuvoton WPCM450 Super I/O", .enable_dev = enable_dev, }; diff --git a/src/superio/renesas/m3885x/superio.c b/src/superio/renesas/m3885x/superio.c index 293fe0e..6b71256 100644 --- a/src/superio/renesas/m3885x/superio.c +++ b/src/superio/renesas/m3885x/superio.c @@ -45,6 +45,6 @@ } struct chip_operations superio_renesas_m3885x_ops = { - CHIP_NAME("Renesas M3885x Super I/O") + .name = "Renesas M3885x Super I/O", .enable_dev = enable_dev, }; diff --git a/src/superio/smsc/fdc37n972/superio.c b/src/superio/smsc/fdc37n972/superio.c index a62bba8..ba197d8 100644 --- a/src/superio/smsc/fdc37n972/superio.c +++ b/src/superio/smsc/fdc37n972/superio.c @@ -46,6 +46,6 @@ } struct chip_operations superio_smsc_fdc37n972_ops = { - CHIP_NAME("SMSC FDC37N972 Super I/O") + .name = "SMSC FDC37N972 Super I/O", .enable_dev = enable_dev, }; diff --git a/src/superio/smsc/kbc1100/superio.c b/src/superio/smsc/kbc1100/superio.c index 862a77b..74f2326 100644 --- a/src/superio/smsc/kbc1100/superio.c +++ b/src/superio/smsc/kbc1100/superio.c @@ -14,7 +14,7 @@ static void kbc1100_init(struct device *dev); struct chip_operations superio_smsc_kbc1100_ops = { - CHIP_NAME("SMSC KBC1100 Super I/O") + .name = "SMSC KBC1100 Super I/O", .enable_dev = enable_dev }; diff --git a/src/superio/smsc/lpc47m10x/superio.c b/src/superio/smsc/lpc47m10x/superio.c index cb297a5..157275e 100644 --- a/src/superio/smsc/lpc47m10x/superio.c +++ b/src/superio/smsc/lpc47m10x/superio.c @@ -58,6 +58,6 @@ } struct chip_operations superio_smsc_lpc47m10x_ops = { - CHIP_NAME("SMSC LPC47M10x Super I/O") + .name = "SMSC LPC47M10x Super I/O", .enable_dev = enable_dev }; diff --git a/src/superio/smsc/lpc47m15x/superio.c b/src/superio/smsc/lpc47m15x/superio.c index e1e4883..6f57133 100644 --- a/src/superio/smsc/lpc47m15x/superio.c +++ b/src/superio/smsc/lpc47m15x/superio.c @@ -14,7 +14,7 @@ static void lpc47m15x_init(struct device *dev); struct chip_operations superio_smsc_lpc47m15x_ops = { - CHIP_NAME("SMSC LPC47M15x/192/997 Super I/O") + .name = "SMSC LPC47M15x/192/997 Super I/O", .enable_dev = enable_dev }; diff --git a/src/superio/smsc/lpc47n217/superio.c b/src/superio/smsc/lpc47n217/superio.c index dcaf6e7..c59ce2d 100644 --- a/src/superio/smsc/lpc47n217/superio.c +++ b/src/superio/smsc/lpc47n217/superio.c @@ -25,7 +25,7 @@ static void pnp_exit_conf_state(struct device *dev); struct chip_operations superio_smsc_lpc47n217_ops = { - CHIP_NAME("SMSC LPC47N217 Super I/O") + .name = "SMSC LPC47N217 Super I/O", .enable_dev = enable_dev, }; diff --git a/src/superio/smsc/lpc47n227/superio.c b/src/superio/smsc/lpc47n227/superio.c index 3712350..edcc271 100644 --- a/src/superio/smsc/lpc47n227/superio.c +++ b/src/superio/smsc/lpc47n227/superio.c @@ -24,7 +24,7 @@ void lpc47n227_pnp_set_enable(struct device *dev, int enable); struct chip_operations superio_smsc_lpc47n227_ops = { - CHIP_NAME("SMSC LPC47N227 Super I/O") + .name = "SMSC LPC47N227 Super I/O", .enable_dev = enable_dev, }; diff --git a/src/superio/smsc/mec1308/superio.c b/src/superio/smsc/mec1308/superio.c index 6c8597c..39e100e 100644 --- a/src/superio/smsc/mec1308/superio.c +++ b/src/superio/smsc/mec1308/superio.c @@ -47,6 +47,6 @@ } struct chip_operations superio_smsc_mec1308_ops = { - CHIP_NAME("SMSC MEC1308 EC SuperIO Interface") + .name = "SMSC MEC1308 EC SuperIO Interface", .enable_dev = enable_dev }; diff --git a/src/superio/smsc/sch5545/superio.c b/src/superio/smsc/sch5545/superio.c index 1ce1fd6..7b8e5a0 100644 --- a/src/superio/smsc/sch5545/superio.c +++ b/src/superio/smsc/sch5545/superio.c @@ -303,6 +303,6 @@ } struct chip_operations superio_smsc_sch5545_ops = { - CHIP_NAME("SMSC SCH5545 Super I/O") + .name = "SMSC SCH5545 Super I/O", .enable_dev = enable_dev, }; diff --git a/src/superio/smsc/sch555x/ramstage.c b/src/superio/smsc/sch555x/ramstage.c index 2245001..1cdd869 100644 --- a/src/superio/smsc/sch555x/ramstage.c +++ b/src/superio/smsc/sch555x/ramstage.c @@ -136,6 +136,6 @@ } struct chip_operations superio_smsc_sch555x_ops = { - CHIP_NAME("SMSC SCH555x Super I/O") + .name = "SMSC SCH555x Super I/O", .enable_dev = sch555x_enable_dev, }; diff --git a/src/superio/smsc/sio1036/superio.c b/src/superio/smsc/sio1036/superio.c index 3dcaae8..8b1704f 100644 --- a/src/superio/smsc/sio1036/superio.c +++ b/src/superio/smsc/sio1036/superio.c @@ -33,6 +33,6 @@ } struct chip_operations superio_smsc_sio1036_ops = { - CHIP_NAME("SMSC SIO1036 Super I/O") + .name = "SMSC SIO1036 Super I/O", .enable_dev = enable_dev }; diff --git a/src/superio/smsc/sio10n268/superio.c b/src/superio/smsc/sio10n268/superio.c index ca5a0c6..fa79a57 100644 --- a/src/superio/smsc/sio10n268/superio.c +++ b/src/superio/smsc/sio10n268/superio.c @@ -43,6 +43,6 @@ } struct chip_operations superio_smsc_sio10n268_ops = { - CHIP_NAME("SMSC SIO10N268 Super I/O") + .name = "SMSC SIO10N268 Super I/O", .enable_dev = enable_dev, }; diff --git a/src/superio/smsc/smscsuperio/superio.c b/src/superio/smsc/smscsuperio/superio.c index a182d90..3ba8216 100644 --- a/src/superio/smsc/smscsuperio/superio.c +++ b/src/superio/smsc/smscsuperio/superio.c @@ -281,6 +281,6 @@ } struct chip_operations superio_smsc_smscsuperio_ops = { - CHIP_NAME("Various SMSC Super I/Os") + .name = "Various SMSC Super I/Os", .enable_dev = enable_dev }; diff --git a/src/superio/winbond/w83627dhg/superio.c b/src/superio/winbond/w83627dhg/superio.c index 2641cb3..491b5c9 100644 --- a/src/superio/winbond/w83627dhg/superio.c +++ b/src/superio/winbond/w83627dhg/superio.c @@ -68,6 +68,6 @@ } struct chip_operations superio_winbond_w83627dhg_ops = { - CHIP_NAME("Winbond W83627DHG Super I/O") + .name = "Winbond W83627DHG Super I/O", .enable_dev = enable_dev, }; diff --git a/src/superio/winbond/w83627ehg/superio.c b/src/superio/winbond/w83627ehg/superio.c index 1e36048..03dce82 100644 --- a/src/superio/winbond/w83627ehg/superio.c +++ b/src/superio/winbond/w83627ehg/superio.c @@ -129,6 +129,6 @@ } struct chip_operations superio_winbond_w83627ehg_ops = { - CHIP_NAME("Winbond W83627EHG Super I/O") + .name = "Winbond W83627EHG Super I/O", .enable_dev = enable_dev, }; diff --git a/src/superio/winbond/w83627hf/superio.c b/src/superio/winbond/w83627hf/superio.c index de2a0c6..f0c5b28 100644 --- a/src/superio/winbond/w83627hf/superio.c +++ b/src/superio/winbond/w83627hf/superio.c @@ -129,6 +129,6 @@ } struct chip_operations superio_winbond_w83627hf_ops = { - CHIP_NAME("Winbond W83627HF Super I/O") + .name = "Winbond W83627HF Super I/O", .enable_dev = enable_dev, }; diff --git a/src/superio/winbond/w83627thg/superio.c b/src/superio/winbond/w83627thg/superio.c index 4276da6..156239f 100644 --- a/src/superio/winbond/w83627thg/superio.c +++ b/src/superio/winbond/w83627thg/superio.c @@ -50,6 +50,6 @@ } struct chip_operations superio_winbond_w83627thg_ops = { - CHIP_NAME("Winbond W83627THG Super I/O") + .name = "Winbond W83627THG Super I/O", .enable_dev = enable_dev, }; diff --git a/src/superio/winbond/w83627uhg/superio.c b/src/superio/winbond/w83627uhg/superio.c index 4b54bac..e276fc5 100644 --- a/src/superio/winbond/w83627uhg/superio.c +++ b/src/superio/winbond/w83627uhg/superio.c @@ -101,6 +101,6 @@ } struct chip_operations superio_winbond_w83627uhg_ops = { - CHIP_NAME("Winbond W83627UHG Super I/O") + .name = "Winbond W83627UHG Super I/O", .enable_dev = enable_dev, }; diff --git a/src/superio/winbond/w83667hg-a/superio.c b/src/superio/winbond/w83667hg-a/superio.c index a5abe61..4cddf20 100644 --- a/src/superio/winbond/w83667hg-a/superio.c +++ b/src/superio/winbond/w83667hg-a/superio.c @@ -103,6 +103,6 @@ } struct chip_operations superio_winbond_w83667hg_a_ops = { - CHIP_NAME("WINBOND W83667HG-A Super I/O") + .name = "WINBOND W83667HG-A Super I/O", .enable_dev = enable_dev, }; diff --git a/src/superio/winbond/w83977tf/superio.c b/src/superio/winbond/w83977tf/superio.c index 4187b52..28bfc8c 100644 --- a/src/superio/winbond/w83977tf/superio.c +++ b/src/superio/winbond/w83977tf/superio.c @@ -50,6 +50,6 @@ } struct chip_operations superio_winbond_w83977tf_ops = { - CHIP_NAME("Winbond W83977TF Super I/O") + .name = "Winbond W83977TF Super I/O", .enable_dev = enable_dev, }; diff --git a/src/superio/winbond/wpcd376i/superio.c b/src/superio/winbond/wpcd376i/superio.c index a692eeb..635d025 100644 --- a/src/superio/winbond/wpcd376i/superio.c +++ b/src/superio/winbond/wpcd376i/superio.c @@ -61,6 +61,6 @@ } struct chip_operations superio_winbond_wpcd376i_ops = { - CHIP_NAME("Winbond WPCD376I Super I/O") + .name = "Winbond WPCD376I Super I/O", .enable_dev = enable_dev, }; diff --git a/src/vendorcode/amd/opensil/genoa_poc/mpio/chip.c b/src/vendorcode/amd/opensil/genoa_poc/mpio/chip.c index 89314ba..9e9e886 100644 --- a/src/vendorcode/amd/opensil/genoa_poc/mpio/chip.c +++ b/src/vendorcode/amd/opensil/genoa_poc/mpio/chip.c @@ -10,7 +10,7 @@ #include "../opensil.h" struct chip_operations vendorcode_amd_opensil_genoa_poc_mpio_ops = { - CHIP_NAME("AMD GENOA MPIO") + .name = "AMD GENOA MPIO", }; static void nbio_config(void) -- To view, visit https://review.coreboot.org/c/coreboot/+/80239?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: main Gerrit-Change-Id: Iaed6dfb144bddcf5c43634b0c955c19afce388f0 Gerrit-Change-Number: 80239 Gerrit-PatchSet: 5 Gerrit-Owner: Nicholas Sudsgaard <devel+coreboot(a)nsudsgaard.com> Gerrit-Reviewer: Alexander Couzens <lynxis(a)fe80.eu> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Arthur Heymans <arthur(a)aheymans.xyz> Gerrit-Reviewer: Caveh Jalali <caveh(a)chromium.org> Gerrit-Reviewer: Christian Walter <christian.walter(a)9elements.com> Gerrit-Reviewer: Dinesh Gehlot <digehlot(a)google.com> Gerrit-Reviewer: Eran Mitrani <mitrani(a)google.com> Gerrit-Reviewer: Felix Held <felix-coreboot(a)felixheld.de> Gerrit-Reviewer: Felix Singer <service+coreboot-gerrit(a)felixsinger.de> Gerrit-Reviewer: Forest Mittelberg <bmbm(a)google.com> Gerrit-Reviewer: Fred Reitberger <reitbergerfred(a)gmail.com> Gerrit-Reviewer: Hung-Te Lin <hungte(a)chromium.org> Gerrit-Reviewer: Jakub Czapiga <czapiga(a)google.com> Gerrit-Reviewer: Jason Glenesk <jason.glenesk(a)gmail.com> Gerrit-Reviewer: Jeff Daly <jeffd(a)silicom-usa.com> Gerrit-Reviewer: Jeremy Soller <jeremy(a)system76.com> Gerrit-Reviewer: Johnny Lin <Johnny_Lin(a)wiwynn.com> Gerrit-Reviewer: Julius Werner <jwerner(a)chromium.org> Gerrit-Reviewer: Jérémy Compostella <jeremy.compostella(a)intel.com> Gerrit-Reviewer: Kapil Porwal <kapilporwal(a)google.com> Gerrit-Reviewer: Lean Sheng Tan <sheng.tan(a)9elements.com> Gerrit-Reviewer: Matt DeVillier <matt.devillier(a)amd.corp-partner.google.com> Gerrit-Reviewer: Nicholas Chin <nic.c3.14(a)gmail.com> Gerrit-Reviewer: Nick Vaccaro <nvaccaro(a)chromium.org> Gerrit-Reviewer: Philipp Hug <philipp(a)hug.cx> Gerrit-Reviewer: Sean Rhodes <sean(a)starlabs.systems> Gerrit-Reviewer: Subrata Banik <subratabanik(a)google.com> Gerrit-Reviewer: Tarun <tstuli(a)gmail.com> Gerrit-Reviewer: Tim Chu <Tim.Chu(a)quantatw.com> Gerrit-Reviewer: Tim Crawford <tcrawford(a)system76.com> Gerrit-Reviewer: Vanessa Eusebio <vanessa.f.eusebio(a)intel.com> Gerrit-Reviewer: Werner Zeh <werner.zeh(a)siemens.com> Gerrit-Reviewer: Xi Chen <xixi.chen(a)mediatek.com> Gerrit-Reviewer: Yidi Lin <yidilin(a)google.com> Gerrit-Reviewer: Yu-Ping Wu <yupingso(a)google.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Reviewer: ron minnich <rminnich(a)gmail.com> Gerrit-MessageType: merged

1 0

[XS] Change in coreboot[main]: mb/google/brya: Correct Ti50 EC-is-trusted logic
by Subrata Banik (Code Review) 31 Jan '24

31 Jan '24

Subrata Banik has submitted this change. ( https://review.coreboot.org/c/coreboot/+/80158?usp=email ) Change subject: mb/google/brya: Correct Ti50 EC-is-trusted logic ...................................................................... mb/google/brya: Correct Ti50 EC-is-trusted logic With Cr50, the GPIO EC_IN_RW is used to determine whether EC is trusted. However, With the switch to Ti50, it is determined by Ti50's boot mode. If the boot mode is TRUSTED_RO, the VB2_CONTEXT_EC_TRUSTED flag will be set in check_boot_mode(). Therefore in the Ti50 case get_ec_is_trusted() can just return 0. The current code of get_ec_is_trusted() only checks the GPIO, which causes the EC to be always considered "trusted". Therefore, correct the return value to 0 for TPM_GOOGLE_TI50. BUG=b:321172119 TEST=emerge-nissa coreboot chromeos-bootimage TEST=firmware_DevMode passed in FAFT test Change-Id: I308f8b36411030911c4421d80827fc49ff325a1b Signed-off-by: Qinghong Zeng <zengqinghong(a)huaqin.corp- partner.google.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/80158 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Subrata Banik <subratabanik(a)google.com> Reviewed-by: Yu-Ping Wu <yupingso(a)google.com> Reviewed-by: Tyler Wang <tyler.wang(a)quanta.corp-partner.google.com> Reviewed-by: Ian Feng <ian_feng(a)compal.corp-partner.google.com> Reviewed-by: Weimin Wu <wuweimin(a)huaqin.corp-partner.google.com> Reviewed-by: Eric Lai <ericllai(a)google.com> --- M src/mainboard/google/brya/chromeos.c 1 file changed, 4 insertions(+), 0 deletions(-) Approvals: Weimin Wu: Looks good to me, but someone else must approve Yu-Ping Wu: Looks good to me, approved Eric Lai: Looks good to me, approved Subrata Banik: Looks good to me, approved Ian Feng: Looks good to me, but someone else must approve Tyler Wang: Looks good to me, but someone else must approve build bot (Jenkins): Verified diff --git a/src/mainboard/google/brya/chromeos.c b/src/mainboard/google/brya/chromeos.c index 5c99371..73b7237 100644 --- a/src/mainboard/google/brya/chromeos.c +++ b/src/mainboard/google/brya/chromeos.c @@ -24,6 +24,10 @@ int get_ec_is_trusted(void) { + /* With Ti50, VB2_CONTEXT_EC_TRUSTED should be set according to the boot mode. */ + if (CONFIG(TPM_GOOGLE_TI50)) + return 0; + /* EC is trusted if not in RW. */ return !gpio_get(GPIO_EC_IN_RW); } -- To view, visit https://review.coreboot.org/c/coreboot/+/80158?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: main Gerrit-Change-Id: I308f8b36411030911c4421d80827fc49ff325a1b Gerrit-Change-Number: 80158 Gerrit-PatchSet: 6 Gerrit-Owner: Qinghong Zeng <zengqinghong(a)huaqin.corp-partner.google.com> Gerrit-Reviewer: David Wu <david_wu(a)quanta.corp-partner.google.com> Gerrit-Reviewer: Eric Lai <ericllai(a)google.com> Gerrit-Reviewer: Ian Feng <ian_feng(a)compal.corp-partner.google.com> Gerrit-Reviewer: Kapil Porwal <kapilporwal(a)google.com> Gerrit-Reviewer: Nick Vaccaro <nvaccaro(a)chromium.org> Gerrit-Reviewer: Reka Norman <rekanorman(a)chromium.org> Gerrit-Reviewer: Subrata Banik <subratabanik(a)google.com> Gerrit-Reviewer: Tyler Wang <tyler.wang(a)quanta.corp-partner.google.com> Gerrit-Reviewer: Weimin Wu <wuweimin(a)huaqin.corp-partner.google.com> Gerrit-Reviewer: Yu-Ping Wu <yupingso(a)google.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-MessageType: merged

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

coreboot-gerrit January 2024