Skip to content

Commit 5c4f3d9

Browse files
bryan1978bryan1978
authored
Merge pull request #13 from ec-michael-shih/01_20231205_202211_0_created_as4630-54-pe
[AS4630-54PE] Apply community PR
2 parents e9c5eae + 506c777 commit 5c4f3d9

28 files changed

+2461
-5741
lines changed

‎123.patch‎

Lines changed: 0 additions & 5611 deletions
This file was deleted.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
CONSOLE_PORT=0x3f8
22
CONSOLE_DEV=0
33
CONSOLE_SPEED=115200
4-
ONIE_PLATFORM_EXTRA_CMDLINE_LINUX="intel_iommu=off modprobe.blacklist=i2c-ismt,i2c_ismt,i2c-i801,i2c_i801"
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_54pe-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: b371
148+
name: 'Ethernet controller: Broadcom Inc. and subsidiaries BCM56371 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_54pe-r0/pddf/pd-plugin.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,11 @@
3333
{
3434
"i2c":
3535
{
36-
"valmap": { "F2B":"EXHAUST", "B2F":"INTAKE" }
36+
"valmap": { "F2B":"exhaust", "B2F":"intake" }
3737
}
3838
},
3939

40-
"PSU_FAN_MAX_SPEED":"18000"
40+
"PSU_FAN_MAX_SPEED":"26688"
4141
},
4242

4343
"FAN":
@@ -46,7 +46,7 @@
4646
{
4747
"i2c":
4848
{
49-
"valmap": {"1":"EXHAUST", "0":"INTAKE"}
49+
"valmap": {"1":"exhaust", "0":"intake"}
5050
}
5151
},
5252

‎device/accton/x86_64-accton_as4630_54pe-r0/pddf/pddf-device.json‎

Lines changed: 50 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"num_fantrays":3,
66
"num_fans_pertray":1,
77
"num_ports":54,
8-
"num_temps": 3,
8+
"num_temps": 4,
99
"pddf_dev_types":
1010
{
1111
"description":"AS4630 - Below is the list of supported PDDF device types (chip names) for various components. If any component uses some other driver, we will create the client using 'echo <dev-address> <dev-type> > <path>/new_device' method",
@@ -211,6 +211,21 @@
211211
}
212212
},
213213

214+
"TEMP4" :
215+
{
216+
"dev_info": { "device_type":"TEMP_SENSOR", "device_name":"TEMP4"},
217+
"dev_attr": { "display_name":"coretemp-isa-0000"},
218+
"i2c":
219+
{
220+
"path_info": {"sysfs_base_path": "/sys/class/hwmon/hwmon1"},
221+
"attr_list":
222+
[
223+
{ "attr_name": "temp1_high_crit_threshold", "drv_attr_name":"temp1_crit"},
224+
{ "attr_name": "temp1_high_threshold", "drv_attr_name":"temp1_max"},
225+
{ "attr_name": "temp1_input"}
226+
]
227+
}
228+
},
214229

