From patchwork Thu Mar 7 14:07:35 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergei Miroshnichenko X-Patchwork-Id: 1052936 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 (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44FXb65x2Fz9sMQ for ; Fri, 8 Mar 2019 01:10:26 +1100 (AEDT) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=yadro.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=yadro.com header.i=@yadro.com header.b="hZEjxupy"; 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 44FXb64Z4HzDqLX for ; Fri, 8 Mar 2019 01:10:26 +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=yadro.com (client-ip=89.207.88.251; helo=mta-01.yadro.com; envelope-from=s.miroshnichenko@yadro.com; receiver=) Authentication-Results: lists.ozlabs.org; dmarc=pass (p=none dis=none) header.from=yadro.com Authentication-Results: lists.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=yadro.com header.i=@yadro.com header.b="hZEjxupy"; dkim-atps=neutral Received: from mta-01.yadro.com (mta-01.yadro.com [89.207.88.251]) (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 44FXYN4v1zzDqDT for ; Fri, 8 Mar 2019 01:08:56 +1100 (AEDT) Received: from localhost (unknown [127.0.0.1]) by mta-01.yadro.com (Postfix) with ESMTP id DB33341975; Thu, 7 Mar 2019 14:08:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=yadro.com; h= content-type:content-type:content-transfer-encoding:mime-version :references:in-reply-to:x-mailer:message-id:date:date:subject :subject:from:from:received:received:received; s=mta-01; t= 1551967728; x=1553782129; bh=oiNRM3kLnk5uv5+0JkERtmJJOai1NSDjwUC xD+Da+LE=; b=hZEjxupyJDaNzJATqTaN25T2fICskQlToeQJsdxrUDR6lWF5hSR qod4QLc3ZRz8k9nSOSlKua7suG9TO689075ZQM1kwreVhwbUKgwOzp2NkD3Tn/gQ zbdhjWdYmx8nKyyrvSGCoFwxcrtYI/1tO+RrXX89HbXmKnnjaFaYMfxM= X-Virus-Scanned: amavisd-new at yadro.com Received: from mta-01.yadro.com ([127.0.0.1]) by localhost (mta-01.yadro.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id xocCI9BcitRu; Thu, 7 Mar 2019 17:08:48 +0300 (MSK) Received: from T-EXCH-02.corp.yadro.com (t-exch-02.corp.yadro.com [172.17.10.102]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mta-01.yadro.com (Postfix) with ESMTPS id DA0D54197D; Thu, 7 Mar 2019 17:08:43 +0300 (MSK) Received: from NB-148.yadro.com (172.17.15.60) by T-EXCH-02.corp.yadro.com (172.17.10.102) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.669.32; Thu, 7 Mar 2019 17:08:43 +0300 From: Sergey Miroshnichenko To: Date: Thu, 7 Mar 2019 17:07:35 +0300 Message-ID: <20190307140736.26787-6-s.miroshnichenko@yadro.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190307140736.26787-1-s.miroshnichenko@yadro.com> References: <20190307140736.26787-1-s.miroshnichenko@yadro.com> MIME-Version: 1.0 X-Originating-IP: [172.17.15.60] X-ClientProxiedBy: T-EXCH-01.corp.yadro.com (172.17.10.101) To T-EXCH-02.corp.yadro.com (172.17.10.102) Subject: [Skiboot] [PATCH RFC v2 5/6] pci-iov: Set parent of VFs to the bridge's downstream instead of PF 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: Stewart Smith , linux@yadro.com Errors-To: skiboot-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Skiboot" This make it a bit simpler to handle PCIe re-enumeration. Signed-off-by: Sergey Miroshnichenko --- core/pci-iov.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/core/pci-iov.c b/core/pci-iov.c index 3bbb7b86..f2344878 100644 --- a/core/pci-iov.c +++ b/core/pci-iov.c @@ -133,8 +133,10 @@ static int64_t pci_iov_change(void *dev __unused, /* Remove all VFs that have been attached to the parent */ if (!iov->enabled) { - list_for_each_safe(&pd->children, vf, tmp, link) - list_del(&vf->link); + list_for_each_safe(pd->parent ? &pd->parent->children : &pd->children, + vf, tmp, link) + if ((vf->bdfn & 0xfff8) == (pd->bdfn & 0xfff8)) + list_del(&vf->link); return OPAL_PARTIAL; } @@ -142,7 +144,8 @@ static int64_t pci_iov_change(void *dev __unused, for (changed = false, i = 0; i < iov->num_VFs; i++) { vf = &iov->VFs[i]; vf->bdfn = pd->bdfn + iov->offset + iov->stride * i; - list_add_tail(&pd->children, &vf->link); + list_add_tail(pd->parent ? &pd->parent->children : &pd->children, + &vf->link); /* * We don't populate the capabilities again if they have @@ -183,7 +186,7 @@ static void pci_iov_init_VF(struct pci_device *pd, struct pci_device *vf) vf->class = pd->class; vf->dn = NULL; vf->slot = NULL; - vf->parent = pd; + vf->parent = pd->parent ? pd->parent : pd; vf->phb = pd->phb; list_head_init(&vf->pcrf); list_head_init(&vf->children);