From patchwork Thu Aug 3 10:16:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Biju Das X-Patchwork-Id: 13339659 X-Patchwork-Delegate: geert@linux-m68k.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B1820C001DF for ; Thu, 3 Aug 2023 10:17:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235379AbjHCKRc (ORCPT ); Thu, 3 Aug 2023 06:17:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52126 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235338AbjHCKQy (ORCPT ); Thu, 3 Aug 2023 06:16:54 -0400 Received: from relmlie5.idc.renesas.com (relmlor1.renesas.com [210.160.252.171]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id C19F63C0C; Thu, 3 Aug 2023 03:16:22 -0700 (PDT) X-IronPort-AV: E=Sophos;i="6.01,251,1684767600"; d="scan'208";a="171794289" Received: from unknown (HELO relmlir5.idc.renesas.com) ([10.200.68.151]) by relmlie5.idc.renesas.com with ESMTP; 03 Aug 2023 19:16:22 +0900 Received: from localhost.localdomain (unknown [10.226.93.128]) by relmlir5.idc.renesas.com (Postfix) with ESMTP id 66B02400386C; Thu, 3 Aug 2023 19:16:18 +0900 (JST) From: Biju Das To: Andy Shevchenko , Daniel Scally , Heikki Krogerus , Sakari Ailus , Greg Kroah-Hartman , "Rafael J. Wysocki" Cc: Biju Das , linux-acpi@vger.kernel.org, Dmitry Torokhov , Wolfram Sang , Geert Uytterhoeven , linux-renesas-soc@vger.kernel.org Subject: [PATCH v5 1/4] drivers: fwnode: Extend device_get_match_data() to struct bus_type Date: Thu, 3 Aug 2023 11:16:08 +0100 Message-Id: <20230803101611.323342-2-biju.das.jz@bp.renesas.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230803101611.323342-1-biju.das.jz@bp.renesas.com> References: <20230803101611.323342-1-biju.das.jz@bp.renesas.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-renesas-soc@vger.kernel.org Extend device_get_match_data() to buses (for eg: I2C) by adding a callback device_get_match_data() to struct bus_type() and call this method as a fallback for generic fwnode based device_get_match_data(). Suggested-by: Dmitry Torokhov Signed-off-by: Biju Das Reviewed-by: Andy Shevchenko Reviewed-by: Sakari Ailus --- v4->v5: * No change v3->v4: * Documented corner case. v2->v3: * Added Rb tag from Andy. RFC v1-> v2: * Replaced "Signed-off-by"->"Suggested-by" tag for Dmitry. * Documented device_get_match_data(). * Added multiple returns to make code path for generic fwnode-based lookup faster. --- drivers/base/property.c | 27 ++++++++++++++++++++++++++- include/linux/device/bus.h | 3 +++ 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/drivers/base/property.c b/drivers/base/property.c index 8c40abed7852..a3c188cf68bb 100644 --- a/drivers/base/property.c +++ b/drivers/base/property.c @@ -1275,9 +1275,34 @@ int fwnode_graph_parse_endpoint(const struct fwnode_handle *fwnode, } EXPORT_SYMBOL(fwnode_graph_parse_endpoint); +/** + * device_get_match_data - get match data from OF/ACPI/Bus match tables + * @dev: device to find the match data + * + * Find match data using generic fwnode-based lookup and if there is no + * match, call the bus->get_match_data() for finding match data. + * + * Return: a match data pointer or NULL if there is no match in the matching + * table. + * + * Besides the fact that some drivers abuse the device ID driver_data type + * and claim it to be integer, for the bus specific ID tables the driver_data + * may be defined as kernel_ulong_t. For these tables 0 is a valid response, + * but not for this function. It's recommended to convert those either to avoid + * 0 or use a real pointer to the predefined driver data. + */ const void *device_get_match_data(const struct device *dev) { - return fwnode_call_ptr_op(dev_fwnode(dev), device_get_match_data, dev); + const void *data; + + data = fwnode_call_ptr_op(dev_fwnode(dev), device_get_match_data, dev); + if (data) + return data; + + if (dev->bus && dev->bus->get_match_data) + return dev->bus->get_match_data(dev); + + return NULL; } EXPORT_SYMBOL_GPL(device_get_match_data); diff --git a/include/linux/device/bus.h b/include/linux/device/bus.h index ae10c4322754..2e15b0ae5384 100644 --- a/include/linux/device/bus.h +++ b/include/linux/device/bus.h @@ -60,6 +60,7 @@ struct fwnode_handle; * this bus. * @dma_cleanup: Called to cleanup DMA configuration on a device on * this bus. + * @get_match_data: Called to get match data on a device on this bus. * @pm: Power management operations of this bus, callback the specific * device driver's pm-ops. * @iommu_ops: IOMMU specific operations for this bus, used to attach IOMMU @@ -102,6 +103,8 @@ struct bus_type { int (*dma_configure)(struct device *dev); void (*dma_cleanup)(struct device *dev); + const void *(*get_match_data)(const struct device *dev); + const struct dev_pm_ops *pm; const struct iommu_ops *iommu_ops;