arch: x86: apl: Update FSP parameters

Add missing parameters to support full configuration of the latest FSP
MR6 release.

Signed-off-by: Bernhard Messerklinger <bernhard.messerklinger@br-automation.com>
Reviewed-by: Simon Glass <sjg@chromium.org>

diff --git a/arch/x86/cpu/apollolake/fsp_bindings.c b/arch/x86/cpu/apollolake/fsp_bindings.c
index 130366b4032c7dd58b7fbbef2b30fdbca09f8a0a..bbf04b5009f11cb2f38ada59766ccff10707d90f 100644 (file)
--- a/arch/x86/cpu/apollolake/fsp_bindings.c
+++ b/arch/x86/cpu/apollolake/fsp_bindings.c
@@ -633,6 +633,17 @@ const struct fsp_binding fsp_m_bindings[] = {
        .offset = offsetof(struct fsp_m_config, variable_nvs_buffer_ptr),
        .propname = "fspm,variable-nvs-buffer-ptr",
        }, {
+       .type = FSP_UINT64,
+       .offset = offsetof(struct fsp_m_config, start_timer_ticker_of_pfet_assert),
+       .propname = "fspm,start-timer-ticker-of-pfet-assert",
+       }, {
+       .type = FSP_UINT8, .offset = offsetof(struct fsp_m_config, rt_en),
+       .propname = "fspm,rt-en",
+       }, {
+       .type = FSP_UINT8,
+       .offset = offsetof(struct fsp_m_config, skip_pcie_power_sequence),
+       .propname = "fspm,skip-pcie-power-sequence",
+       }, {
        .propname = NULL
        }
 };
@@ -1822,6 +1833,18 @@ const struct fsp_binding fsp_s_bindings[] = {
        .count = ARRAY_SIZE_OF_MEMBER(struct fsp_s_config,
                                      port_usb20_hs_npre_drv_sel),
        }, {
+       .type = FSP_UINT8,
+       .offset = offsetof(struct fsp_s_config, os_selection),
+       .propname = "fsps,os-selection",
+       }, {
+       .type = FSP_UINT8,
+       .offset = offsetof(struct fsp_s_config, dptf_enabled),
+       .propname = "fsps,dptf-enabled",
+       }, {
+       .type = FSP_UINT8,
+       .offset = offsetof(struct fsp_s_config, pwm_enabled),
+       .propname = "fsps,pwm-enabled",
+       }, {
        .propname = NULL
        }
 };

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
index 5275b75f3b0e6eec2e297023b6f075c2aece1b89..78c338e9ffa95502795c492bfffc876a8eb73f57 100644 (file)
--- a/arch/x86/include/asm/arch-apollolake/fsp/fsp_m_upd.h
+++ b/arch/x86/include/asm/arch-apollolake/fsp/fsp_m_upd.h
@@ -122,7 +122,10 @@ struct __packed fsp_m_config {
 
        /* 0x150 */
        void    *variable_nvs_buffer_ptr;
-       u8      reserved_fspm_upd[12];
+       u64     start_timer_ticker_of_pfet_assert;
+       u8      rt_en;
+       u8      skip_pcie_power_sequence;
+       u8      reserved_fspm_upd[2];
 };
 
 /** FSP-M UPD Configuration */

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
index 451a7a254a4b6eb05c46e9668af70a53f122f8aa..be80f5db09a9263211d5204cd40a898882d1d140 100644 (file)
--- a/arch/x86/include/asm/arch-apollolake/fsp/fsp_s_upd.h
+++ b/arch/x86/include/asm/arch-apollolake/fsp/fsp_s_upd.h
@@ -351,7 +351,10 @@ struct __packed fsp_s_config {
        u8      port_usb20_hs_npre_drv_sel[8];
 
        /* 0x370 */
-       u8      reserved_fsps_upd[16];
+       u8      os_selection;
+       u8      dptf_enabled;
+       u8      pwm_enabled;
+       u8      reserved_fsps_upd[13];
 };
 
 /** struct fsps_upd - FSP-S Configuration */
@@ -563,4 +566,8 @@ struct __packed fsps_upd {
 #define PCIE_RP_SELECTABLE_DEEMPHASIS_6_DB 0
 #define PCIE_RP_SELECTABLE_DEEMPHASIS_3_5_DB 1
 
+#define OS_SELECTION_WINDOWS 0
+#define OS_SELECTION_ANDROID 1
+#define OS_SELECTION_LINUX 3
+
 #endif

diff --git a/doc/device-tree-bindings/fsp/fsp2/apollolake/fsp-m.txt b/doc/device-tree-bindings/fsp/fsp2/apollolake/fsp-m.txt
index 5311938f4380934ce379f7f6960ea67fa817c3b5..666400e0858c1b92921ec2f4ea0b937571128973 100644 (file)
--- a/doc/device-tree-bindings/fsp/fsp2/apollolake/fsp-m.txt
+++ b/doc/device-tree-bindings/fsp/fsp2/apollolake/fsp-m.txt
@@ -240,6 +240,9 @@ Optional properties:
 - fspm,enable-reset-system: Enable Reset System
 - fspm,enable-s3-heci2: Enable HECI2 in S3 resume path
 - fspm,variable-nvs-buffer-ptr:
+- fspm,start-timer-ticker-of-pfet-assert: PCIE SLOT Power Enable Assert Time - PFET
+- fspm,rt-en: Real Time Enabling
+- fspm,skip-pcie-power-sequence: Skip Pcie Power Sequence
 
 Example:
 

diff --git a/doc/device-tree-bindings/fsp/fsp2/apollolake/fsp-s.txt b/doc/device-tree-bindings/fsp/fsp2/apollolake/fsp-s.txt
index 973d253adaea59394b837e1e7d8136e78597ab82..731a310cf8962e461c8a5e97dd2bcb2028937c1b 100644 (file)
--- a/doc/device-tree-bindings/fsp/fsp2/apollolake/fsp-s.txt
+++ b/doc/device-tree-bindings/fsp/fsp2/apollolake/fsp-s.txt
@@ -463,6 +463,12 @@ Optional properties:
 - fsps,port-usb20-i-usb-tx-emphasis-en: PerPort HS Transmitter Emphasis
 - fsps,port-usb20-per-port-rxi-set: PerPort HS Receiver Bias
 - fsps,port-usb20-hs-npre-drv-sel: Delay/skew's strength control for HS driver
+- fsps,os-selection: OS Selection
+  0: Windows
+  1: Android
+  3: Linux
+- fsps,dptf-enabled: DPTF
+- fsps,pwm-enabled: PWM Enabled
 
 Example: