From owner-dev-commits-src-main@freebsd.org Tue Jun 8 16:37:50 2021 Return-Path: Delivered-To: dev-commits-src-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 9097D63AC1B; Tue, 8 Jun 2021 16:37:50 +0000 (UTC) (envelope-from nwhitehorn@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Fzwrt3pZHz3nCt; Tue, 8 Jun 2021 16:37:50 +0000 (UTC) (envelope-from nwhitehorn@freebsd.org) Received: from comporellon.tachypleus.net (unknown [IPv6:2601:405:4a00:acd:64aa:ae5e:5615:3d60]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) (Authenticated sender: nwhitehorn/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 3E1FD9F5D; Tue, 8 Jun 2021 16:37:50 +0000 (UTC) (envelope-from nwhitehorn@freebsd.org) Subject: Re: git: 28c4e511c23f - main - Add ofw interface support to PCI To: Marcin Wojtas , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <202106081552.158FqkLO005343@gitrepo.freebsd.org> From: Nathan Whitehorn Message-ID: <0d50b80a-dbbc-9db9-0a31-1baaedc9978e@freebsd.org> Date: Tue, 8 Jun 2021 12:37:49 -0400 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:78.0) Gecko/20100101 Thunderbird/78.10.2 MIME-Version: 1.0 In-Reply-To: <202106081552.158FqkLO005343@gitrepo.freebsd.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Content-Language: en-US X-BeenThere: dev-commits-src-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for the main branch of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Jun 2021 16:37:50 -0000 Did you look at moving sys/powerpc/ofw/ofw_pcibus.c to MI code? It does a bit more than this (NUMA etc.) and isn't actually PowerPC-specific. -Nathan On 6/8/21 11:52 AM, Marcin Wojtas wrote: > The branch main has been updated by mw: > > URL: https://cgit.FreeBSD.org/src/commit/?id=28c4e511c23f8b7fd131a13cc2a027aefcb520b7 > > commit 28c4e511c23f8b7fd131a13cc2a027aefcb520b7 > Author: Marcin Wojtas > AuthorDate: 2021-05-27 08:09:04 +0000 > Commit: Marcin Wojtas > CommitDate: 2021-06-08 15:52:02 +0000 > > Add ofw interface support to PCI > > Some arm64 SoCs have nodes in their fdts that describe devices > connected to the internal PCI bus. One such SoC is Freescale LS1028A. > In order to access information stored in them we need to add ofw bus > support to pci. Pass devinfo request up to our parent, which > is responsible for parsing all the information. > It allows to use ofw interface on PCI devices that support it. > This method is similar to sys/dev/acpica/acpi_pci.c. > > Submitted by: Kornel Duleba > Reviewed by: andrew > Obtained from: Semihalf > Sponsored by: Alstom Group > Differential Revision: https://reviews.freebsd.org/D30181 > --- > sys/conf/files.arm64 | 1 + > sys/dev/ofw/ofw_pci.c | 93 +++++++++++++++++++++++++++++++++++++++++++++++++++ > 2 files changed, 94 insertions(+) > > diff --git a/sys/conf/files.arm64 b/sys/conf/files.arm64 > index fed33562b834..7b9b2583aaa1 100644 > --- a/sys/conf/files.arm64 > +++ b/sys/conf/files.arm64 > @@ -245,6 +245,7 @@ dev/neta/if_mvneta_fdt.c optional neta fdt > dev/neta/if_mvneta.c optional neta mdio mii > > dev/ofw/ofw_cpu.c optional fdt > +dev/ofw/ofw_pci.c optional fdt pci > dev/ofw/ofw_pcib.c optional fdt pci > > dev/pci/controller/pci_n1sdp.c optional pci_n1sdp acpi > diff --git a/sys/dev/ofw/ofw_pci.c b/sys/dev/ofw/ofw_pci.c > new file mode 100644 > index 000000000000..c7ed7c5c8fe9 > --- /dev/null > +++ b/sys/dev/ofw/ofw_pci.c > @@ -0,0 +1,93 @@ > +/*- > + * SPDX-License-Identifier: BSD-2-Clause-FreeBSD > + * > + * Copyright (c) 2021 Alstom Group. > + * Copyright (c) 2021 Semihalf. > + * > + * Redistribution and use in source and binary forms, with or without > + * modification, are permitted provided that the following conditions > + * are met: > + * 1. Redistributions of source code must retain the above copyright > + * notice, this list of conditions and the following disclaimer. > + * 2. Redistributions in binary form must reproduce the above copyright > + * notice, this list of conditions and the following disclaimer in the > + * documentation and/or other materials provided with the distribution. > + * > + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR > + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES > + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. > + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, > + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT > + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, > + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY > + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT > + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF > + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. > + */ > + > +#include > +__FBSDID("$FreeBSD$"); > + > +#include > +#include > +#include > +#include > +#include > + > +#include > +#include > +#include > + > +#include > +#include > +#include > + > +#include "pcib_if.h" > +#include "pci_if.h" > + > +static int ofw_pci_probe(device_t); > +static const struct ofw_bus_devinfo* pci_ofw_get_devinfo(device_t, device_t); > + > +static device_method_t ofw_pci_methods[] = { > + DEVMETHOD(device_probe, ofw_pci_probe), > + > + /* ofw_bus interface */ > + DEVMETHOD(ofw_bus_get_devinfo, pci_ofw_get_devinfo), > + DEVMETHOD(ofw_bus_get_compat, ofw_bus_gen_get_compat), > + DEVMETHOD(ofw_bus_get_model, ofw_bus_gen_get_model), > + DEVMETHOD(ofw_bus_get_name, ofw_bus_gen_get_name), > + DEVMETHOD(ofw_bus_get_node, ofw_bus_gen_get_node), > + DEVMETHOD(ofw_bus_get_type, ofw_bus_gen_get_type), > + > + DEVMETHOD_END > +}; > + > +static devclass_t pci_devclass; > + > +DEFINE_CLASS_1(pci, ofw_pci_driver, ofw_pci_methods, sizeof(struct pci_softc), > + pci_driver); > +DRIVER_MODULE(ofw_pci, pcib, ofw_pci_driver, pci_devclass, 0, 0); > +MODULE_DEPEND(ofw_pci, simplebus, 1, 1, 1); > +MODULE_DEPEND(ofw_pci, pci, 1, 1, 1); > +MODULE_VERSION(ofw_pci, 1); > + > +static int > +ofw_pci_probe(device_t dev) > +{ > + device_t parent; > + > + parent = device_get_parent(dev); > + if (ofw_bus_get_node(parent) <= 0) > + return (ENXIO); > + > + device_set_desc(dev, "OFW PCI bus"); > + return (BUS_PROBE_DEFAULT); > +} > + > +/* Pass the request up to our parent. */ > +static const struct ofw_bus_devinfo* > +pci_ofw_get_devinfo(device_t bus, device_t dev) > +{ > + > + return OFW_BUS_GET_DEVINFO(device_get_parent(bus), dev); > +} >