From patchwork Fri Feb 1 00:26:35 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deb McLemore X-Patchwork-Id: 1034541 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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43rHwW50mJz9sMl for ; Fri, 1 Feb 2019 11:26:51 +1100 (AEDT) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=linux.ibm.com Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 43rHwW3CGczDqdh for ; Fri, 1 Feb 2019 11:26:51 +1100 (AEDT) X-Original-To: skiboot@lists.ozlabs.org Delivered-To: skiboot@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=linux.ibm.com (client-ip=148.163.158.5; helo=mx0a-001b2d01.pphosted.com; envelope-from=debmc@linux.ibm.com; receiver=) Authentication-Results: lists.ozlabs.org; dmarc=none (p=none dis=none) header.from=linux.ibm.com Received: from mx0a-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 43rHwP4smCzDqdT for ; Fri, 1 Feb 2019 11:26:45 +1100 (AEDT) Received: from pps.filterd (m0098417.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.27/8.16.0.27) with SMTP id x110OAWK056661 for ; Thu, 31 Jan 2019 19:26:42 -0500 Received: from e32.co.us.ibm.com (e32.co.us.ibm.com [32.97.110.150]) by mx0a-001b2d01.pphosted.com with ESMTP id 2qcam1204m-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 31 Jan 2019 19:26:42 -0500 Received: from localhost by e32.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 1 Feb 2019 00:26:41 -0000 Received: from b03cxnp07029.gho.boulder.ibm.com (9.17.130.16) by e32.co.us.ibm.com (192.168.1.132) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; (version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256/256) Fri, 1 Feb 2019 00:26:39 -0000 Received: from b03ledav003.gho.boulder.ibm.com (b03ledav003.gho.boulder.ibm.com [9.17.130.234]) by b03cxnp07029.gho.boulder.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id x110QcYM23330838 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Fri, 1 Feb 2019 00:26:39 GMT Received: from b03ledav003.gho.boulder.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id DB8846A047 for ; Fri, 1 Feb 2019 00:26:38 +0000 (GMT) Received: from b03ledav003.gho.boulder.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id A54D16A04D for ; Fri, 1 Feb 2019 00:26:38 +0000 (GMT) Received: from debmc-p50.localdomain (unknown [9.85.168.40]) by b03ledav003.gho.boulder.ibm.com (Postfix) with ESMTP for ; Fri, 1 Feb 2019 00:26:38 +0000 (GMT) Received: by debmc-p50.localdomain (Postfix, from userid 1000) id 9E27A660B41; Thu, 31 Jan 2019 18:26:36 -0600 (CST) From: Deb McLemore To: skiboot@lists.ozlabs.org Date: Thu, 31 Jan 2019 18:26:35 -0600 X-Mailer: git-send-email 2.7.4 X-TM-AS-GCONF: 00 x-cbid: 19020100-0004-0000-0000-000014DADD08 X-IBM-SpamModules-Scores: X-IBM-SpamModules-Versions: BY=3.00010512; HX=3.00000242; KW=3.00000007; PH=3.00000004; SC=3.00000277; SDB=6.01154569; UDB=6.00602067; IPR=6.00935001; MB=3.00025380; MTD=3.00000008; XFM=3.00000015; UTC=2019-02-01 00:26:40 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 19020100-0005-0000-0000-00008A6E5F46 Message-Id: <1548980795-27198-1-git-send-email-debmc@linux.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:, , definitions=2019-01-31_14:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=1 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=933 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1810050000 definitions=main-1902010000 Subject: [Skiboot] [PATCH] p9dsu: Fix p9dsu slot tables X-BeenThere: skiboot@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Mailing list for skiboot development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Deb McLemore MIME-Version: 1.0 Errors-To: skiboot-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Skiboot" Set the attributes on the slot tables to account for builtin or pluggable etypes, this will allow pci enumeration to calculate subordinate buses. Update some slot label strings. Add WIO Slot5 which is standard on the ESS config. Signed-off-by: Deb McLemore --- platforms/astbmc/p9dsu.c | 45 ++++++++++++++++++++++++++++++--------------- 1 file changed, 30 insertions(+), 15 deletions(-) diff --git a/platforms/astbmc/p9dsu.c b/platforms/astbmc/p9dsu.c index 0fec04e..2700416 100644 --- a/platforms/astbmc/p9dsu.c +++ b/platforms/astbmc/p9dsu.c @@ -355,25 +355,25 @@ static const struct slot_table_entry p9dsu2uess_uio_plx_down[] = { .power_limit = 75, }, { - .etype = st_builtin_dev, + .etype = st_pluggable_slot, .location = ST_LOC_DEVFN(0x8,0), - .name = "PLX switch UIO Slot2", + .name = "PLX SWITCH UIO Slot2", .power_limit = 75, }, { - .etype = st_builtin_dev, + .etype = st_pluggable_slot, .location = ST_LOC_DEVFN(0x9,0), - .name = "PLX Down Onboard LAN UIO Slot2", + .name = "PLX DOWN LAN UIO Slot2", }, { .etype = st_end }, }; static const struct slot_table_entry p9dsu2uess_uio_plx_up[] = { { - .etype = st_builtin_dev, + .etype = st_pluggable_slot, .location = ST_LOC_DEVFN(0,0), .children = p9dsu2uess_uio_plx_down, - .name = "PLX up UIO Slot2", + .name = "PLX UP UIO Slot2", .power_limit = 75, }, { .etype = st_end }, @@ -387,9 +387,9 @@ static const struct slot_table_entry p9dsu2uess_wio_plx_down[] = { .power_limit = 75, }, { - .etype = st_builtin_dev, + .etype = st_pluggable_slot, .location = ST_LOC_DEVFN(0x8,0), - .name = "PLX switch WIO Slot3", + .name = "PLX SWITCH WIO Slot3", .power_limit = 75, }, { @@ -403,10 +403,10 @@ static const struct slot_table_entry p9dsu2uess_wio_plx_down[] = { static const struct slot_table_entry p9dsu2uess_wio_plx_up[] = { { - .etype = st_builtin_dev, + .etype = st_pluggable_slot, .location = ST_LOC_DEVFN(0,0), .children = p9dsu2uess_wio_plx_down, - .name = "PLX up WIO Slot3", + .name = "PLX UP WIO Slot3", .power_limit = 75, }, { .etype = st_end }, @@ -424,8 +424,8 @@ static const struct slot_table_entry p9dsu2uess_phb0_0_slot[] = { static const struct slot_table_entry p9dsu2uess_phb0_1_slot[] = { { - .etype = st_builtin_dev, - .location = ST_LOC_DEVFN(0x1,0), + .etype = st_pluggable_slot, + .location = ST_LOC_DEVFN(0,0), .children = p9dsu2uess_uio_plx_up, .name = "PLX UIO Slot2", .power_limit = 75, @@ -435,7 +435,7 @@ static const struct slot_table_entry p9dsu2uess_phb0_1_slot[] = { static const struct slot_table_entry p9dsu2uess_phb0_2_slot[] = { { - .etype = st_builtin_dev, + .etype = st_pluggable_slot, .location = ST_LOC_DEVFN(0,0), .name = "UIO Slot3", .power_limit = 75, @@ -492,7 +492,7 @@ static const struct slot_table_entry p9dsu2uess_phb8_1_slot[] = { static const struct slot_table_entry p9dsu2uess_phb8_2_slot[] = { { - .etype = st_builtin_dev, + .etype = st_pluggable_slot, .location = ST_LOC_DEVFN(0,0), .children = p9dsu2uess_wio_plx_up, .name = "PLX WIO Slot3", @@ -511,6 +511,16 @@ static const struct slot_table_entry p9dsu2uess_phb8_3_slot[] = { { .etype = st_end }, }; +static const struct slot_table_entry p9dsu2uess_phb8_4_slot[] = { + { + .etype = st_pluggable_slot, + .location = ST_LOC_DEVFN(0,0), + .name = "WIO Slot5", + .power_limit = 75, + }, + { .etype = st_end }, +}; + static const struct slot_table_entry p9dsu2uess_phb_table[] = { { .etype = st_phb, @@ -557,11 +567,16 @@ static const struct slot_table_entry p9dsu2uess_phb_table[] = { .location = ST_LOC_PHB(8,2), .children = p9dsu2uess_phb8_2_slot, }, - { + { .etype = st_phb, .location = ST_LOC_PHB(8,3), .children = p9dsu2uess_phb8_3_slot, }, + { + .etype = st_phb, + .location = ST_LOC_PHB(8,4), + .children = p9dsu2uess_phb8_4_slot, + }, { .etype = st_end }, };