Skip to content

Commit c623730

Browse files
ec-michael-shihtiger_fu
ec-michael-shih
authored and
tiger_fu
committed
[AS4630-54NPE] Apply community PR
Apply community PR : sonic-net/sonic-buildimage#14293 Detail: sonic-net/sonic-buildimage#14292 as4630-54npe already merge(at commit id: 4be14f0) the PRs below: sonic-net/sonic-buildimage#13241 sonic-net/sonic-buildimage#13288 sonic-net/sonic-buildimage#15002 sonic-net/sonic-buildimage#13685 sonic-net/sonic-buildimage#14475 sonic-net/sonic-buildimage#14993 sonic-net/sonic-buildimage#14919 sonic-net/sonic-buildimage#15461 sonic-net/sonic-buildimage#16114 sonic-net/sonic-buildimage#334
1 parent 7944b52 commit c623730

49 files changed

Lines changed: 7665 additions & 17 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎device/accton/x86_64-accton_as4630_54npe-r0/installer.conf‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
CONSOLE_PORT=0x3f8
2+
CONSOLE_DEV=0
3+
CONSOLE_SPEED=115200
4+
ONIE_PLATFORM_EXTRA_CMDLINE_LINUX="pcie_aspm=off intel_iommu=off modprobe.blacklist=i2c-ismt,i2c_ismt,i2c-i801,i2c_i801"

‎device/accton/x86_64-accton_as4630_54npe-r0/pcie.yaml‎

