[TGL] refactor TSN enablement control (#1242)
This patch refactors TSN enablement control by - rename ENABLE_TSN_MAC_ADDRESS with ENABLE_TSN: align the naming with ENABLE_TCC - ENABLE_TSN can be used as a one-stop control knob to reserve FW spaces and include proper TSN CfgData - collect TSN-specific CfgData into CfgData_Tsn_Feature.dlt With the new control, inconsistent TSN settings are fixed: - TSN MAC FW space is reserved but PchTsnEnable is not set Signed-off-by: Stanley Chang <stanley.chang@intel.com>
This commit is contained in:
parent
49a3a54e6c
commit
ab3a47d33a
|
@ -159,8 +159,9 @@ class Board(BaseBoard):
|
||||||
self.TCC_STREAM_SIZE = 0x00005000
|
self.TCC_STREAM_SIZE = 0x00005000
|
||||||
self.SIIPFW_SIZE += self.TCC_CCFG_SIZE + self.TCC_CRL_SIZE + self.TCC_STREAM_SIZE
|
self.SIIPFW_SIZE += self.TCC_CCFG_SIZE + self.TCC_CRL_SIZE + self.TCC_STREAM_SIZE
|
||||||
|
|
||||||
self.ENABLE_TSN_MAC_ADDRESS = 1
|
# to enable TSN, set 1 to self.ENABLE_TSN
|
||||||
if self.ENABLE_TSN_MAC_ADDRESS:
|
self.ENABLE_TSN = 0
|
||||||
|
if self.ENABLE_TSN:
|
||||||
self.TMAC_SIZE = 0x00001000
|
self.TMAC_SIZE = 0x00001000
|
||||||
self.SIIPFW_SIZE += self.TMAC_SIZE
|
self.SIIPFW_SIZE += self.TMAC_SIZE
|
||||||
|
|
||||||
|
@ -219,6 +220,10 @@ class Board(BaseBoard):
|
||||||
if self.ENABLE_TCC:
|
if self.ENABLE_TCC:
|
||||||
lines += open (os.path.join(brd_cfg_src_dir, 'CfgData_Tcc_Feature.dlt')).read()
|
lines += open (os.path.join(brd_cfg_src_dir, 'CfgData_Tcc_Feature.dlt')).read()
|
||||||
|
|
||||||
|
# Enable TSN in dlt file
|
||||||
|
if self.ENABLE_TSN:
|
||||||
|
lines += open (os.path.join(brd_cfg_src_dir, 'CfgData_Tsn_Feature.dlt')).read()
|
||||||
|
|
||||||
# Write to generated final dlt file
|
# Write to generated final dlt file
|
||||||
output_cfg_dlt_file = os.path.join(build._fv_dir, dlt_file)
|
output_cfg_dlt_file = os.path.join(build._fv_dir, dlt_file)
|
||||||
open(output_cfg_dlt_file, 'w').write(lines)
|
open(output_cfg_dlt_file, 'w').write(lines)
|
||||||
|
@ -309,9 +314,9 @@ class Board(BaseBoard):
|
||||||
('TCCT', '', 'Lz4', container_list_auth_type, 'KEY_ID_CONTAINER_COMP'+'_'+self._RSA_SIGN_TYPE, 0, self.TCC_STREAM_SIZE,0), # TCC Stream Config
|
('TCCT', '', 'Lz4', container_list_auth_type, 'KEY_ID_CONTAINER_COMP'+'_'+self._RSA_SIGN_TYPE, 0, self.TCC_STREAM_SIZE,0), # TCC Stream Config
|
||||||
)
|
)
|
||||||
|
|
||||||
if self.ENABLE_TSN_MAC_ADDRESS:
|
if self.ENABLE_TSN:
|
||||||
container_list.append (
|
container_list.append (
|
||||||
('TMAC','', 'Lz4', container_list_auth_type, 'KEY_ID_CONTAINER_COMP'+'_'+self._RSA_SIGN_TYPE, 0, self.TMAC_SIZE, 0), # TSN MAC Address
|
('TMAC', '', 'Lz4', container_list_auth_type, 'KEY_ID_CONTAINER_COMP'+'_'+self._RSA_SIGN_TYPE, 0, self.TMAC_SIZE, 0), # TSN MAC Address
|
||||||
)
|
)
|
||||||
|
|
||||||
return [container_list]
|
return [container_list]
|
||||||
|
|
|
@ -0,0 +1,17 @@
|
||||||
|
## @file
|
||||||
|
#
|
||||||
|
# TSN feature Configuration Delta File.
|
||||||
|
#
|
||||||
|
# Copyright (c) 2021, Intel Corporation. All rights reserved.<BR>
|
||||||
|
# SPDX-License-Identifier: BSD-2-Clause-Patent
|
||||||
|
#
|
||||||
|
##
|
||||||
|
#
|
||||||
|
|
||||||
|
SILICON_CFG_DATA.PchTsnEnable | 1
|
||||||
|
|
||||||
|
SILICON_CFG_DATA.PchTsnLinkSpeed | 3
|
||||||
|
|
||||||
|
# TSN Multi-VC is not enabled by default
|
||||||
|
#SILICON_CFG_DATA.PchTsnMultiVcEnable | 0
|
||||||
|
|
Loading…
Reference in New Issue