diff --git a/device/accton/x86_64-accton_as9736_64d-r0/Accton-AS9736-64D-100G/th4-as9736-64x100G.config.yml b/device/accton/x86_64-accton_as9736_64d-r0/Accton-AS9736-64D-100G/th4-as9736-64x100G.config.yml index ad60e788769..57bd11adb6d 100644 --- a/device/accton/x86_64-accton_as9736_64d-r0/Accton-AS9736-64D-100G/th4-as9736-64x100G.config.yml +++ b/device/accton/x86_64-accton_as9736_64d-r0/Accton-AS9736-64D-100G/th4-as9736-64x100G.config.yml @@ -11,24 +11,15 @@ bcm_device: 0: global: - pktio_mode: 1 - vlan_flooding_l2mc_num_reserved: 0 - ipv6_lpm_128b_enable: 1 - shared_block_mask_section: uc_bc - skip_protocol_default_entries: 1 - # LTSW uses value 1 for ALPM combined mode - l3_alpm_template: 1 - l3_alpm_hit_skip: 1 - sai_feat_tail_timestamp : 1 - sai_field_group_auto_prioritize: 1 - #l3_intf_vlan_split_egress for MTU at L3IF - l3_intf_vlan_split_egress : 1 - pfc_deadlock_seq_control : 1 - sai_tunnel_support: 2 - bcm_tunnel_term_compatible_mode: 1 - l3_ecmp_member_first_lkup_mem_size: 12288 - sai_port_pmap_phy_lanes : 1 - sai_disable_ports_when_sw_shutdown: 1 + pktio_mode: 1 + rx_cosq_mapping_management_mode: 1 + vlan_default_port: 3 + l3_alpm_template: 1 + port_allow_tpid_disable: 1 + riot_overlay_l3_intf_mem_size: 4096 + riot_overlay_l3_egress_mem_size: 8192 + l3_ecmp_member_first_lkup_mem_size: 8192 + l3_intf_vlan_split_egress: 1 ... --- bcm_device: @@ -878,341 +869,322 @@ device: ... --- device: - 0: - PC_PORT_PHYS_MAP: - ? - # CPU port - PORT_ID: 0 - : - PC_PHYS_PORT_ID: 0 - ? - PORT_ID: 1 - : - PC_PHYS_PORT_ID: 1 - ? - PORT_ID: 5 - : - PC_PHYS_PORT_ID: 5 - ? - PORT_ID: 9 - : - PC_PHYS_PORT_ID: 9 - ? - PORT_ID: 13 - : - PC_PHYS_PORT_ID: 13 - ? - PORT_ID: 17 - : - PC_PHYS_PORT_ID: 17 - ? - PORT_ID: 21 - : - PC_PHYS_PORT_ID: 21 - ? - PORT_ID: 25 - : - PC_PHYS_PORT_ID: 25 - ? - PORT_ID: 29 - : - PC_PHYS_PORT_ID: 29 - ? - PORT_ID: 34 - : - PC_PHYS_PORT_ID: 33 - ? - PORT_ID: 38 - : - PC_PHYS_PORT_ID: 37 - ? - PORT_ID: 42 - : - PC_PHYS_PORT_ID: 41 - ? - PORT_ID: 46 - : - PC_PHYS_PORT_ID: 45 - ? - PORT_ID: 51 - : - PC_PHYS_PORT_ID: 49 - ? - PORT_ID: 55 - : - PC_PHYS_PORT_ID: 53 - ? - PORT_ID: 59 - : - PC_PHYS_PORT_ID: 57 - ? - PORT_ID: 63 - : - PC_PHYS_PORT_ID: 61 - ? - PORT_ID: 68 - : - PC_PHYS_PORT_ID: 65 - ? - PORT_ID: 72 - : - PC_PHYS_PORT_ID: 69 - ? - PORT_ID: 76 - : - PC_PHYS_PORT_ID: 73 - ? - PORT_ID: 80 - : - PC_PHYS_PORT_ID: 77 - ? - PORT_ID: 85 - : - PC_PHYS_PORT_ID: 81 - ? - PORT_ID: 89 - : - PC_PHYS_PORT_ID: 85 - ? - PORT_ID: 93 - : - PC_PHYS_PORT_ID: 89 - ? - PORT_ID: 97 - : - PC_PHYS_PORT_ID: 93 - ? - PORT_ID: 102 - : - PC_PHYS_PORT_ID: 97 - ? - PORT_ID: 106 - : - PC_PHYS_PORT_ID: 101 - ? - PORT_ID: 110 - : - PC_PHYS_PORT_ID: 105 - ? - PORT_ID: 114 - : - PC_PHYS_PORT_ID: 109 - ? - PORT_ID: 119 - : - PC_PHYS_PORT_ID: 113 - ? - PORT_ID: 123 - : - PC_PHYS_PORT_ID: 117 - ? - PORT_ID: 127 - : - PC_PHYS_PORT_ID: 121 - ? - PORT_ID: 131 - : - PC_PHYS_PORT_ID: 125 - ? - PORT_ID: 136 - : - PC_PHYS_PORT_ID: 129 - ? - PORT_ID: 140 - : - PC_PHYS_PORT_ID: 133 - ? - PORT_ID: 144 - : - PC_PHYS_PORT_ID: 137 - ? - PORT_ID: 148 - : - PC_PHYS_PORT_ID: 141 - ? - PORT_ID: 153 - : - PC_PHYS_PORT_ID: 145 - ? - PORT_ID: 157 - : - PC_PHYS_PORT_ID: 149 - ? - PORT_ID: 161 - : - PC_PHYS_PORT_ID: 153 - ? - PORT_ID: 165 - : - PC_PHYS_PORT_ID: 157 - ? - PORT_ID: 170 - : - PC_PHYS_PORT_ID: 161 - ? - PORT_ID: 174 - : - PC_PHYS_PORT_ID: 165 - ? - PORT_ID: 178 - : - PC_PHYS_PORT_ID: 169 - ? - PORT_ID: 182 - : - PC_PHYS_PORT_ID: 173 - ? - PORT_ID: 187 - : - PC_PHYS_PORT_ID: 177 - ? - PORT_ID: 191 - : - PC_PHYS_PORT_ID: 181 - ? - PORT_ID: 195 - : - PC_PHYS_PORT_ID: 185 - ? - PORT_ID: 199 - : - PC_PHYS_PORT_ID: 189 - ? - PORT_ID: 204 - : - PC_PHYS_PORT_ID: 193 - ? - PORT_ID: 208 - : - PC_PHYS_PORT_ID: 197 - ? - PORT_ID: 212 - : - PC_PHYS_PORT_ID: 201 - ? - PORT_ID: 216 - : - PC_PHYS_PORT_ID: 205 - ? - PORT_ID: 221 - : - PC_PHYS_PORT_ID: 209 - ? - PORT_ID: 225 - : - PC_PHYS_PORT_ID: 213 - ? - PORT_ID: 229 - : - PC_PHYS_PORT_ID: 217 - ? - PORT_ID: 233 - : - PC_PHYS_PORT_ID: 221 - ? - PORT_ID: 238 - : - PC_PHYS_PORT_ID: 225 - ? - PORT_ID: 242 - : - PC_PHYS_PORT_ID: 229 - ? - PORT_ID: 246 - : - PC_PHYS_PORT_ID: 233 - ? - PORT_ID: 250 - : - PC_PHYS_PORT_ID: 237 - ? - PORT_ID: 255 - : - PC_PHYS_PORT_ID: 241 - ? - PORT_ID: 259 - : - PC_PHYS_PORT_ID: 245 - ? - PORT_ID: 263 - : - PC_PHYS_PORT_ID: 249 - ? - PORT_ID: 267 - : - PC_PHYS_PORT_ID: 253 - ? - PORT_ID: 50 - : - PC_PHYS_PORT_ID: 258 - ? - PORT_ID: 152 - : - PC_PHYS_PORT_ID: 257 + 0: + PC_PORT_PHYS_MAP: + ? + PORT_ID: 0 + : + PC_PHYS_PORT_ID: 0 + ? + PORT_ID: 1 + : + PC_PHYS_PORT_ID: 1 + ? + PORT_ID: 5 + : + PC_PHYS_PORT_ID: 5 + ? + PORT_ID: 9 + : + PC_PHYS_PORT_ID: 9 + ? + PORT_ID: 13 + : + PC_PHYS_PORT_ID: 13 + ? + PORT_ID: 17 + : + PC_PHYS_PORT_ID: 17 + ? + PORT_ID: 21 + : + PC_PHYS_PORT_ID: 21 + ? + PORT_ID: 25 + : + PC_PHYS_PORT_ID: 25 + ? + PORT_ID: 29 + : + PC_PHYS_PORT_ID: 29 + ? + PORT_ID: 34 + : + PC_PHYS_PORT_ID: 33 + ? + PORT_ID: 38 + : + PC_PHYS_PORT_ID: 37 + ? + PORT_ID: 42 + : + PC_PHYS_PORT_ID: 41 + ? + PORT_ID: 46 + : + PC_PHYS_PORT_ID: 45 + ? + PORT_ID: 51 + : + PC_PHYS_PORT_ID: 49 + ? + PORT_ID: 55 + : + PC_PHYS_PORT_ID: 53 + ? + PORT_ID: 59 + : + PC_PHYS_PORT_ID: 57 + ? + PORT_ID: 63 + : + PC_PHYS_PORT_ID: 61 + ? + PORT_ID: 68 + : + PC_PHYS_PORT_ID: 65 + ? + PORT_ID: 72 + : + PC_PHYS_PORT_ID: 69 + ? + PORT_ID: 76 + : + PC_PHYS_PORT_ID: 73 + ? + PORT_ID: 80 + : + PC_PHYS_PORT_ID: 77 + ? + PORT_ID: 85 + : + PC_PHYS_PORT_ID: 81 + ? + PORT_ID: 89 + : + PC_PHYS_PORT_ID: 85 + ? + PORT_ID: 93 + : + PC_PHYS_PORT_ID: 89 + ? + PORT_ID: 97 + : + PC_PHYS_PORT_ID: 93 + ? + PORT_ID: 102 + : + PC_PHYS_PORT_ID: 97 + ? + PORT_ID: 106 + : + PC_PHYS_PORT_ID: 101 + ? + PORT_ID: 110 + : + PC_PHYS_PORT_ID: 105 + ? + PORT_ID: 114 + : + PC_PHYS_PORT_ID: 109 + ? + PORT_ID: 119 + : + PC_PHYS_PORT_ID: 113 + ? + PORT_ID: 123 + : + PC_PHYS_PORT_ID: 117 + ? + PORT_ID: 127 + : + PC_PHYS_PORT_ID: 121 + ? + PORT_ID: 131 + : + PC_PHYS_PORT_ID: 125 + ? + PORT_ID: 136 + : + PC_PHYS_PORT_ID: 129 + ? + PORT_ID: 140 + : + PC_PHYS_PORT_ID: 133 + ? + PORT_ID: 144 + : + PC_PHYS_PORT_ID: 137 + ? + PORT_ID: 148 + : + PC_PHYS_PORT_ID: 141 + ? + PORT_ID: 153 + : + PC_PHYS_PORT_ID: 145 + ? + PORT_ID: 157 + : + PC_PHYS_PORT_ID: 149 + ? + PORT_ID: 161 + : + PC_PHYS_PORT_ID: 153 + ? + PORT_ID: 165 + : + PC_PHYS_PORT_ID: 157 + ? + PORT_ID: 170 + : + PC_PHYS_PORT_ID: 161 + ? + PORT_ID: 174 + : + PC_PHYS_PORT_ID: 165 + ? + PORT_ID: 178 + : + PC_PHYS_PORT_ID: 169 + ? + PORT_ID: 182 + : + PC_PHYS_PORT_ID: 173 + ? + PORT_ID: 187 + : + PC_PHYS_PORT_ID: 177 + ? + PORT_ID: 191 + : + PC_PHYS_PORT_ID: 181 + ? + PORT_ID: 195 + : + PC_PHYS_PORT_ID: 185 + ? + PORT_ID: 199 + : + PC_PHYS_PORT_ID: 189 + ? + PORT_ID: 204 + : + PC_PHYS_PORT_ID: 193 + ? + PORT_ID: 208 + : + PC_PHYS_PORT_ID: 197 + ? + PORT_ID: 212 + : + PC_PHYS_PORT_ID: 201 + ? + PORT_ID: 216 + : + PC_PHYS_PORT_ID: 205 + ? + PORT_ID: 221 + : + PC_PHYS_PORT_ID: 209 + ? + PORT_ID: 225 + : + PC_PHYS_PORT_ID: 213 + ? + PORT_ID: 229 + : + PC_PHYS_PORT_ID: 217 + ? + PORT_ID: 233 + : + PC_PHYS_PORT_ID: 221 + ? + PORT_ID: 238 + : + PC_PHYS_PORT_ID: 225 + ? + PORT_ID: 242 + : + PC_PHYS_PORT_ID: 229 + ? + PORT_ID: 246 + : + PC_PHYS_PORT_ID: 233 + ? + PORT_ID: 250 + : + PC_PHYS_PORT_ID: 237 + ? + PORT_ID: 255 + : + PC_PHYS_PORT_ID: 241 + ? + PORT_ID: 259 + : + PC_PHYS_PORT_ID: 245 + ? + PORT_ID: 263 + : + PC_PHYS_PORT_ID: 249 + ? + PORT_ID: 267 + : + PC_PHYS_PORT_ID: 253 + ? + PORT_ID: 50 + : + PC_PHYS_PORT_ID: 258 + ? + PORT_ID: 152 + : + PC_PHYS_PORT_ID: 257 ... --- device: - 0: - PC_PORT: - ? - PORT_ID: 0 - : - &port_mode_10g - ENABLE: 1 - SPEED: 10000 - NUM_LANES: 1 - ? - PORT_ID: [1, 5, 9, 13, - 17, 21, 25, 29, - 34, 38, 42, 46, - 51, 55, 59, 63, - 68, 72, 76, 80, - 85, 89, 93, 97, - 102, 106, 110, 114, - 119, 123, 127, 131, - 136, 140, 144, 148, - 153, 157, 161, 165, - 170, 174, 178, 182, - 187, 191, 195, 199, - 204, 208, 212, 216, - 221, 225, 229, 233, - 238, 242, 246, 250, - 255, 259, 263, 267] - : - ENABLE: 0 - SPEED: 100000 - NUM_LANES: 4 - FEC_MODE: PC_FEC_RS528 - MAX_FRAME_SIZE: 9416 - LINK_TRAINING: 0 - ? # BCM56990 2x10g management port - PORT_ID: [50, 152] - : - ENABLE: 0 - SPEED: 10000 - NUM_LANES: 1 - MAX_FRAME_SIZE: 9416 - SER_CONFIG: - SER_ENABLE: 0 - PORT_CONFIG: - PORT_SYSTEM_PROFILE_OPERMODE_PIPEUNIQUE: 1 -device: - 0: - # Per pipe flex counter configuration - CTR_EFLEX_CONFIG: - CTR_ING_EFLEX_OPERMODE_PIPEUNIQUE: 0 - CTR_EGR_EFLEX_OPERMODE_PIPEUNIQUE: 0 - - # Per pipe flex state configuration - #FLEX_STATE_CONFIG: - # FLEX_STATE_ING_OPERMODE_PIPEUNIQUE: 0 - # FLEX_STATE_EGR_OPERMODE_PIPEUNIQUE: 1 - - # Lossy vs Lossless mode - TM_THD_CONFIG: - THRESHOLD_MODE: LOSSLESS + 0: + PC_PORT: + ? + PORT_ID: [50, 152] + : + ENABLE: 0 + SPEED: 10000 + NUM_LANES: 1 + FEC_MODE: PC_FEC_NONE + ? + PORT_ID: 0 + : + ENABLE: 1 + SPEED: 10000 + NUM_LANES: 1 + FEC_MODE: PC_FEC_NONE + ? + PORT_ID: [1, 5, 9, 13, 17, 21, 25, 29, 34, 38, 42, 46, 51, 55, 59, 63, 68, 72, 76, 80, 85, 89, 93, 97, 102, 106, 110, 114, 119, 123, 127, 131, 136, 140, 144, 148, 153, 157, 161, 165, 170, 174, 178, 182, 187, 191, 195, 199, 204, 208, 212, 216, 221, 225, 229, 233, 238, 242, 246, 250, 255, 259, 263, 267] + : + ENABLE: 0 + SPEED: 100000 + NUM_LANES: 4 + FEC_MODE: PC_FEC_RS528 - # IFP mode - FP_CONFIG: - FP_ING_OPERMODE: GLOBAL_PIPE_AWARE + PC_PMD_FIRMWARE: + ? + PORT_ID: [1, 5, 9, 13, 17, 21, 25, 29, 34, 38, 42, 46, 51, 55, 59, 63, 68, 72, 76, 80, 85, 89, 93, 97, 102, 106, 110, 114, 119, 123, 127, 131, 136, 140, 144, 148, 153, 157, 161, 165, 170, 174, 178, 182, 187, 191, 195, 199, 204, 208, 212, 216, 221, 225, 229, 233, 238, 242, 246, 250, 255, 259, 263, 267] + : + MEDIUM_TYPE_AUTO: 0 + MEDIUM_TYPE: PC_PHY_MEDIUM_COPPER +... +--- +device: + 0: + TM_THD_CONFIG: + THRESHOLD_MODE: LOSSLESS +... +--- +device: + 0: + FP_CONFIG: + FP_ING_OPERMODE: GLOBAL_PIPE_AWARE + FP_CONTROL: + FP_ING_ARP_AS_IP: 1 + FP_ING_RARP_AS_IP: 1 ... diff --git a/device/accton/x86_64-accton_as9736_64d-r0/Accton-AS9736-64D/th4-as9736-64x400G.config.yml b/device/accton/x86_64-accton_as9736_64d-r0/Accton-AS9736-64D/th4-as9736-64x400G.config.yml index fcf2245b046..e79a9838289 100644 --- a/device/accton/x86_64-accton_as9736_64d-r0/Accton-AS9736-64D/th4-as9736-64x400G.config.yml +++ b/device/accton/x86_64-accton_as9736_64d-r0/Accton-AS9736-64D/th4-as9736-64x400G.config.yml @@ -11,30 +11,21 @@ bcm_device: 0: global: - pktio_mode: 1 - vlan_flooding_l2mc_num_reserved: 0 - ipv6_lpm_128b_enable: 1 - shared_block_mask_section: uc_bc - skip_protocol_default_entries: 1 - # LTSW uses value 1 for ALPM combined mode - l3_alpm_template: 1 - l3_alpm_hit_skip: 1 - sai_feat_tail_timestamp : 1 - sai_field_group_auto_prioritize: 1 - #l3_intf_vlan_split_egress for MTU at L3IF - l3_intf_vlan_split_egress : 1 - pfc_deadlock_seq_control : 1 - sai_tunnel_support: 2 - bcm_tunnel_term_compatible_mode: 1 - l3_ecmp_member_first_lkup_mem_size: 12288 - sai_port_pmap_phy_lanes : 1 - sai_disable_ports_when_sw_shutdown: 1 + pktio_mode: 1 + rx_cosq_mapping_management_mode: 1 + vlan_default_port: 3 + l3_alpm_template: 1 + port_allow_tpid_disable: 1 + riot_overlay_l3_intf_mem_size: 4096 + riot_overlay_l3_egress_mem_size: 8192 + l3_ecmp_member_first_lkup_mem_size: 8192 + l3_intf_vlan_split_egress: 1 ... --- bcm_device: 0: global: - dport_map_enable: 1 + dport_map_enable: 0 port: 68: { dport_map_port: 1 } 72: { dport_map_port: 2 } @@ -878,341 +869,322 @@ device: ... --- device: - 0: - PC_PORT_PHYS_MAP: - ? - # CPU port - PORT_ID: 0 - : - PC_PHYS_PORT_ID: 0 - ? - PORT_ID: 1 - : - PC_PHYS_PORT_ID: 1 - ? - PORT_ID: 5 - : - PC_PHYS_PORT_ID: 5 - ? - PORT_ID: 9 - : - PC_PHYS_PORT_ID: 9 - ? - PORT_ID: 13 - : - PC_PHYS_PORT_ID: 13 - ? - PORT_ID: 17 - : - PC_PHYS_PORT_ID: 17 - ? - PORT_ID: 21 - : - PC_PHYS_PORT_ID: 21 - ? - PORT_ID: 25 - : - PC_PHYS_PORT_ID: 25 - ? - PORT_ID: 29 - : - PC_PHYS_PORT_ID: 29 - ? - PORT_ID: 34 - : - PC_PHYS_PORT_ID: 33 - ? - PORT_ID: 38 - : - PC_PHYS_PORT_ID: 37 - ? - PORT_ID: 42 - : - PC_PHYS_PORT_ID: 41 - ? - PORT_ID: 46 - : - PC_PHYS_PORT_ID: 45 - ? - PORT_ID: 51 - : - PC_PHYS_PORT_ID: 49 - ? - PORT_ID: 55 - : - PC_PHYS_PORT_ID: 53 - ? - PORT_ID: 59 - : - PC_PHYS_PORT_ID: 57 - ? - PORT_ID: 63 - : - PC_PHYS_PORT_ID: 61 - ? - PORT_ID: 68 - : - PC_PHYS_PORT_ID: 65 - ? - PORT_ID: 72 - : - PC_PHYS_PORT_ID: 69 - ? - PORT_ID: 76 - : - PC_PHYS_PORT_ID: 73 - ? - PORT_ID: 80 - : - PC_PHYS_PORT_ID: 77 - ? - PORT_ID: 85 - : - PC_PHYS_PORT_ID: 81 - ? - PORT_ID: 89 - : - PC_PHYS_PORT_ID: 85 - ? - PORT_ID: 93 - : - PC_PHYS_PORT_ID: 89 - ? - PORT_ID: 97 - : - PC_PHYS_PORT_ID: 93 - ? - PORT_ID: 102 - : - PC_PHYS_PORT_ID: 97 - ? - PORT_ID: 106 - : - PC_PHYS_PORT_ID: 101 - ? - PORT_ID: 110 - : - PC_PHYS_PORT_ID: 105 - ? - PORT_ID: 114 - : - PC_PHYS_PORT_ID: 109 - ? - PORT_ID: 119 - : - PC_PHYS_PORT_ID: 113 - ? - PORT_ID: 123 - : - PC_PHYS_PORT_ID: 117 - ? - PORT_ID: 127 - : - PC_PHYS_PORT_ID: 121 - ? - PORT_ID: 131 - : - PC_PHYS_PORT_ID: 125 - ? - PORT_ID: 136 - : - PC_PHYS_PORT_ID: 129 - ? - PORT_ID: 140 - : - PC_PHYS_PORT_ID: 133 - ? - PORT_ID: 144 - : - PC_PHYS_PORT_ID: 137 - ? - PORT_ID: 148 - : - PC_PHYS_PORT_ID: 141 - ? - PORT_ID: 153 - : - PC_PHYS_PORT_ID: 145 - ? - PORT_ID: 157 - : - PC_PHYS_PORT_ID: 149 - ? - PORT_ID: 161 - : - PC_PHYS_PORT_ID: 153 - ? - PORT_ID: 165 - : - PC_PHYS_PORT_ID: 157 - ? - PORT_ID: 170 - : - PC_PHYS_PORT_ID: 161 - ? - PORT_ID: 174 - : - PC_PHYS_PORT_ID: 165 - ? - PORT_ID: 178 - : - PC_PHYS_PORT_ID: 169 - ? - PORT_ID: 182 - : - PC_PHYS_PORT_ID: 173 - ? - PORT_ID: 187 - : - PC_PHYS_PORT_ID: 177 - ? - PORT_ID: 191 - : - PC_PHYS_PORT_ID: 181 - ? - PORT_ID: 195 - : - PC_PHYS_PORT_ID: 185 - ? - PORT_ID: 199 - : - PC_PHYS_PORT_ID: 189 - ? - PORT_ID: 204 - : - PC_PHYS_PORT_ID: 193 - ? - PORT_ID: 208 - : - PC_PHYS_PORT_ID: 197 - ? - PORT_ID: 212 - : - PC_PHYS_PORT_ID: 201 - ? - PORT_ID: 216 - : - PC_PHYS_PORT_ID: 205 - ? - PORT_ID: 221 - : - PC_PHYS_PORT_ID: 209 - ? - PORT_ID: 225 - : - PC_PHYS_PORT_ID: 213 - ? - PORT_ID: 229 - : - PC_PHYS_PORT_ID: 217 - ? - PORT_ID: 233 - : - PC_PHYS_PORT_ID: 221 - ? - PORT_ID: 238 - : - PC_PHYS_PORT_ID: 225 - ? - PORT_ID: 242 - : - PC_PHYS_PORT_ID: 229 - ? - PORT_ID: 246 - : - PC_PHYS_PORT_ID: 233 - ? - PORT_ID: 250 - : - PC_PHYS_PORT_ID: 237 - ? - PORT_ID: 255 - : - PC_PHYS_PORT_ID: 241 - ? - PORT_ID: 259 - : - PC_PHYS_PORT_ID: 245 - ? - PORT_ID: 263 - : - PC_PHYS_PORT_ID: 249 - ? - PORT_ID: 267 - : - PC_PHYS_PORT_ID: 253 - ? - PORT_ID: 50 - : - PC_PHYS_PORT_ID: 258 - ? - PORT_ID: 152 - : - PC_PHYS_PORT_ID: 257 + 0: + PC_PORT_PHYS_MAP: + ? + PORT_ID: 0 + : + PC_PHYS_PORT_ID: 0 + ? + PORT_ID: 1 + : + PC_PHYS_PORT_ID: 1 + ? + PORT_ID: 5 + : + PC_PHYS_PORT_ID: 5 + ? + PORT_ID: 9 + : + PC_PHYS_PORT_ID: 9 + ? + PORT_ID: 13 + : + PC_PHYS_PORT_ID: 13 + ? + PORT_ID: 17 + : + PC_PHYS_PORT_ID: 17 + ? + PORT_ID: 21 + : + PC_PHYS_PORT_ID: 21 + ? + PORT_ID: 25 + : + PC_PHYS_PORT_ID: 25 + ? + PORT_ID: 29 + : + PC_PHYS_PORT_ID: 29 + ? + PORT_ID: 34 + : + PC_PHYS_PORT_ID: 33 + ? + PORT_ID: 38 + : + PC_PHYS_PORT_ID: 37 + ? + PORT_ID: 42 + : + PC_PHYS_PORT_ID: 41 + ? + PORT_ID: 46 + : + PC_PHYS_PORT_ID: 45 + ? + PORT_ID: 51 + : + PC_PHYS_PORT_ID: 49 + ? + PORT_ID: 55 + : + PC_PHYS_PORT_ID: 53 + ? + PORT_ID: 59 + : + PC_PHYS_PORT_ID: 57 + ? + PORT_ID: 63 + : + PC_PHYS_PORT_ID: 61 + ? + PORT_ID: 68 + : + PC_PHYS_PORT_ID: 65 + ? + PORT_ID: 72 + : + PC_PHYS_PORT_ID: 69 + ? + PORT_ID: 76 + : + PC_PHYS_PORT_ID: 73 + ? + PORT_ID: 80 + : + PC_PHYS_PORT_ID: 77 + ? + PORT_ID: 85 + : + PC_PHYS_PORT_ID: 81 + ? + PORT_ID: 89 + : + PC_PHYS_PORT_ID: 85 + ? + PORT_ID: 93 + : + PC_PHYS_PORT_ID: 89 + ? + PORT_ID: 97 + : + PC_PHYS_PORT_ID: 93 + ? + PORT_ID: 102 + : + PC_PHYS_PORT_ID: 97 + ? + PORT_ID: 106 + : + PC_PHYS_PORT_ID: 101 + ? + PORT_ID: 110 + : + PC_PHYS_PORT_ID: 105 + ? + PORT_ID: 114 + : + PC_PHYS_PORT_ID: 109 + ? + PORT_ID: 119 + : + PC_PHYS_PORT_ID: 113 + ? + PORT_ID: 123 + : + PC_PHYS_PORT_ID: 117 + ? + PORT_ID: 127 + : + PC_PHYS_PORT_ID: 121 + ? + PORT_ID: 131 + : + PC_PHYS_PORT_ID: 125 + ? + PORT_ID: 136 + : + PC_PHYS_PORT_ID: 129 + ? + PORT_ID: 140 + : + PC_PHYS_PORT_ID: 133 + ? + PORT_ID: 144 + : + PC_PHYS_PORT_ID: 137 + ? + PORT_ID: 148 + : + PC_PHYS_PORT_ID: 141 + ? + PORT_ID: 153 + : + PC_PHYS_PORT_ID: 145 + ? + PORT_ID: 157 + : + PC_PHYS_PORT_ID: 149 + ? + PORT_ID: 161 + : + PC_PHYS_PORT_ID: 153 + ? + PORT_ID: 165 + : + PC_PHYS_PORT_ID: 157 + ? + PORT_ID: 170 + : + PC_PHYS_PORT_ID: 161 + ? + PORT_ID: 174 + : + PC_PHYS_PORT_ID: 165 + ? + PORT_ID: 178 + : + PC_PHYS_PORT_ID: 169 + ? + PORT_ID: 182 + : + PC_PHYS_PORT_ID: 173 + ? + PORT_ID: 187 + : + PC_PHYS_PORT_ID: 177 + ? + PORT_ID: 191 + : + PC_PHYS_PORT_ID: 181 + ? + PORT_ID: 195 + : + PC_PHYS_PORT_ID: 185 + ? + PORT_ID: 199 + : + PC_PHYS_PORT_ID: 189 + ? + PORT_ID: 204 + : + PC_PHYS_PORT_ID: 193 + ? + PORT_ID: 208 + : + PC_PHYS_PORT_ID: 197 + ? + PORT_ID: 212 + : + PC_PHYS_PORT_ID: 201 + ? + PORT_ID: 216 + : + PC_PHYS_PORT_ID: 205 + ? + PORT_ID: 221 + : + PC_PHYS_PORT_ID: 209 + ? + PORT_ID: 225 + : + PC_PHYS_PORT_ID: 213 + ? + PORT_ID: 229 + : + PC_PHYS_PORT_ID: 217 + ? + PORT_ID: 233 + : + PC_PHYS_PORT_ID: 221 + ? + PORT_ID: 238 + : + PC_PHYS_PORT_ID: 225 + ? + PORT_ID: 242 + : + PC_PHYS_PORT_ID: 229 + ? + PORT_ID: 246 + : + PC_PHYS_PORT_ID: 233 + ? + PORT_ID: 250 + : + PC_PHYS_PORT_ID: 237 + ? + PORT_ID: 255 + : + PC_PHYS_PORT_ID: 241 + ? + PORT_ID: 259 + : + PC_PHYS_PORT_ID: 245 + ? + PORT_ID: 263 + : + PC_PHYS_PORT_ID: 249 + ? + PORT_ID: 267 + : + PC_PHYS_PORT_ID: 253 + ? + PORT_ID: 50 + : + PC_PHYS_PORT_ID: 258 + ? + PORT_ID: 152 + : + PC_PHYS_PORT_ID: 257 ... --- device: - 0: - PC_PORT: - ? - PORT_ID: 0 - : - &port_mode_10g - ENABLE: 1 - SPEED: 10000 - NUM_LANES: 1 - ? - PORT_ID: [1, 5, 9, 13, - 17, 21, 25, 29, - 34, 38, 42, 46, - 51, 55, 59, 63, - 68, 72, 76, 80, - 85, 89, 93, 97, - 102, 106, 110, 114, - 119, 123, 127, 131, - 136, 140, 144, 148, - 153, 157, 161, 165, - 170, 174, 178, 182, - 187, 191, 195, 199, - 204, 208, 212, 216, - 221, 225, 229, 233, - 238, 242, 246, 250, - 255, 259, 263, 267] - : - ENABLE: 0 - SPEED: 400000 - NUM_LANES: 8 - FEC_MODE: PC_FEC_RS544_2XN - MAX_FRAME_SIZE: 9416 - LINK_TRAINING: 0 - ? # BCM56990 2x10g management port - PORT_ID: [50, 152] - : - ENABLE: 0 - SPEED: 10000 - NUM_LANES: 1 - MAX_FRAME_SIZE: 9416 - SER_CONFIG: - SER_ENABLE: 0 - PORT_CONFIG: - PORT_SYSTEM_PROFILE_OPERMODE_PIPEUNIQUE: 1 -device: - 0: - # Per pipe flex counter configuration - CTR_EFLEX_CONFIG: - CTR_ING_EFLEX_OPERMODE_PIPEUNIQUE: 0 - CTR_EGR_EFLEX_OPERMODE_PIPEUNIQUE: 0 - - # Per pipe flex state configuration - #FLEX_STATE_CONFIG: - # FLEX_STATE_ING_OPERMODE_PIPEUNIQUE: 0 - # FLEX_STATE_EGR_OPERMODE_PIPEUNIQUE: 1 - - # Lossy vs Lossless mode - TM_THD_CONFIG: - THRESHOLD_MODE: LOSSLESS + 0: + PC_PORT: + ? + PORT_ID: [50, 152] + : + ENABLE: 0 + SPEED: 10000 + NUM_LANES: 1 + FEC_MODE: PC_FEC_NONE + ? + PORT_ID: 0 + : + ENABLE: 1 + SPEED: 10000 + NUM_LANES: 1 + FEC_MODE: PC_FEC_NONE + ? + PORT_ID: [1, 5, 9, 13, 17, 21, 25, 29, 34, 38, 42, 46, 51, 55, 59, 63, 68, 72, 76, 80, 85, 89, 93, 97, 102, 106, 110, 114, 119, 123, 127, 131, 136, 140, 144, 148, 153, 157, 161, 165, 170, 174, 178, 182, 187, 191, 195, 199, 204, 208, 212, 216, 221, 225, 229, 233, 238, 242, 246, 250, 255, 259, 263, 267] + : + ENABLE: 0 + SPEED: 400000 + NUM_LANES: 8 + FEC_MODE: PC_FEC_RS544_2XN - # IFP mode - FP_CONFIG: - FP_ING_OPERMODE: GLOBAL_PIPE_AWARE + PC_PMD_FIRMWARE: + ? + PORT_ID: [1, 5, 9, 13, 17, 21, 25, 29, 34, 38, 42, 46, 51, 55, 59, 63, 68, 72, 76, 80, 85, 89, 93, 97, 102, 106, 110, 114, 119, 123, 127, 131, 136, 140, 144, 148, 153, 157, 161, 165, 170, 174, 178, 182, 187, 191, 195, 199, 204, 208, 212, 216, 221, 225, 229, 233, 238, 242, 246, 250, 255, 259, 263, 267] + : + MEDIUM_TYPE_AUTO: 0 + MEDIUM_TYPE: PC_PHY_MEDIUM_COPPER +... +--- +device: + 0: + TM_THD_CONFIG: + THRESHOLD_MODE: LOSSLESS +... +--- +device: + 0: + FP_CONFIG: + FP_ING_OPERMODE: GLOBAL_PIPE_AWARE + FP_CONTROL: + FP_ING_ARP_AS_IP: 1 + FP_ING_RARP_AS_IP: 1 ... diff --git a/device/accton/x86_64-accton_as9736_64d-r0/platform.json b/device/accton/x86_64-accton_as9736_64d-r0/platform.json index e60810f8790..73894804e8e 100644 --- a/device/accton/x86_64-accton_as9736_64d-r0/platform.json +++ b/device/accton/x86_64-accton_as9736_64d-r0/platform.json @@ -158,7 +158,7 @@ ], "thermals": [ { - "name": "Temp sensor 1", + "name": "SMB_RearMiddle_temp(0x48)", "controllable": true, "low-threshold": false, "high-threshold": true, @@ -166,7 +166,7 @@ "high-crit-threshold": true }, { - "name": "Temp sensor 2", + "name": "SMB_FrontMiddle_temp(0x49)", "controllable": true, "low-threshold": false, "high-threshold": true, @@ -174,7 +174,7 @@ "high-crit-threshold": true }, { - "name": "Temp sensor 3", + "name": "SMB_LeftMiddle_temp(0x4C)", "controllable": true, "low-threshold": false, "high-threshold": true, @@ -182,7 +182,7 @@ "high-crit-threshold": true }, { - "name": "Temp sensor 4", + "name": "FCM_Center_temp(0x48)", "controllable": true, "low-threshold": false, "high-threshold": true, @@ -190,7 +190,7 @@ "high-crit-threshold": true }, { - "name": "Temp sensor 5", + "name": "FCM_Left_temp(0x49)", "controllable": true, "low-threshold": false, "high-threshold": true, @@ -198,7 +198,7 @@ "high-crit-threshold": true }, { - "name": "Temp sensor 6", + "name": "PDB-L_temp(0x48)", "controllable": true, "low-threshold": false, "high-threshold": true, @@ -206,7 +206,7 @@ "high-crit-threshold": true }, { - "name": "Temp sensor 7", + "name": "PDB-R_temp(0x49)", "controllable": true, "low-threshold": false, "high-threshold": true, @@ -214,7 +214,7 @@ "high-crit-threshold": true }, { - "name": "Temp sensor 8", + "name": "UDB_RearLeft_temp(0x48)", "controllable": true, "low-threshold": false, "high-threshold": true, @@ -222,7 +222,7 @@ "high-crit-threshold": true }, { - "name": "Temp sensor 9", + "name": "UDB_RearMiddle_temp(0x4C)", "controllable": true, "low-threshold": false, "high-threshold": true, @@ -230,7 +230,7 @@ "high-crit-threshold": true }, { - "name": "Temp sensor 10", + "name": "LDB_FrontRight_temp(0x4C)", "controllable": true, "low-threshold": false, "high-threshold": true, @@ -238,7 +238,7 @@ "high-crit-threshold": true }, { - "name": "Temp sensor 11", + "name": "LDB_RearRight_temp(0x4D)", "controllable": true, "low-threshold": false, "high-threshold": true, @@ -246,7 +246,7 @@ "high-crit-threshold": true }, { - "name": "CPU Package Temp", + "name": "CPU_Package_temp", "controllable": true, "low-threshold": false, "high-threshold": true, @@ -254,7 +254,7 @@ "high-crit-threshold": true }, { - "name": "CPU Core 0 Temp", + "name": "CPU_Core_0_temp", "controllable": true, "low-threshold": false, "high-threshold": true, @@ -262,7 +262,7 @@ "high-crit-threshold": true }, { - "name": "CPU Core 1 Temp", + "name": "CPU_Core_1_temp", "controllable": true, "low-threshold": false, "high-threshold": true, @@ -270,7 +270,7 @@ "high-crit-threshold": true }, { - "name": "CPU Core 2 Temp", + "name": "CPU_Core_2_temp", "controllable": true, "low-threshold": false, "high-threshold": true, @@ -278,7 +278,7 @@ "high-crit-threshold": true }, { - "name": "CPU Core 3 Temp", + "name": "CPU_Core_3_temp", "controllable": true, "low-threshold": false, "high-threshold": true, @@ -286,7 +286,7 @@ "high-crit-threshold": true }, { - "name": "CPU Core 4 Temp", + "name": "CPU_Core_4_temp", "controllable": true, "low-threshold": false, "high-threshold": true, @@ -294,7 +294,7 @@ "high-crit-threshold": true }, { - "name": "CPU Core 5 Temp", + "name": "CPU_Core_5_temp", "controllable": true, "low-threshold": false, "high-threshold": true, @@ -302,7 +302,7 @@ "high-crit-threshold": true }, { - "name": "CPU Core 6 Temp", + "name": "CPU_Core_6_temp", "controllable": true, "low-threshold": false, "high-threshold": true, @@ -310,7 +310,7 @@ "high-crit-threshold": true }, { - "name": "CPU Core 7 Temp", + "name": "CPU_Core_7_temp", "controllable": true, "low-threshold": false, "high-threshold": true, diff --git a/platform/broadcom/sonic-platform-modules-accton/as9736-64d/modules/accton_as9736_64d_fpga.c b/platform/broadcom/sonic-platform-modules-accton/as9736-64d/modules/accton_as9736_64d_fpga.c index b4262b53b32..f6f86883c2c 100755 --- a/platform/broadcom/sonic-platform-modules-accton/as9736-64d/modules/accton_as9736_64d_fpga.c +++ b/platform/broadcom/sonic-platform-modules-accton/as9736-64d/modules/accton_as9736_64d_fpga.c @@ -61,7 +61,7 @@ #define ASLPC_DEV_LDB_CPLD2_PCIE_START_OFFST 0x500 #define ASLPC_DEV_SMB_CPLD_PCIE_START_OFFST 0x200 -#define REG_SET_ALL_32_BITS 32 +#define REG_SET_ALL_32_BITS 0xFF #define REG_SET_32_BITS_TO_0 0x00000000 #define REG_SET_32_BITS_TO_1 0xFFFFFFFF #define BIT(x) x @@ -1407,13 +1407,13 @@ static ssize_t port_status_write(struct device *dev, struct device_attribute *da fpga_write_port_value(PCIE_FPGA_UDB, PCIE_FPGA_SET_LPMODE, (attr->index - MODULE_LPMODE_1), !!value); break; case MODULE_LPMODE_33 ... MODULE_LPMODE_64: - fpga_write_port_value(PCIE_FPGA_LDB, PCIE_FPGA_SET_LPMODE, (attr->index - MODULE_LPMODE_1), !!value); + fpga_write_port_value(PCIE_FPGA_LDB, PCIE_FPGA_SET_LPMODE, (attr->index - MODULE_LPMODE_33), !!value); break; case MODULE_RESET_1 ... MODULE_RESET_32: fpga_write_port_value(PCIE_FPGA_UDB, PCIE_FPGA_SET_RESET, (attr->index - MODULE_RESET_1), !value); break; case MODULE_RESET_33 ... MODULE_RESET_64: - fpga_write_port_value(PCIE_FPGA_LDB, PCIE_FPGA_SET_RESET, (attr->index - MODULE_RESET_1), !value); + fpga_write_port_value(PCIE_FPGA_LDB, PCIE_FPGA_SET_RESET, (attr->index - MODULE_RESET_33), !value); break; case MODULE_RESET_ALL: fpga_write_port_value(PCIE_FPGA_UDB, PCIE_FPGA_SET_RESET, REG_SET_ALL_32_BITS, !value); /*port 1~32*/ @@ -1899,7 +1899,7 @@ sfp_eeprom_read(struct file *filp, struct kobject *kobj, (get_filter_unpresent_case(attr)) ) { /*Filter xcvr unplug error case*/ return -ENXIO; } - pcie_err("%s ERROR(%d): Port%d pcie get done status failed!!", show_date_time(), state, pdata->port_num); + pcie_err("%s ERROR(%d): Port%d pcie get(offset=0x%x) done status failed!!", show_date_time(), state, pdata->port_num, off); return -EBUSY; } @@ -1978,7 +1978,7 @@ static ssize_t sfp_bin_read(struct file *filp, struct kobject *kobj, (get_filter_unpresent_case(attr)) ) { /*Filter xcvr unplug error case*/ return -ENXIO; } - pcie_err("%s ERROR(%d): Port%d pcie get done status failed!!", show_date_time(), state, pdata->port_num); + pcie_err("%s ERROR(%d): Port%d pcie get(offset=0x%x) done status failed!!", show_date_time(), state, pdata->port_num, off); return -EBUSY; } @@ -2028,7 +2028,7 @@ sfp_eeprom_write(struct bin_attribute *attr, char *buf, loff_t off, size_t count (get_filter_unpresent_case(attr)) ) { /*Filter xcvr unplug error case*/ return -ENXIO; } - pcie_err("%s ERROR(%d): Port%d pcie set failed!!", show_date_time(), state, pdata->port_num); + pcie_err("%s ERROR(%d): Port%d pcie set (offset=0x%x, value=0x%x) failed!!", show_date_time(), state, pdata->port_num, off, (unsigned char)buf[0]); return -EBUSY; } diff --git a/platform/broadcom/sonic-platform-modules-accton/as9736-64d/sonic_platform/sfp.py b/platform/broadcom/sonic-platform-modules-accton/as9736-64d/sonic_platform/sfp.py index 065f33e7422..57814faca8b 100644 --- a/platform/broadcom/sonic-platform-modules-accton/as9736-64d/sonic_platform/sfp.py +++ b/platform/broadcom/sonic-platform-modules-accton/as9736-64d/sonic_platform/sfp.py @@ -611,16 +611,20 @@ def validate_eeprom_cmis(self): if checksum_test != eeprom_raw[127]: return False - checksum_test = 0 - eeprom_raw = self.read_eeprom(640, 128) - if eeprom_raw is None: - return None - - for i in range(0, 127): - checksum_test = (checksum_test + eeprom_raw[i]) & 0xFF - else: - if checksum_test != eeprom_raw[127]: - return False + # EEPROM byte_1: Get '40h' indicates version 4.0, '52h' indicates version 5.2. + # CMIS_5.0 starts to support the checksum of page 04h + cmis_rev_byte_raw = self.read_eeprom(1, 1) + if cmis_rev_byte_raw[0] >= 0x50: + checksum_test = 0 + eeprom_raw = self.read_eeprom(640, 128) + if eeprom_raw is None: + return None + + for i in range(0, 127): + checksum_test = (checksum_test + eeprom_raw[i]) & 0xFF + else: + if checksum_test != eeprom_raw[127]: + return False return True diff --git a/platform/broadcom/sonic-platform-modules-accton/as9736-64d/sonic_platform/thermal.py b/platform/broadcom/sonic-platform-modules-accton/as9736-64d/sonic_platform/thermal.py index 3a91e3a1951..12ff05f647f 100644 --- a/platform/broadcom/sonic-platform-modules-accton/as9736-64d/sonic_platform/thermal.py +++ b/platform/broadcom/sonic-platform-modules-accton/as9736-64d/sonic_platform/thermal.py @@ -83,124 +83,124 @@ def __init__(self, thermal_index=0, is_psu=False, psu_index=0): # Default thresholds self.default_threshold = { THERMAL_NAME_LIST[0] : { - self.conf.HIGH_THRESHOLD_FIELD : '71.0', - self.conf.LOW_THRESHOLD_FIELD : '33.0', - self.conf.HIGH_CRIT_THRESHOLD_FIELD : '76.0', - self.conf.LOW_CRIT_THRESHOLD_FIELD : '22.0' + self.conf.HIGH_THRESHOLD_FIELD : '65.0', + self.conf.LOW_THRESHOLD_FIELD : '7.0', + self.conf.HIGH_CRIT_THRESHOLD_FIELD : '69.0', + self.conf.LOW_CRIT_THRESHOLD_FIELD : '-7.0' }, THERMAL_NAME_LIST[1] : { - self.conf.HIGH_THRESHOLD_FIELD : '55.0', - self.conf.LOW_THRESHOLD_FIELD : '23.0', - self.conf.HIGH_CRIT_THRESHOLD_FIELD : '60.0', - self.conf.LOW_CRIT_THRESHOLD_FIELD : '12.0' + self.conf.HIGH_THRESHOLD_FIELD : '53.0', + self.conf.LOW_THRESHOLD_FIELD : '3.0', + self.conf.HIGH_CRIT_THRESHOLD_FIELD : '57.0', + self.conf.LOW_CRIT_THRESHOLD_FIELD : '-10.0' }, THERMAL_NAME_LIST[2] : { - self.conf.HIGH_THRESHOLD_FIELD : '58.0', - self.conf.LOW_THRESHOLD_FIELD : '22.0', - self.conf.HIGH_CRIT_THRESHOLD_FIELD : '63.0', - self.conf.LOW_CRIT_THRESHOLD_FIELD : '13.0' + self.conf.HIGH_THRESHOLD_FIELD : '55.0', + self.conf.LOW_THRESHOLD_FIELD : '3.0', + self.conf.HIGH_CRIT_THRESHOLD_FIELD : '59.0', + self.conf.LOW_CRIT_THRESHOLD_FIELD : '-11.0' }, THERMAL_NAME_LIST[3] : { - self.conf.HIGH_THRESHOLD_FIELD : '49.0', - self.conf.LOW_THRESHOLD_FIELD : '18.0', + self.conf.HIGH_THRESHOLD_FIELD : '51.0', + self.conf.LOW_THRESHOLD_FIELD : '2.0', self.conf.HIGH_CRIT_THRESHOLD_FIELD : '54.0', - self.conf.LOW_CRIT_THRESHOLD_FIELD : '8.0' + self.conf.LOW_CRIT_THRESHOLD_FIELD : '-16.0' }, THERMAL_NAME_LIST[4] : { - self.conf.HIGH_THRESHOLD_FIELD : '50.0', - self.conf.LOW_THRESHOLD_FIELD : '21.0', + self.conf.HIGH_THRESHOLD_FIELD : '51.0', + self.conf.LOW_THRESHOLD_FIELD : '3.0', self.conf.HIGH_CRIT_THRESHOLD_FIELD : '55.0', - self.conf.LOW_CRIT_THRESHOLD_FIELD : '10.0' + self.conf.LOW_CRIT_THRESHOLD_FIELD : '-14.0' }, THERMAL_NAME_LIST[5] : { - self.conf.HIGH_THRESHOLD_FIELD : '45.0', - self.conf.LOW_THRESHOLD_FIELD : '9.0', - self.conf.HIGH_CRIT_THRESHOLD_FIELD : '50.0', - self.conf.LOW_CRIT_THRESHOLD_FIELD : '-2.0' + self.conf.HIGH_THRESHOLD_FIELD : '47.0', + self.conf.LOW_THRESHOLD_FIELD : '1.0', + self.conf.HIGH_CRIT_THRESHOLD_FIELD : '51.0', + self.conf.LOW_CRIT_THRESHOLD_FIELD : '-17.0' }, THERMAL_NAME_LIST[6] : { - self.conf.HIGH_THRESHOLD_FIELD : '41.0', - self.conf.LOW_THRESHOLD_FIELD : '12.0', - self.conf.HIGH_CRIT_THRESHOLD_FIELD : '46.0', - self.conf.LOW_CRIT_THRESHOLD_FIELD : '1.0' + self.conf.HIGH_THRESHOLD_FIELD : '44.0', + self.conf.LOW_THRESHOLD_FIELD : '3.0', + self.conf.HIGH_CRIT_THRESHOLD_FIELD : '47.0', + self.conf.LOW_CRIT_THRESHOLD_FIELD : '-14.0' }, THERMAL_NAME_LIST[7] : { - self.conf.HIGH_THRESHOLD_FIELD : '65.0', - self.conf.LOW_THRESHOLD_FIELD : '36.0', - self.conf.HIGH_CRIT_THRESHOLD_FIELD : '70.0', - self.conf.LOW_CRIT_THRESHOLD_FIELD : '24.0' + self.conf.HIGH_THRESHOLD_FIELD : '62.0', + self.conf.LOW_THRESHOLD_FIELD : '3.0', + self.conf.HIGH_CRIT_THRESHOLD_FIELD : '66.0', + self.conf.LOW_CRIT_THRESHOLD_FIELD : '-13.0' }, THERMAL_NAME_LIST[8] : { - self.conf.HIGH_THRESHOLD_FIELD : '56.0', - self.conf.LOW_THRESHOLD_FIELD : '27.0', - self.conf.HIGH_CRIT_THRESHOLD_FIELD : '61.0', - self.conf.LOW_CRIT_THRESHOLD_FIELD : '16.0' + self.conf.HIGH_THRESHOLD_FIELD : '54.0', + self.conf.LOW_THRESHOLD_FIELD : '0.0', + self.conf.HIGH_CRIT_THRESHOLD_FIELD : '58.0', + self.conf.LOW_CRIT_THRESHOLD_FIELD : '-17.0' }, THERMAL_NAME_LIST[9] : { - self.conf.HIGH_THRESHOLD_FIELD : '52.0', - self.conf.LOW_THRESHOLD_FIELD : '26.0', - self.conf.HIGH_CRIT_THRESHOLD_FIELD : '57.0', - self.conf.LOW_CRIT_THRESHOLD_FIELD : '15.0' + self.conf.HIGH_THRESHOLD_FIELD : '51.0', + self.conf.LOW_THRESHOLD_FIELD : '1.0', + self.conf.HIGH_CRIT_THRESHOLD_FIELD : '54.0', + self.conf.LOW_CRIT_THRESHOLD_FIELD : '-17.0' }, THERMAL_NAME_LIST[10] : { - self.conf.HIGH_THRESHOLD_FIELD : '62.0', - self.conf.LOW_THRESHOLD_FIELD : '31.0', - self.conf.HIGH_CRIT_THRESHOLD_FIELD : '67.0', - self.conf.LOW_CRIT_THRESHOLD_FIELD : '20.0' + self.conf.HIGH_THRESHOLD_FIELD : '59.0', + self.conf.LOW_THRESHOLD_FIELD : '3.0', + self.conf.HIGH_CRIT_THRESHOLD_FIELD : '61.0', + self.conf.LOW_CRIT_THRESHOLD_FIELD : '-13.0' }, THERMAL_NAME_LIST[11] : { - self.conf.HIGH_THRESHOLD_FIELD : '99.0', - self.conf.LOW_THRESHOLD_FIELD : '84.0', - self.conf.HIGH_CRIT_THRESHOLD_FIELD : '107.0', - self.conf.LOW_CRIT_THRESHOLD_FIELD : '72.0' + self.conf.HIGH_THRESHOLD_FIELD : '92.0', + self.conf.LOW_THRESHOLD_FIELD : '14.0', + self.conf.HIGH_CRIT_THRESHOLD_FIELD : '93.0', + self.conf.LOW_CRIT_THRESHOLD_FIELD : '1.0' }, THERMAL_NAME_LIST[12] : { - self.conf.HIGH_THRESHOLD_FIELD : '99.0', - self.conf.LOW_THRESHOLD_FIELD : '84.0', - self.conf.HIGH_CRIT_THRESHOLD_FIELD : '107.0', - self.conf.LOW_CRIT_THRESHOLD_FIELD : '72.0' + self.conf.HIGH_THRESHOLD_FIELD : '92.0', + self.conf.LOW_THRESHOLD_FIELD : '14.0', + self.conf.HIGH_CRIT_THRESHOLD_FIELD : '93.0', + self.conf.LOW_CRIT_THRESHOLD_FIELD : '1.0' }, THERMAL_NAME_LIST[13] : { - self.conf.HIGH_THRESHOLD_FIELD : '99.0', - self.conf.LOW_THRESHOLD_FIELD : '84.0', - self.conf.HIGH_CRIT_THRESHOLD_FIELD : '107.0', - self.conf.LOW_CRIT_THRESHOLD_FIELD : '72.0' + self.conf.HIGH_THRESHOLD_FIELD : '92.0', + self.conf.LOW_THRESHOLD_FIELD : '14.0', + self.conf.HIGH_CRIT_THRESHOLD_FIELD : '93.0', + self.conf.LOW_CRIT_THRESHOLD_FIELD : '1.0' }, THERMAL_NAME_LIST[14] : { - self.conf.HIGH_THRESHOLD_FIELD : '99.0', - self.conf.LOW_THRESHOLD_FIELD : '84.0', - self.conf.HIGH_CRIT_THRESHOLD_FIELD : '107.0', - self.conf.LOW_CRIT_THRESHOLD_FIELD : '72.0' + self.conf.HIGH_THRESHOLD_FIELD : '92.0', + self.conf.LOW_THRESHOLD_FIELD : '14.0', + self.conf.HIGH_CRIT_THRESHOLD_FIELD : '93.0', + self.conf.LOW_CRIT_THRESHOLD_FIELD : '1.0' }, THERMAL_NAME_LIST[15] : { - self.conf.HIGH_THRESHOLD_FIELD : '99.0', - self.conf.LOW_THRESHOLD_FIELD : '84.0', - self.conf.HIGH_CRIT_THRESHOLD_FIELD : '107.0', - self.conf.LOW_CRIT_THRESHOLD_FIELD : '72.0' + self.conf.HIGH_THRESHOLD_FIELD : '92.0', + self.conf.LOW_THRESHOLD_FIELD : '14.0', + self.conf.HIGH_CRIT_THRESHOLD_FIELD : '93.0', + self.conf.LOW_CRIT_THRESHOLD_FIELD : '1.0' }, THERMAL_NAME_LIST[16] : { - self.conf.HIGH_THRESHOLD_FIELD : '99.0', - self.conf.LOW_THRESHOLD_FIELD : '84.0', - self.conf.HIGH_CRIT_THRESHOLD_FIELD : '107.0', - self.conf.LOW_CRIT_THRESHOLD_FIELD : '72.0' + self.conf.HIGH_THRESHOLD_FIELD : '92.0', + self.conf.LOW_THRESHOLD_FIELD : '14.0', + self.conf.HIGH_CRIT_THRESHOLD_FIELD : '93.0', + self.conf.LOW_CRIT_THRESHOLD_FIELD : '1.0' }, THERMAL_NAME_LIST[17] : { - self.conf.HIGH_THRESHOLD_FIELD : '99.0', - self.conf.LOW_THRESHOLD_FIELD : '84.0', - self.conf.HIGH_CRIT_THRESHOLD_FIELD : '107.0', - self.conf.LOW_CRIT_THRESHOLD_FIELD : '72.0' + self.conf.HIGH_THRESHOLD_FIELD : '92.0', + self.conf.LOW_THRESHOLD_FIELD : '14.0', + self.conf.HIGH_CRIT_THRESHOLD_FIELD : '93.0', + self.conf.LOW_CRIT_THRESHOLD_FIELD : '1.0' }, THERMAL_NAME_LIST[18] : { - self.conf.HIGH_THRESHOLD_FIELD : '99.0', - self.conf.LOW_THRESHOLD_FIELD : '84.0', - self.conf.HIGH_CRIT_THRESHOLD_FIELD : '107.0', - self.conf.LOW_CRIT_THRESHOLD_FIELD : '72.0' + self.conf.HIGH_THRESHOLD_FIELD : '92.0', + self.conf.LOW_THRESHOLD_FIELD : '14.0', + self.conf.HIGH_CRIT_THRESHOLD_FIELD : '93.0', + self.conf.LOW_CRIT_THRESHOLD_FIELD : '1.0' }, THERMAL_NAME_LIST[19] : { - self.conf.HIGH_THRESHOLD_FIELD : '99.0', - self.conf.LOW_THRESHOLD_FIELD : '84.0', - self.conf.HIGH_CRIT_THRESHOLD_FIELD : '107.0', - self.conf.LOW_CRIT_THRESHOLD_FIELD : '72.0' + self.conf.HIGH_THRESHOLD_FIELD : '92.0', + self.conf.LOW_THRESHOLD_FIELD : '14.0', + self.conf.HIGH_CRIT_THRESHOLD_FIELD : '93.0', + self.conf.LOW_CRIT_THRESHOLD_FIELD : '1.0' }, PSU_THERMAL_NAME_LIST[0] : { self.conf.HIGH_THRESHOLD_FIELD : str(float(psu_temp_max)),