diff options
author | Elyes Haouas <ehaouas@noos.fr> | 2024-03-23 15:40:00 +0100 |
---|---|---|
committer | Felix Singer <service+coreboot-gerrit@felixsinger.de> | 2024-03-30 08:29:38 +0000 |
commit | c0d3cf105254c0bbde5c57c8817f5263271fb0fe (patch) | |
tree | b76d060dcb00f6696ded9e39bdc7a7808bcb1e72 /src | |
parent | 57351dd872746392175f5684b04ac9fb0a5d5538 (diff) |
soc/intel: Remove blank lines before '}' and after '{'
Change-Id: I79b93b0ca446411e2a1feb65d00045e3be85ee8a
Signed-off-by: Elyes Haouas <ehaouas@noos.fr>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/81489
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Felix Singer <service+coreboot-gerrit@felixsinger.de>
Diffstat (limited to 'src')
66 files changed, 0 insertions, 76 deletions
diff --git a/src/soc/intel/alderlake/chip.h b/src/soc/intel/alderlake/chip.h index 1620c10b6e..a490540fc5 100644 --- a/src/soc/intel/alderlake/chip.h +++ b/src/soc/intel/alderlake/chip.h @@ -323,7 +323,6 @@ enum slew_rate { }; struct soc_intel_alderlake_config { - /* Common struct containing soc config data required by common code */ struct soc_intel_common_config common_soc_config; diff --git a/src/soc/intel/apollolake/chip.c b/src/soc/intel/apollolake/chip.c index 15780d0971..91e39c9183 100644 --- a/src/soc/intel/apollolake/chip.c +++ b/src/soc/intel/apollolake/chip.c @@ -846,7 +846,6 @@ static void disable_xhci_lfps_pm(void) void platform_fsp_notify_status(enum fsp_notify_phase phase) { if (phase == END_OF_FIRMWARE) { - /* * Before hiding P2SB device and dropping privilege level, * dump CSE status and disable HECI1 interface. diff --git a/src/soc/intel/apollolake/chip.h b/src/soc/intel/apollolake/chip.h index 392f58637a..e05bd50f4c 100644 --- a/src/soc/intel/apollolake/chip.h +++ b/src/soc/intel/apollolake/chip.h @@ -33,7 +33,6 @@ enum sata_speed_limit { }; struct soc_intel_apollolake_config { - /* Common structure containing soc config data required by common code*/ struct soc_intel_common_config common_soc_config; diff --git a/src/soc/intel/apollolake/cpu.c b/src/soc/intel/apollolake/cpu.c index f849350dd0..a49bf471a9 100644 --- a/src/soc/intel/apollolake/cpu.c +++ b/src/soc/intel/apollolake/cpu.c @@ -164,7 +164,6 @@ static void pre_mp_init(void) } x86_setup_mtrrs_with_detect(); x86_mtrr_check(); - } #if !CONFIG(SOC_INTEL_COMMON_BLOCK_CPU_MPINIT) diff --git a/src/soc/intel/apollolake/elog.c b/src/soc/intel/apollolake/elog.c index e5e00dd410..03ef816103 100644 --- a/src/soc/intel/apollolake/elog.c +++ b/src/soc/intel/apollolake/elog.c @@ -82,7 +82,6 @@ static void pch_log_power_and_resets(const struct chipset_power_state *ps) /* Power Button Override */ if (ps->pm1_sts & PRBTNOR_STS) elog_add_event(ELOG_TYPE_POWER_BUTTON_OVERRIDE); - } void pch_log_state(void) diff --git a/src/soc/intel/apollolake/romstage.c b/src/soc/intel/apollolake/romstage.c index b9ec4e2bb0..ba865e32b2 100644 --- a/src/soc/intel/apollolake/romstage.c +++ b/src/soc/intel/apollolake/romstage.c @@ -323,7 +323,6 @@ void platform_fsp_memory_init_params_cb(FSPM_UPD *mupd, uint32_t version) assert(CONFIG(BOOT_DEVICE_MEMORY_MAPPED)); fsp_version = version; - } __weak diff --git a/src/soc/intel/baytrail/acpi.c b/src/soc/intel/baytrail/acpi.c index f24fe7f5b7..e2269c3490 100644 --- a/src/soc/intel/baytrail/acpi.c +++ b/src/soc/intel/baytrail/acpi.c @@ -229,7 +229,6 @@ static void generate_p_state_entries(int core) /* Generate the remaining entries */ for (ratio = ratio_min + ((num_entries - 1) * ratio_step); ratio >= ratio_min; ratio -= ratio_step) { - /* Calculate VID for this ratio */ vid = ((ratio - ratio_min) * vid_range_2) / ratio_range_2 + vid_min; diff --git a/src/soc/intel/baytrail/fadt.c b/src/soc/intel/baytrail/fadt.c index 7f48253faf..1593f3163f 100644 --- a/src/soc/intel/baytrail/fadt.c +++ b/src/soc/intel/baytrail/fadt.c @@ -29,5 +29,4 @@ void acpi_fill_fadt(acpi_fadt_t *fadt) ACPI_FADT_SLEEP_BUTTON | ACPI_FADT_SEALED_CASE | ACPI_FADT_S4_RTC_WAKE | ACPI_FADT_PLATFORM_CLOCK; - } diff --git a/src/soc/intel/baytrail/smm.c b/src/soc/intel/baytrail/smm.c index ed83173e6f..a9fce8edab 100644 --- a/src/soc/intel/baytrail/smm.c +++ b/src/soc/intel/baytrail/smm.c @@ -70,7 +70,6 @@ static void smm_southcluster_route_gpios(void) static void smm_southbridge_enable(uint16_t pm1_events) { - printk(BIOS_DEBUG, "Enabling SMIs.\n"); if (!smm_save_params[SMM_SAVE_PARAM_PCIE_WAKE_ENABLE]) pm1_events |= PCIEXPWAK_DIS; diff --git a/src/soc/intel/braswell/acpi.c b/src/soc/intel/braswell/acpi.c index 718bfe995d..ff8774c635 100644 --- a/src/soc/intel/braswell/acpi.c +++ b/src/soc/intel/braswell/acpi.c @@ -257,7 +257,6 @@ static void generate_p_state_entries(int core) /* Generate the remaining entries */ for (ratio = ratio_min + ((num_entries - 1) * ratio_step); ratio >= ratio_min; ratio -= ratio_step) { - /* Calculate VID for this ratio */ vid = ((ratio - ratio_min) * vid_range_2) / ratio_range_2 + vid_min; diff --git a/src/soc/intel/braswell/gpio.c b/src/soc/intel/braswell/gpio.c index 58970e83c4..5780a754f1 100644 --- a/src/soc/intel/braswell/gpio.c +++ b/src/soc/intel/braswell/gpio.c @@ -89,7 +89,6 @@ static void setup_gpio_route(const struct soc_gpio_map *sw_gpios, for (sw_config = sw_gpios, n_config = n_gpios; (!north_done || !south_done); sw_config++, n_config++, gpio++) { - /* When north config is done */ if ((gpio > GP_NORTH_COUNT) || (n_config->pad_conf0 == GPIO_LIST_END)) north_done = 1; @@ -228,7 +227,6 @@ static void setup_gpios(const struct soc_gpio_map *gpios, const struct gpio_bank void setup_soc_gpios(struct soc_gpio_config *config, u8 enable_xdp_tap) { if (config) { - /* * Write the default value 0xffffff to the SW write_access_policy_interrupt_reg * to allow the SW interrupt mask register to be set diff --git a/src/soc/intel/braswell/smm.c b/src/soc/intel/braswell/smm.c index 64e560ed42..45ccd3d1c4 100644 --- a/src/soc/intel/braswell/smm.c +++ b/src/soc/intel/braswell/smm.c @@ -69,7 +69,6 @@ static void smm_southcluster_route_gpios(void) static void smm_southbridge_enable(uint16_t pm1_events) { - printk(BIOS_DEBUG, "Enabling SMIs.\n"); if (!smm_save_params[SMM_SAVE_PARAM_PCIE_WAKE_ENABLE]) pm1_events |= PCIEXPWAK_DIS; diff --git a/src/soc/intel/braswell/southcluster.c b/src/soc/intel/braswell/southcluster.c index 2e3728057d..06a47bcfd4 100644 --- a/src/soc/intel/braswell/southcluster.c +++ b/src/soc/intel/braswell/southcluster.c @@ -111,7 +111,6 @@ static void write_pci_config_irqs(void) */ printk(BIOS_DEBUG, "PCI_CFG IRQ: Write PIRQ assignments\n"); for (irq_dev = all_devices; irq_dev; irq_dev = irq_dev->next) { - if ((irq_dev->path.type != DEVICE_PATH_PCI) || (!irq_dev->enabled)) continue; @@ -288,7 +287,6 @@ static void sc_init(struct device *dev) setup_i8254(); sc_set_serial_irqs_mode(dev, config->serirq_mode); - } /* diff --git a/src/soc/intel/broadwell/gma.c b/src/soc/intel/broadwell/gma.c index d3b923ad94..639a945d75 100644 --- a/src/soc/intel/broadwell/gma.c +++ b/src/soc/intel/broadwell/gma.c @@ -253,7 +253,6 @@ u32 gtt_read(u32 reg) u32 val; val = read32(res2mmio(gtt_res, reg, 0)); return val; - } void gtt_write(u32 reg, u32 data) diff --git a/src/soc/intel/broadwell/pch/lpc.c b/src/soc/intel/broadwell/pch/lpc.c index ecd66fa626..8a703df395 100644 --- a/src/soc/intel/broadwell/pch/lpc.c +++ b/src/soc/intel/broadwell/pch/lpc.c @@ -368,7 +368,6 @@ static void pch_pm_init(struct device *dev) /* Set RCBA 0x2b1c[29]=1 if DSP disabled */ if (RCBA32(FD) & PCH_DISABLE_ADSPD) RCBA32_OR(0x2b1c, (1 << 29)); - } static void pch_cg_init(struct device *dev) diff --git a/src/soc/intel/cannonlake/chip.h b/src/soc/intel/cannonlake/chip.h index 994f2aebef..1e7e5a5225 100644 --- a/src/soc/intel/cannonlake/chip.h +++ b/src/soc/intel/cannonlake/chip.h @@ -37,7 +37,6 @@ enum chip_pl2_4_cfg { }; struct soc_intel_cannonlake_config { - /* Common struct containing soc config data required by common code */ struct soc_intel_common_config common_soc_config; diff --git a/src/soc/intel/cannonlake/finalize.c b/src/soc/intel/cannonlake/finalize.c index ba7fc69b55..116883c9a3 100644 --- a/src/soc/intel/cannonlake/finalize.c +++ b/src/soc/intel/cannonlake/finalize.c @@ -79,7 +79,6 @@ static void pch_finalize(void) */ if (!CONFIG(USE_INTEL_FSP_MP_INIT)) cpu_lt_lock_memory(); - } static void soc_finalize(void *unused) diff --git a/src/soc/intel/cannonlake/include/soc/vr_config.h b/src/soc/intel/cannonlake/include/soc/vr_config.h index 518fbd573e..5ea8633dde 100644 --- a/src/soc/intel/cannonlake/include/soc/vr_config.h +++ b/src/soc/intel/cannonlake/include/soc/vr_config.h @@ -8,7 +8,6 @@ #include <fsp/api.h> struct vr_config { - /* The below settings will take effect when this is set to 1 * for that domain. */ uint8_t vr_config_enable; diff --git a/src/soc/intel/common/block/acpi/acpi.c b/src/soc/intel/common/block/acpi/acpi.c index cd60416c44..1faf433113 100644 --- a/src/soc/intel/common/block/acpi/acpi.c +++ b/src/soc/intel/common/block/acpi/acpi.c @@ -273,7 +273,6 @@ void generate_p_state_entries(int core, int cores_per_package) /* Generate the remaining entries */ for (ratio = ratio_min + ((num_entries - 1) * ratio_step); ratio >= ratio_min; ratio -= ratio_step) { - /* Calculate power at this ratio */ power = common_calculate_power_ratio(power_max, ratio_max, ratio); clock = (ratio * cpu_get_bus_clock()) / KHz; diff --git a/src/soc/intel/common/block/acpi/acpi_bert.c b/src/soc/intel/common/block/acpi/acpi_bert.c index 417dad3ac7..8c1bd34a02 100644 --- a/src/soc/intel/common/block/acpi/acpi_bert.c +++ b/src/soc/intel/common/block/acpi/acpi_bert.c @@ -54,7 +54,6 @@ static enum cb_err record_crashlog_into_bert(void **region, size_t *length) bool multi_entry = false; cl_node_t *cl_node = cl_list_head.next; while (cl_node) { - if ((cl_node->size <= 0) || (!(cl_node->data))) { cl_node = cl_node->next; continue; diff --git a/src/soc/intel/common/block/cpu/cpulib.c b/src/soc/intel/common/block/cpu/cpulib.c index 1cefc1277e..0a9de869ff 100644 --- a/src/soc/intel/common/block/cpu/cpulib.c +++ b/src/soc/intel/common/block/cpu/cpulib.c @@ -154,7 +154,6 @@ void cpu_set_p_state_to_min_clock_ratio(void) */ int cpu_get_burst_mode_state(void) { - msr_t msr; unsigned int eax; int burst_en, burst_cap, burst_state = BURST_MODE_UNKNOWN; diff --git a/src/soc/intel/common/block/crashlog/crashlog.c b/src/soc/intel/common/block/crashlog/crashlog.c index 6735d971ba..541dea4482 100644 --- a/src/soc/intel/common/block/crashlog/crashlog.c +++ b/src/soc/intel/common/block/crashlog/crashlog.c @@ -200,7 +200,6 @@ bool __weak cpu_cl_discovery(void) int cl_pmc_re_arm_after_reset(void) { - const struct pmc_ipc_buffer req = { 0 }; struct pmc_ipc_buffer res; uint32_t cmd_reg; @@ -400,7 +399,6 @@ void __weak cl_get_pmc_sram_data(cl_node_t *head) if (discovery_buf.bits.discov_mechanism == 1) { for (int i = 0; i < descriptor_table.numb_regions; i++) { - cl_node_t *cl_node = malloc_cl_node(descriptor_table.regions[i].bits.size); if (!cl_node) { printk(BIOS_DEBUG, "failed to allocate cl_node [region = %d]\n", i); @@ -425,7 +423,6 @@ void __weak cl_get_pmc_sram_data(cl_node_t *head) } } } else { - cl_node_t *cl_node = malloc_cl_node(discovery_buf.bits.size); if (!cl_node) { printk(BIOS_DEBUG, "failed to allocate cl_node\n"); @@ -458,7 +455,6 @@ pmc_send_re_arm_after_reset: /* Clear the SSRAM region after copying the error log */ cl_pmc_clear(); - } void cl_get_cpu_sram_data(cl_node_t *head) @@ -481,7 +477,6 @@ void cl_get_cpu_sram_data(cl_node_t *head) } for (int i = 0 ; i < cpu_cl_disc_tab.header.fields.count ; i++) { - u32 cpu_bar_addr = cl_get_cpu_bar_addr(); bool pmc_sram = false; diff --git a/src/soc/intel/common/block/cse/cse.c b/src/soc/intel/common/block/cse/cse.c index 6d7569dbb0..d0ca57bc05 100644 --- a/src/soc/intel/common/block/cse/cse.c +++ b/src/soc/intel/common/block/cse/cse.c @@ -1258,7 +1258,6 @@ static void me_reset_with_count(void) */ printk(BIOS_ERR, "Failed to change ME state in %u attempts!\n", ME_DISABLE_ATTEMPTS); - } } else { printk(BIOS_DEBUG, "ME: Resetting"); @@ -1268,7 +1267,6 @@ static void me_reset_with_count(void) static void cse_set_state(struct device *dev) { - /* (CS)ME Disable Command */ struct me_disable_command { struct mkhi_hdr hdr; diff --git a/src/soc/intel/common/block/cse/cse_lite.c b/src/soc/intel/common/block/cse/cse_lite.c index 5298b315d7..3579bcea78 100644 --- a/src/soc/intel/common/block/cse/cse_lite.c +++ b/src/soc/intel/common/block/cse/cse_lite.c @@ -83,7 +83,6 @@ enum bp_status { * The flags are returned in response to MKHI_BUP_COMMON_GET_BOOT_PARTITION_INFO cmd. */ enum bp_info_flags { - /* Redundancy Enabled: It indicates CSE supports RO(BP1) and RW(BP2) regions */ BP_INFO_REDUNDANCY_EN = 1 << 0, @@ -715,7 +714,6 @@ static void cse_get_bp_entry_range(enum boot_partition_id bp, uint32_t *start_of if (end_offset) *end_offset = cse_bp->end_offset; - } static bool cse_is_rw_bp_status_valid(void) diff --git a/src/soc/intel/common/block/cse/telemetry.c b/src/soc/intel/common/block/cse/telemetry.c index 6502be99c9..c1c70e5595 100644 --- a/src/soc/intel/common/block/cse/telemetry.c +++ b/src/soc/intel/common/block/cse/telemetry.c @@ -28,7 +28,6 @@ static void process_cse_telemetry_data(void) current_time = timestamp_get(); for (unsigned int i = 0; i < NUM_CSE_BOOT_PERF_DATA; i++) { - if (cse_perf_data.timestamp[i] == 0xffffffff) { printk(BIOS_ERR, "%s: CSME timestamps invalid\n", __func__); return; @@ -48,7 +47,6 @@ static void process_cse_telemetry_data(void) /* Normalize TS values to zero-point */ for (unsigned int i = zero_point_idx + 1; i < NUM_CSE_BOOT_PERF_DATA; i++) { - if (ts[i] && ts[i] < ts[zero_point_idx]) { printk(BIOS_ERR, "%s: CSME timestamps invalid," " wraparound detected\n", __func__); diff --git a/src/soc/intel/common/block/fast_spi/mmap_boot.c b/src/soc/intel/common/block/fast_spi/mmap_boot.c index fa163d7e49..bc31edc24f 100644 --- a/src/soc/intel/common/block/fast_spi/mmap_boot.c +++ b/src/soc/intel/common/block/fast_spi/mmap_boot.c @@ -170,7 +170,6 @@ uint32_t spi_flash_get_mmap_windows(struct flash_mmap_window *table) bios_mmap_init(); for (i = 0; i < TOTAL_DECODE_WINDOWS; i++) { - if (region_sz(&real_dev_windows[i].sub_region) == 0) continue; diff --git a/src/soc/intel/common/block/gpio/gpio.c b/src/soc/intel/common/block/gpio/gpio.c index 09ada90ccc..63d7a5e8d2 100644 --- a/src/soc/intel/common/block/gpio/gpio.c +++ b/src/soc/intel/common/block/gpio/gpio.c @@ -810,7 +810,6 @@ void gpi_clear_get_smi_status(struct gpi_status *sts) if (CONFIG(DEBUG_SMI)) print_gpi_status(sts); - } int gpi_status_get(const struct gpi_status *sts, gpio_t pad) diff --git a/src/soc/intel/common/block/sgx/sgx.c b/src/soc/intel/common/block/sgx/sgx.c index 31447f9a76..9f30b92846 100644 --- a/src/soc/intel/common/block/sgx/sgx.c +++ b/src/soc/intel/common/block/sgx/sgx.c @@ -163,7 +163,6 @@ static int is_prmrr_approved(void) */ void sgx_configure(void *unused) { - if (!is_sgx_supported() || !is_prmrr_set()) { printk(BIOS_ERR, "SGX: not supported or pre-conditions not met\n"); return; diff --git a/src/soc/intel/common/block/tcss/tcss.c b/src/soc/intel/common/block/tcss/tcss.c index 8080c25fce..1c4b9b391f 100644 --- a/src/soc/intel/common/block/tcss/tcss.c +++ b/src/soc/intel/common/block/tcss/tcss.c @@ -41,7 +41,6 @@ static uint32_t tcss_make_alt_mode_cmd_buf_0(int u, int u3, int m) return TCSS_ALT_FIELD(USAGE, u) | TCSS_ALT_FIELD(USB3, u3) | TCSS_ALT_FIELD(MODE, m); - } static uint32_t tcss_make_alt_mode_cmd_buf_1(int p, int c, int ufp, int dp) @@ -65,7 +64,6 @@ static uint32_t tcss_make_hpd_mode_cmd(int u, int u3, int hpd_lvl, int hpd_irq) TCSS_HPD_FIELD(USB3, u3) | TCSS_HPD_FIELD(LVL, hpd_lvl) | TCSS_HPD_FIELD(IRQ, hpd_irq); - } static int send_pmc_req(int cmd_type, const struct pmc_ipc_buffer *req, diff --git a/src/soc/intel/denverton_ns/bootblock/bootblock.c b/src/soc/intel/denverton_ns/bootblock/bootblock.c index 0846c8e474..6601714491 100644 --- a/src/soc/intel/denverton_ns/bootblock/bootblock.c +++ b/src/soc/intel/denverton_ns/bootblock/bootblock.c @@ -80,7 +80,6 @@ static void sanity_check_pci_mmconf(void) void bootblock_soc_early_init(void) { - #if (CONFIG(CONSOLE_SERIAL)) early_uart_init(); #endif diff --git a/src/soc/intel/denverton_ns/gpio_dnv.c b/src/soc/intel/denverton_ns/gpio_dnv.c index 299f950968..05260bfe16 100644 --- a/src/soc/intel/denverton_ns/gpio_dnv.c +++ b/src/soc/intel/denverton_ns/gpio_dnv.c @@ -159,7 +159,6 @@ void gpio_configure_dnv_pads(const struct dnv_pad_config *gpio, size_t num) NumberOfGroups = V_PCH_GPIO_GROUP_MAX; for (Index = 0; Index < (uint32_t)num; Index++) { - Dw0RegMask = 0; Dw0Reg = 0; Dw1RegMask = 0; diff --git a/src/soc/intel/denverton_ns/romstage.c b/src/soc/intel/denverton_ns/romstage.c index 8e555efff1..b55ddfb435 100644 --- a/src/soc/intel/denverton_ns/romstage.c +++ b/src/soc/intel/denverton_ns/romstage.c @@ -146,7 +146,6 @@ static void soc_memory_init_params(FSP_M_CONFIG *m_cfg) /* if ME HECI communication is disabled, apply default one*/ if (mupd->FspmConfig.PcdMeHeciCommunication == 0) { - /* Configure FIA MUX PCD */ /* Assume the validating silicon has max lanes. */ supported_hsio_lanes = BL_ME_FIA_MUX_LANE_NUM_MAX; diff --git a/src/soc/intel/denverton_ns/smm.c b/src/soc/intel/denverton_ns/smm.c index bb399e81ca..e32ae104b8 100644 --- a/src/soc/intel/denverton_ns/smm.c +++ b/src/soc/intel/denverton_ns/smm.c @@ -32,7 +32,6 @@ void smm_southbridge_clear_state(void) static void smm_southbridge_enable(uint16_t pm1_events) { - printk(BIOS_DEBUG, "Enabling SMIs.\n"); /* Configure events Disable PCIe wake. */ enable_pm1(pm1_events | PCIEXPWAK_DIS); diff --git a/src/soc/intel/denverton_ns/uart.c b/src/soc/intel/denverton_ns/uart.c index b8598cc4ef..ca2e67f752 100644 --- a/src/soc/intel/denverton_ns/uart.c +++ b/src/soc/intel/denverton_ns/uart.c @@ -32,7 +32,6 @@ static void dnv_ns_uart_read_resources(struct device *dev) if (res != NULL) res->flags = 0; compact_resources(dev); - } static struct device_operations uart_ops = { diff --git a/src/soc/intel/elkhartlake/chip.h b/src/soc/intel/elkhartlake/chip.h index 817689006c..5330f223ad 100644 --- a/src/soc/intel/elkhartlake/chip.h +++ b/src/soc/intel/elkhartlake/chip.h @@ -109,7 +109,6 @@ enum sata_speed_limit { }; struct soc_intel_elkhartlake_config { - /* Common struct containing soc config data required by common code */ struct soc_intel_common_config common_soc_config; diff --git a/src/soc/intel/elkhartlake/include/soc/meminit.h b/src/soc/intel/elkhartlake/include/soc/meminit.h index 2dcbd13253..ca871da91a 100644 --- a/src/soc/intel/elkhartlake/include/soc/meminit.h +++ b/src/soc/intel/elkhartlake/include/soc/meminit.h @@ -52,7 +52,6 @@ struct spd_info { /* Board-specific memory dq mapping information */ struct mb_cfg { - /* * For each channel, there are 6 sets of DQ byte mappings, * where each set has a package 0 and a package 1 value (package 0 diff --git a/src/soc/intel/elkhartlake/meminit.c b/src/soc/intel/elkhartlake/meminit.c index fd64c7d3e5..a8fa97215c 100644 --- a/src/soc/intel/elkhartlake/meminit.c +++ b/src/soc/intel/elkhartlake/meminit.c @@ -88,7 +88,6 @@ static void meminit_channels(FSP_M_CONFIG *mem_cfg, const struct mb_cfg *board_c void memcfg_init(FSP_M_CONFIG *mem_cfg, const struct mb_cfg *board_cfg, const struct spd_info *spd_info, bool half_populated) { - if (spd_info->read_type == READ_SMBUS) { for (int i = 0; i < NUM_DIMM_SLOT; i++) mem_cfg->SpdAddressTable[i] = spd_info->spd_spec.spd_smbus_address[i]; diff --git a/src/soc/intel/elkhartlake/systemagent.c b/src/soc/intel/elkhartlake/systemagent.c index a9fd26c603..9eadf89c57 100644 --- a/src/soc/intel/elkhartlake/systemagent.c +++ b/src/soc/intel/elkhartlake/systemagent.c @@ -60,5 +60,4 @@ void soc_systemagent_init(struct device *dev) config = config_of_soc(); soc_config = &config->power_limits_config; set_power_limits(MOBILE_SKU_PL1_TIME_SEC, soc_config); - } diff --git a/src/soc/intel/jasperlake/chip.h b/src/soc/intel/jasperlake/chip.h index af7ee54188..f8d069e004 100644 --- a/src/soc/intel/jasperlake/chip.h +++ b/src/soc/intel/jasperlake/chip.h @@ -58,7 +58,6 @@ static const struct { }; struct soc_intel_jasperlake_config { - /* Common struct containing soc config data required by common code */ struct soc_intel_common_config common_soc_config; diff --git a/src/soc/intel/jasperlake/gpio.c b/src/soc/intel/jasperlake/gpio.c index 3376aaa245..387fb591ce 100644 --- a/src/soc/intel/jasperlake/gpio.c +++ b/src/soc/intel/jasperlake/gpio.c @@ -32,7 +32,6 @@ static const struct reset_mapping rst_map_com0[] = { * linux/drivers/pinctrl/intel/pinctrl-jasperlake.c */ static const struct pad_group jsl_community0_groups[] = { - INTEL_GPP_BASE(GPP_F0, GPP_F0, GPP_F19, 320), /* GPP_F */ INTEL_GPP(GPP_F0, GPIO_SPI0_IO_2, GPIO_SPI0_CLK_LOOPBK),/* SPI0 */ INTEL_GPP_BASE(GPP_F0, GPP_B0, GPIO_GSPI1_CLK_LOOPBK, 32),/* GPP_B */ diff --git a/src/soc/intel/jasperlake/include/soc/meminit.h b/src/soc/intel/jasperlake/include/soc/meminit.h index 5ba3e69db8..a8d3621657 100644 --- a/src/soc/intel/jasperlake/include/soc/meminit.h +++ b/src/soc/intel/jasperlake/include/soc/meminit.h @@ -52,7 +52,6 @@ struct spd_info { /* Board-specific memory dq mapping information */ struct mb_cfg { - /* * For each channel, there are 6 sets of DQ byte mappings, * where each set has a package 0 and a package 1 value (package 0 diff --git a/src/soc/intel/jasperlake/meminit.c b/src/soc/intel/jasperlake/meminit.c index 9cf5ecba67..9846160b1d 100644 --- a/src/soc/intel/jasperlake/meminit.c +++ b/src/soc/intel/jasperlake/meminit.c @@ -88,7 +88,6 @@ static void meminit_channels(FSP_M_CONFIG *mem_cfg, const struct mb_cfg *board_c void memcfg_init(FSP_M_CONFIG *mem_cfg, const struct mb_cfg *board_cfg, const struct spd_info *spd_info, bool half_populated) { - if (spd_info->read_type == READ_SMBUS) { for (int i = 0; i < NUM_DIMM_SLOT; i++) mem_cfg->SpdAddressTable[i] = spd_info->spd_spec.spd_smbus_address[i]; diff --git a/src/soc/intel/jasperlake/romstage/romstage.c b/src/soc/intel/jasperlake/romstage/romstage.c index 3688f9e513..787eb77c91 100644 --- a/src/soc/intel/jasperlake/romstage/romstage.c +++ b/src/soc/intel/jasperlake/romstage/romstage.c @@ -139,7 +139,6 @@ void mainboard_romstage_entry(void) fsp_memory_init(s3wake); pmc_set_disb(); if (!s3wake) { - /* * cse_fw_sync() must be called after DRAM initialization as * HMRFPO_ENABLE HECI command (which is used by cse_fw_sync()) diff --git a/src/soc/intel/meteorlake/chip.h b/src/soc/intel/meteorlake/chip.h index cfef3c1b51..1b08ccdbd6 100644 --- a/src/soc/intel/meteorlake/chip.h +++ b/src/soc/intel/meteorlake/chip.h @@ -146,7 +146,6 @@ enum slew_rate { }; struct soc_intel_meteorlake_config { - /* Common struct containing soc config data required by common code */ struct soc_intel_common_config common_soc_config; diff --git a/src/soc/intel/meteorlake/crashlog.c b/src/soc/intel/meteorlake/crashlog.c index 52d23714ff..6d654d7e0b 100644 --- a/src/soc/intel/meteorlake/crashlog.c +++ b/src/soc/intel/meteorlake/crashlog.c @@ -110,7 +110,6 @@ void cl_get_pmc_sram_data(cl_node_t *head) /* process crashlog records */ for (int i = 0; i < descriptor_table.numb_regions + 1; i++) { - u32 sram_base = 0; bool pmc_sram = true; printk(BIOS_DEBUG, "Region[0x%x].Tag=0x%x offset=0x%x, size=0x%x\n", diff --git a/src/soc/intel/meteorlake/finalize.c b/src/soc/intel/meteorlake/finalize.c index a977b0516e..06ea13cc91 100644 --- a/src/soc/intel/meteorlake/finalize.c +++ b/src/soc/intel/meteorlake/finalize.c @@ -27,7 +27,6 @@ static void pch_handle_sideband(config_t *config) { - } static void pch_finalize(void) diff --git a/src/soc/intel/skylake/chip.h b/src/soc/intel/skylake/chip.h index 3070c462ba..7997f7df44 100644 --- a/src/soc/intel/skylake/chip.h +++ b/src/soc/intel/skylake/chip.h @@ -31,7 +31,6 @@ enum skylake_i2c_voltage { }; struct soc_intel_skylake_config { - /* Common struct containing soc config data required by common code */ struct soc_intel_common_config common_soc_config; diff --git a/src/soc/intel/skylake/fadt.c b/src/soc/intel/skylake/fadt.c index 5c97f4e2f6..693218f9ba 100644 --- a/src/soc/intel/skylake/fadt.c +++ b/src/soc/intel/skylake/fadt.c @@ -25,5 +25,4 @@ void soc_fill_fadt(acpi_fadt_t *fadt) if (config->s0ix_enable) fadt->flags |= ACPI_FADT_LOW_PWR_IDLE_S0; - } diff --git a/src/soc/intel/skylake/gpio.c b/src/soc/intel/skylake/gpio.c index 0480a061a1..50628a7d98 100644 --- a/src/soc/intel/skylake/gpio.c +++ b/src/soc/intel/skylake/gpio.c @@ -181,5 +181,4 @@ uint32_t soc_gpio_pad_config_fixup(const struct pad_config *cfg, if (cfg->pad >= GPP_F4 && cfg->pad <= GPP_F11 && dw_reg == 1) reg_val = reg_val & ~(PAD_CFG1_TOL_1V8); return reg_val; - } diff --git a/src/soc/intel/skylake/include/soc/vr_config.h b/src/soc/intel/skylake/include/soc/vr_config.h index 5207af85c4..5b24435e5b 100644 --- a/src/soc/intel/skylake/include/soc/vr_config.h +++ b/src/soc/intel/skylake/include/soc/vr_config.h @@ -8,7 +8,6 @@ #include <fsp/api.h> struct vr_config { - /* * The below settings will take effect when this is set to 1 * for that domain. diff --git a/src/soc/intel/tigerlake/chip.h b/src/soc/intel/tigerlake/chip.h index 8700dd5d51..f8d4d4907b 100644 --- a/src/soc/intel/tigerlake/chip.h +++ b/src/soc/intel/tigerlake/chip.h @@ -116,7 +116,6 @@ enum ddi_port_config { }; struct soc_intel_tigerlake_config { - /* Common struct containing soc config data required by common code */ struct soc_intel_common_config common_soc_config; diff --git a/src/soc/intel/tigerlake/crashlog_lib.c b/src/soc/intel/tigerlake/crashlog_lib.c index bde641d475..fca38a1c35 100644 --- a/src/soc/intel/tigerlake/crashlog_lib.c +++ b/src/soc/intel/tigerlake/crashlog_lib.c @@ -116,7 +116,6 @@ u32 cl_get_cpu_tmp_bar(void) bool cl_pmc_sram_has_mmio_access(void) { - if (pci_read_config16(PCH_DEV_SRAM, PCI_VENDOR_ID) == 0xFFFF) { printk(BIOS_ERR, "PMC SSRAM PCI device is disabled.\n"); return false; diff --git a/src/soc/intel/tigerlake/fsp_params.c b/src/soc/intel/tigerlake/fsp_params.c index 33269356c8..d5472dd91b 100644 --- a/src/soc/intel/tigerlake/fsp_params.c +++ b/src/soc/intel/tigerlake/fsp_params.c @@ -563,7 +563,6 @@ void platform_fsp_silicon_init_params_cb(FSPS_UPD *supd) params->PchFivrExtV1p05RailIccMaximum = config->ext_fivr_settings.v1p05_icc_max_ma; - } /* Apply minimum assertion width settings if non-zero */ diff --git a/src/soc/intel/tigerlake/meminit.c b/src/soc/intel/tigerlake/meminit.c index d4f96689f0..df9ba2dce3 100644 --- a/src/soc/intel/tigerlake/meminit.c +++ b/src/soc/intel/tigerlake/meminit.c @@ -176,5 +176,4 @@ void memcfg_init(FSPM_UPD *memupd, const struct mb_cfg *mb_cfg, default: die("Unsupported memory type(%d)\n", mb_cfg->type); } - } diff --git a/src/soc/intel/tigerlake/romstage/fsp_params.c b/src/soc/intel/tigerlake/romstage/fsp_params.c index baf2eb36cf..f7337f024d 100644 --- a/src/soc/intel/tigerlake/romstage/fsp_params.c +++ b/src/soc/intel/tigerlake/romstage/fsp_params.c @@ -221,7 +221,6 @@ static void soc_memory_init_params(FSP_M_CONFIG *m_cfg, config->ibecc.region_mask); } } - } void platform_fsp_memory_init_params_cb(FSPM_UPD *mupd, uint32_t version) diff --git a/src/soc/intel/tigerlake/romstage/romstage.c b/src/soc/intel/tigerlake/romstage/romstage.c index 31b19d2265..1985ea3c5b 100644 --- a/src/soc/intel/tigerlake/romstage/romstage.c +++ b/src/soc/intel/tigerlake/romstage/romstage.c @@ -150,5 +150,4 @@ void mainboard_romstage_entry(void) save_dimm_info(); } - } diff --git a/src/soc/intel/xeon_sp/chip_common.c b/src/soc/intel/xeon_sp/chip_common.c index bec0d93f63..3ca0eca5ee 100644 --- a/src/soc/intel/xeon_sp/chip_common.c +++ b/src/soc/intel/xeon_sp/chip_common.c @@ -433,7 +433,6 @@ bool is_ubox_domain(struct device *dev) return (strstr(dev->name, DOMAIN_TYPE_UBX0) || strstr(dev->name, DOMAIN_TYPE_UBX1)); - } bool is_cxl_domain(struct device *dev) diff --git a/src/soc/intel/xeon_sp/cpx/soc_acpi.c b/src/soc/intel/xeon_sp/cpx/soc_acpi.c index 1434fbfce5..1bdfe5815f 100644 --- a/src/soc/intel/xeon_sp/cpx/soc_acpi.c +++ b/src/soc/intel/xeon_sp/cpx/soc_acpi.c @@ -130,7 +130,6 @@ void soc_power_states_generation(int core, int cores_per_package) /* Generate the remaining entries */ for (ratio = ratio_min + ((num_entries - 1) * ratio_step); ratio >= ratio_min; ratio -= ratio_step) { - /* Calculate power at this ratio */ power = common_calculate_power_ratio(power_max, ratio_max, ratio); clock = ratio * CONFIG_CPU_BCLK_MHZ; diff --git a/src/soc/intel/xeon_sp/finalize.c b/src/soc/intel/xeon_sp/finalize.c index af630fe812..fa39eb6e87 100644 --- a/src/soc/intel/xeon_sp/finalize.c +++ b/src/soc/intel/xeon_sp/finalize.c @@ -82,7 +82,6 @@ static void bios_done_finalize(void *unused) /* bios_done_msr() only defined for some Xeon-SP, such as SPR-SP */ if (mp_run_on_all_cpus(&bios_done_msr, NULL) != CB_SUCCESS) printk(BIOS_ERR, "Fail to set BIOS_DONE MSR\n"); - } BOOT_STATE_INIT_ENTRY(BS_PAYLOAD_LOAD, BS_ON_ENTRY, soc_finalize, NULL); diff --git a/src/soc/intel/xeon_sp/romstage.c b/src/soc/intel/xeon_sp/romstage.c index e57ba4554a..9084f2ae24 100644 --- a/src/soc/intel/xeon_sp/romstage.c +++ b/src/soc/intel/xeon_sp/romstage.c @@ -36,7 +36,6 @@ __weak void mainboard_memory_init_params(FSPM_UPD *mupd) __weak void mainboard_rtc_failed(void) { - } __weak void save_dimm_info(void) { } __weak void mainboard_ewl_check(void) { } diff --git a/src/soc/intel/xeon_sp/smihandler.c b/src/soc/intel/xeon_sp/smihandler.c index 4362c6a906..7c7cee38ee 100644 --- a/src/soc/intel/xeon_sp/smihandler.c +++ b/src/soc/intel/xeon_sp/smihandler.c @@ -83,7 +83,6 @@ void smihandler_soc_at_finalize(void) */ void cpu_smi_handler(void) { - } /* This is needed by common SMM code */ diff --git a/src/soc/intel/xeon_sp/spr/chip.c b/src/soc/intel/xeon_sp/spr/chip.c index 7b934ba3a5..9b3b46f559 100644 --- a/src/soc/intel/xeon_sp/spr/chip.c +++ b/src/soc/intel/xeon_sp/spr/chip.c @@ -29,7 +29,6 @@ __weak void mainboard_silicon_init_params(FSPS_UPD *params) { - } /* UPD parameters to be initialized before SiliconInit */ diff --git a/src/soc/intel/xeon_sp/spr/romstage.c b/src/soc/intel/xeon_sp/spr/romstage.c index 91d2099632..3e16608ca4 100644 --- a/src/soc/intel/xeon_sp/spr/romstage.c +++ b/src/soc/intel/xeon_sp/spr/romstage.c @@ -149,7 +149,6 @@ void soc_config_iio(FSPM_UPD *mupd, const UPD_IIO_PCIE_PORT_CONFIG_ENTRY mupd->FspmConfig.IioPcieConfigTableNumber = CONFIG_MAX_SOCKET; /* Set by mainboard */ for (socket = 0; socket < CONFIG_MAX_SOCKET; socket++) { - /* Configures DMI, IOU0 ~ IOU4 */ for (port = 0; port < IIO_PORT_SETTINGS; port++) { const UPD_IIO_PCIE_PORT_CONFIG_ENTRY *port_cfg = diff --git a/src/soc/intel/xeon_sp/spr/soc_acpi.c b/src/soc/intel/xeon_sp/spr/soc_acpi.c index 607ee6c36d..2d1f375c9d 100644 --- a/src/soc/intel/xeon_sp/spr/soc_acpi.c +++ b/src/soc/intel/xeon_sp/spr/soc_acpi.c @@ -140,7 +140,6 @@ void soc_power_states_generation(int core, int cores_per_package) /* Generate the remaining entries */ for (ratio = ratio_min + ((num_entries - 1) * ratio_step); ratio >= ratio_min; ratio -= ratio_step) { - /* Calculate power at this ratio */ power = common_calculate_power_ratio(power_max, ratio_max, ratio); clock = ratio * CONFIG_CPU_BCLK_MHZ; diff --git a/src/soc/intel/xeon_sp/spr/soc_util.c b/src/soc/intel/xeon_sp/spr/soc_util.c index 41b256c28a..6ed018c56c 100644 --- a/src/soc/intel/xeon_sp/spr/soc_util.c +++ b/src/soc/intel/xeon_sp/spr/soc_util.c @@ -165,7 +165,6 @@ void soc_set_mrc_cold_boot_flag(bool cold_boot_required) printk(BIOS_SPEW, "MRC status: 0x%02x want 0x%02x\n", mrc_status, new_mrc_status); if (new_mrc_status != mrc_status) cmos_write(new_mrc_status, CMOS_OFFSET_MRC_STATUS); - } bool is_memtype_reserved(uint16_t mem_type) diff --git a/src/soc/intel/xeon_sp/uncore.c b/src/soc/intel/xeon_sp/uncore.c index 0eaff0626f..a177a89d66 100644 --- a/src/soc/intel/xeon_sp/uncore.c +++ b/src/soc/intel/xeon_sp/uncore.c @@ -253,7 +253,6 @@ static void mc_add_dram_resources(struct device *dev, int *res_count) res = reserved_ram_from_to(dev, index++, (dpr.top - dpr.size) * MiB, dpr.top * MiB); LOG_RESOURCE("dpr", dev, res); - } /* Mark TSEG/SMM region as reserved */ |