Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Mellanox] Fix platform files for SN4800 #83

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
160 changes: 120 additions & 40 deletions device/mellanox/x86_64-mlnx_msn4800-r0/pcie.yaml
Original file line number Diff line number Diff line change
@@ -1,111 +1,191 @@
- bus: '00'
dev: '00'
fn: '0'
id: 3e10
name: 'Host bridge : Intel Corporation Device (rev 07)'
id: 3ec4
name: 'Host bridge: Intel Corporation 8th Gen Core Processor Host Bridge/DRAM Registers
(rev 07)'
- bus: '00'
dev: '01'
fn: '0'
id: 1901
name: 'PCI bridge : Intel Corporation Skylake PCIe Controller (x16) (rev 07)
(prog-if 00 [Normal decode])'
id: '1901'
name: 'PCI bridge: Intel Corporation Skylake PCIe Controller (x16) (rev 07)'
- bus: '00'
dev: '08'
dev: 08
fn: '0'
id: 1911
name: 'System peripheral : Intel Corporation Skylake Gaussian Mixture Model'
id: '1911'
name: 'System peripheral: Intel Corporation Skylake Gaussian Mixture Model'
- bus: '00'
dev: '12'
fn: '0'
id: a379
name: 'Signal processing controller : Intel Corporation Device (rev 10)'
name: 'Signal processing controller: Intel Corporation Cannon Lake PCH Thermal Controller
(rev 10)'
- bus: '00'
dev: '14'
fn: '0'
id: a36d
name: 'USB controller : Intel Corporation Device (rev 10) (prog-if 30 [XHCI])'
name: 'USB controller: Intel Corporation Cannon Lake PCH USB 3.1 xHCI Host Controller
(rev 10)'
- bus: '00'
dev: '14'
fn: '2'
id: a36f
name: 'RAM memory : Intel Corporation Device (rev 10)'
name: 'RAM memory: Intel Corporation Cannon Lake PCH Shared SRAM (rev 10)'
- bus: '00'
dev: '15'
fn: '0'
id: a368
name: 'Serial bus controller : Intel Corporation Device (rev 10)'
name: 'Serial bus controller [0c80]: Intel Corporation Cannon Lake PCH Serial IO
I2C Controller (rev 10)'
- bus: '00'
dev: '16'
fn: '0'
id: a360
name: 'Communication controller : Intel Corporation Device (rev 10)'
name: 'Communication controller: Intel Corporation Cannon Lake PCH HECI Controller
(rev 10)'
- bus: '00'
dev: '17'
fn: '0'
id: a353
name: 'SATA controller : Intel Corporation Device (rev 10) (prog-if 01 [AHCI 1.0])'
name: 'SATA controller: Intel Corporation Cannon Lake Mobile PCH SATA AHCI Controller
(rev 10)'
- bus: '00'
dev: '1b'
dev: 1b
fn: '0'
id: a340
name: 'PCI bridge : Intel Corporation Device (rev f0) (prog-if 00 [Normal decode])'
name: 'PCI bridge: Intel Corporation Cannon Lake PCH PCI Express Root Port (rev
f0)'
- bus: '00'
dev: '1b'
dev: 1b
fn: '2'
id: a342
name: 'PCI bridge : Intel Corporation Device (rev f0) (prog-if 00 [Normal decode])'
name: 'PCI bridge: Intel Corporation Cannon Lake PCH PCI Express Root Port (rev
f0)'
- bus: '00'
dev: '1b'
dev: 1b
fn: '4'
id: a32c
name: 'PCI bridge : Intel Corporation Device (rev f0) (prog-if 00 [Normal decode])'
name: 'PCI bridge: Intel Corporation Cannon Lake PCH PCI Express Root Port (rev
f0)'
- bus: '00'
dev: '1c'
dev: 1c
fn: '0'
id: a33d
name: 'PCI bridge : Intel Corporation Device (rev f0) (prog-if 00 [Normal decode])'
name: 'PCI bridge: Intel Corporation Cannon Lake PCH PCI Express Root Port (rev
f0)'
- bus: '00'
dev: '1c'
dev: 1c
fn: '6'
id: a33e
name: 'PCI bridge : Intel Corporation Device (rev f0) (prog-if 00 [Normal decode])'
name: 'PCI bridge: Intel Corporation Cannon Lake PCH PCI Express Root Port (rev
f0)'
- bus: '00'
dev: '1c'
dev: 1c
fn: '7'
id: a33f
name: 'PCI bridge : Intel Corporation Device (rev f0) (prog-if 00 [Normal decode])'
name: 'PCI bridge: Intel Corporation Cannon Lake PCH PCI Express Root Port (rev
f0)'
- bus: '00'
dev: '1d'
dev: 1d
fn: '0'
id: a334
name: 'PCI bridge : Intel Corporation Device (rev f0) (prog-if 00 [Normal decode])'
name: 'PCI bridge: Intel Corporation Cannon Lake PCH PCI Express Root Port (rev
f0)'
- bus: '00'
dev: '1e'
dev: 1e
fn: '0'
id: a328
name: 'Communication controller : Intel Corporation Device (rev 10)'
name: 'Communication controller: Intel Corporation Cannon Lake PCH Serial IO UART
Host Controller (rev 10)'
- bus: '00'
dev: '1f'
dev: 1f
fn: '0'
id: a30e
name: 'ISA bridge : Intel Corporation Device (rev 10)'
name: 'ISA bridge: Intel Corporation Cannon Lake LPC Controller (rev 10)'
- bus: '00'
dev: '1f'
dev: 1f
fn: '4'
id: a323
name: 'SMBus : Intel Corporation Device (rev 10)'
name: 'SMBus: Intel Corporation Cannon Lake PCH SMBus Controller (rev 10)'
- bus: '00'
dev: '1f'
dev: 1f
fn: '5'
id: a324
name: 'Serial bus controller : Intel Corporation Device (rev 10)'
name: 'Serial bus controller [0c80]: Intel Corporation Cannon Lake PCH SPI Controller
(rev 10)'
- bus: '00'
dev: '1f'
dev: 1f
fn: '6'
id: 15bb
name: 'Ethernet controller : Intel Corporation Device (rev 10)'
name: 'Ethernet controller: Intel Corporation Ethernet Connection (7) I219-LM (rev
10)'
- bus: '01'
dev: '00'
fn: '0'
id: cf6c
name: 'Ethernet controller : Mellanox Technologies Device'
id: cf70
name: 'Ethernet controller: Mellanox Technologies Spectrum-3'
- bus: '03'
dev: '00'
fn: '0'
id: '1976'
name: 'PCI bridge: Mellanox Technologies MT28908 Family [ConnectX-6 PCIe Bridge]'
- bus: '04'
dev: '00'
fn: '0'
id: '1976'
name: 'PCI bridge: Mellanox Technologies MT28908 Family [ConnectX-6 PCIe Bridge]'
- bus: '04'
dev: '02'
fn: '0'
id: '1976'
name: 'PCI bridge: Mellanox Technologies MT28908 Family [ConnectX-6 PCIe Bridge]'
- bus: '05'
dev: '00'
fn: '0'
id: 101b
name: 'Ethernet controller: Mellanox Technologies MT28908 Family [ConnectX-6]'
- bus: '06'
dev: '00'
fn: '0'
id: '1976'
name: 'PCI bridge: Mellanox Technologies MT28908 Family [ConnectX-6 PCIe Bridge]'
- bus: '07'
dev: '00'
fn: '0'
id: '1976'
name: 'PCI bridge: Mellanox Technologies MT28908 Family [ConnectX-6 PCIe Bridge]'
- bus: '07'
dev: '02'
fn: '0'
id: '1976'
name: 'PCI bridge: Mellanox Technologies MT28908 Family [ConnectX-6 PCIe Bridge]'
- bus: '07'
dev: '04'
fn: '0'
id: '1976'
name: 'PCI bridge: Mellanox Technologies MT28908 Family [ConnectX-6 PCIe Bridge]'
- bus: '07'
dev: '06'
fn: '0'
id: '1976'
name: 'PCI bridge: Mellanox Technologies MT28908 Family [ConnectX-6 PCIe Bridge]'
- bus: '07'
dev: 08
fn: '0'
id: '1976'
name: 'PCI bridge: Mellanox Technologies MT28908 Family [ConnectX-6 PCIe Bridge]'
- bus: '07'
dev: 0a
fn: '0'
id: '1976'
name: 'PCI bridge: Mellanox Technologies MT28908 Family [ConnectX-6 PCIe Bridge]'
- bus: '07'
dev: 0c
fn: '0'
id: '1976'
name: 'PCI bridge: Mellanox Technologies MT28908 Family [ConnectX-6 PCIe Bridge]'
- bus: '07'
dev: 0e
fn: '0'
id: '1976'
name: 'PCI bridge: Mellanox Technologies MT28908 Family [ConnectX-6 PCIe Bridge]'
73 changes: 59 additions & 14 deletions device/mellanox/x86_64-mlnx_msn4800-r0/platform.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@
},
{
"name": "CPLD3"
},
{
"name": "CPLD4"
}
],
"fans": [],
Expand All @@ -28,42 +31,46 @@
"fans": [
{
"name": "fan1"
},
}
]
},
{
"name": "drawer2",
"fans": [
{
"name": "fan2"
}
]
},
{
"name": "drawer2",
"name": "drawer3",
"fans": [
{
"name": "fan3"
},
}
]
},
{
"name": "drawer4",
"fans": [
{
"name": "fan4"
}
]
},
{
"name": "drawer3",
"name": "drawer5",
"fans": [
{
"name": "fan5"
},
{
"name": "fan6"
}
]
},
{
"name": "drawer4",
"name": "drawer6",
"fans": [
{
"name": "fan7"
},
{
"name": "fan8"
"name": "fan6"
}
]
}
Expand All @@ -73,7 +80,7 @@
"name": "PSU 1",
"fans": [
{
"name": "psu_1_fan_1"
"name": "psu1_fan1"
}
],
"thermals": [
Expand All @@ -85,13 +92,39 @@
{
"name": "PSU 2",
"fans": [
{
"name": "psu2_fan1"
}
],
"thermals": [
{
"name": "PSU-2 Temp"
}
]
},
{
"name": "PSU 3",
"fans": [
{
"name": "psu3_fan1"
}
],
"thermals": [
{
"name": "xSFP module 1 Temp"
"name": "PSU-3 Temp"
}
]
},
{
"name": "PSU 4",
"fans": [
{
"name": "psu4_fan1"
}
],
"thermals": [
{
"name": "PSU-4 Temp"
}
]
}
Expand All @@ -112,6 +145,18 @@
{
"name": "CPU Core 1 Temp"
},
{
"name": "CPU Core 2 Temp"
},
{
"name": "CPU Core 3 Temp"
},
{
"name": "CPU Core 4 Temp"
},
{
"name": "CPU Core 5 Temp"
},
{
"name": "CPU Pack Temp"
}
Expand Down
1 change: 0 additions & 1 deletion device/mellanox/x86_64-mlnx_msn4800-r0/platform_wait

This file was deleted.

4 changes: 4 additions & 0 deletions device/mellanox/x86_64-mlnx_msn4800-r0/platform_wait
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/bin/bash
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why not using the same mechanism with other platforms?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

need to clarify with low level team, how to do this on 4800 platform.


declare -r EXIT_SUCCESS="0"
exit "${EXIT_SUCCESS}"
Loading