From patchwork Wed Nov 23 11:21:03 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomasz Nowicki X-Patchwork-Id: 9443005 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id C09CB60235 for ; Wed, 23 Nov 2016 11:23:15 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 97B7C206AF for ; Wed, 23 Nov 2016 11:23:15 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8C27723E64; Wed, 23 Nov 2016 11:23:15 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED, T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 1BB94206AF for ; Wed, 23 Nov 2016 11:23:14 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1c9VcJ-00073A-Vq; Wed, 23 Nov 2016 11:21:32 +0000 Received: from mail-lf0-x22a.google.com ([2a00:1450:4010:c07::22a]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1c9VcG-0006wn-AL for linux-arm-kernel@lists.infradead.org; Wed, 23 Nov 2016 11:21:29 +0000 Received: by mail-lf0-x22a.google.com with SMTP id t196so1144446lff.3 for ; Wed, 23 Nov 2016 03:21:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=semihalf-com.20150623.gappssmtp.com; s=20150623; h=subject:to:references:cc:from:message-id:date:user-agent :mime-version:in-reply-to:content-transfer-encoding; bh=atv/bUuNWuTgMMGJ5/uIAybUc4aTCP9y4kQOq6W/w4M=; b=yW5BrWT7eT2be8WFp584wI9x4xtTEwlP4D8+xg5X6WUQ6Zag+riqNIQ8BHXWOAnlo+ f0VoZgmVl25cMBCZ9g1objW/afxS3fPVB9sZXZSbbECNe+aKvgT3tk142AxMkLG4NyMq H1GLPk6Bd3Ltv2GNhVUsaSX5dnYebCGLRc4m9XNv4bdId4mTuRXeM1thoMbBMQxfC+kX eQIQE0n+Uas4nnFWAT0PAAgJcAUa5h1SMqFzGEGDcCELqED/A/MnJAqbZCeb3exsi1UO 2b5IZC7UxB3CLwk7NBvZ92NUzEeG83IMCDXFh/yewQ+U7apLkCVAAuP/s/B1ieCoUlSH HwqQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:subject:to:references:cc:from:message-id:date :user-agent:mime-version:in-reply-to:content-transfer-encoding; bh=atv/bUuNWuTgMMGJ5/uIAybUc4aTCP9y4kQOq6W/w4M=; b=G12eMak3UkDG08NNbfmhnF7sSj9i75XDRcuKIYPItSSmw9nfIarMwY9M8OKgiiFIXI gpg9c1ktn1cc3R9pxFI7JDyXmClIC3byw8lpDyKOSBR3F1n3nJTvC847MRhuIg7Cgq2x y666QKRbaS5sD+6A5U7H17RJkloppMTqbHxdxuBN0LPpqh5WUnEd0JuR8p5UALnUfCP+ /sHQ+jfO54peXC4iFYz0Mb9OYWCYnwnd6swEB/zjTA9aQ/JIfWFqTfpXUmhKzFO4RdFv Otk5i9LT4V8PgJ7bIg6Bxbly64FFCjbItZrTCGJjdblqLXrcdIO50nuCAHLZyY0xNG1F YXDg== X-Gm-Message-State: AKaTC03pXth67Zp0FFoKagU/MhhCaExcm+8uUxOQ8qd0bAz6/B07DwpLuv1+pfYL778tUg== X-Received: by 10.46.9.5 with SMTP id 5mr886413ljj.23.1479900065265; Wed, 23 Nov 2016 03:21:05 -0800 (PST) Received: from [10.0.0.85] (31-172-191-173.noc.fibertech.net.pl. [31.172.191.173]) by smtp.googlemail.com with ESMTPSA id l34sm7115300lfi.4.2016.11.23.03.21.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 23 Nov 2016 03:21:04 -0800 (PST) Subject: Re: [PATCH V9 11/11] ARM64/PCI: Support for ACPI based PCI host controller To: Bjorn Helgaas References: <1465588519-11334-1-git-send-email-tn@semihalf.com> <1465588519-11334-12-git-send-email-tn@semihalf.com> <20161122231321.GA20246@bhelgaas-glaptop.roam.corp.google.com> From: Tomasz Nowicki Message-ID: Date: Wed, 23 Nov 2016 12:21:03 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Firefox/45.0 Thunderbird/45.4.0 MIME-Version: 1.0 In-Reply-To: <20161122231321.GA20246@bhelgaas-glaptop.roam.corp.google.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20161123_032128_681376_8FA1DA60 X-CRM114-Status: GOOD ( 21.89 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: rafael@kernel.org, linux-pci@vger.kernel.org, will.deacon@arm.com, okaya@codeaurora.org, wangyijing@huawei.com, andrea.gallo@linaro.org, Lorenzo.Pieralisi@arm.com, linaro-acpi@lists.linaro.org, ddaney@caviumnetworks.com, linux-acpi@vger.kernel.org, robert.richter@caviumnetworks.com, liudongdong3@huawei.com, catalin.marinas@arm.com, Liviu.Dudau@arm.com, arnd@arndb.de, jcm@redhat.com, msalter@redhat.com, cov@codeaurora.org, mw@semihalf.com, linux-arm-kernel@lists.infradead.org, jchandra@broadcom.com, dhdang@apm.com, linux-kernel@vger.kernel.org, jeremy.linton@arm.com, hanjun.guo@linaro.org, Suravee.Suthikulpanit@amd.com Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Hi Bjorn, On 23.11.2016 00:13, Bjorn Helgaas wrote: > Hi Tomasz, > > On Fri, Jun 10, 2016 at 09:55:19PM +0200, Tomasz Nowicki wrote: >> Implement pci_acpi_scan_root and other arch-specific call so that ARM64 >> can start using ACPI to setup and enumerate PCI buses. >> >> Prior to buses enumeration the pci_acpi_scan_root() implementation looks >> for configuration space start address (obtained through ACPI _CBA method or >> MCFG interface). If succeed, it uses ECAM library to create new mapping. >> Then it attaches generic ECAM ops (pci_generic_ecam_ops) which are used >> for accessing configuration space later on. >> ... > >> +static struct acpi_pci_root_ops acpi_pci_root_ops = { >> + .release_info = pci_acpi_generic_release_info, >> +}; >> + >> +/* Interface called from ACPI code to setup PCI host controller */ >> struct pci_bus *pci_acpi_scan_root(struct acpi_pci_root *root) >> { >> - /* TODO: Should be revisited when implementing PCI on ACPI */ >> - return NULL; >> + int node = acpi_get_node(root->device->handle); >> + struct acpi_pci_generic_root_info *ri; >> + struct pci_bus *bus, *child; >> + >> + ri = kzalloc_node(sizeof(*ri), GFP_KERNEL, node); >> + if (!ri) >> + return NULL; >> + >> + ri->cfg = pci_acpi_setup_ecam_mapping(root); >> + if (!ri->cfg) { >> + kfree(ri); >> + return NULL; >> + } >> + >> + acpi_pci_root_ops.pci_ops = &ri->cfg->ops->pci_ops; > > This has already been merged, but this isn't right, is it? We're > writing a host controller-specific pointer into the single system-wide > acpi_pci_root_ops, then passing it on to acpi_pci_root_create(). > > Today, I think ri->cfg->ops->pci_ops is always &pci_generic_ecam_ops, > from this path: > > ri->cfg = pci_acpi_setup_ecam_mapping > cfg = pci_ecam_create(..., &pci_generic_ecam_ops) > cfg = kzalloc(...) > cfg->ops = ops # &pci_generic_ecam_ops > > But we're about to merge the ECAM quirks series, which will mean it > may not be &pci_generic_ecam_ops. Even apart from the ECAM quirks, we > should avoid this pattern of putting device-specific info in a single > shared structure because it's too difficult to verify that it's > correct. > Well spotted. I agree, we need to fix this. How about this: Of course, this should be the part of ECAM quirks core patches. The other option we have is to remove "struct pci_ops *pci_ops;" from acpi_pci_root_ops structure and pass struct pci_ops as an extra argument to acpi_pci_root_create(). What do you think? Thanks, Tomasz diff --git a/arch/arm64/kernel/pci.c b/arch/arm64/kernel/pci.c index fb439c7..31c0e1c 100644 --- a/arch/arm64/kernel/pci.c +++ b/arch/arm64/kernel/pci.c @@ -152,33 +152,35 @@ static void pci_acpi_generic_release_info(struct acpi_pci_root_info *ci) ri = container_of(ci, struct acpi_pci_generic_root_info, common); pci_ecam_free(ri->cfg); + kfree(ci->ops); kfree(ri); } -static struct acpi_pci_root_ops acpi_pci_root_ops = { - .release_info = pci_acpi_generic_release_info, -}; - /* Interface called from ACPI code to setup PCI host controller */ struct pci_bus *pci_acpi_scan_root(struct acpi_pci_root *root) { int node = acpi_get_node(root->device->handle); struct acpi_pci_generic_root_info *ri; struct pci_bus *bus, *child; + struct acpi_pci_root_ops *root_ops; ri = kzalloc_node(sizeof(*ri), GFP_KERNEL, node); if (!ri) return NULL; + root_ops = kzalloc_node(sizeof(*root_ops), GFP_KERNEL, node); + if (!root_ops) + return NULL; + ri->cfg = pci_acpi_setup_ecam_mapping(root); if (!ri->cfg) { kfree(ri); + kfree(root_ops); return NULL; } - acpi_pci_root_ops.pci_ops = &ri->cfg->ops->pci_ops; - bus = acpi_pci_root_create(root, &acpi_pci_root_ops, &ri->common, - ri->cfg); + root_ops->release_info = pci_acpi_generic_release_info; + root_ops->pci_ops = &ri->cfg->ops->pci_ops; + bus = acpi_pci_root_create(root, root_ops, &ri->common, ri->cfg); if (!bus) return NULL;