From owner-dev-commits-src-all@freebsd.org Tue Jun 8 16:52:07 2021 Return-Path: Delivered-To: dev-commits-src-all@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 9955763AD1E for ; Tue, 8 Jun 2021 16:52:07 +0000 (UTC) (envelope-from mw@semihalf.com) Received: from mail-qk1-x729.google.com (mail-qk1-x729.google.com [IPv6:2607:f8b0:4864:20::729]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Fzx9M2Plmz3nx3 for ; Tue, 8 Jun 2021 16:52:07 +0000 (UTC) (envelope-from mw@semihalf.com) Received: by mail-qk1-x729.google.com with SMTP id c138so7956482qkg.5 for ; Tue, 08 Jun 2021 09:52:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=semihalf-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc:content-transfer-encoding; bh=dNHm3eIrsRNYTeTWg6JppI0OqF49f/oq2wgx43+cEGE=; b=oWKPpB106NhxfN5xcX/t0kEfuDdtU27xiU8WpNR3ZNogQyPfcfxpGOlklUnWMRNRDv jSU9z+jXIOKVfpFJdQgMRGQUc3pjYMcJ4ekqMTkMOaWJFsWKr52cUOFCTThYkNyACKdH NMo5dWcwe9aCj2hCJ2RFOfOVJ1/RRQDohIPyBS6AnAaoNSmiDv7HfP/bdXu8AkciSaR2 NuYumWYpblx879odFI9CdORseGf+1BNuTzL7TejymlKe4M7WC1gLxqKooMlB38zy8BXJ 1/4cz+CNjr5eBWAYfSUs82E501sF9sP8ERGNVNL7YYz0FUOeBxrjF3g8UHO+IIQWS3Ip 2hpA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc:content-transfer-encoding; bh=dNHm3eIrsRNYTeTWg6JppI0OqF49f/oq2wgx43+cEGE=; b=mZBzdbL1zeeqbsZmOuzHepOu4d9kWV40TSzBQ5bFJaqPvtvyRogUz6Eee70q/incSO VIIiW89JF9TlXuxnlCiEotEZM3XIZluBzoLn4DP+KFkAjqHpWq5firauHbmTXiJsVEKH Q+TPoLa8u/kLDBJjAOI1+R6RRVOC5AVC+m3H9RmmEgKEE38Sze2ZNYCMVc6l6vE4doV2 QOVspuh6bcOx0vDAqEc/m8hRq4cpfLlRyZqTkH/fg1WvwSADKdJlT9HiJkZf12Kbscv5 Clz6B9oSp/DrrCJUwm6FTXde5gy02yw4Z5vEQXVFRfOkflOKwBlXXY0SkiKIrnHPRcpi uMtw== X-Gm-Message-State: AOAM532amBPQL+pt9DdfWxmEXdru+qT2QF3jL0AK2ZAtH3Zs878PnFpg +QxUmsn/uJu4c6aGnrTapfs6zivvtuoNzLxk6aLL9A== X-Google-Smtp-Source: ABdhPJwSSbuUfdeCRxu1II0cOblB4MjnVruva6QPGreEVDpN9HP7xA5JNxeh/XgFOOv55EK0pR46/RhEemtvpk3aufs= X-Received: by 2002:a05:620a:1267:: with SMTP id b7mr7724621qkl.385.1623171126168; Tue, 08 Jun 2021 09:52:06 -0700 (PDT) MIME-Version: 1.0 References: <202106081552.158FqkLO005343@gitrepo.freebsd.org> <0d50b80a-dbbc-9db9-0a31-1baaedc9978e@freebsd.org> In-Reply-To: <0d50b80a-dbbc-9db9-0a31-1baaedc9978e@freebsd.org> From: Marcin Wojtas Date: Tue, 8 Jun 2021 18:51:54 +0200 Message-ID: Subject: Re: git: 28c4e511c23f - main - Add ofw interface support to PCI To: Nathan Whitehorn Cc: Marcin Wojtas , src-committers , dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org, =?UTF-8?Q?Kornel_Dul=C4=99ba?= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: 4Fzx9M2Plmz3nx3 X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] X-BeenThere: dev-commits-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Jun 2021 16:52:07 -0000 Hi Nathan, wt., 8 cze 2021 o 18:37 Nathan Whitehorn napisa=C5= =82(a): > > 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 > Thanks for the pointer - we will take a look. Best regards, Marcin > 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=3D28c4e511c23f8b7fd131a13c= c2a027aefcb520b7 > > > > 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 LS102= 8A. > > In order to access information stored in them we need to add ofw b= us > > 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 mdi= o 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_n1sd= p 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 copyrigh= t > > + * notice, this list of conditions and the following disclaimer in = the > > + * documentation and/or other materials provided with the distribut= ion. > > + * > > + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS O= R > > + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARR= ANTIES > > + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAI= MED. > > + * 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 O= F USE, > > + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON A= NY > > + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT > > + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE U= SE 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, dev= ice_t); > > + > > +static device_method_t ofw_pci_methods[] =3D { > > + 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 =3D device_get_parent(dev); > > + if (ofw_bus_get_node(parent) <=3D 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); > > +} > > >