x86: apl: Add FSP structures
authorSimon Glass <sjg@chromium.org>
Mon, 9 Dec 2019 00:40:18 +0000 (17:40 -0700)
committerBin Meng <bmeng.cn@gmail.com>
Sun, 15 Dec 2019 03:44:30 +0000 (11:44 +0800)
These are mostly specific to a particular SoC. Add the definitions for
Apollo Lake.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
arch/x86/include/asm/arch-apollolake/fsp/fsp_configs.h [new file with mode: 0644]
arch/x86/include/asm/arch-apollolake/fsp/fsp_m_upd.h [new file with mode: 0644]
arch/x86/include/asm/arch-apollolake/fsp/fsp_s_upd.h [new file with mode: 0644]
arch/x86/include/asm/arch-apollolake/fsp/fsp_vpd.h [new file with mode: 0644]

diff --git a/arch/x86/include/asm/arch-apollolake/fsp/fsp_configs.h b/arch/x86/include/asm/arch-apollolake/fsp/fsp_configs.h
new file mode 100644 (file)
index 0000000..9185d94
--- /dev/null
@@ -0,0 +1,14 @@
+/* SPDX-License-Identifier: Intel */
+/*
+ * Copyright 2019 Google LLC
+ */
+
+#ifndef __FSP_CONFIGS_H__
+#define __FSP_CONFIGS_H__
+
+#define FSPT_UPD_SIGNATURE     0x545F4450554C5041      /* 'APLUPD_T' */
+#define FSPM_UPD_SIGNATURE     0x4D5F4450554C5041      /* 'APLUPD_M' */
+#define FSPS_UPD_SIGNATURE     0x535F4450554C5041      /* 'APLUPD_S' */
+#define VBT_SIGNATURE          0x54425624
+
+#endif
diff --git a/arch/x86/include/asm/arch-apollolake/fsp/fsp_m_upd.h b/arch/x86/include/asm/arch-apollolake/fsp/fsp_m_upd.h
new file mode 100644 (file)
index 0000000..93bee5b
--- /dev/null
@@ -0,0 +1,123 @@
+/* SPDX-License-Identifier: Intel */
+/*
+ * Copyright (c) 2019, Intel Corporation. All rights reserved.
+ * Copyright 2019 Google LLC
+ */
+
+#ifndef        __ASM_ARCH_FSP_M_UDP_H
+#define        __ASM_ARCH_FSP_M_UDP_H
+
+#include <asm/fsp2/fsp_api.h>
+
+#define FSP_DRAM_CHANNELS      4
+
+struct __packed fspm_arch_upd {
+       u8      revision;
+       u8      reserved[3];
+       void    *nvs_buffer_ptr;
+       void    *stack_base;
+       u32     stack_size;
+       u32     boot_loader_tolum_size;
+       u32     boot_mode;
+       u8      reserved1[8];
+};
+
+struct __packed fsp_ram_channel {
+       u8      rank_enable;
+       u8      device_width;
+       u8      dram_density;
+       u8      option;
+       u8      odt_config;
+       u8      tristate_clk1;
+       u8      mode2_n;
+       u8      odt_levels;
+};
+
+struct __packed fsp_m_config {
+       u32     serial_debug_port_address;
+       u8      serial_debug_port_type;
+       u8      serial_debug_port_device;
+       u8      serial_debug_port_stride_size;
+       u8      mrc_fast_boot;
+       u8      igd;
+       u8      igd_dvmt50_pre_alloc;
+       u8      igd_aperture_size;
+       u8      gtt_size;
+       u8      primary_video_adaptor;
+       u8      package;
+       u8      profile;
+       u8      memory_down;
+
+       u8      ddr3_l_page_size;
+       u8      ddr3_lasr;
+       u8      scrambler_support;
+       u8      interleaved_mode;
+       u16     channel_hash_mask;
+       u16     slice_hash_mask;
+       u8      channels_slices_enable;
+       u8      min_ref_rate2x_enable;
+       u8      dual_rank_support_enable;
+       u8      rmt_mode;
+       u16     memory_size_limit;
+       u16     low_memory_max_value;
+
+       u16     high_memory_max_value;
+       u8      disable_fast_boot;
+       u8      dimm0_spd_address;
+       u8      dimm1_spd_address;
+       struct fsp_ram_channel chan[FSP_DRAM_CHANNELS];
+       u8      rmt_check_run;
+       u16     rmt_margin_check_scale_high_threshold;
+       u8      ch_bit_swizzling[FSP_DRAM_CHANNELS][32];
+       u32     msg_level_mask;
+       u8      unused_upd_space0[4];
+
+       u8      pre_mem_gpio_table_pin_num[4];
+       u32     pre_mem_gpio_table_ptr;
+       u8      pre_mem_gpio_table_entry_num;
+       u8      enhance_port8xh_decoding;
+       u8      spd_write_enable;
+       u8      mrc_data_saving;
+       u32     oem_loading_base;
+
+       u8      oem_file_name[16];
+
+       void    *mrc_boot_data_ptr;
+       u8      e_mmc_trace_len;
+       u8      skip_cse_rbp;
+       u8      npk_en;
+       u8      fw_trace_en;
+       u8      fw_trace_destination;
+       u8      recover_dump;
+       u8      msc0_wrap;
+       u8      msc1_wrap;
+       u32     msc0_size;
+
+       u32     msc1_size;
+       u8      pti_mode;
+       u8      pti_training;
+       u8      pti_speed;
+       u8      punit_mlvl;
+
+       u8      pmc_mlvl;
+       u8      sw_trace_en;
+       u8      periodic_retraining_disable;
+       u8      enable_reset_system;
+
+       u8      enable_s3_heci2;
+       u8      unused_upd_space1[3];
+
+       void    *variable_nvs_buffer_ptr;
+       u8      reserved_fspm_upd[12];
+};
+
+/** FSP-M UPD Configuration */
+struct __packed fspm_upd {
+       struct fsp_upd_header header;
+       struct fspm_arch_upd arch;
+       struct fsp_m_config config;
+       u8 unused_upd_space2[158];
+       u16 upd_terminator;
+};
+
+#endif
diff --git a/arch/x86/include/asm/arch-apollolake/fsp/fsp_s_upd.h b/arch/x86/include/asm/arch-apollolake/fsp/fsp_s_upd.h
new file mode 100644 (file)
index 0000000..4a868e8
--- /dev/null
@@ -0,0 +1,292 @@
+/* SPDX-License-Identifier: Intel */
+/*
+ * Copyright (c) 2016, Intel Corporation. All rights reserved.
+ * Copyright 2019 Google LLC
+ */
+#ifndef __ASM_ARCH_FSP_S_UDP_H
+#define __ASM_ARCH_FSP_S_UDP_H
+
+#include <asm/fsp2/fsp_api.h>
+
+struct __packed fsp_s_config {
+       u8      active_processor_cores;
+       u8      disable_core1;
+       u8      disable_core2;
+       u8      disable_core3;
+       u8      vmx_enable;
+       u8      proc_trace_mem_size;
+       u8      proc_trace_enable;
+       u8      eist;
+       u8      boot_p_state;
+       u8      enable_cx;
+       u8      c1e;
+       u8      bi_proc_hot;
+       u8      pkg_c_state_limit;
+       u8      c_state_auto_demotion;
+       u8      c_state_un_demotion;
+       u8      max_core_c_state;
+       u8      pkg_c_state_demotion;
+       u8      pkg_c_state_un_demotion;
+       u8      turbo_mode;
+       u8      hda_verb_table_entry_num;
+       u32     hda_verb_table_ptr;
+       u8      p2sb_unhide;
+       u8      ipu_en;
+       u8      ipu_acpi_mode;
+       u8      force_wake;
+       u32     gtt_mm_adr;
+       u32     gm_adr;
+       u8      pavp_lock;
+       u8      graphics_freq_modify;
+       u8      graphics_freq_req;
+       u8      graphics_video_freq;
+       u8      pm_lock;
+       u8      dop_clock_gating;
+       u8      unsolicited_attack_override;
+       u8      wopcm_support;
+       u8      wopcm_size;
+       u8      power_gating;
+       u8      unit_level_clock_gating;
+       u8      fast_boot;
+       u8      dyn_sr;
+       u8      sa_ipu_enable;
+       u8      pm_support;
+       u8      enable_render_standby;
+       u32     logo_size;
+       u32     logo_ptr;
+       u32     graphics_config_ptr;
+       u8      pavp_enable;
+       u8      pavp_pr3;
+       u8      cd_clock;
+       u8      pei_graphics_peim_init;
+       u8      write_protection_enable[5];
+       u8      read_protection_enable[5];
+       u16     protected_range_limit[5];
+       u16     protected_range_base[5];
+       u8      gmm;
+       u8      clk_gating_pgcb_clk_trunk;
+       u8      clk_gating_sb;
+       u8      clk_gating_sb_clk_trunk;
+       u8      clk_gating_sb_clk_partition;
+       u8      clk_gating_core;
+       u8      clk_gating_dma;
+       u8      clk_gating_reg_access;
+       u8      clk_gating_host;
+       u8      clk_gating_partition;
+       u8      clk_gating_trunk;
+       u8      hda_enable;
+       u8      dsp_enable;
+       u8      pme;
+       u8      hd_audio_io_buffer_ownership;
+       u8      hd_audio_io_buffer_voltage;
+       u8      hd_audio_vc_type;
+       u8      hd_audio_link_frequency;
+       u8      hd_audio_i_disp_link_frequency;
+       u8      hd_audio_i_disp_link_tmode;
+       u8      dsp_endpoint_dmic;
+       u8      dsp_endpoint_bluetooth;
+       u8      dsp_endpoint_i2s_skp;
+       u8      dsp_endpoint_i2s_hp;
+       u8      audio_ctl_pwr_gate;
+       u8      audio_dsp_pwr_gate;
+       u8      mmt;
+       u8      hmt;
+       u8      hd_audio_pwr_gate;
+       u8      hd_audio_clk_gate;
+       u32     dsp_feature_mask;
+       u32     dsp_pp_module_mask;
+       u8      bios_cfg_lock_down;
+       u8      hpet;
+       u8      hpet_bdf_valid;
+       u8      hpet_bus_number;
+       u8      hpet_device_number;
+       u8      hpet_function_number;
+       u8      io_apic_bdf_valid;
+       u8      io_apic_bus_number;
+       u8      io_apic_device_number;
+       u8      io_apic_function_number;
+       u8      io_apic_entry24_119;
+       u8      io_apic_id;
+       u8      io_apic_range_select;
+       u8      ish_enable;
+       u8      bios_interface;
+       u8      bios_lock;
+       u8      spi_eiss;
+       u8      bios_lock_sw_smi_number;
+       u8      lpss_s0ix_enable;
+       u8      unused_upd_space0[1];
+       u8      i2c_clk_gate_cfg[8];
+       u8      hsuart_clk_gate_cfg[4];
+       u8      spi_clk_gate_cfg[3];
+       u8      i2c0_enable;
+       u8      i2c1_enable;
+       u8      i2c2_enable;
+       u8      i2c3_enable;
+       u8      i2c4_enable;
+       u8      i2c5_enable;
+       u8      i2c6_enable;
+       u8      i2c7_enable;
+       u8      hsuart0_enable;
+       u8      hsuart1_enable;
+       u8      hsuart2_enable;
+       u8      hsuart3_enable;
+       u8      spi0_enable;
+       u8      spi1_enable;
+       u8      spi2_enable;
+       u8      os_dbg_enable;
+       u8      dci_en;
+       u32     uart2_kernel_debug_base_address;
+       u8      pcie_clock_gating_disabled;
+       u8      pcie_root_port8xh_decode;
+       u8      pcie8xh_decode_port_index;
+       u8      pcie_root_port_peer_memory_write_enable;
+       u8      pcie_aspm_sw_smi_number;
+       u8      unused_upd_space1[1];
+       u8      pcie_root_port_en[6];
+       u8      pcie_rp_hide[6];
+       u8      pcie_rp_slot_implemented[6];
+       u8      pcie_rp_hot_plug[6];
+       u8      pcie_rp_pm_sci[6];
+       u8      pcie_rp_ext_sync[6];
+       u8      pcie_rp_transmitter_half_swing[6];
+       u8      pcie_rp_acs_enabled[6];
+       u8      pcie_rp_clk_req_supported[6];
+       u8      pcie_rp_clk_req_number[6];
+       u8      pcie_rp_clk_req_detect[6];
+       u8      advanced_error_reporting[6];
+       u8      pme_interrupt[6];
+       u8      unsupported_request_report[6];
+       u8      fatal_error_report[6];
+       u8      no_fatal_error_report[6];
+       u8      correctable_error_report[6];
+       u8      system_error_on_fatal_error[6];
+       u8      system_error_on_non_fatal_error[6];
+       u8      system_error_on_correctable_error[6];
+       u8      pcie_rp_speed[6];
+       u8      physical_slot_number[6];
+       u8      pcie_rp_completion_timeout[6];
+       u8      ptm_enable[6];
+       u8      pcie_rp_aspm[6];
+       u8      pcie_rp_l1_substates[6];
+       u8      pcie_rp_ltr_enable[6];
+       u8      pcie_rp_ltr_config_lock[6];
+       u8      pme_b0_s5_dis;
+       u8      pci_clock_run;
+       u8      timer8254_clk_setting;
+       u8      enable_sata;
+       u8      sata_mode;
+       u8      sata_salp_support;
+       u8      sata_pwr_opt_enable;
+       u8      e_sata_speed_limit;
+       u8      speed_limit;
+       u8      unused_upd_space2[1];
+       u8      sata_ports_enable[2];
+       u8      sata_ports_dev_slp[2];
+       u8      sata_ports_hot_plug[2];
+       u8      sata_ports_interlock_sw[2];
+       u8      sata_ports_external[2];
+       u8      sata_ports_spin_up[2];
+       u8      sata_ports_solid_state_drive[2];
+       u8      sata_ports_enable_dito_config[2];
+       u8      sata_ports_dm_val[2];
+       u8      unused_upd_space3[2];
+       u16     sata_ports_dito_val[2];
+       u16     sub_system_vendor_id;
+       u16     sub_system_id;
+       u8      crid_settings;
+       u8      reset_select;
+       u8      sdcard_enabled;
+       u8      e_mmc_enabled;
+       u8      e_mmc_host_max_speed;
+       u8      ufs_enabled;
+       u8      sdio_enabled;
+       u8      gpp_lock;
+       u8      sirq_enable;
+       u8      sirq_mode;
+       u8      start_frame_pulse;
+       u8      smbus_enable;
+       u8      arp_enable;
+       u8      unused_upd_space4;
+       u16     num_rsvd_smbus_addresses;
+       u8      rsvd_smbus_address_table[128];
+       u8      disable_compliance_mode;
+       u8      usb_per_port_ctl;
+       u8      usb30_mode;
+       u8      unused_upd_space5[1];
+       u8      port_usb20_enable[8];
+       u8      port_us20b_over_current_pin[8];
+       u8      usb_otg;
+       u8      hsic_support_enable;
+       u8      port_usb30_enable[6];
+       u8      port_us30b_over_current_pin[6];
+       u8      ssic_port_enable[2];
+       u16     dlane_pwr_gating;
+       u8      vtd_enable;
+       u8      lock_down_global_smi;
+       u16     reset_wait_timer;
+       u8      rtc_lock;
+       u8      sata_test_mode;
+       u8      ssic_rate[2];
+       u16     dynamic_power_gating;
+       u16     pcie_rp_ltr_max_snoop_latency[6];
+       u8      pcie_rp_snoop_latency_override_mode[6];
+       u8      unused_upd_space6[2];
+       u16     pcie_rp_snoop_latency_override_value[6];
+       u8      pcie_rp_snoop_latency_override_multiplier[6];
+       u8      skip_mp_init;
+       u8      dci_auto_detect;
+       u16     pcie_rp_ltr_max_non_snoop_latency[6];
+       u8      pcie_rp_non_snoop_latency_override_mode[6];
+       u8      tco_timer_halt_lock;
+       u8      pwr_btn_override_period;
+       u16     pcie_rp_non_snoop_latency_override_value[6];
+       u8      pcie_rp_non_snoop_latency_override_multiplier[6];
+       u8      pcie_rp_slot_power_limit_scale[6];
+       u8      pcie_rp_slot_power_limit_value[6];
+       u8      disable_native_power_button;
+       u8      power_butter_debounce_mode;
+       u32     sdio_tx_cmd_cntl;
+       u32     sdio_tx_data_cntl1;
+       u32     sdio_tx_data_cntl2;
+       u32     sdio_rx_cmd_data_cntl1;
+       u32     sdio_rx_cmd_data_cntl2;
+       u32     sdcard_tx_cmd_cntl;
+       u32     sdcard_tx_data_cntl1;
+       u32     sdcard_tx_data_cntl2;
+       u32     sdcard_rx_cmd_data_cntl1;
+       u32     sdcard_rx_strobe_cntl;
+       u32     sdcard_rx_cmd_data_cntl2;
+       u32     emmc_tx_cmd_cntl;
+       u32     emmc_tx_data_cntl1;
+       u32     emmc_tx_data_cntl2;
+       u32     emmc_rx_cmd_data_cntl1;
+       u32     emmc_rx_strobe_cntl;
+       u32     emmc_rx_cmd_data_cntl2;
+       u32     emmc_master_sw_cntl;
+       u8      pcie_rp_selectable_deemphasis[6];
+       u8      monitor_mwait_enable;
+       u8      hd_audio_dsp_uaa_compliance;
+       u32     ipc[4];
+       u8      sata_ports_disable_dynamic_pg[2];
+       u8      init_s3_cpu;
+       u8      skip_punit_init;
+       u8      unused_upd_space7[4];
+       u8      port_usb20_per_port_tx_pe_half[8];
+       u8      port_usb20_per_port_pe_txi_set[8];
+       u8      port_usb20_per_port_txi_set[8];
+       u8      port_usb20_hs_skew_sel[8];
+       u8      port_usb20_i_usb_tx_emphasis_en[8];
+       u8      port_usb20_per_port_rxi_set[8];
+       u8      port_usb20_hs_npre_drv_sel[8];
+       u8      reserved_fsps_upd[16];
+};
+
+/** struct fsps_upd - FSP-S Configuration */
+struct __packed fsps_upd {
+       struct fsp_upd_header header;
+       struct fsp_s_config config;
+       u8 unused_upd_space2[46];
+       u16 upd_terminator;
+};
+
+#endif
diff --git a/arch/x86/include/asm/arch-apollolake/fsp/fsp_vpd.h b/arch/x86/include/asm/arch-apollolake/fsp/fsp_vpd.h
new file mode 100644 (file)
index 0000000..b14f28b
--- /dev/null
@@ -0,0 +1,11 @@
+/* SPDX-License-Identifier: Intel */
+/*
+ * Copyright 2019 Google LLC
+ */
+
+#ifndef __FSP_VPD_H
+#define __FSP_VPD_H
+
+/* Nothing to declare here for FSP2 */
+
+#endif