From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.3 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,NICE_REPLY_A, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 566F8C4361B for ; Thu, 17 Dec 2020 13:24:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 09915238EF for ; Thu, 17 Dec 2020 13:24:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727385AbgLQNYf (ORCPT ); Thu, 17 Dec 2020 08:24:35 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:36929 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727415AbgLQNYf (ORCPT ); Thu, 17 Dec 2020 08:24:35 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1608211388; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=VlVf+FHlKW5NSk9hq2l37/fFa7FHsGlOWn1DRV6wf4o=; b=Z1PMv/YJfsTWlaMdGkLkuyHcBpG/BVzErE2p5hXUaTMjr7ZV5l6XSfgJlsq892rGjj3qa+ vOFaWZin+Z7adwBHLnAjt4QNZSI1LOn3bw8o08b06drPBJK2ZAc3yJpUUxhQge+ouSyr5V XL2zhoOgwRlDVd5Mdczvn/dAj896I88= Received: from mail-qv1-f71.google.com (mail-qv1-f71.google.com [209.85.219.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-390-QZ6Vra2wM4SQb-bktYu6Ig-1; Thu, 17 Dec 2020 08:23:05 -0500 X-MC-Unique: QZ6Vra2wM4SQb-bktYu6Ig-1 Received: by mail-qv1-f71.google.com with SMTP id c2so20790274qvs.12 for ; Thu, 17 Dec 2020 05:23:05 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-transfer-encoding :content-language; bh=VlVf+FHlKW5NSk9hq2l37/fFa7FHsGlOWn1DRV6wf4o=; b=YkX/QVEwrhzSzUu+4Dz8QYN3kWQs3z30vEYcmadYR+CK3KX3a1DxGTMaDzaelyWjdm 0wpqH2S6P1uMyVj/O4hDTp8UVAGqE6eIakaS5f7qHqx6W0g1J9tbo6JQjPdktvo71wMM rHpUVCJog4VtdRr9XF4bNbm/TXQmzs8GLmAOtmAktd8TqACkhe7ncawnwvwgXH+spH/0 p8Wd0v5OxY+ryjP5zgWsN2X3shWgNae5TpZovwrnFI8wFOZgMZXoOi/ItI5ulttdu8ap uUxF/skOgXHQUjJ9REEDaxbQtrHgAEctUApifPviJPErhHKtE9PFu71Qh4tgWfYtKQrK t24g== X-Gm-Message-State: AOAM533UrDVZgp2QmjWFB7zu6ysHVUeYoqcpZMnl8GXSua13bIO/eelx hir4CODjiisOVj+858YCb8ScCPDP2PHP54neyrZnoq0n2LsPuGiafDikRmnxZluL1gqmod2kI24 7+J519/rRYFCYYzdYQvSTHQ== X-Received: by 2002:a0c:d403:: with SMTP id t3mr689536qvh.4.1608211385319; Thu, 17 Dec 2020 05:23:05 -0800 (PST) X-Google-Smtp-Source: ABdhPJyYVSnHnGs6evLAnR4tS3yXheybtLYXtZ9atG/KqoIuyrRH82prh428jtyp6E1TXAFuQEHUug== X-Received: by 2002:a0c:d403:: with SMTP id t3mr689519qvh.4.1608211385133; Thu, 17 Dec 2020 05:23:05 -0800 (PST) Received: from trix.remote.csb (075-142-250-213.res.spectrum.com. [75.142.250.213]) by smtp.gmail.com with ESMTPSA id i18sm3360997qkg.66.2020.12.17.05.23.03 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 17 Dec 2020 05:23:04 -0800 (PST) Subject: Re: [PATCH v3 1/3] fpga: dfl: add the match() ops for dfl driver To: Xu Yilun , mdf@kernel.org, linux-fpga@vger.kernel.org, linux-kernel@vger.kernel.org Cc: gregkh@linuxfoundation.org, lgoncalv@redhat.com, hao.wu@intel.com References: <1608183881-18692-1-git-send-email-yilun.xu@intel.com> <1608183881-18692-2-git-send-email-yilun.xu@intel.com> From: Tom Rix Message-ID: <3d9f02d0-5937-1cce-db70-9c3e90d32ec3@redhat.com> Date: Thu, 17 Dec 2020 05:23:02 -0800 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.4.0 MIME-Version: 1.0 In-Reply-To: <1608183881-18692-2-git-send-email-yilun.xu@intel.com> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Content-Language: en-US Precedence: bulk List-ID: X-Mailing-List: linux-fpga@vger.kernel.org On 12/16/20 9:44 PM, Xu Yilun wrote: > The match ops allows dfl drivers have their own matching algorithem > instead of the standard id_table matching. > > This is to support the DFL UIO driver. It intends to match any DFL > device which could not be handled by other DFL drivers. > > Signed-off-by: Xu Yilun This looks fine. Reviewed-by: Tom Rix > --- > v3: this patch is splited out from DFL UIO patch. > move the declarations of exported symbols from include/linux/dfl.h > to driver/fpga/dfl.h > fix some comments. > --- > drivers/fpga/dfl.c | 22 +++++++++++++++++----- > drivers/fpga/dfl.h | 5 +++++ > include/linux/dfl.h | 3 +++ > 3 files changed, 25 insertions(+), 5 deletions(-) > > diff --git a/drivers/fpga/dfl.c b/drivers/fpga/dfl.c > index 511b20f..dd90111 100644 > --- a/drivers/fpga/dfl.c > +++ b/drivers/fpga/dfl.c > @@ -256,12 +256,13 @@ dfl_match_one_device(const struct dfl_device_id *id, struct dfl_device *ddev) > return NULL; > } > > -static int dfl_bus_match(struct device *dev, struct device_driver *drv) > +int dfl_match_device(struct dfl_device *ddev, struct dfl_driver *ddrv) > { > - struct dfl_device *ddev = to_dfl_dev(dev); > - struct dfl_driver *ddrv = to_dfl_drv(drv); > const struct dfl_device_id *id_entry; > > + if (ddrv->match) > + return ddrv->match(ddev); > + > id_entry = ddrv->id_table; > if (id_entry) { > while (id_entry->feature_id) { > @@ -275,6 +276,15 @@ static int dfl_bus_match(struct device *dev, struct device_driver *drv) > > return 0; > } > +EXPORT_SYMBOL_GPL(dfl_match_device); > + > +static int dfl_bus_match(struct device *dev, struct device_driver *drv) > +{ > + struct dfl_device *ddev = to_dfl_dev(dev); > + struct dfl_driver *ddrv = to_dfl_drv(drv); > + > + return dfl_match_device(ddev, ddrv); > +} > > static int dfl_bus_probe(struct device *dev) > { > @@ -328,7 +338,7 @@ static struct attribute *dfl_dev_attrs[] = { > }; > ATTRIBUTE_GROUPS(dfl_dev); > > -static struct bus_type dfl_bus_type = { > +struct bus_type dfl_bus_type = { > .name = "dfl", > .match = dfl_bus_match, > .probe = dfl_bus_probe, > @@ -336,6 +346,7 @@ static struct bus_type dfl_bus_type = { > .uevent = dfl_bus_uevent, > .dev_groups = dfl_dev_groups, > }; > +EXPORT_SYMBOL_GPL(dfl_bus_type); > > static void release_dfl_dev(struct device *dev) > { > @@ -469,7 +480,8 @@ static int dfl_devs_add(struct dfl_feature_platform_data *pdata) > > int __dfl_driver_register(struct dfl_driver *dfl_drv, struct module *owner) > { > - if (!dfl_drv || !dfl_drv->probe || !dfl_drv->id_table) > + if (!dfl_drv || !dfl_drv->probe || > + (!dfl_drv->id_table && !dfl_drv->match)) > return -EINVAL; > > dfl_drv->drv.owner = owner; > diff --git a/drivers/fpga/dfl.h b/drivers/fpga/dfl.h > index 2b82c96..01c43d8 100644 > --- a/drivers/fpga/dfl.h > +++ b/drivers/fpga/dfl.h > @@ -17,6 +17,7 @@ > #include > #include > #include > +#include > #include > #include > #include > @@ -517,4 +518,8 @@ long dfl_feature_ioctl_set_irq(struct platform_device *pdev, > struct dfl_feature *feature, > unsigned long arg); > > +extern struct bus_type dfl_bus_type; > + > +int dfl_match_device(struct dfl_device *ddev, struct dfl_driver *ddrv); > + > #endif /* __FPGA_DFL_H */ > diff --git a/include/linux/dfl.h b/include/linux/dfl.h > index 6cc1098..cfd98a4 100644 > --- a/include/linux/dfl.h > +++ b/include/linux/dfl.h > @@ -51,6 +51,8 @@ struct dfl_device { > * @drv: driver model structure. > * @id_table: pointer to table of device IDs the driver is interested in. > * { } member terminated. > + * @match: returns one if given device can be handled by the driver and zero > + * otherwise. If NULL, matching is based on id_table. > * @probe: mandatory callback for device binding. > * @remove: callback for device unbinding. > */ > @@ -58,6 +60,7 @@ struct dfl_driver { > struct device_driver drv; > const struct dfl_device_id *id_table; > > + int (*match)(struct dfl_device *dfl_dev); > int (*probe)(struct dfl_device *dfl_dev); > void (*remove)(struct dfl_device *dfl_dev); > };