From patchwork Thu Mar 7 14:07:31 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergei Miroshnichenko X-Patchwork-Id: 1052931 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 44FXYq6dSQz9sMQ for ; Fri, 8 Mar 2019 01:09:19 +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="RH2BaShY"; 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 44FXYq5Dn8zDqCX for ; Fri, 8 Mar 2019 01:09:19 +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="RH2BaShY"; 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 44FXYF5NwxzDqCD for ; Fri, 8 Mar 2019 01:08:49 +1100 (AEDT) Received: from localhost (unknown [127.0.0.1]) by mta-01.yadro.com (Postfix) with ESMTP id 13CDE41980; Thu, 7 Mar 2019 14:08:45 +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= 1551967723; x=1553782124; bh=3SpedOBNf/p1tLD1QIPZlyYPqF1gCB74jgy Vrys/7h8=; b=RH2BaShYUW7GHY40GUEg1Ujfsgc/e7aM8I/o1dGEej7rWT3Edv1 PtTpRlttrcHlXu4sp1rTWkoBuWFZwawgNRiJjFZTR49ctXwTVxv9nveDusbUmh5x YkfGtPaUS+PUT8pWN9SkNmNC2XjyoiRqYyhaX9dSHh/p1z3ntIXWWZFA= 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 fllD58sbUBrO; Thu, 7 Mar 2019 17:08:43 +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 9E3B641975; 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:42 +0300 From: Sergey Miroshnichenko To: Date: Thu, 7 Mar 2019 17:07:31 +0300 Message-ID: <20190307140736.26787-2-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 1/6] core/pci: Add functions to find accessible devices by bdfn 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" During the PCIe re-enumeration by an OS the .bdfn field of the struct pci_device may not correspond to its device's actual address for a while, so the pci_find_dev() will return an invalid descriptor in this case. Some code may rely on this behavior, so this patch introduces a new function to return a descriptor for addressable devices only. This new function will help in discovering hotplugged devices. Here's a synthetic (but possible) scenario where pci_find_dev_safe() is different from pci_find_dev(): I. Before the re-enumeration: +-[0021:00]---00.0-[01-04]--+-00.0-[02]-- +-01.0-[03]----00.0 Device Z1 +-02.0-[04]-- - pci_find_dev(0021:03:00.0) returns correct struct pci_device *pd for Device Z1; - pci_find_dev_safe(0021:03:00.0) returns the same pd. II. Re-enumeration, step 1: _____ Dropped the bus numbers by writing zeros / +-[0021:00]---00.0-[00-00]--+-00.0-[02]-- +-01.0-[03]----00.0 Device Z1 +-02.0-[04]-- - Device Z1 is unreachable (bus 1 is not assigned), but pci_find_dev(0021:03:00.0) returns its pd; - pci_find_dev_safe(0021:03:00.0) returns NULL. III. Re-enumeration, step 2: __ Update the bus numbers: primary <- 0, / secondary <- 1, subordinate <- ff / +-[0021:00]---00.0-[01-ff]--+-00.0-[02]-- +-01.0-[03]----00.0 Device Z1 +-02.0-[04]-- - By coincidence, pci_find_dev(0021:03:00.0) returns pd for Device Z1; - pci_find_dev_safe(0021:03:00.0) returns pd for Device Z1, which is correct by coincidence. IV. Re-enumeration, step 3: ___ Drop the bus numbers / +-[0021:00]---00.0-[01-ff]--+-00.0-[00-00]-- +-01.0-[00-00]----00.0 Device Z1 +-02.0-[00-00]-- - Device Z1 is unreachable (downstream 0021:01:01.0 has no bus numbers assigned), but pci_find_dev(0021:03:00.0) returns its uncorrected pd; - pci_find_dev_safe(0021:03:00.0) returns NULL. V. Re-enumeration, step 4: Set the bus numbers __ _ A phantom of Device Z1 \ / from pci_find_dev(03:00.0) +-[0021:00]---00.0-[01-ff]--+-00.0-[02-06]-- - +-01.0-[00-00]----00.0 Device Z1 +-02.0-[00-00]-- - pci_find_dev(0021:03:00.0) returns a phantom of the Device Z1 for wrong address; - pci_find_dev_safe(0021:03:00.0) returns NULL. VI. Re-enumeration, step 5: +-[0021:00]---00.0-[01-ff]--+-00.0-[02-06]-- -+-01.0-[07-0b]----00.0 Device Z1 / +-02.0-[00-00]-- Set the bus numbers -- - pci_find_dev(0021:03:00.0) returns a phantom of the Device Z1; - pci_find_dev_safe(0021:03:00.0) returns NULL; - pci_find_dev_safe(0021:07:00.0) returns pd for the Device Z1, but its .bdfn field needs to be corrected (by the following patch). VI. After the re-enumeration: +-[0021:00]---00.0-[01-10]--+-00.0-[02-06]-- +-01.0-[07-0b]----00.0 Device Z1 +-02.0-[0c-10]-- Even though the .bdfn field is not correct at the moment, it is clear that this is a previously known device, not a hotplugged one. Signed-off-by: Sergey Miroshnichenko --- core/pci.c | 83 +++++++++++++++++++++++++++++++++++++++++++++++++++ include/pci.h | 2 ++ 2 files changed, 85 insertions(+) diff --git a/core/pci.c b/core/pci.c index 454b5010..dac4e853 100644 --- a/core/pci.c +++ b/core/pci.c @@ -1867,6 +1867,89 @@ struct pci_device *pci_find_dev(struct phb *phb, uint16_t bdfn) return pci_walk_dev(phb, NULL, __pci_find_dev, &bdfn); } +static struct pci_device *__pci_find_parent(struct pci_device *pd, uint8_t bus) +{ + struct pci_device *child; + + if (!pd) + return NULL; + + if (pd->secondary_bus == bus) + return pd; + + if (bus < pd->secondary_bus || bus > pd->subordinate_bus) + return NULL; + + list_for_each(&pd->children, child, link) { + if (child->secondary_bus == bus) + return child; + } + + list_for_each(&pd->children, child, link) { + struct pci_device *found = __pci_find_parent(child, bus); + + if (found) + return found; + } + + return NULL; +} + +struct pci_device *pci_find_parent_dev(struct phb *phb, uint16_t bdfn) +{ + struct pci_device *pd; + uint8_t bus = (bdfn >> 8); + + if (!phb) + return NULL; + + list_for_each(&phb->devices, pd, link) { + struct pci_device *found = __pci_find_parent(pd, bus); + + if (found) + return found; + } + + return NULL; +} + +struct pci_device *pci_find_dev_safe(struct phb *phb, uint16_t bdfn) +{ + struct pci_device *parent; + struct pci_device *child; + + if (!phb) + return NULL; + + if (!bdfn) { + struct pci_device *pd; + + list_for_each(&phb->devices, pd, link) { + if (pd->bdfn == bdfn) + return pd; + } + } + + parent = pci_find_parent_dev(phb, bdfn); + if (!parent) + return NULL; + + list_for_each(&parent->children, child, link) { + if ((child->bdfn & 0xff) == (bdfn & 0xff)) { + if (child->bdfn != bdfn) { + PCIERR(phb, bdfn, "pci_device has invalid bdfn field %04x:%02x:%02x.%d\n", + phb->opal_id, + child->bdfn >> 8, + (child->bdfn >> 3) & 0x1f, + child->bdfn & 0x7); + } + return child; + } + } + + return NULL; +} + static int __pci_restore_bridge_buses(struct phb *phb, struct pci_device *pd, void *data __unused) diff --git a/include/pci.h b/include/pci.h index b49641ca..3262a4bd 100644 --- a/include/pci.h +++ b/include/pci.h @@ -473,6 +473,8 @@ extern struct pci_device *pci_walk_dev(struct phb *phb, void *), void *userdata); extern struct pci_device *pci_find_dev(struct phb *phb, uint16_t bdfn); +extern struct pci_device *pci_find_dev_safe(struct phb *phb, uint16_t bdfn); +extern struct pci_device *pci_find_parent_dev(struct phb *phb, uint16_t bdfn); extern void pci_restore_bridge_buses(struct phb *phb, struct pci_device *pd); extern struct pci_cfg_reg_filter *pci_find_cfg_reg_filter(struct pci_device *pd, uint32_t start, uint32_t len); From patchwork Thu Mar 7 14:07:32 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergei Miroshnichenko X-Patchwork-Id: 1052930 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) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44FXYN3mpCz9sMQ for ; Fri, 8 Mar 2019 01:08:56 +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="Xu4kUWeX"; 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 44FXYN13dnzDqD3 for ; Fri, 8 Mar 2019 01:08:56 +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="Xu4kUWeX"; 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 44FXYF5LhgzDqCC for ; Fri, 8 Mar 2019 01:08:49 +1100 (AEDT) Received: from localhost (unknown [127.0.0.1]) by mta-01.yadro.com (Postfix) with ESMTP id 0EEC341975; Thu, 7 Mar 2019 14:08:46 +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= 1551967725; x=1553782126; bh=3E2z37ZBJTan5DLfRA+LguKBfq1/dxJEmXf BNmoWbqY=; b=Xu4kUWeX15B1+t/Qu6CY/mWr/E7Ftacpojrv1a0DB9abAMlifbW cZ9+IXMS1GbnZwpNVoLHNd7qaMdCzjClhGeKK4dJPWEJy6P8NCOd+secO+ipTwam w7ugwKsNS/aQZfuqVJevBZq22m7BbqMCzwPsant1It7ZlE+Kvjtzu9tA= 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 jUN3rthZIRK9; Thu, 7 Mar 2019 17:08:45 +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 C6B1241976; 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:42 +0300 From: Sergey Miroshnichenko To: Date: Thu, 7 Mar 2019 17:07:32 +0300 Message-ID: <20190307140736.26787-3-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 2/6] core/pci: Make the pci_scan_one() function public 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 change will be used by the next commit to discover new PCI devices and to create struct pci_device for them. Signed-off-by: Sergey Miroshnichenko --- core/pci.c | 4 ++-- include/pci.h | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/core/pci.c b/core/pci.c index dac4e853..4a59f8a1 100644 --- a/core/pci.c +++ b/core/pci.c @@ -226,8 +226,8 @@ bool pci_wait_crs(struct phb *phb, uint16_t bdfn, uint32_t *out_vdid) return true; } -static struct pci_device *pci_scan_one(struct phb *phb, struct pci_device *parent, - uint16_t bdfn) +struct pci_device *pci_scan_one(struct phb *phb, struct pci_device *parent, + uint16_t bdfn) { struct pci_device *pd = NULL; uint32_t vdid; diff --git a/include/pci.h b/include/pci.h index 3262a4bd..ccde3031 100644 --- a/include/pci.h +++ b/include/pci.h @@ -454,6 +454,8 @@ extern void pci_remove_bus(struct phb *phb, struct list_head *list); extern uint8_t pci_scan_bus(struct phb *phb, uint8_t bus, uint8_t max_bus, struct list_head *list, struct pci_device *parent, bool scan_downstream); +extern struct pci_device *pci_scan_one(struct phb *phb, struct pci_device *parent, + uint16_t bdfn); extern void pci_add_device_nodes(struct phb *phb, struct list_head *list, struct dt_node *parent_node, From patchwork Thu Mar 7 14:07:33 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergei Miroshnichenko X-Patchwork-Id: 1052932 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 44FXZ63tDQz9sN1 for ; Fri, 8 Mar 2019 01:09:34 +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="l0pngwYv"; 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 44FXZ611bbzDqHw for ; Fri, 8 Mar 2019 01:09:34 +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="l0pngwYv"; 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 44FXYG0wYMzDqCH for ; Fri, 8 Mar 2019 01:08:49 +1100 (AEDT) Received: from localhost (unknown [127.0.0.1]) by mta-01.yadro.com (Postfix) with ESMTP id 1B7F041976; Thu, 7 Mar 2019 14:08:47 +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= 1551967726; x=1553782127; bh=h8GnCIk1HekU5VpdS+DHP64RtXkXNDcQiEv UOfdkL2k=; b=l0pngwYvbcmpXq9XybmcjkRfXxSdfudtgfI9uhr/+vT/9TJ8PmO LYOh8ENYu9PTqxx2eiAj7L/EcXimqGbLPTo8N2ClZntWmiQ5ys6RCn8U/+MxrT43 tH7ONjN5zK3JQc6yzGHa6jzsvFvQFtWYYA4dJcOhHulHps20ob/oerlA= 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 rVRb_yKcJqxf; Thu, 7 Mar 2019 17:08:46 +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 CB55D41977; 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:42 +0300 From: Sergey Miroshnichenko To: Date: Thu, 7 Mar 2019 17:07:33 +0300 Message-ID: <20190307140736.26787-4-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 3/6] core/pci: Create the struct pci_device nodes automatically 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" Currently the struct pci_device nodes are created only during the bus rescan in skiboot (pci_scan_bus) initiated by an OS via OPAL. But these structures also could be created if reading the configuration space via OPAL reveals a new hotplugged device. This will allow using the standard platform-independent PCIe hotplug driver in Linux kernel ("pciehp") instead of requesting a Device Tree update. Signed-off-by: Sergey Miroshnichenko --- core/pci-opal.c | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/core/pci-opal.c b/core/pci-opal.c index d7abb15b..51162c14 100644 --- a/core/pci-opal.c +++ b/core/pci-opal.c @@ -23,13 +23,21 @@ #include #include +static struct pci_device *pci_create_dn(struct phb *phb, uint16_t bdfn) +{ + struct pci_device *parent = pci_find_parent_dev(phb, bdfn); + + return pci_scan_one(phb, parent, bdfn); +} + #define OPAL_PCICFG_ACCESS_READ(op, cb, type) \ static int64_t opal_pci_config_##op(uint64_t phb_id, \ uint64_t bus_dev_func, \ - uint64_t offset, type data) \ + uint64_t offset, type *data) \ { \ struct phb *phb = pci_get_phb(phb_id); \ int64_t rc; \ + bool dev_found; \ \ if (!opal_addr_valid((void *)data)) \ return OPAL_PARAMETER; \ @@ -37,7 +45,14 @@ static int64_t opal_pci_config_##op(uint64_t phb_id, \ if (!phb) \ return OPAL_PARAMETER; \ phb_lock(phb); \ + \ + dev_found = pci_find_dev_safe(phb, bus_dev_func); \ + \ rc = phb->ops->cfg_##cb(phb, bus_dev_func, offset, data); \ + \ + if (!rc && !dev_found && *data != (type)0xffffffff) \ + pci_create_dn(phb, bus_dev_func); \ + \ phb_unlock(phb); \ \ return rc; \ @@ -60,9 +75,9 @@ static int64_t opal_pci_config_##op(uint64_t phb_id, \ return rc; \ } -OPAL_PCICFG_ACCESS_READ(read_byte, read8, uint8_t *) -OPAL_PCICFG_ACCESS_READ(read_half_word, read16, uint16_t *) -OPAL_PCICFG_ACCESS_READ(read_word, read32, uint32_t *) +OPAL_PCICFG_ACCESS_READ(read_byte, read8, uint8_t) +OPAL_PCICFG_ACCESS_READ(read_half_word, read16, uint16_t) +OPAL_PCICFG_ACCESS_READ(read_word, read32, uint32_t) OPAL_PCICFG_ACCESS_WRITE(write_byte, write8, uint8_t) OPAL_PCICFG_ACCESS_WRITE(write_half_word, write16, uint16_t) OPAL_PCICFG_ACCESS_WRITE(write_word, write32, uint32_t) From patchwork Thu Mar 7 14:07:34 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergei Miroshnichenko X-Patchwork-Id: 1052934 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 44FXZb4fNxz9sMQ for ; Fri, 8 Mar 2019 01:09:59 +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="axcxPbUz"; 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 44FXZb3ZWHzDqKq for ; Fri, 8 Mar 2019 01:09:59 +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="axcxPbUz"; 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 44FXYH1h6mzDqCC for ; Fri, 8 Mar 2019 01:08:51 +1100 (AEDT) Received: from localhost (unknown [127.0.0.1]) by mta-01.yadro.com (Postfix) with ESMTP id 2E2D241977; Thu, 7 Mar 2019 14:08:48 +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= 1551967727; x=1553782128; bh=YceAdC5lPMDMTgA0bIeaRxWDuDbwrEx/smL ur+yTykI=; b=axcxPbUzQOAOhEENLxphtbsiBqmG1guAATmfbiucdZ/Ml7W8wuh 2JKpvjCt0hzUfJmuYjQM1ff5PGR+mk4XKj4xauMxsU2UL37gmqRw21psba9qeeZI vb09IfPEyUfbBtT3U9aApUj3/kg73MOTueyBF2H2O00jCIWkA9EsDS8Y= 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 qKZbWAUQXnnI; Thu, 7 Mar 2019 17:08:47 +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 D42A74197C; 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:42 +0300 From: Sergey Miroshnichenko To: Date: Thu, 7 Mar 2019 17:07:34 +0300 Message-ID: <20190307140736.26787-5-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 4/6] pci-iov: Fix device allocation for VFs 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" Cfg filters are invoked before performing the I/O, so pci_iov_change() was reading an old value of the SRIOV_CTRL_VFE register - before it is updated. This patch makes use of the data which is being written to SRIOV_CTRL_VFE. Signed-off-by: Sergey Miroshnichenko --- core/pci-iov.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/core/pci-iov.c b/core/pci-iov.c index 8fecebc1..3bbb7b86 100644 --- a/core/pci-iov.c +++ b/core/pci-iov.c @@ -79,15 +79,13 @@ static void pci_iov_vf_quirk(struct phb *phb, struct pci_device *vf) * Update the SRIOV parameters that change when the number of * VFs is configured. */ -static bool pci_iov_update_parameters(struct pci_iov *iov) +static bool pci_iov_update_parameters(struct pci_iov *iov, uint16_t val) { struct phb *phb = iov->phb; uint16_t bdfn = iov->pd->bdfn; uint32_t pos = iov->pos; - uint16_t val; bool enabled; - pci_cfg_read16(phb, bdfn, pos + PCIECAP_SRIOV_CTRL, &val); enabled = !!(val & PCIECAP_SRIOV_CTRL_VFE); if (iov->enabled == enabled) return false; @@ -115,8 +113,8 @@ static bool pci_iov_update_parameters(struct pci_iov *iov) static int64_t pci_iov_change(void *dev __unused, struct pci_cfg_reg_filter *pcrf, uint32_t offset __unused, - uint32_t len __unused, - uint32_t *data __unused, + uint32_t len, + uint32_t *data, bool write __unused) { struct pci_iov *iov = (struct pci_iov *)pcrf->data; @@ -127,7 +125,9 @@ static int64_t pci_iov_change(void *dev __unused, bool changed; /* Update SRIOV variable parameters */ - changed = pci_iov_update_parameters(iov); + changed = pci_iov_update_parameters(iov, + (len == 2) ? (*data >> 16) : *data); + if (!changed) return OPAL_PARTIAL; @@ -202,6 +202,7 @@ void pci_init_iov_cap(struct phb *phb, struct pci_device *pd) struct pci_iov *iov; struct pci_cfg_reg_filter *pcrf; uint32_t i; + uint16_t val; /* Search for SRIOV capability */ if (!pci_has_cap(pd, PCI_CFG_CAP_ID_EXP, false)) @@ -260,6 +261,7 @@ void pci_init_iov_cap(struct phb *phb, struct pci_device *pd) iov->pd = pd; iov->pos = pos; iov->enabled = false; - pci_iov_update_parameters(iov); + pci_cfg_read16(phb, pd->bdfn, pos + PCIECAP_SRIOV_CTRL, &val); + pci_iov_update_parameters(iov, val); pci_set_cap(pd, PCIECAP_ID_SRIOV, pos, iov, pci_free_iov_cap, true); } 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); From patchwork Thu Mar 7 14:07:36 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergei Miroshnichenko X-Patchwork-Id: 1052935 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [203.11.71.2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44FXZs2wk2z9sMQ for ; Fri, 8 Mar 2019 01:10:13 +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="dyg6hruh"; 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 44FXZs0d9TzDqH2 for ; Fri, 8 Mar 2019 01:10:13 +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="dyg6hruh"; 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 44FXYK4jPnzDqCC for ; Fri, 8 Mar 2019 01:08:53 +1100 (AEDT) Received: from localhost (unknown [127.0.0.1]) by mta-01.yadro.com (Postfix) with ESMTP id C155241973; Thu, 7 Mar 2019 14:08:49 +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=oJuDXoz4TUMYTuCSQT+DKlcGknF8ZA5Kkg3 ekzvqGK0=; b=dyg6hruh7wP2macUaqK8tTyKGeXc0vusaxBJNgjz958gv9FNGiO uwcTjXn9sKUF6oWAyAAGvLtrkyz38ipmWx8Kx0nuorRVZ7meTWKqB136nxjkMxTG BukEtkOgtznudVksDove0ryj+XNPimx/p+R0SiPU+d6W5UZX6mI2uUog= 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 QhEeN7fDlTnS; 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 DE86E4197F; 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:36 +0300 Message-ID: <20190307140736.26787-7-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 6/6] core/pci: Hook up the writes to PRIMARY/SECONDARY/SUBORDINATE_BUS registers 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" When Linux kernel boots with the "pci=realloc" command line argument, it re-enumerates the PCIe topology first by dropping all the bridge's downstream port's bus numbers to zero, and then assigns the newly calculated bus numbers: pci_scan_bridge_extend() if (pcibios_assign_all_busses()) pci_write_config_dword(dev, PCI_PRIMARY_BUS, buses & ~0xffffff); ... buses = ... ... pci_write_config_dword(dev, PCI_PRIMARY_BUS, buses); But this leaves the corresponding struct pci_device entries in the skiboot de-synchronized with actual values in bridge's registers. This patch intercepts the write requests to the PCI_CFG_PRIMARY_BUS, PCI_CFG_SECONDARY_BUS and PCI_CFG_SUBORDINATE_BUS registers, updating the bdfn, primary_bus, secondary_bus and subordinate_bus fields. Signed-off-by: Sergey Miroshnichenko --- core/pci-opal.c | 78 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 77 insertions(+), 1 deletion(-) diff --git a/core/pci-opal.c b/core/pci-opal.c index 51162c14..d0be6c95 100644 --- a/core/pci-opal.c +++ b/core/pci-opal.c @@ -58,6 +58,80 @@ static int64_t opal_pci_config_##op(uint64_t phb_id, \ return rc; \ } +static void pci_update_children_bdfns(struct pci_device *pd) +{ + struct pci_device *child; + + list_for_each(&pd->children, child, link) { + uint16_t new_bdfn = (child->bdfn & 0xff) | (pd->secondary_bus << 8); + + if (child->bdfn != new_bdfn || child->primary_bus != pd->secondary_bus) { + if (!list_empty(&child->pcrf) && child->primary_bus) + bitmap_clr_bit(*child->phb->filter_map, child->bdfn); + + child->bdfn = new_bdfn; + child->primary_bus = pd->secondary_bus; + + if (!list_empty(&child->pcrf) && child->primary_bus) + bitmap_set_bit(*child->phb->filter_map, child->bdfn); + + if (child->primary_bus && child->slot) + child->slot->id = PCI_SLOT_ID(child->phb, child->bdfn); + } + } +} + +static void opal_pci_config_write_hook(struct phb *phb, uint16_t bdfn, uint64_t offset, + uint32_t data, uint32_t size) +{ + struct pci_device *pd; + uint8_t old_sec; + + if (data == 0xffffffff) + return; + + pd = pci_find_dev_safe(phb, bdfn); + if (!pd) { + pd = pci_create_dn(phb, bdfn); + return; + } + + switch (offset) { + case PCI_CFG_PRIMARY_BUS: + case PCI_CFG_SECONDARY_BUS: + case PCI_CFG_SUBORDINATE_BUS: + break; + + default: + return; + } + + old_sec = pd->secondary_bus; + + switch (offset) { + case PCI_CFG_PRIMARY_BUS: + pd->primary_bus = data & 0xff; + + if (size == 4) { + pd->secondary_bus = (data >> 8) & 0xff; + pd->subordinate_bus = (data >> 16) & 0xff; + } + break; + + case PCI_CFG_SECONDARY_BUS: + pd->secondary_bus = data & 0xff; + break; + + case PCI_CFG_SUBORDINATE_BUS: + pd->subordinate_bus = data & 0xff; + break; + } + + if (pd->is_bridge && old_sec != pd->secondary_bus) { + pci_update_children_bdfns(pd); + } +} + #define OPAL_PCICFG_ACCESS_WRITE(op, cb, type) \ static int64_t opal_pci_config_##op(uint64_t phb_id, \ uint64_t bus_dev_func, \ @@ -68,8 +142,10 @@ static int64_t opal_pci_config_##op(uint64_t phb_id, \ \ if (!phb) \ return OPAL_PARAMETER; \ - phb_lock(phb); \ + phb_lock(phb); \ rc = phb->ops->cfg_##cb(phb, bus_dev_func, offset, data); \ + opal_pci_config_write_hook(phb, bus_dev_func, offset, data, \ + sizeof(type)); \ phb_unlock(phb); \ \ return rc; \