From patchwork Thu Dec 7 23:28:16 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Reza Arbab X-Patchwork-Id: 845904 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 3ytBW91QW3z9s71 for ; Fri, 8 Dec 2017 10:28:37 +1100 (AEDT) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3ytBW81V5fzDsTj for ; Fri, 8 Dec 2017 10:28:36 +1100 (AEDT) X-Original-To: skiboot@lists.ozlabs.org Delivered-To: skiboot@lists.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=linux.vnet.ibm.com (client-ip=148.163.158.5; helo=mx0a-001b2d01.pphosted.com; envelope-from=arbab@linux.vnet.ibm.com; receiver=) 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 3ytBW06g89zDsPy for ; Fri, 8 Dec 2017 10:28:28 +1100 (AEDT) Received: from pps.filterd (m0098413.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.0.21/8.16.0.21) with SMTP id vB7NO1g5092553 for ; Thu, 7 Dec 2017 18:28:25 -0500 Received: from e13.ny.us.ibm.com (e13.ny.us.ibm.com [129.33.205.203]) by mx0b-001b2d01.pphosted.com with ESMTP id 2eqenf1kdk-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Thu, 07 Dec 2017 18:28:25 -0500 Received: from localhost by e13.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 7 Dec 2017 18:28:24 -0500 Received: from b01cxnp23032.gho.pok.ibm.com (9.57.198.27) by e13.ny.us.ibm.com (146.89.104.200) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Thu, 7 Dec 2017 18:28:21 -0500 Received: from b01ledav002.gho.pok.ibm.com (b01ledav002.gho.pok.ibm.com [9.57.199.107]) by b01cxnp23032.gho.pok.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id vB7NSLZY42860560; Thu, 7 Dec 2017 23:28:21 GMT Received: from b01ledav002.gho.pok.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 156A3124037; Thu, 7 Dec 2017 18:25:21 -0500 (EST) Received: from arbab-vm.localdomain (unknown [9.85.206.186]) by b01ledav002.gho.pok.ibm.com (Postfix) with ESMTP id D167A12403F; Thu, 7 Dec 2017 18:25:20 -0500 (EST) Received: by arbab-vm.localdomain (Postfix, from userid 152845) id DE1971016E6; Thu, 7 Dec 2017 17:28:18 -0600 (CST) From: Reza Arbab To: skiboot@lists.ozlabs.org Date: Thu, 7 Dec 2017 17:28:16 -0600 X-Mailer: git-send-email 1.8.3.1 X-TM-AS-GCONF: 00 x-cbid: 17120723-0008-0000-0000-000002AC811F X-IBM-SpamModules-Scores: X-IBM-SpamModules-Versions: BY=3.00008168; HX=3.00000241; KW=3.00000007; PH=3.00000004; SC=3.00000244; SDB=6.00956943; UDB=6.00483780; IPR=6.00736973; BA=6.00005729; NDR=6.00000001; ZLA=6.00000005; ZF=6.00000009; ZB=6.00000000; ZP=6.00000000; ZH=6.00000000; ZU=6.00000002; MB=3.00018413; XFM=3.00000015; UTC=2017-12-07 23:28:22 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 17120723-0009-0000-0000-00003787C76A Message-Id: <1512689298-9458-1-git-send-email-arbab@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2017-12-07_11:, , 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=995 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1711220000 definitions=main-1712070342 Subject: [Skiboot] [PATCH] hdata/iohub: Use only wildcard slots for pluggables X-BeenThere: skiboot@lists.ozlabs.org X-Mailman-Version: 2.1.24 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" From: Oliver O'Halloran We don't want to cause a VID:DID check against pluggable devices, as they may use multiple devids. Narrow the condition under which VID:DID is listed in the dt, so that we'll end up creating a wildcard slot for these instead. Cc: stable # 5.9.x Signed-off-by: Oliver O'Halloran Signed-off-by: Reza Arbab --- hdata/iohub.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hdata/iohub.c b/hdata/iohub.c index a5f12fd..2260f60 100644 --- a/hdata/iohub.c +++ b/hdata/iohub.c @@ -705,7 +705,7 @@ static void parse_one_slot(const struct slot_map_entry *entry, st_name(type), vid, did); /* The VID:DID is only meaningful for builtins and switches */ - if (vid && did) { + if (type == st_sw_upstream && vid && did) { node = dt_new_2addr(parent, st_name(type), vid, did); dt_add_property_cells(node, "reg", vid, did); } else {