Lines changed: 167 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,167 @@
1+
- bus: '00'
2+
dev: '00'
3+
fn: '0'
4+
id: '1980'
5+
name: 'Host bridge: Intel Corporation Atom Processor C3000 Series System Agent (rev
6+
11)'
7+
- bus: '00'
8+
dev: '04'
9+
fn: '0'
10+
id: 19a1
11+
name: 'Host bridge: Intel Corporation Atom Processor C3000 Series Error Registers
12+
(rev 11)'
13+
- bus: '00'
14+
dev: '05'
15+
fn: '0'
16+
id: 19a2
17+
name: 'Generic system peripheral [0807]: Intel Corporation Atom Processor C3000
18+
Series Root Complex Event Collector (rev 11)'
19+
- bus: '00'
20+
dev: '06'
21+
fn: '0'
22+
id: 19a3
23+
name: 'PCI bridge: Intel Corporation Atom Processor C3000 Series Integrated QAT
24+
Root Port (rev 11)'
25+
- bus: '00'
26+
dev: 09
27+
fn: '0'
28+
id: 19a4
29+
name: 'PCI bridge: Intel Corporation Atom Processor C3000 Series PCI Express Root
30+
Port #0 (rev 11)'
31+
- bus: '00'
32+
dev: 0b
33+
fn: '0'
34+
id: 19a6
35+
name: 'PCI bridge: Intel Corporation Atom Processor C3000 Series PCI Express Root
36+
Port #2 (rev 11)'
37+
- bus: '00'
38+
dev: 0e
39+
fn: '0'
40+
id: 19a8
41+
name: 'PCI bridge: Intel Corporation Atom Processor C3000 Series PCI Express Root
42+
Port #4 (rev 11)'
43+
- bus: '00'
44+
dev: '10'
45+
fn: '0'
46+
id: 19aa
47+
name: 'PCI bridge: Intel Corporation Atom Processor C3000 Series PCI Express Root
48+
Port #6 (rev 11)'
49+
- bus: '00'
50+
dev: '12'
51+
fn: '0'
52+
id: 19ac
53+
name: 'System peripheral: Intel Corporation Atom Processor C3000 Series SMBus Contoller
54+
- Host (rev 11)'
55+
- bus: '00'
56+
dev: '13'
57+
fn: '0'
58+
id: 19b2
59+
name: 'SATA controller: Intel Corporation Atom Processor C3000 Series SATA Controller
60+
0 (rev 11)'
61+
- bus: '00'
62+
dev: '15'
63+
fn: '0'
64+
id: 19d0
65+
name: 'USB controller: Intel Corporation Atom Processor C3000 Series USB 3.0 xHCI
66+
Controller (rev 11)'
67+
- bus: '00'
68+
dev: '16'
69+
fn: '0'
70+
id: 19d1
71+
name: 'PCI bridge: Intel Corporation Atom Processor C3000 Series Integrated LAN
72+
Root Port #0 (rev 11)'
73+
- bus: '00'
74+
dev: '17'
75+
fn: '0'
76+
id: 19d2
77+
name: 'PCI bridge: Intel Corporation Atom Processor C3000 Series Integrated LAN
78+
Root Port #1 (rev 11)'
79+
- bus: '00'
80+
dev: '18'
81+
fn: '0'
82+
id: 19d3
83+
name: 'Communication controller: Intel Corporation Atom Processor C3000 Series ME
84+
HECI 1 (rev 11)'
85+
- bus: '00'
86+
dev: 1a
87+
fn: '0'
88+
id: 19d8
89+
name: 'Serial controller: Intel Corporation Atom Processor C3000 Series HSUART Controller
90+
(rev 11)'
91+
- bus: '00'
92+
dev: 1a
93+
fn: '1'
94+
id: 19d8
95+
name: 'Serial controller: Intel Corporation Atom Processor C3000 Series HSUART Controller
96+
(rev 11)'
97+
- bus: '00'
98+
dev: 1a
99+
fn: '2'
100+
id: 19d8
101+
name: 'Serial controller: Intel Corporation Atom Processor C3000 Series HSUART Controller
102+
(rev 11)'
103+
- bus: '00'
104+
dev: 1c
105+
fn: '0'
106+
id: 19db
107+
name: 'SD Host controller: Intel Corporation Device 19db (rev 11)'
108+
- bus: '00'
109+
dev: 1f
110+
fn: '0'
111+
id: 19dc
112+
name: 'ISA bridge: Intel Corporation Atom Processor C3000 Series LPC or eSPI (rev
113+
11)'
114+
- bus: '00'
115+
dev: 1f
116+
fn: '1'
117+
id: 19dd
118+
name: 'Memory controller: Intel Corporation Atom Processor C3000 Series Primary
119+
to Side Band (P2SB) Bridge (rev 11)'
120+
- bus: '00'
121+
dev: 1f
122+
fn: '2'
123+
id: 19de
124+
name: 'Memory controller: Intel Corporation Atom Processor C3000 Series Power Management
125+
Controller (rev 11)'
126+
- bus: '00'
127+
dev: 1f
128+
fn: '4'
129+
id: 19df
130+
name: 'SMBus: Intel Corporation Atom Processor C3000 Series SMBus controller (rev
131+
11)'
132+
- bus: '00'
133+
dev: 1f
134+
fn: '5'
135+
id: 19e0
136+
name: 'Serial bus controller [0c80]: Intel Corporation Atom Processor C3000 Series
137+
SPI Controller (rev 11)'
138+
- bus: '01'
139+
dev: '00'
140+
fn: '0'
141+
id: 19e2
142+
name: 'Co-processor: Intel Corporation Atom Processor C3000 Series QuickAssist Technology
143+
(rev 11)'
144+
- bus: '05'
145+
dev: '00'
146+
fn: '0'
147+
id: b370
148+
name: 'Ethernet controller: Broadcom Inc. and subsidiaries BCM56370 Switch ASIC
149+
(rev 03)'
150+
- bus: '06'
151+
dev: '00'
152+
fn: '0'
153+
id: 15c2
154+
name: 'Ethernet controller: Intel Corporation Ethernet Connection X553 Backplane
155+
(rev 11)'
156+
- bus: '06'
157+
dev: '00'
158+
fn: '1'
159+
id: 15c2
160+
name: 'Ethernet controller: Intel Corporation Ethernet Connection X553 Backplane
161+
(rev 11)'
162+
- bus: 08
163+
dev: '00'
164+
fn: '0'
165+
id: 15e5
166+
name: 'Ethernet controller: Intel Corporation Ethernet Connection X553 1GbE (rev
167+
11)'

‎device/accton/x86_64-accton_as4630_54npe-r0/platform.json‎

