From patchwork Fri Aug 16 14:17:13 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergei Miroshnichenko X-Patchwork-Id: 1148251 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 46957G61mmz9sNC for ; Sat, 17 Aug 2019 00:19:54 +1000 (AEST) 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="Fj8DZLEy"; dkim-atps=neutral Received: from bilbo.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 46957G2tw7zDrfF for ; Sat, 17 Aug 2019 00:19:54 +1000 (AEST) 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.252; 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="Fj8DZLEy"; dkim-atps=neutral Received: from mta-01.yadro.com (mta-02.yadro.com [89.207.88.252]) (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 46954f2gHBzDrfF for ; Sat, 17 Aug 2019 00:17:32 +1000 (AEST) Received: from localhost (unknown [127.0.0.1]) by mta-01.yadro.com (Postfix) with ESMTP id 5E2B4412D6 for ; Fri, 16 Aug 2019 14:17:29 +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= 1565965048; x=1567779449; bh=AetkGNEvzXhwN/yTMzBiizKpF1/fXk8OpSA BGDZpV5I=; b=Fj8DZLEyceYK9oladoGZUEYCscfQcRkn0KGixAMC0DMATf4zHhS jCg3kiWqPiFJUs9LLZnXJ3DYRoRKnPRXrBgzOgv1eJrfVrt7UOtrzXU0mkGweK2e onYXPrG9SDIAQoulxlsgroELXnATYT/EQqjoLHD/wRonBi44O7HSv7zk= 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 ncaeO4fvYL7U for ; Fri, 16 Aug 2019 17:17:28 +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 51C5542ECA for ; Fri, 16 Aug 2019 17:17:27 +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; Fri, 16 Aug 2019 17:17:26 +0300 From: Sergey Miroshnichenko To: Date: Fri, 16 Aug 2019 17:17:13 +0300 Message-ID: <20190816141714.26380-5-s.miroshnichenko@yadro.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190816141714.26380-1-s.miroshnichenko@yadro.com> References: <20190816141714.26380-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 v3 4/5] 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: 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 72b9cee2..59f21592 100644 --- a/core/pci-opal.c +++ b/core/pci-opal.c @@ -49,6 +49,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, \ @@ -59,8 +133,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; \