Skip to content

Commit

Permalink
Merge branch 'sonic-net:master' into yang-macaddr
Browse files Browse the repository at this point in the history
  • Loading branch information
bradh352 authored Dec 3, 2024
2 parents 2ffbf97 + e108423 commit b4110ed
Show file tree
Hide file tree
Showing 11 changed files with 751 additions and 5 deletions.
91 changes: 91 additions & 0 deletions device/mellanox/x86_64-nvidia_sn5640_simx-r0/pcie.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,91 @@
##
## SPDX-FileCopyrightText: NVIDIA CORPORATION & AFFILIATES
## Copyright (c) 2023-2024 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
## SPDX-License-Identifier: Apache-2.0
##
## Licensed under the Apache License, Version 2.0 (the "License");
## you may not use this file except in compliance with the License.
## You may obtain a copy of the License at
##
## http://www.apache.org/licenses/LICENSE-2.0
##
## Unless required by applicable law or agreed to in writing, software
## distributed under the License is distributed on an "AS IS" BASIS,
## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
## See the License for the specific language governing permissions and
## limitations under the License.
##

- bus: '00'
dev: '00'
fn: '0'
id: '1237'
name: 'Host bridge: Intel Corporation 440FX - 82441FX PMC [Natoma] (rev 02)'
- bus: '00'
dev: '01'
fn: '0'
id: '7000'
name: 'ISA bridge: Intel Corporation 82371SB PIIX3 ISA [Natoma/Triton II]'
- bus: '00'
dev: '01'
fn: '1'
id: '7010'
name: 'IDE interface: Intel Corporation 82371SB PIIX3 IDE [Natoma/Triton II]'
- bus: '00'
dev: '01'
fn: '2'
id: '7020'
name: 'USB controller: Intel Corporation 82371SB PIIX3 USB [Natoma/Triton II] (rev
01)'
- bus: '00'
dev: '01'
fn: '3'
id: '7113'
name: 'Bridge: Intel Corporation 82371AB/EB/MB PIIX4 ACPI (rev 03)'
- bus: '00'
dev: '02'
fn: '0'
id: 00b8
name: 'VGA compatible controller: Cirrus Logic GD 5446'
- bus: '00'
dev: '03'
fn: '0'
id: 100e
name: 'Ethernet controller: Intel Corporation 82540EM Gigabit Ethernet Controller
(rev 03)'
- bus: '00'
dev: '04'
fn: '0'
id: '1002'
name: 'Unclassified device [00ff]: Red Hat, Inc. Virtio memory balloon'
- bus: '00'
dev: '05'
fn: '0'
id: '1009'
name: 'Unclassified device [0002]: Red Hat, Inc. Virtio filesystem'
- bus: '00'
dev: '06'
fn: '0'
id: '2922'
name: 'SATA controller: Intel Corporation 82801IR/IO/IH (ICH9R/DO/DH) 6 port SATA
Controller [AHCI mode] (rev 02)'
- bus: '00'
dev: '07'
fn: '0'
id: '0001'
name: 'PCI bridge: Red Hat, Inc. QEMU PCI-PCI bridge'
- bus: '00'
dev: 0c
fn: '0'
id: '1009'
name: 'Unclassified device [0002]: Red Hat, Inc. Virtio filesystem'
- bus: '00'
dev: 0e
fn: '0'
id: '1001'
name: 'System peripheral: NVIDIA Corporation GK110B [GeForce GTX TITAN Z] (rev 01)'
- bus: '01'
dev: '10'
fn: '0'
id: cf82
name: 'Ethernet controller: Mellanox Technologies Spectrum-4L'
18 changes: 17 additions & 1 deletion device/mellanox/x86_64-nvidia_sn5640_simx-r0/platform.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"chassis": {
"name": "SN5600_SIMX",
"name": "SN5640_SIMX",
"components": [
{
"name": "ONIE"
Expand Down Expand Up @@ -634,6 +634,22 @@
"name": "xSFP module 64 Temp"
}
]
},
{
"name": "sfp65",
"thermals": [
{
"name": "xSFP module 65 Temp"
}
]
},
{
"name": "sfp66",
"thermals": [
{
"name": "xSFP module 66 Temp"
}
]
}
]
},
Expand Down
Loading

0 comments on commit b4110ed

Please sign in to comment.