From patchwork Tue Aug 1 13:00:04 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oliver O'Halloran X-Patchwork-Id: 796221 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3xMGhF0YQXz9sR8 for ; Tue, 1 Aug 2017 23:02:53 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="IBjwN2zg"; 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 3xMGhD6W60zDrJj for ; Tue, 1 Aug 2017 23:02:52 +1000 (AEST) 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="IBjwN2zg"; dkim-atps=neutral X-Original-To: skiboot@lists.ozlabs.org Delivered-To: skiboot@lists.ozlabs.org Received: from mail-pg0-x241.google.com (mail-pg0-x241.google.com [IPv6:2607:f8b0:400e:c05::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 3xMGdn5mb6zDsQ8 for ; Tue, 1 Aug 2017 23:00:45 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="IBjwN2zg"; dkim-atps=neutral Received: by mail-pg0-x241.google.com with SMTP id l64so2608483pge.2 for ; Tue, 01 Aug 2017 06:00:45 -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=k/8UvzQ8KOUWpjJnCArEqV/t3AqH9ZxJnyGV/UAb/v8=; b=IBjwN2zgwlP9N9vMDs+qxY8u5fNDuSGAME2y3waHKiy1IjXbsGVNDUtCr+m2xqxcdG oqD+8D8x+XTMJORBK46ozqOMYHS0ljBHKPaDBkJsS5S5ObxMtwzMh5HjJNzBi9UkofL9 dsFXFvmvqOmwXN3il0GG2kWjZR89FwauWWvPSwPxw3XdS7lT1CG39g5VxQjVKRYvb0/L W9wqrLHXuFU4fW6E9LIHyRsvHZK7LDQHtFrBCS7A5bbSehcdpbtqKX8Hhzr6YNFYNqRU SLbWa8I49aqWNXmfs8fbKbiz4PfvU3RTVgcTrWHNqFdwAZLoy0KGJkCKAIOjF1gJ1ynH 6Q+w== 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=k/8UvzQ8KOUWpjJnCArEqV/t3AqH9ZxJnyGV/UAb/v8=; b=FqZ8yz1ocuPMYKPes1lIAAh0SLjCz25CXfSB4gZqWZ0TU3uxI6eqqjEYlOZb8CnVel YH/EDMl8QGdJNxMK4cuR8629JgnpV7CC0gQD6e921a19FknTSq1izMyLG/I0woVXJOCa ws50LUNw6OD8Lg2G+wcjoxRu57m3f7FQ59YFu8aamBGv9cX2BI0GStp2+TkG82My+Hjt lLFVKiNZi65tWKXlGtrF8Ba0VoJNBZfRc0H24cvf0rxgbX1jS3zh4sdBgQHWX3BrHowH XE+RsBP5M6mcrQ5QMRwYmOmyGO+GbMK8mc2xLcbQdv+cUnjTiJq8HF/9BHu35BbaTIeK Z57A== X-Gm-Message-State: AIVw111CFu2RoZngO1D+Zo7tP06srs6wQMevS0W874U+4+10s1DFoG12 vuM0XAiNZcesrODL X-Received: by 10.99.109.5 with SMTP id i5mr18937319pgc.440.1501592443904; Tue, 01 Aug 2017 06:00:43 -0700 (PDT) Received: from flat-canetoad.ozlabs.ibm.com ([122.99.82.10]) by smtp.gmail.com with ESMTPSA id g22sm3235806pgn.65.2017.08.01.06.00.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 01 Aug 2017 06:00:43 -0700 (PDT) From: Oliver O'Halloran To: skiboot@lists.ozlabs.org Date: Tue, 1 Aug 2017 23:00:04 +1000 Message-Id: <20170801130007.8990-10-oohall@gmail.com> X-Mailer: git-send-email 2.9.4 In-Reply-To: <20170801130007.8990-1-oohall@gmail.com> References: <20170801130007.8990-1-oohall@gmail.com> Subject: [Skiboot] [RFC 09/12] astbmc/slots: Remove NPU PHB slots X-BeenThere: skiboot@lists.ozlabs.org X-Mailman-Version: 2.1.23 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" Don't need them anymore. Signed-off-by: Oliver O'Halloran --- platforms/astbmc/garrison.c | 38 --------------------------------- platforms/astbmc/p8dnu.c | 38 --------------------------------- platforms/astbmc/witherspoon.c | 48 ------------------------------------------ 3 files changed, 124 deletions(-) diff --git a/platforms/astbmc/garrison.c b/platforms/astbmc/garrison.c index 4b3ba071a833..a467672ea7a0 100644 --- a/platforms/astbmc/garrison.c +++ b/platforms/astbmc/garrison.c @@ -63,20 +63,6 @@ static const struct slot_table_entry garrison_phb0_3_slot[] = { { .etype = st_end }, }; -static const struct slot_table_entry garrison_npu0_slots[] = { - { - .etype = st_npu_slot, - .location = ST_LOC_NPU_GROUP(0), - .name = "GPU2", - }, - { - .etype = st_npu_slot, - .location = ST_LOC_NPU_GROUP(1), - .name = "GPU1", - }, - { .etype = st_end }, -}; - static const struct slot_table_entry garrison_phb1_0_slot[] = { { .etype = st_pluggable_slot, @@ -144,20 +130,6 @@ static const struct slot_table_entry garrison_phb1_3_slot[] = { { .etype = st_end }, }; -static const struct slot_table_entry garrison_npu1_slots[] = { - { - .etype = st_npu_slot, - .location = ST_LOC_NPU_GROUP(0), - .name = "GPU4", - }, - { - .etype = st_npu_slot, - .location = ST_LOC_NPU_GROUP(1), - .name = "GPU3", - }, - { .etype = st_end }, -}; - static const struct slot_table_entry garrison_phb_table[] = { { .etype = st_phb, @@ -181,11 +153,6 @@ static const struct slot_table_entry garrison_phb_table[] = { }, { .etype = st_phb, - .location = ST_LOC_PHB(0,4), - .children = garrison_npu0_slots, - }, - { - .etype = st_phb, .location = ST_LOC_PHB(1,0), .children = garrison_phb1_0_slot, }, @@ -204,11 +171,6 @@ static const struct slot_table_entry garrison_phb_table[] = { .location = ST_LOC_PHB(1,3), .children = garrison_phb1_3_slot, }, - { - .etype = st_phb, - .location = ST_LOC_PHB(1,4), - .children = garrison_npu1_slots, - }, { .etype = st_end }, }; diff --git a/platforms/astbmc/p8dnu.c b/platforms/astbmc/p8dnu.c index 1ac2a2141dbb..5502af86bdaf 100644 --- a/platforms/astbmc/p8dnu.c +++ b/platforms/astbmc/p8dnu.c @@ -105,20 +105,6 @@ static const struct slot_table_entry p8dnu_phb0_3_slot[] = { { .etype = st_end }, }; -static const struct slot_table_entry p8dnu_npu0_slots[] = { - { - .etype = st_npu_slot, - .location = ST_LOC_NPU_GROUP(0), - .name = "GPU2", - }, - { - .etype = st_npu_slot, - .location = ST_LOC_NPU_GROUP(1), - .name = "GPU1", - }, - { .etype = st_end }, -}; - static const struct slot_table_entry p8dnu_phb1_0_slot[] = { { .etype = st_pluggable_slot, @@ -186,20 +172,6 @@ static const struct slot_table_entry p8dnu_phb1_3_slot[] = { { .etype = st_end }, }; -static const struct slot_table_entry p8dnu_npu1_slots[] = { - { - .etype = st_npu_slot, - .location = ST_LOC_NPU_GROUP(0), - .name = "GPU4", - }, - { - .etype = st_npu_slot, - .location = ST_LOC_NPU_GROUP(1), - .name = "GPU3", - }, - { .etype = st_end }, -}; - static const struct slot_table_entry p8dnu_phb_table[] = { { .etype = st_phb, @@ -223,11 +195,6 @@ static const struct slot_table_entry p8dnu_phb_table[] = { }, { .etype = st_phb, - .location = ST_LOC_PHB(0,4), - .children = p8dnu_npu0_slots, - }, - { - .etype = st_phb, .location = ST_LOC_PHB(1,0), .children = p8dnu_phb1_0_slot, }, @@ -246,11 +213,6 @@ static const struct slot_table_entry p8dnu_phb_table[] = { .location = ST_LOC_PHB(1,3), .children = p8dnu_phb1_3_slot, }, - { - .etype = st_phb, - .location = ST_LOC_PHB(1,4), - .children = p8dnu_npu1_slots, - }, { .etype = st_end }, }; diff --git a/platforms/astbmc/witherspoon.c b/platforms/astbmc/witherspoon.c index c3e997a393ac..4f384db77b5b 100644 --- a/platforms/astbmc/witherspoon.c +++ b/platforms/astbmc/witherspoon.c @@ -110,44 +110,6 @@ static const struct slot_table_entry witherspoon_phb8_5_slot[] = { { .etype = st_end }, }; -static const struct slot_table_entry witherspoon_npu0_slots[] = { - { - .etype = st_npu_slot, - .location = ST_LOC_NPU_GROUP(0), - .name = "GPU0", - }, - { - .etype = st_npu_slot, - .location = ST_LOC_NPU_GROUP(1), - .name = "GPU1", - }, - { - .etype = st_npu_slot, - .location = ST_LOC_NPU_GROUP(2), - .name = "GPU2", - }, - { .etype = st_end }, -}; - -static const struct slot_table_entry witherspoon_npu8_slots[] = { - { - .etype = st_npu_slot, - .location = ST_LOC_NPU_GROUP(0), - .name = "GPU3", - }, - { - .etype = st_npu_slot, - .location = ST_LOC_NPU_GROUP(1), - .name = "GPU4", - }, - { - .etype = st_npu_slot, - .location = ST_LOC_NPU_GROUP(2), - .name = "GPU5", - }, - { .etype = st_end }, -}; - static const struct slot_table_entry witherspoon_phb_table[] = { { .etype = st_phb, @@ -156,19 +118,9 @@ static const struct slot_table_entry witherspoon_phb_table[] = { }, { .etype = st_phb, - .location = ST_LOC_PHB(0,7), - .children = witherspoon_npu0_slots, - }, - { - .etype = st_phb, .location = ST_LOC_PHB(8,5), .children = witherspoon_phb8_5_slot, }, - { - .etype = st_phb, - .location = ST_LOC_PHB(8,8), - .children = witherspoon_npu8_slots, - }, { .etype = st_end }, };