From patchwork Mon May 30 13:14:38 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 9141381 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 E676B60759 for ; Mon, 30 May 2016 13:16:20 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DAEC128185 for ; Mon, 30 May 2016 13:16:20 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CFA6E281C2; Mon, 30 May 2016 13:16:20 +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.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED 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 5971728185 for ; Mon, 30 May 2016 13:16:19 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1b7N24-0000B1-0a; Mon, 30 May 2016 13:15:00 +0000 Received: from mout.kundenserver.de ([212.227.126.135]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1b7N21-00006E-DO for linux-arm-kernel@lists.infradead.org; Mon, 30 May 2016 13:14:58 +0000 Received: from wuerfel.localnet ([78.42.132.4]) by mrelayeu.kundenserver.de (mreue004) with ESMTPSA (Nemesis) id 0MBX6o-1bFaDN2Nmw-00AVWw; Mon, 30 May 2016 15:14:15 +0200 From: Arnd Bergmann To: linuxppc-dev@lists.ozlabs.org Subject: [PATCH 1/4] base: soc: introduce soc_device_match() interface Date: Mon, 30 May 2016 15:14:38 +0200 Message-ID: <6032641.cjSseEG2PF@wuerfel> User-Agent: KMail/5.1.3 (Linux/4.4.0-22-generic; KDE/5.18.0; x86_64; ; ) In-Reply-To: References: <1462417950-46796-1-git-send-email-yangbo.lu@nxp.com> MIME-Version: 1.0 X-Provags-ID: V03:K0:2E+uOftq+6fhB1Tyjx3blNc854FT6HNPJZ4xsfb8XRJQPSf4lhg nK49rIHT8cbzoOIrIE1mj4cPTSkc6OYIo2s9K1uRB7U8PrMwo4qmOGqGEcJ3Zb0MJ0n0eAt Ll4h20jfsIJNVpvGEd7QP5lisvHEZHJVA5xlfTGWE+/MjmQGGL+sOhw6rVEWKywoPjz6BqV 3gXagtXOPXCN+kGGtEy0g== X-UI-Out-Filterresults: notjunk:1; V01:K0:I+zZTlPqcyc=:Px/sdwmaCHQ7uU8nxKXJCb wjxjH0Eg7jx26QPJNXbFt173aAbU2CnoC0fuXIvAq/fJbY6+kZfZtmygG6itBottTkmlnORIn iXqHTy/Rg3WLh9hgrsNs5Bua/OdjlcseBHM4ku5Je5RYNGzZNzedkk8J+pXJGnCXImH/jZUjg YJTlwBbRerQFYqrJh+5lAJQrGBnGANXnNcvdKmRZF0sQAgHn1iTpBi9gdVlbzlnDrCgJlxT9k FRwG3s0QBnShO7t7uErzS4EEOxBLdsOW1gYb69+rgrCd3Cge/cvC6FQ69/ECZa/DYyQ22smcB fV1npXu9tPOYee5PW64uUgF/BHVLQ5B77PlegUilfPKDhBoZwiV3GmNTaGWnJVerAEEMXqK2t fZrWrOhvOuQ4PmmTORSU1g8pAQsemauB8dkqQNWjpWSJd2KssGe+qirjHeN90l4di+iNVwcpl e4VeltuRUlaWMgU1PWUjiyi9Mt9NvpjD1Y9idua9Fa8dzslXrv1JbmewrLvou5INDF/zcsmAH anW2NZhebp2Waf8EBGruxpIwelEgsK4cqP/1GkkKk9CDgOs4K6Uk52Zx4W2eYA2lHmKEVzWEH X2IDwI8490zs2kv8Vf7JnkhxcUvFlEe087eeJKVzAQHLWgpdpvDojudh+OMMpvnX++XwZVjhU 2OyHmFsHciy7PfePLa1TSjVxmKsIAD9nEV5ZdMAZ2F+HovKbToOCrrX4egxzyDE/NKuupducf MF62o+esdO68xkYnbivAvVbEuAjhZ7KiaquVsg== X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160530_061457_801081_CA4B5F8E X-CRM114-Status: GOOD ( 22.53 ) 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: Mark Rutland , Ulf Hansson , "linux-kernel@vger.kernel.org" , "linux-i2c@vger.kernel.org" , "linux-clk@vger.kernel.org" , Qiang Zhao , Russell King , Bhupesh Sharma , Joerg Roedel , Claudiu Manoil , "devicetree@vger.kernel.org" , Kumar Gala , Scott Wood , Rob Herring , Santosh Shilimkar , "linux-arm-kernel@lists.infradead.org" , "netdev@vger.kernel.org" , "linux-mmc@vger.kernel.org" , Xiaobo Xie , Yang-Leo Li , "iommu@lists.linux-foundation.org" , Yangbo Lu 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 We keep running into cases where device drivers want to know the exact version of the SoC a they are currently running on. In the past, this has usually been done through a vendor specific API that can be called by a driver, or by directly accessing some kind of version register that is not part of the device itself but that belongs to a global register area of the chip. Common reasons for doing this include: - A machine is not using devicetree or similar for passing data about on-chip devices, but just announces their presence using boot-time platform devices, and the machine code itself does not care about the revision. - There is existing firmware or boot loaders with existing DT binaries with generic compatible strings that do not identify the particular revision of each device, but the driver knows which SoC revisions include which part - A prerelease version of a chip has some quirks and we are using the same version of the bootloader and the DT blob on both the prerelease and the final version. An update of the DT binding seems inappropriate because that would involve maintaining multiple copies of the dts and/or bootloader. This introduces the soc_device_match() interface that is meant to work like of_match_node() but instead of identifying the version of a device, it identifies the SoC itself using a vendor-agnostic interface. Unlike soc_device_match(), we do not do an exact string compare but instead use glob_match() to allow wildcards in strings. Signed-off-by: Arnd Bergmann diff --git a/drivers/base/Kconfig b/drivers/base/Kconfig index 246acdafedb6..fc7613cc7fd5 100644 --- a/drivers/base/Kconfig +++ b/drivers/base/Kconfig @@ -225,6 +225,7 @@ config GENERIC_CPU_AUTOPROBE config SOC_BUS bool + select GLOB source "drivers/base/regmap/Kconfig" diff --git a/drivers/base/soc.c b/drivers/base/soc.c index 75b98aad6faf..e9623c6674a5 100644 --- a/drivers/base/soc.c +++ b/drivers/base/soc.c @@ -14,6 +14,7 @@ #include #include #include +#include static DEFINE_IDA(soc_ida); @@ -168,3 +169,60 @@ static void __exit soc_bus_unregister(void) bus_unregister(&soc_bus_type); } module_exit(soc_bus_unregister); + +static int soc_device_match_one(struct device *dev, void *arg) +{ + struct soc_device *soc_dev = container_of(dev, struct soc_device, dev); + struct soc_device_attribute *match = arg; + + if (match->machine && !glob_match(match->machine, soc_dev->attr->machine)) + return 0; + + if (match->family && !glob_match(match->family, soc_dev->attr->family)) + return 0; + + if (match->revision && !glob_match(match->revision, soc_dev->attr->revision)) + return 0; + + if (match->soc_id && !glob_match(match->soc_id, soc_dev->attr->revision)) + return 0; + + return 1; +} + +/* + * soc_device_match - identify the SoC in the machine + * @matches: zero-terminated array of possible matches + * + * returns the first matching entry of the argument array, or NULL + * if none of them match. + * + * This function is meant as a helper in place of of_match_node() + * in cases where either no device tree is available or the information + * in a device node is insufficient to identify a particular variant + * by its compatible strings or other properties. For new devices, + * the DT binding should always provide unique compatible strings + * that allow the use of of_match_node() instead. + * + * The calling function can use the .data entry of the + * soc_device_attribute to pass a structure or function pointer for + * each entry. + */ +struct soc_device_attribute *soc_device_match(struct soc_device_attribute *matches) +{ + struct device *dev; + int ret; + + for (ret = 0; ret == 0; matches++) { + if (matches->machine || matches->family || + matches->revision || matches->soc_id) + return NULL; + + dev = NULL; + ret = bus_for_each_dev(&soc_bus_type, dev, matches, + soc_device_match_one); + } + + return matches; +} +EXPORT_SYMBOL_GPL(soc_device_match); diff --git a/include/linux/sys_soc.h b/include/linux/sys_soc.h index 2739ccb69571..02c48c76052b 100644 --- a/include/linux/sys_soc.h +++ b/include/linux/sys_soc.h @@ -13,6 +13,8 @@ struct soc_device_attribute { const char *family; const char *revision; const char *soc_id; + + const void *data; }; /** @@ -34,4 +36,6 @@ void soc_device_unregister(struct soc_device *soc_dev); */ struct device *soc_device_to_device(struct soc_device *soc); +struct soc_device_attribute *soc_device_match(struct soc_device_attribute *matches); + #endif /* __SOC_BUS_H */