From 843d17d4abe05f84e05c00cec4744ac30763ca76 Mon Sep 17 00:00:00 2001 From: Rob Johnston Date: Fri, 11 Jan 2019 16:24:20 +0000 Subject: 10223 Want topo maps for various SMCI systems Reviewed by: Robert Mustacchi Reviewed by: Richard Lowe Approved by: Dan McDonald --- ...ompute-Platform-1101-disk-hc-topology.xmlgenksh | 10 +- .../Joyent-Compute-Platform-3301-hc-topology.xml | 251 +++++++++++++++++++ ...t-Compute-Platform-330x-chassis-hc-topology.xml | 43 ++++ ...oyent-Compute-Platform-330x-fan-hc-topology.xml | 127 ++++++++++ .../Joyent,Joyent-Compute-Platform-330x/Makefile | 49 ++++ ...t-Storage-Platform-7001-chassis-hc-topology.xml | 43 ++++ .../Joyent-Storage-Platform-7001-hc-topology.xml | 89 +++++++ ...yent-Storage-Platform-7001-slot-hc-topology.xml | 277 +++++++++++++++++++++ .../Joyent,Joyent-Storage-Platform-7001/Makefile | 33 +++ usr/src/lib/fm/topo/maps/Makefile | 8 +- .../fm/topo/maps/SMCI,SSG-2028R-ACR24L/Makefile | 65 +++++ .../SSG-2028R-ACR24L-chassis-hc-topology.xml | 42 ++++ .../SSG-2028R-ACR24L-disk-hc-topology.xmlgenksh | 108 ++++++++ .../SSG-2028R-ACR24L-hc-topology.xml | 98 ++++++++ .../SSG-2028R-ACR24L-slot-hc-topology.xml | 277 +++++++++++++++++++++ .../fm/topo/maps/SMCI,SSG-2029P-ACR24L/Makefile | 51 ++++ .../SSG-2029P-ACR24L-chassis-hc-topology.xml | 43 ++++ .../SSG-2029P-ACR24L-disk-hc-topology.xmlgenksh | 143 +++++++++++ .../SSG-2029P-ACR24L-hc-topology.xml | 96 +++++++ .../SSG-2029P-ACR24L-slot-hc-topology.xml | 277 +++++++++++++++++++++ .../fm/topo/maps/SMCI,SSG-6049P-E1CR36L/Makefile | 47 ++++ .../SSG-6049P-E1CR36L-chassis-hc-topology.xml | 43 ++++ .../SSG-6049P-E1CR36L-hc-topology.xml | 87 +++++++ .../SSG-6049P-E1CR36L-slot-hc-topology.xml | 277 +++++++++++++++++++++ 24 files changed, 2579 insertions(+), 5 deletions(-) create mode 100644 usr/src/lib/fm/topo/maps/Joyent,Joyent-Compute-Platform-330x/Joyent-Compute-Platform-3301-hc-topology.xml create mode 100644 usr/src/lib/fm/topo/maps/Joyent,Joyent-Compute-Platform-330x/Joyent-Compute-Platform-330x-chassis-hc-topology.xml create mode 100644 usr/src/lib/fm/topo/maps/Joyent,Joyent-Compute-Platform-330x/Joyent-Compute-Platform-330x-fan-hc-topology.xml create mode 100644 usr/src/lib/fm/topo/maps/Joyent,Joyent-Compute-Platform-330x/Makefile create mode 100644 usr/src/lib/fm/topo/maps/Joyent,Joyent-Storage-Platform-7001/Joyent-Storage-Platform-7001-chassis-hc-topology.xml create mode 100644 usr/src/lib/fm/topo/maps/Joyent,Joyent-Storage-Platform-7001/Joyent-Storage-Platform-7001-hc-topology.xml create mode 100644 usr/src/lib/fm/topo/maps/Joyent,Joyent-Storage-Platform-7001/Joyent-Storage-Platform-7001-slot-hc-topology.xml create mode 100644 usr/src/lib/fm/topo/maps/Joyent,Joyent-Storage-Platform-7001/Makefile create mode 100644 usr/src/lib/fm/topo/maps/SMCI,SSG-2028R-ACR24L/Makefile create mode 100644 usr/src/lib/fm/topo/maps/SMCI,SSG-2028R-ACR24L/SSG-2028R-ACR24L-chassis-hc-topology.xml create mode 100755 usr/src/lib/fm/topo/maps/SMCI,SSG-2028R-ACR24L/SSG-2028R-ACR24L-disk-hc-topology.xmlgenksh create mode 100644 usr/src/lib/fm/topo/maps/SMCI,SSG-2028R-ACR24L/SSG-2028R-ACR24L-hc-topology.xml create mode 100644 usr/src/lib/fm/topo/maps/SMCI,SSG-2028R-ACR24L/SSG-2028R-ACR24L-slot-hc-topology.xml create mode 100644 usr/src/lib/fm/topo/maps/SMCI,SSG-2029P-ACR24L/Makefile create mode 100644 usr/src/lib/fm/topo/maps/SMCI,SSG-2029P-ACR24L/SSG-2029P-ACR24L-chassis-hc-topology.xml create mode 100755 usr/src/lib/fm/topo/maps/SMCI,SSG-2029P-ACR24L/SSG-2029P-ACR24L-disk-hc-topology.xmlgenksh create mode 100644 usr/src/lib/fm/topo/maps/SMCI,SSG-2029P-ACR24L/SSG-2029P-ACR24L-hc-topology.xml create mode 100644 usr/src/lib/fm/topo/maps/SMCI,SSG-2029P-ACR24L/SSG-2029P-ACR24L-slot-hc-topology.xml create mode 100644 usr/src/lib/fm/topo/maps/SMCI,SSG-6049P-E1CR36L/Makefile create mode 100644 usr/src/lib/fm/topo/maps/SMCI,SSG-6049P-E1CR36L/SSG-6049P-E1CR36L-chassis-hc-topology.xml create mode 100644 usr/src/lib/fm/topo/maps/SMCI,SSG-6049P-E1CR36L/SSG-6049P-E1CR36L-hc-topology.xml create mode 100644 usr/src/lib/fm/topo/maps/SMCI,SSG-6049P-E1CR36L/SSG-6049P-E1CR36L-slot-hc-topology.xml (limited to 'usr/src/lib/fm') diff --git a/usr/src/lib/fm/topo/maps/Joyent,Joyent-Compute-Platform-1101/Joyent-Compute-Platform-1101-disk-hc-topology.xmlgenksh b/usr/src/lib/fm/topo/maps/Joyent,Joyent-Compute-Platform-1101/Joyent-Compute-Platform-1101-disk-hc-topology.xmlgenksh index 000742db71..874bad142f 100644 --- a/usr/src/lib/fm/topo/maps/Joyent,Joyent-Compute-Platform-1101/Joyent-Compute-Platform-1101-disk-hc-topology.xmlgenksh +++ b/usr/src/lib/fm/topo/maps/Joyent,Joyent-Compute-Platform-1101/Joyent-Compute-Platform-1101-disk-hc-topology.xmlgenksh @@ -69,17 +69,19 @@ EOF enclosure=1 bay=0 slot=0 -devctl='/devices/pci@0,0/pci8086,3c02@1/pci15d9,691@0:devctl' +devctl0='/devices/pci@0,0/pci8086,3c02@1/pci15d9,691@0:devctl' +devctl1='/devices/pci@0,0/pci8086,e02@1/pci15d9,691@0:devctl' while (( slot <= 7 )); do - do_node $bay "Front Disk $bay" "$devctl" $enclosure $slot + do_node $bay "Front Disk $bay" "$devctl0|$devctl1" $enclosure $slot (( bay = bay + 1 )) (( slot = slot + 1 )) done slot=0 -devctl='/devices/pci@0,0/pci8086,3c06@2,2/pci15d9,691@0:devctl' +devctl0='/devices/pci@0,0/pci8086,3c06@2,2/pci15d9,691@0:devctl' +devctl1='/devices/pci@0,0/pci8086,e06@2,2/pci15d9,691@0:devctl' while (( slot <= 7 )); do - do_node $bay "Front Disk $bay" "$devctl" $enclosure $slot + do_node $bay "Front Disk $bay" "$devctl0|$devctl1" $enclosure $slot (( bay = bay + 1 )) (( slot = slot + 1 )) done diff --git a/usr/src/lib/fm/topo/maps/Joyent,Joyent-Compute-Platform-330x/Joyent-Compute-Platform-3301-hc-topology.xml b/usr/src/lib/fm/topo/maps/Joyent,Joyent-Compute-Platform-330x/Joyent-Compute-Platform-3301-hc-topology.xml new file mode 100644 index 0000000000..000ed261a8 --- /dev/null +++ b/usr/src/lib/fm/topo/maps/Joyent,Joyent-Compute-Platform-330x/Joyent-Compute-Platform-3301-hc-topology.xml @@ -0,0 +1,251 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/usr/src/lib/fm/topo/maps/Joyent,Joyent-Compute-Platform-330x/Joyent-Compute-Platform-330x-chassis-hc-topology.xml b/usr/src/lib/fm/topo/maps/Joyent,Joyent-Compute-Platform-330x/Joyent-Compute-Platform-330x-chassis-hc-topology.xml new file mode 100644 index 0000000000..20dbc301eb --- /dev/null +++ b/usr/src/lib/fm/topo/maps/Joyent,Joyent-Compute-Platform-330x/Joyent-Compute-Platform-330x-chassis-hc-topology.xml @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/usr/src/lib/fm/topo/maps/Joyent,Joyent-Compute-Platform-330x/Joyent-Compute-Platform-330x-fan-hc-topology.xml b/usr/src/lib/fm/topo/maps/Joyent,Joyent-Compute-Platform-330x/Joyent-Compute-Platform-330x-fan-hc-topology.xml new file mode 100644 index 0000000000..5284971c19 --- /dev/null +++ b/usr/src/lib/fm/topo/maps/Joyent,Joyent-Compute-Platform-330x/Joyent-Compute-Platform-330x-fan-hc-topology.xml @@ -0,0 +1,127 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/usr/src/lib/fm/topo/maps/Joyent,Joyent-Compute-Platform-330x/Makefile b/usr/src/lib/fm/topo/maps/Joyent,Joyent-Compute-Platform-330x/Makefile new file mode 100644 index 0000000000..677a099c43 --- /dev/null +++ b/usr/src/lib/fm/topo/maps/Joyent,Joyent-Compute-Platform-330x/Makefile @@ -0,0 +1,49 @@ +# +# This file and its contents are supplied under the terms of the +# Common Development and Distribution License ("CDDL"), version 1.0. +# You may only use this file in accordance with the terms of version +# 1.0 of the CDDL. +# +# A full copy of the text of the CDDL should have accompanied this +# source. A copy of the CDDL is also available via the Internet at +# http://www.illumos.org/license/CDDL. +# + +# +# Copyright (c) 2018, Joyent, Inc. +# + +ARCH = i86pc +CLASS = arch +DTDFILE = topology.dtd.1 +OTHER_VARIANTS = \ + Joyent-Compute-Platform-3302-hc-topology.xml + +ROOTJOYENTMAPS = $(OTHER_VARIANTS:%=$(arch_ROOTTOPOROOT)/%) + +TOPOFILE = \ + Joyent-Compute-Platform-3301-hc-topology.xml \ + Joyent-Compute-Platform-330x-chassis-hc-topology.xml \ + Joyent-Compute-Platform-330x-fan-hc-topology.xml + +SRCDIR = ../Joyent,Joyent-Compute-Platform-330x + +PLATFORM = Joyent-Compute-Platform-330x + +CLOBBERFILES += $(ROOTJOYENTMAPS) + +include ../Makefile.map + +install: $(ROOTJOYENTMAPS) + +# +# The JCP-3301 and JCP-3302 are essentially the same underlying hardware. The +# only significant difference is the JCP-3302 uses SSDs internally instead of +# traditional disks. As such, the same platform topo map should work for +# both platforms so we simply create a symlink from the JCP 3301 map for the +# JCP 3302. +# +$(ROOTJOYENTMAPS): Joyent-Compute-Platform-3301-hc-topology.xml + $(RM) $@ + $(SYMLINK) ./$? $@ + diff --git a/usr/src/lib/fm/topo/maps/Joyent,Joyent-Storage-Platform-7001/Joyent-Storage-Platform-7001-chassis-hc-topology.xml b/usr/src/lib/fm/topo/maps/Joyent,Joyent-Storage-Platform-7001/Joyent-Storage-Platform-7001-chassis-hc-topology.xml new file mode 100644 index 0000000000..d71085a615 --- /dev/null +++ b/usr/src/lib/fm/topo/maps/Joyent,Joyent-Storage-Platform-7001/Joyent-Storage-Platform-7001-chassis-hc-topology.xml @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/usr/src/lib/fm/topo/maps/Joyent,Joyent-Storage-Platform-7001/Joyent-Storage-Platform-7001-hc-topology.xml b/usr/src/lib/fm/topo/maps/Joyent,Joyent-Storage-Platform-7001/Joyent-Storage-Platform-7001-hc-topology.xml new file mode 100644 index 0000000000..915e3ccfb0 --- /dev/null +++ b/usr/src/lib/fm/topo/maps/Joyent,Joyent-Storage-Platform-7001/Joyent-Storage-Platform-7001-hc-topology.xml @@ -0,0 +1,89 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/usr/src/lib/fm/topo/maps/Joyent,Joyent-Storage-Platform-7001/Joyent-Storage-Platform-7001-slot-hc-topology.xml b/usr/src/lib/fm/topo/maps/Joyent,Joyent-Storage-Platform-7001/Joyent-Storage-Platform-7001-slot-hc-topology.xml new file mode 100644 index 0000000000..6b16063427 --- /dev/null +++ b/usr/src/lib/fm/topo/maps/Joyent,Joyent-Storage-Platform-7001/Joyent-Storage-Platform-7001-slot-hc-topology.xml @@ -0,0 +1,277 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/usr/src/lib/fm/topo/maps/Joyent,Joyent-Storage-Platform-7001/Makefile b/usr/src/lib/fm/topo/maps/Joyent,Joyent-Storage-Platform-7001/Makefile new file mode 100644 index 0000000000..bffc198721 --- /dev/null +++ b/usr/src/lib/fm/topo/maps/Joyent,Joyent-Storage-Platform-7001/Makefile @@ -0,0 +1,33 @@ +# +# This file and its contents are supplied under the terms of the +# Common Development and Distribution License ("CDDL"), version 1.0. +# You may only use this file in accordance with the terms of version +# 1.0 of the CDDL. +# +# A full copy of the text of the CDDL should have accompanied this +# source. A copy of the CDDL is also available via the Internet at +# http://www.illumos.org/license/CDDL. +# + +# +# Copyright (c) 2018, Joyent, Inc. +# + +# NOTE: The name of the xml file we are building is 'platform' +# specific, but its build is structured as 'arch' specific since +# 'uname -i' on all x86 platforms returns i86pc. + +ARCH = i86pc +CLASS = arch +DTDFILE = topology.dtd.1 + +TOPOFILE = \ + Joyent-Storage-Platform-7001-hc-topology.xml \ + Joyent-Storage-Platform-7001-chassis-hc-topology.xml \ + Joyent-Storage-Platform-7001-slot-hc-topology.xml + +SRCDIR = ../Joyent,Joyent-Storage-Platform-7001 + +PLATFORM = Joyent-Storage-Platform-7001 + +include ../Makefile.map diff --git a/usr/src/lib/fm/topo/maps/Makefile b/usr/src/lib/fm/topo/maps/Makefile index a01b016ebe..a35419192f 100644 --- a/usr/src/lib/fm/topo/maps/Makefile +++ b/usr/src/lib/fm/topo/maps/Makefile @@ -22,6 +22,7 @@ # # Copyright 2009 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. +# Copyright (c) 2018, Joyent, Inc. # sparc_SUBDIRS = sun4u \ @@ -49,7 +50,12 @@ i386_SUBDIRS = i86pc \ SUNW,Sun-Fire-X4500 \ SUNW,Sun-Fire-X4540 \ SUNW,Sun-Fire-X4600-M2 \ - Joyent,Joyent-Compute-Platform-1101 + Joyent,Joyent-Compute-Platform-1101 \ + Joyent,Joyent-Compute-Platform-330x \ + Joyent,Joyent-Storage-Platform-7001 \ + SMCI,SSG-2028R-ACR24L \ + SMCI,SSG-6049P-E1CR36L \ + SMCI,SSG-2029P-ACR24L SUBDIRS = $($(MACH)_SUBDIRS) diff --git a/usr/src/lib/fm/topo/maps/SMCI,SSG-2028R-ACR24L/Makefile b/usr/src/lib/fm/topo/maps/SMCI,SSG-2028R-ACR24L/Makefile new file mode 100644 index 0000000000..15401c3abb --- /dev/null +++ b/usr/src/lib/fm/topo/maps/SMCI,SSG-2028R-ACR24L/Makefile @@ -0,0 +1,65 @@ +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# Common Development and Distribution License (the "License"). +# You may not use this file except in compliance with the License. +# +# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE +# or http://www.opensolaris.org/os/licensing. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# + +# +# Copyright 2009 Sun Microsystems, Inc. All rights reserved. +# Use is subject to license terms. +# Copyright (c) 2018, Joyent, Inc. +# + +# NOTE: The name of the xml file we are building is 'platform' +# specific, but its build is structured as 'arch' specific since +# 'uname -i' on all x86 platforms returns i86pc. + +ARCH = i86pc +CLASS = arch +DTDFILE = topology.dtd.1 +JOYENT_PLATFORMS = \ + Joyent-Compute-Platform-3101-hc-topology.xml \ + Joyent-Compute-Platform-3102-hc-topology.xml + +ROOTJOYENTMAPS = $(JOYENT_PLATFORMS:%=$(arch_ROOTTOPOROOT)/%) + +TOPOFILE = \ + SSG-2028R-ACR24L-hc-topology.xml \ + SSG-2028R-ACR24L-chassis-hc-topology.xml \ + SSG-2028R-ACR24L-disk-hc-topology.xml \ + SSG-2028R-ACR24L-slot-hc-topology.xml + +SRCDIR = ../SMCI,SSG-2028R-ACR24L + +PLATFORM = SSG-2028R-ACR24L + +CLOBBERFILES += $(ROOTJOYENTMAPS) SSG-2028R-ACR24L-disk-hc-topology.xml + +include ../Makefile.map + +install: $(ROOTJOYENTMAPS) + +# +# Note, the Joyent Compute Platform 310x is based on the SuperMicro +# SSG-2028R-ACR24L. Because of that, the topo map used here will work for all +# such systems. +# +$(ROOTJOYENTMAPS): SSG-2028R-ACR24L-hc-topology.xml + $(RM) $@ + $(SYMLINK) ./$? $@ + diff --git a/usr/src/lib/fm/topo/maps/SMCI,SSG-2028R-ACR24L/SSG-2028R-ACR24L-chassis-hc-topology.xml b/usr/src/lib/fm/topo/maps/SMCI,SSG-2028R-ACR24L/SSG-2028R-ACR24L-chassis-hc-topology.xml new file mode 100644 index 0000000000..8a53632472 --- /dev/null +++ b/usr/src/lib/fm/topo/maps/SMCI,SSG-2028R-ACR24L/SSG-2028R-ACR24L-chassis-hc-topology.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/usr/src/lib/fm/topo/maps/SMCI,SSG-2028R-ACR24L/SSG-2028R-ACR24L-disk-hc-topology.xmlgenksh b/usr/src/lib/fm/topo/maps/SMCI,SSG-2028R-ACR24L/SSG-2028R-ACR24L-disk-hc-topology.xmlgenksh new file mode 100755 index 0000000000..0f4b6c9731 --- /dev/null +++ b/usr/src/lib/fm/topo/maps/SMCI,SSG-2028R-ACR24L/SSG-2028R-ACR24L-disk-hc-topology.xmlgenksh @@ -0,0 +1,108 @@ +#!/bin/ksh +# +# This file and its contents are supplied under the terms of the +# Common Development and Distribution License ("CDDL"), version 1.0. +# You may only use this file in accordance with the terms of version +# 1.0 of the CDDL. +# +# A full copy of the text of the CDDL should have accompanied this +# source. A copy of the CDDL is also available via the Internet at +# http://www.illumos.org/license/CDDL. +# + +# +# Copyright (c) 2017, Joyent, Inc. +# + +# +# Generate the topology map for an expanderless system with 3 bays. HBAs +# are in slots 1, 3, and 5. +# + +function do_node +{ + cat < + + + + + + + + + + +EOF +} + + +cat < + + + + + + + + + + + + + + + + + + + + + + +EOF + +enclosure=1 +bay=0 +slot=0 +devctl0='/devices/pci@0,0/pci8086,6f04@2/pci15d9,808@0:devctl' +while (( slot <= 7 )); do + do_node $bay "Front Disk $bay" "$devctl0" $enclosure $slot + (( bay = bay + 1 )) + (( slot = slot + 1 )) +done + +slot=0 +devctl0='/devices/pci@0,0/pci8086,6f08@3/pci15d9,808@0:devctl' +while (( slot <= 7 )); do + do_node $bay "Front Disk $bay" "$devctl0" $enclosure $slot + (( bay = bay + 1 )) + (( slot = slot + 1 )) +done + +slot=0 +devctl0='/devices/pci@78,0/pci8086,6f02@1/pci15d9,808@0:devctl' +while (( slot <= 7 )); do + do_node $bay "Front Disk $bay" "$devctl0" $enclosure $slot + (( bay = bay + 1 )) + (( slot = slot + 1 )) +done + +cat < + + + + + + +EOF diff --git a/usr/src/lib/fm/topo/maps/SMCI,SSG-2028R-ACR24L/SSG-2028R-ACR24L-hc-topology.xml b/usr/src/lib/fm/topo/maps/SMCI,SSG-2028R-ACR24L/SSG-2028R-ACR24L-hc-topology.xml new file mode 100644 index 0000000000..8406db227d --- /dev/null +++ b/usr/src/lib/fm/topo/maps/SMCI,SSG-2028R-ACR24L/SSG-2028R-ACR24L-hc-topology.xml @@ -0,0 +1,98 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/usr/src/lib/fm/topo/maps/SMCI,SSG-2028R-ACR24L/SSG-2028R-ACR24L-slot-hc-topology.xml b/usr/src/lib/fm/topo/maps/SMCI,SSG-2028R-ACR24L/SSG-2028R-ACR24L-slot-hc-topology.xml new file mode 100644 index 0000000000..6b16063427 --- /dev/null +++ b/usr/src/lib/fm/topo/maps/SMCI,SSG-2028R-ACR24L/SSG-2028R-ACR24L-slot-hc-topology.xml @@ -0,0 +1,277 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/usr/src/lib/fm/topo/maps/SMCI,SSG-2029P-ACR24L/Makefile b/usr/src/lib/fm/topo/maps/SMCI,SSG-2029P-ACR24L/Makefile new file mode 100644 index 0000000000..0cd1c11a20 --- /dev/null +++ b/usr/src/lib/fm/topo/maps/SMCI,SSG-2029P-ACR24L/Makefile @@ -0,0 +1,51 @@ +# +# This file and its contents are supplied under the terms of the +# Common Development and Distribution License ("CDDL"), version 1.0. +# You may only use this file in accordance with the terms of version +# 1.0 of the CDDL. +# +# A full copy of the text of the CDDL should have accompanied this +# source. A copy of the CDDL is also available via the Internet at +# http://www.illumos.org/license/CDDL. +# + +# +# Copyright (c) 2018, Joyent, Inc. +# + +# NOTE: The name of the xml file we are building is 'platform' +# specific, but its build is structured as 'arch' specific since +# 'uname -i' on all x86 platforms returns i86pc. + +ARCH = i86pc +CLASS = arch +DTDFILE = topology.dtd.1 +JOYENT_PLATFORMS = \ + Joyent-M12G5-hc-topology.xml + +ROOTJOYENTMAPS = $(JOYENT_PLATFORMS:%=$(arch_ROOTTOPOROOT)/%) + +TOPOFILE = \ + SSG-2029P-ACR24L-hc-topology.xml \ + SSG-2029P-ACR24L-chassis-hc-topology.xml \ + SSG-2029P-ACR24L-disk-hc-topology.xml \ + SSG-2029P-ACR24L-slot-hc-topology.xml + +SRCDIR = ../SMCI,SSG-2029P-ACR24L + +PLATFORM = SSG-2029P-ACR24L + +CLOBBERFILES += SSG-2029P-ACR24L-disk-hc-topology.xml + +include ../Makefile.map + +install: $(ROOTJOYENTMAPS) + +# +# Note, the Joyent M12G5 is based on the SuperMicro SSG-2029P-ACR24L. +# Because of that, the topo map used here will work for all such +# systems. +# +$(ROOTJOYENTMAPS): SSG-2029P-ACR24L-hc-topology.xml + $(RM) $@ + $(SYMLINK) ./$? $@ diff --git a/usr/src/lib/fm/topo/maps/SMCI,SSG-2029P-ACR24L/SSG-2029P-ACR24L-chassis-hc-topology.xml b/usr/src/lib/fm/topo/maps/SMCI,SSG-2029P-ACR24L/SSG-2029P-ACR24L-chassis-hc-topology.xml new file mode 100644 index 0000000000..8f1d790414 --- /dev/null +++ b/usr/src/lib/fm/topo/maps/SMCI,SSG-2029P-ACR24L/SSG-2029P-ACR24L-chassis-hc-topology.xml @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/usr/src/lib/fm/topo/maps/SMCI,SSG-2029P-ACR24L/SSG-2029P-ACR24L-disk-hc-topology.xmlgenksh b/usr/src/lib/fm/topo/maps/SMCI,SSG-2029P-ACR24L/SSG-2029P-ACR24L-disk-hc-topology.xmlgenksh new file mode 100755 index 0000000000..327c41c53b --- /dev/null +++ b/usr/src/lib/fm/topo/maps/SMCI,SSG-2029P-ACR24L/SSG-2029P-ACR24L-disk-hc-topology.xmlgenksh @@ -0,0 +1,143 @@ +#!/bin/ksh +# +# This file and its contents are supplied under the terms of the +# Common Development and Distribution License ("CDDL"), version 1.0. +# You may only use this file in accordance with the terms of version +# 1.0 of the CDDL. +# +# A full copy of the text of the CDDL should have accompanied this +# source. A copy of the CDDL is also available via the Internet at +# http://www.illumos.org/license/CDDL. +# + +# +# Copyright (c) 2018, Joyent, Inc. +# + +# +# Generate the topology map for an expanderless system with 24 bays. HBAs are +# in slots 2, 4, and 6. Additionally, there are two rear-facing SATA drive +# bays, connected to the SATA headers on the motherboard. +# + +function do_sas_node +{ + cat < + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +EOF +} + +function do_sata_node +{ + bay=$1 + bay_inst=$2 + # + # There are six SATA headers on the motherboard, which represent + # targets 0-5. The two rear-facing SATA bays are connected to the two + # headers associated with targets 4 and 5. + # + (( target = bay + 4 )) + hpath="/pci@0,0/pci15d9,981@11,5" + tpath="/disk@${target},0" + cat < + + + + + + + + + + +EOF +} + + +cat < + +EOF + +enclosure=1 +bay=0 +slot=0 +devctl0='/devices/pci@7d,0/pci8086,2030@0/pci15d9,808@0:devctl' +while (( slot <= 7 )); do + do_sas_node $bay "Front Disk $bay" "$devctl0" $enclosure $slot + (( bay = bay + 1 )) + (( slot = slot + 1 )) +done + +slot=0 +devctl0='/devices/pci@cd,0/pci8086,2030@0/pci15d9,808@0:devctl' +while (( slot <= 7 )); do + do_sas_node $bay "Front Disk $bay" "$devctl0" $enclosure $slot + (( bay = bay + 1 )) + (( slot = slot + 1 )) +done + +slot=0 +devctl0='/devices/pci@56,0/pci8086,2030@0/pci15d9,808@0:devctl' +while (( slot <= 7 )); do + do_sas_node $bay "Front Disk $bay" "$devctl0" $enclosure $slot + (( bay = bay + 1 )) + (( slot = slot + 1 )) +done + +do_sata_node 0 24 +do_sata_node 1 25 + +cat < + + + + + + +EOF diff --git a/usr/src/lib/fm/topo/maps/SMCI,SSG-2029P-ACR24L/SSG-2029P-ACR24L-hc-topology.xml b/usr/src/lib/fm/topo/maps/SMCI,SSG-2029P-ACR24L/SSG-2029P-ACR24L-hc-topology.xml new file mode 100644 index 0000000000..68182bfef3 --- /dev/null +++ b/usr/src/lib/fm/topo/maps/SMCI,SSG-2029P-ACR24L/SSG-2029P-ACR24L-hc-topology.xml @@ -0,0 +1,96 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/usr/src/lib/fm/topo/maps/SMCI,SSG-2029P-ACR24L/SSG-2029P-ACR24L-slot-hc-topology.xml b/usr/src/lib/fm/topo/maps/SMCI,SSG-2029P-ACR24L/SSG-2029P-ACR24L-slot-hc-topology.xml new file mode 100644 index 0000000000..29dcc6d206 --- /dev/null +++ b/usr/src/lib/fm/topo/maps/SMCI,SSG-2029P-ACR24L/SSG-2029P-ACR24L-slot-hc-topology.xml @@ -0,0 +1,277 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/usr/src/lib/fm/topo/maps/SMCI,SSG-6049P-E1CR36L/Makefile b/usr/src/lib/fm/topo/maps/SMCI,SSG-6049P-E1CR36L/Makefile new file mode 100644 index 0000000000..eeaf0c9045 --- /dev/null +++ b/usr/src/lib/fm/topo/maps/SMCI,SSG-6049P-E1CR36L/Makefile @@ -0,0 +1,47 @@ +# +# This file and its contents are supplied under the terms of the +# Common Development and Distribution License ("CDDL"), version 1.0. +# You may only use this file in accordance with the terms of version +# 1.0 of the CDDL. +# +# A full copy of the text of the CDDL should have accompanied this +# source. A copy of the CDDL is also available via the Internet at +# http://www.illumos.org/license/CDDL. +# + +# +# Copyright (c) 2018, Joyent, Inc. +# + +# NOTE: The name of the xml file we are building is 'platform' +# specific, but its build is structured as 'arch' specific since +# 'uname -i' on all x86 platforms returns i86pc. + +ARCH = i86pc +CLASS = arch +DTDFILE = topology.dtd.1 +JOYENT_PLATFORMS = \ + Joyent-S10G5-hc-topology.xml + +ROOTJOYENTMAPS = $(JOYENT_PLATFORMS:%=$(arch_ROOTTOPOROOT)/%) + +TOPOFILE = \ + SSG-6049P-E1CR36L-hc-topology.xml \ + SSG-6049P-E1CR36L-chassis-hc-topology.xml \ + SSG-6049P-E1CR36L-slot-hc-topology.xml + +SRCDIR = ../SMCI,SSG-6049P-E1CR36L + +PLATFORM = SSG-6049P-E1CR36L + +include ../Makefile.map + +install: $(ROOTJOYENTMAPS) +# +# Note, the Joyent S10G5 is based on the SuperMicro SSG-6049P-E1CR36L. +# Because of that, the topo map used here will work for all such +# systems. +# +$(ROOTJOYENTMAPS): SSG-6049P-E1CR36L-hc-topology.xml + $(RM) $@ + $(SYMLINK) ./$? $@ diff --git a/usr/src/lib/fm/topo/maps/SMCI,SSG-6049P-E1CR36L/SSG-6049P-E1CR36L-chassis-hc-topology.xml b/usr/src/lib/fm/topo/maps/SMCI,SSG-6049P-E1CR36L/SSG-6049P-E1CR36L-chassis-hc-topology.xml new file mode 100644 index 0000000000..346f77966e --- /dev/null +++ b/usr/src/lib/fm/topo/maps/SMCI,SSG-6049P-E1CR36L/SSG-6049P-E1CR36L-chassis-hc-topology.xml @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/usr/src/lib/fm/topo/maps/SMCI,SSG-6049P-E1CR36L/SSG-6049P-E1CR36L-hc-topology.xml b/usr/src/lib/fm/topo/maps/SMCI,SSG-6049P-E1CR36L/SSG-6049P-E1CR36L-hc-topology.xml new file mode 100644 index 0000000000..f3f7311249 --- /dev/null +++ b/usr/src/lib/fm/topo/maps/SMCI,SSG-6049P-E1CR36L/SSG-6049P-E1CR36L-hc-topology.xml @@ -0,0 +1,87 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/usr/src/lib/fm/topo/maps/SMCI,SSG-6049P-E1CR36L/SSG-6049P-E1CR36L-slot-hc-topology.xml b/usr/src/lib/fm/topo/maps/SMCI,SSG-6049P-E1CR36L/SSG-6049P-E1CR36L-slot-hc-topology.xml new file mode 100644 index 0000000000..d367c42744 --- /dev/null +++ b/usr/src/lib/fm/topo/maps/SMCI,SSG-6049P-E1CR36L/SSG-6049P-E1CR36L-slot-hc-topology.xml @@ -0,0 +1,277 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- cgit v1.2.3