From patchwork Thu Oct 24 18:02:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergei Miroshnichenko X-Patchwork-Id: 1183490 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)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 46zc6Y5y2qz9sPp for ; Fri, 25 Oct 2019 06:01:41 +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="P3m7VUyD"; 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 46zc6Y3NCFzDqVS for ; Fri, 25 Oct 2019 06:01:41 +1100 (AEDT) X-Original-To: skiboot@lists.ozlabs.org Delivered-To: skiboot@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) 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="P3m7VUyD"; 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 46zZq43GvYzDqTZ for ; Fri, 25 Oct 2019 05:03:12 +1100 (AEDT) Received: from localhost (unknown [127.0.0.1]) by mta-01.yadro.com (Postfix) with ESMTP id 73D8E43130; Thu, 24 Oct 2019 18:03:09 +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= 1571940188; x=1573754589; bh=7MX9+2FXU71yWCtfvZ68ErYtq8ogi8LO/dF aVXY/308=; b=P3m7VUyDUWaY+eJCVEm0Vptipztz7PV/IdJm+UcNKZTLvC8zSRR Tm7r7I8f7jOUELvhYhxI5bw/fAVJpTLqOMlY1yur3y8FlOJ/wSwRMoXivZ//lf+b uI3hNlmuvvVfEO38qWaYa/KEcjgFI5Yn46JcQ5pUQOmK3gxkycR7Zlp8= 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 IGnKna8Q-gtH; Thu, 24 Oct 2019 21:03:08 +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 2C35243597; Thu, 24 Oct 2019 21:03:07 +0300 (MSK) Received: from NB-148.yadro.com (172.17.15.136) 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, 24 Oct 2019 21:03:06 +0300 From: Sergey Miroshnichenko To: Date: Thu, 24 Oct 2019 21:02:57 +0300 Message-ID: <20191024180259.882169-4-s.miroshnichenko@yadro.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191024180259.882169-1-s.miroshnichenko@yadro.com> References: <20191024180259.882169-1-s.miroshnichenko@yadro.com> MIME-Version: 1.0 X-Originating-IP: [172.17.15.136] 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 RESEND v3 3/5] 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: 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 828ce8a9..a3f1b71d 100644 --- a/core/pci-opal.c +++ b/core/pci-opal.c @@ -14,13 +14,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; \ @@ -28,7 +36,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; \ @@ -51,9 +66,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)