215230
"CPLD1":
216231
{
@@ -251,15 +266,15 @@
251266
"SYS_LED":
252267
{
253268
"dev_info": { "device_type":"LED", "device_name":"SYS_LED"},
254-
"dev_attr": { "index":"0"},
269+
"dev_attr": { "index":"0", "flag": "rw"},
255270
"i2c" : {
256271
"attr_list":
257272
[
258-
{"attr_name":"STATUS_LED_COLOR_GREEN", "bits" : "7:5", "descr" : "", "value" : "0x1", "swpld_addr" : "0x60", "swpld_addr_offset" : "0x30"},
259-
{"attr_name":"STATUS_LED_COLOR_GREEN_BLINK", "bits" : "7:5", "descr" : "", "value" : "0x3", "swpld_addr" : "0x60", "swpld_addr_offset" : "0x30"},
260-
{"attr_name":"STATUS_LED_COLOR_AMBER", "bits" : "7:5", "descr" : "", "value" : "0x4", "swpld_addr" : "0x60", "swpld_addr_offset" : "0x30"},
261-
{"attr_name":"STATUS_LED_COLOR_AMBER_BLINK", "bits" : "7:5", "descr" : "", "value" : "0x2", "swpld_addr" : "0x60", "swpld_addr_offset" : "0x30"},
262-
{"attr_name":"STATUS_LED_COLOR_OFF", "bits" : "7:5", "descr" : "", "value" : "0x7", "swpld_addr" : "0x60", "swpld_addr_offset" : "0x30"}
273+
{"attr_name":"green", "bits" : "7:5", "descr" : "", "value" : "0x1", "swpld_addr" : "0x60", "swpld_addr_offset" : "0x30"},
274+
{"attr_name":"green_blink", "bits" : "7:5", "descr" : "", "value" : "0x3", "swpld_addr" : "0x60", "swpld_addr_offset" : "0x30"},
275+
{"attr_name":"amber", "bits" : "7:5", "descr" : "", "value" : "0x4", "swpld_addr" : "0x60", "swpld_addr_offset" : "0x30"},
276+
{"attr_name":"amber_blink", "bits" : "7:5", "descr" : "", "value" : "0x2", "swpld_addr" : "0x60", "swpld_addr_offset" : "0x30"},
277+
{"attr_name":"off", "bits" : "7:5", "descr" : "", "value" : "0x7", "swpld_addr" : "0x60", "swpld_addr_offset" : "0x30"}
263278
]
264279
}
265280
},
@@ -268,41 +283,41 @@
268283
"PSU1_LED":
269284
{
270285
"dev_info": { "device_type":"LED", "device_name":"PSU_LED"},
271-
"dev_attr": { "index":"0"},
286+
"dev_attr": { "index":"0", "flag": "r"},
272287
"i2c" : {
273288
"attr_list":
274289
[
275-
{"attr_name":"STATUS_LED_COLOR_GREEN", "bits" : "1:0", "descr" : "", "value" : "0x1", "swpld_addr" : "0x60", "swpld_addr_offset" : "0x30"},
276-
{"attr_name":"STATUS_LED_COLOR_AMBER", "bits" : "1:0", "descr" : "", "value" : "0x2", "swpld_addr" : "0x60", "swpld_addr_offset" : "0x30"},
277-
{"attr_name":"STATUS_LED_COLOR_OFF", "bits" : "1:0", "descr" : "", "value" : "0x3", "swpld_addr" : "0x60", "swpld_addr_offset" : "0x30"}
290+
{"attr_name":"green", "bits" : "1:0", "descr" : "", "value" : "0x1", "swpld_addr" : "0x60", "swpld_addr_offset" : "0x30"},
291+
{"attr_name":"amber", "bits" : "1:0", "descr" : "", "value" : "0x2", "swpld_addr" : "0x60", "swpld_addr_offset" : "0x30"},
292+
{"attr_name":"off", "bits" : "1:0", "descr" : "", "value" : "0x3", "swpld_addr" : "0x60", "swpld_addr_offset" : "0x30"}
278293
]
279294
}
280295
},
281296

282297
"PSU2_LED":
283298
{
284299
"dev_info": { "device_type":"LED", "device_name":"PSU_LED"},
285-
"dev_attr": { "index":"1"},
300+
"dev_attr": { "index":"1", "flag": "r"},
286301
"i2c" : {
287302
"attr_list":
288303
[
289-
{"attr_name":"STATUS_LED_COLOR_GREEN", "bits" : "7:6", "descr" : "", "value" : "0x1", "swpld_addr" : "0x60", "swpld_addr_offset" : "0x31"},
290-
{"attr_name":"STATUS_LED_COLOR_AMBER", "bits" : "7:6", "descr" : "", "value" : "0x2", "swpld_addr" : "0x60", "swpld_addr_offset" : "0x31"},
291-
{"attr_name":"STATUS_LED_COLOR_OFF", "bits" : "7:6", "descr" : "", "value" : "0x3", "swpld_addr" : "0x60", "swpld_addr_offset" : "0x31"}
304+
{"attr_name":"green", "bits" : "7:6", "descr" : "", "value" : "0x1", "swpld_addr" : "0x60", "swpld_addr_offset" : "0x31"},
305+
{"attr_name":"amber", "bits" : "7:6", "descr" : "", "value" : "0x2", "swpld_addr" : "0x60", "swpld_addr_offset" : "0x31"},
306+
{"attr_name":"off", "bits" : "7:6", "descr" : "", "value" : "0x3", "swpld_addr" : "0x60", "swpld_addr_offset" : "0x31"}
292307
]
293308
}
294309
},
295310

296311
"FAN_LED":
297312
{
298313
"dev_info": { "device_type":"LED", "device_name":"FAN_LED"},
299-
"dev_attr": { "index":"0"},
314+
"dev_attr": { "index":"0", "flag": "r"},
300315
"i2c" : {
301316
"attr_list":
302317
[
303-
{"attr_name":"STATUS_LED_COLOR_GREEN", "bits" : "3:2", "descr" : "", "value" : "0x1", "swpld_addr" : "0x60", "swpld_addr_offset" : "0x31"},
304-
{"attr_name":"STATUS_LED_COLOR_AMBER", "bits" : "3:2", "descr" : "", "value" : "0x2", "swpld_addr" : "0x60", "swpld_addr_offset" : "0x31"},
305-
{"attr_name":"STATUS_LED_COLOR_OFF", "bits" : "3:2", "descr" : "", "value" : "0x3", "swpld_addr" : "0x60", "swpld_addr_offset" : "0x31"}
318+
{"attr_name":"green", "bits" : "3:2", "descr" : "", "value" : "0x1", "swpld_addr" : "0x60", "swpld_addr_offset" : "0x31"},
319+
{"attr_name":"amber", "bits" : "3:2", "descr" : "", "value" : "0x2", "swpld_addr" : "0x60", "swpld_addr_offset" : "0x31"},
320+
{"attr_name":"off", "bits" : "3:2", "descr" : "", "value" : "0x3", "swpld_addr" : "0x60", "swpld_addr_offset" : "0x31"}
306321
]
307322
}
308323
},
@@ -336,7 +351,11 @@
336351
{ "attr_name":"psu_i_out", "attr_devaddr":"0x58", "attr_devtype":"pmbus", "attr_offset":"0x8c", "attr_mask":"0x0", "attr_cmpval":"0xff", "attr_len":"2"},
337352
{ "attr_name":"psu_p_out", "attr_devaddr":"0x58", "attr_devtype":"pmbus", "attr_offset":"0x96", "attr_mask":"0x0", "attr_cmpval":"0xff", "attr_len":"2"},
338353
{ "attr_name":"psu_fan1_speed_rpm", "attr_devaddr":"0x58", "attr_devtype":"pmbus", "attr_offset":"0x90", "attr_mask":"0x0", "attr_cmpval":"0xff", "attr_len":"2"},
339-
{ "attr_name":"psu_temp1_input", "attr_devaddr":"0x58", "attr_devtype":"pmbus", "attr_offset":"0x8d", "attr_mask":"0x0", "attr_cmpval":"0xff", "attr_len":"2"}
354+
{ "attr_name":"psu_temp1_input", "attr_devaddr":"0x58", "attr_devtype":"pmbus", "attr_offset":"0x8d", "attr_mask":"0x0", "attr_cmpval":"0xff", "attr_len":"2"},
355+
{ "attr_name":"psu_v_out_max", "attr_devaddr":"0x58", "attr_devtype":"pmbus", "attr_offset":"0xa5", "attr_mask":"0x0", "attr_cmpval":"0xff", "attr_len":"2"},
356+
{ "attr_name":"psu_v_out_min", "attr_devaddr":"0x58", "attr_devtype":"pmbus", "attr_offset":"0xa4", "attr_mask":"0x0", "attr_cmpval":"0xff", "attr_len":"2"},
357+
{ "attr_name":"psu_p_out_max", "attr_devaddr":"0x58", "attr_devtype":"pmbus", "attr_offset":"0xa7", "attr_mask":"0x0", "attr_cmpval":"0xff", "attr_len":"2"},
358+
{ "attr_name":"psu_temp1_high_threshold", "attr_devaddr":"0x58", "attr_devtype":"pmbus", "attr_offset":"0xa8", "attr_mask":"0x0", "attr_cmpval":"0xff", "attr_len":"2"}
340359
]
341360
}
342361
},
@@ -387,7 +406,11 @@
387406
{ "attr_name":"psu_i_out", "attr_devaddr":"0x59", "attr_devtype":"pmbus", "attr_offset":"0x8c", "attr_mask":"0x0", "attr_cmpval":"0xff", "attr_len":"2"},
388407
{ "attr_name":"psu_p_out", "attr_devaddr":"0x59", "attr_devtype":"pmbus", "attr_offset":"0x96", "attr_mask":"0x0", "attr_cmpval":"0xff", "attr_len":"2"},
389408
{ "attr_name":"psu_fan1_speed_rpm", "attr_devaddr":"0x59", "attr_devtype":"pmbus", "attr_offset":"0x90", "attr_mask":"0x0", "attr_cmpval":"0xff", "attr_len":"2"},
390-
{ "attr_name":"psu_temp1_input", "attr_devaddr":"0x59", "attr_devtype":"pmbus", "attr_offset":"0x8d", "attr_mask":"0x0", "attr_cmpval":"0xff", "attr_len":"2"}
409+
{ "attr_name":"psu_temp1_input", "attr_devaddr":"0x59", "attr_devtype":"pmbus", "attr_offset":"0x8d", "attr_mask":"0x0", "attr_cmpval":"0xff", "attr_len":"2"},
410+
{ "attr_name":"psu_v_out_max", "attr_devaddr":"0x59", "attr_devtype":"pmbus", "attr_offset":"0xa5", "attr_mask":"0x0", "attr_cmpval":"0xff", "attr_len":"2"},
411+
{ "attr_name":"psu_v_out_min", "attr_devaddr":"0x59", "attr_devtype":"pmbus", "attr_offset":"0xa4", "attr_mask":"0x0", "attr_cmpval":"0xff", "attr_len":"2"},
412+
{ "attr_name":"psu_p_out_max", "attr_devaddr":"0x59", "attr_devtype":"pmbus", "attr_offset":"0xa7", "attr_mask":"0x0", "attr_cmpval":"0xff", "attr_len":"2"},
413+
{ "attr_name":"psu_temp1_high_threshold", "attr_devaddr":"0x59", "attr_devtype":"pmbus", "attr_offset":"0xa8", "attr_mask":"0x0", "attr_cmpval":"0xff", "attr_len":"2"}
391414
]
392415
}
393416
},
@@ -592,7 +615,9 @@
592615
"topo_info": { "parent_bus":"0x16", "dev_addr":"0x53", "dev_type":"pddf_xcvr"},
593616
"attr_list":
594617
[
595-
{ "attr_name":"xcvr_present", "attr_devaddr":"0x60", "attr_devtype":"cpld", "attr_devname":"CPLD1", "attr_offset":"0x21", "attr_mask":"0x0", "attr_cmpval":"0x0", "attr_len":"1"}
618+
{ "attr_name":"xcvr_present", "attr_devaddr":"0x60", "attr_devtype":"cpld", "attr_devname":"CPLD1", "attr_offset":"0x21", "attr_mask":"0x0", "attr_cmpval":"0x0", "attr_len":"1"},
619+
{ "attr_name":"xcvr_reset", "attr_devaddr":"0x60", "attr_devtype":"cpld", "attr_devname":"CPLD1", "attr_offset":"0x21", "attr_mask":"0x3", "attr_cmpval":"0x0", "attr_len":"1"},
620+
{ "attr_name":"xcvr_intr_status", "attr_devaddr":"0x60", "attr_devtype":"cpld", "attr_devname":"CPLD1", "attr_offset":"0x21", "attr_mask":"0x2", "attr_cmpval":"0x0", "attr_len":"1"}
596621
]
597622
}
598623
},
@@ -630,7 +655,9 @@
630655
"topo_info": { "parent_bus":"0x17", "dev_addr":"0x53", "dev_type":"pddf_xcvr"},
631656
"attr_list":
632657
[
633-
{ "attr_name":"xcvr_present", "attr_devaddr":"0x60", "attr_devtype":"cpld", "attr_devname":"CPLD1", "attr_offset":"0x21", "attr_mask":"0x4", "attr_cmpval":"0x0", "attr_len":"1"}
658+
{ "attr_name":"xcvr_present", "attr_devaddr":"0x60", "attr_devtype":"cpld", "attr_devname":"CPLD1", "attr_offset":"0x21", "attr_mask":"0x4", "attr_cmpval":"0x0", "attr_len":"1"},
659+
{ "attr_name":"xcvr_reset", "attr_devaddr":"0x60", "attr_devtype":"cpld", "attr_devname":"CPLD1", "attr_offset":"0x21", "attr_mask":"0x7", "attr_cmpval":"0x0", "attr_len":"1"},
660+
{ "attr_name":"xcvr_intr_status", "attr_devaddr":"0x60", "attr_devtype":"cpld", "attr_devname":"CPLD1", "attr_offset":"0x21", "attr_mask":"0x5", "attr_cmpval":"0x0", "attr_len":"1"}
634661
]
635662
}
636663
}

0 commit comments

Comments
 (0)