Lines changed: 108 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
{
22
"chassis": {
33
"name": "4630-54NPE",
4+
"thermal_manager":false,
5+
"status_led": {
6+
"controllable": true,
7+
"colors": ["STATUS_LED_COLOR_GREEN", "STATUS_LED_COLOR_GREEN_BLINK", "STATUS_LED_COLOR_AMBER", "STATUS_LED_COLOR_OFF"]
8+
},
49
"components": [
510
{
611
"name": "CPLD1"
@@ -14,81 +19,169 @@
1419
],
1520
"fans": [
1621
{
17-
"name": "FAN-1"
18-
},
19-
{
20-
"name": "FAN-2"
21-
},
22-
{
23-
"name": "FAN-3"
22+
"name": "FAN-1",
23+
"speed": {
24+
"controllable": true,
25+
"minimum": 7
26+
},
27+
"status_led": {
28+
"controllable": false
29+
}
30+
},
31+
{
32+
"name": "FAN-2",
33+
"speed": {
34+
"controllable": true,
35+
"minimum": 7
36+
},
37+
"status_led": {
38+
"controllable": false
39+
}
40+
},
41+
{
42+
"name": "FAN-3",
43+
"speed": {
44+
"controllable": true,
45+
"minimum": 7
46+
},
47+
"status_led": {
48+
"controllable": false
49+
}
2450
}
2551
],
2652
"fan_drawers":[
2753
{
2854
"name": "FanTray1",
55+
"status_led": {
56+
"controllable": false
57+
},
2958
"num_fans" : 1,
3059
"fans": [
3160
{
32-
"name": "FAN-1"
61+
"name": "FAN-1",
62+
"speed": {
63+
"controllable": true,
64+
"minimum": 7
65+
},
66+
"status_led": {
67+
"controllable": false
68+
}
3369
}
3470
]
3571
},
3672
{
3773
"name": "FanTray2",
74+
"status_led": {
75+
"controllable": false
76+
},
3877
"num_fans" : 1,
3978
"fans": [
4079
{
41-
"name": "FAN-2"
80+
"name": "FAN-2",
81+
"speed": {
82+
"controllable": true,
83+
"minimum": 7
84+
},
85+
"status_led": {
86+
"controllable": false
87+
}
4288
}
4389
]
4490
},
4591
{
4692
"name": "FanTray3",
93+
"status_led": {
94+
"controllable": false
95+
},
4796
"num_fans" : 1,
4897
"fans": [
4998
{
50-
"name": "FAN-3"
99+
"name": "FAN-3",
100+
"speed": {
101+
"controllable": true,
102+
"minimum": 7
103+
},
104+
"status_led": {
105+
"controllable": false
106+
}
51107
}
52108
]
53109
}
54110
],
55111
"psus": [
56112
{
57113
"name": "PSU-1",
114+
"status_led": {
115+
"controllable": true,
116+
"colors": ["STATUS_LED_COLOR_GREEN", "STATUS_LED_COLOR_AMBER", "STATUS_LED_COLOR_OFF"]
117+
},
58118
"fans": [
59119
{
60120
"name": "PSU-1 FAN-1"
61121
}
62122
],
63123
"thermals": [
64124
{
65-
"name": "PSU-1 temp sensor 1"
125+
"name": "PSU-1 temp sensor 1",
126+
"controllable": false,
127+
"low-crit-threshold": false,
128+
"high-crit-threshold": false
66129
}
67130
]
68131
},
69132
{
70133
"name": "PSU-2",
134+
"status_led": {
135+
"controllable": true,
136+
"colors": ["STATUS_LED_COLOR_GREEN", "STATUS_LED_COLOR_AMBER", "STATUS_LED_COLOR_OFF"]
137+
},
71138
"fans": [
72139
{
73140
"name": "PSU-2 FAN-1"
74141
}
75142
],
76143
"thermals": [
77144
{
78-
"name": "PSU-2 temp sensor 1"
145+
"name": "PSU-2 temp sensor 1",
146+
"controllable": false,
147+
"low-crit-threshold": false,
148+
"high-crit-threshold": false
79149
}
80150
]
81151
}
82152
],
83153
"thermals": [
84154
{
85-
"name": "Temp sensor 1"
155+
"name": "Temp sensor 1",
156+
"controllable": true,
157+
"low-threshold": false,
158+
"high-threshold": true,
159+
"low-crit-threshold": false,
160+
"high-crit-threshold": false
161+
},
162+
{
163+
"name": "Temp sensor 2",
164+
"controllable": true,
165+
"low-threshold": false,
166+
"high-threshold": true,
167+
"low-crit-threshold": false,
168+
"high-crit-threshold": false
86169
},
87170
{
88-
"name": "Temp sensor 2"
171+
"name": "Temp sensor 3",
172+
"controllable": true,
173+
"low-threshold": false,
174+
"high-threshold": true,
175+
"low-crit-threshold": false,
176+
"high-crit-threshold": false
89177
},
90178
{
91-
"name": "Temp sensor 3"
179+
"name": "Temp sensor 4",
180+
"controllable": false,
181+
"low-threshold": false,
182+
"high-threshold": true,
183+
"low-crit-threshold": false,
184+
"high-crit-threshold": true
92185
}
93186
],
94187
"sfps": [

‎device/accton/x86_64-accton_as4630_54npe-r0/platform_asic‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
broadcom
1+
broadcom

‎device/accton/x86_64-accton_as4630_54npe-r0/platform_components.json‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
"chassis": {
3+
"4630-54NPE-O-AC-F": {
4+
"component": {
5+
"CPLD1": { },
6+
"CPLD2": { },
7+
"BIOS": { }
8+
}
9+
}
10+
}
11+
}

0 commit comments

Comments
 (0)