From patchwork Tue Apr 10 07:28:02 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oliver O'Halloran X-Patchwork-Id: 896515 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [103.22.144.68]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40KzM703TLz9s2Y for ; Tue, 10 Apr 2018 17:29:23 +1000 (AEST) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="ri5IDiiO"; dkim-atps=neutral Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 40KzM65fxGzF0BV for ; Tue, 10 Apr 2018 17:29:22 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="ri5IDiiO"; dkim-atps=neutral X-Original-To: skiboot@lists.ozlabs.org Delivered-To: skiboot@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=gmail.com (client-ip=2607:f8b0:400e:c01::241; helo=mail-pl0-x241.google.com; envelope-from=oohall@gmail.com; receiver=) Authentication-Results: lists.ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="ri5IDiiO"; dkim-atps=neutral Received: from mail-pl0-x241.google.com (mail-pl0-x241.google.com [IPv6:2607:f8b0:400e:c01::241]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 40KzKt5KvmzDrpX for ; Tue, 10 Apr 2018 17:28:18 +1000 (AEST) Received: by mail-pl0-x241.google.com with SMTP id 61-v6so6892914plb.2 for ; Tue, 10 Apr 2018 00:28:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=EMfWL26Mr0+a2S7jdWOKiaqScv/a74P9AAaxqtNBq8s=; b=ri5IDiiO9/BjN8MNFqhNu6i8Yo+XkIfSVq0f6NKfqB5XO/zURNtU6caEtOKIz1Ca69 8HWFmLOc479+DE7MIeDdbECQMkEVUVO7+cA8kKM4YKWOQAQsCfftM/k7LFoIpJMf+9TC fpArJ3AOY6DBPXwcO0bGff5jl6o8kjEj0WOAnObg3RXC1iSfpM0IzW7ybDupmWvSjD9d bHlSlmHrpwLuMbB8tZutCrxmBq9hsjbDQBy0s9IonnQfG78D8K4qF51RrxFKWEfQjmPR 3s2CJIAGaPoRyg5EJBIg9oevq3jUocKnJ+Nv1jjNqbeJCKbEPFul7hFrZX3ay7jYZvbV Ptnw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=EMfWL26Mr0+a2S7jdWOKiaqScv/a74P9AAaxqtNBq8s=; b=CX9inmamoZV/NZYAhs8EHczmm2LN4QxgHCCpYMRZQI29RXQjdd0XvKdmcm+r/vcyUU 1MILvgFYvWmsvjW/Z9tUZFZPfUmL6pSctVDKvj6/0oU6MxIBYTpEU7vyG1ftlwy/OFSP G2oedQ3svJrAt/4j/MIuQiToOAlQl+2i31sxfG27pU8aF0+Jh5VgwsSBPDEm57z+DCzs s+KzdqqWuWdOIr40uDmbBFomSY1YMQ4vOqOnb1haLTyX8VBSURSS10sCsTvxFCU3iRKc DYO6O8+Z7KXQk18jmvk2OdvfHITeIfOMvYbok0OQiSAckEe+DSylhsaMa8TuVAlqoGCe KlAQ== X-Gm-Message-State: AElRT7G5GtCaqeHUButWlXGSDKEztmxrIika573rw8Sz5kax2CR0cVCk 2rOlFieUVUxu+XyYAo6jJIBVpA== X-Google-Smtp-Source: AIpwx4/J6IvWYSZPmhlaTeyCHWuNsrA9Lx9HHjNda8d9Jc8s5fqej5/SIzyql8c/5EYZj3vW5S4+0w== X-Received: by 2002:a17:902:6e8c:: with SMTP id v12-v6mr41614752plk.24.1523345297063; Tue, 10 Apr 2018 00:28:17 -0700 (PDT) Received: from flat-canetoad.ozlabs.ibm.com ([122.99.82.10]) by smtp.gmail.com with ESMTPSA id o66sm4119609pfg.90.2018.04.10.00.28.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 10 Apr 2018 00:28:16 -0700 (PDT) From: Oliver O'Halloran To: skiboot@lists.ozlabs.org Date: Tue, 10 Apr 2018 17:28:02 +1000 Message-Id: <20180410072802.17870-2-oohall@gmail.com> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20180410072802.17870-1-oohall@gmail.com> References: <20180410072802.17870-1-oohall@gmail.com> Subject: [Skiboot] [PATCH 2/2] romulus: Add a barebones slot table X-BeenThere: skiboot@lists.ozlabs.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: Mailing list for skiboot development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: skiboot-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Skiboot" Add slot tables for romulus. Hopefully they won't be needed in THE FUTURE! Signed-off-by: Oliver O'Halloran --- ahahaha who am I kidding. --- platforms/astbmc/romulus.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/platforms/astbmc/romulus.c b/platforms/astbmc/romulus.c index e1b137cb3df6..7cdc3b9d3669 100644 --- a/platforms/astbmc/romulus.c +++ b/platforms/astbmc/romulus.c @@ -24,6 +24,34 @@ #include "astbmc.h" +ST_PLUGGABLE(romulus_cpu1_slot1, "CPU1 Slot1 (8x)"); +ST_PLUGGABLE(romulus_cpu1_slot2, "CPU1 Slot2 (16x)"); + +ST_PLUGGABLE(romulus_cpu2_slot1, "CPU2 Slot1 (16x)"); +ST_PLUGGABLE(romulus_cpu2_slot2, "CPU2 Slot2 (16x)"); +ST_PLUGGABLE(romulus_cpu2_slot3, "CPU2 Slot3 (8x)"); + +ST_BUILTIN_DEV(romulus_builtin_raid, "Builtin RAID"); +ST_BUILTIN_DEV(romulus_builtin_usb, "Builtin USB"); +ST_BUILTIN_DEV(romulus_builtin_ethernet, "Builtin Ethernet"); +ST_BUILTIN_DEV(romulus_builtin_bmc, "BMC"); + +static const struct slot_table_entry romulus_phb_table[] = { + ST_PHB_ENTRY(0, 0, romulus_cpu1_slot2), + ST_PHB_ENTRY(0, 1, romulus_cpu1_slot1), + + ST_PHB_ENTRY(0, 2, romulus_builtin_raid), + ST_PHB_ENTRY(0, 3, romulus_builtin_usb), + ST_PHB_ENTRY(0, 4, romulus_builtin_ethernet), + ST_PHB_ENTRY(0, 5, romulus_builtin_bmc), + + ST_PHB_ENTRY(8, 0, romulus_cpu2_slot2), // might be swapped with 3 + ST_PHB_ENTRY(8, 1, romulus_cpu2_slot3), // might be PHB1 or 2 + ST_PHB_ENTRY(8, 3, romulus_cpu2_slot1), + + { .etype = st_end }, +}; + static bool romulus_probe(void) { if (!dt_node_is_compatible(dt_root, "ibm,romulus")) @@ -35,6 +63,8 @@ static bool romulus_probe(void) /* Setup UART for use by OPAL (Linux hvc) */ uart_set_console_policy(UART_CONSOLE_OPAL); + slot_table_init(romulus_phb_table); + return true; }