From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Wed, 28 Apr 2021 12:29:50 +0200 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1lbhS2-0007yD-B2 for lore@lore.pengutronix.de; Wed, 28 Apr 2021 12:29:50 +0200 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1lbhS1-00069u-8f for lore@pengutronix.de; Wed, 28 Apr 2021 12:29:50 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=desiato.20200630; h=Sender:Content-Transfer-Encoding :Content-Type:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Cc:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=XZR+CBCdkMq/iokY21yyWF08Pi4Ge6MtQueoD63Dc3k=; b=STztar/C3C+PHuIApCHBQDwWn TSt/kL+w7b7TC28IdgHg+Y3ZKm+dR1JBI3zslqwlGGN5ZkgGygd6pV8UUSX9lWskXjIAJn9LMUzS7 vK/1vNklB+r52/aQplp3JiWRsVZRr6d078c4teXqSfH+oojv3pQAvPbVXgQEOtRnqqE4Iwk52oYFO ovN2qST3zhnwo4hXiUiAXP2SWhdWTdcDBNBQw9+h06aCh6WD0Zazr5K+sDnfhMdR+N2v0N/iTIv/E lWwKTT50RtbTPpuOR0nm7Y5Evd6Ql4nQklrRVFW1zDPDj9YIZ376VloSGb7iK1hnfd3v05FLIKJIl b4QWbZQ8A==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lbhQy-003Ier-MJ; Wed, 28 Apr 2021 10:28:48 +0000 Received: from bombadil.infradead.org ([2607:7c80:54:e::133]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lbhQk-003Idv-JE for barebox@desiato.infradead.org; Wed, 28 Apr 2021 10:28:31 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:To:From:Sender: Reply-To:Cc:Content-Type:Content-ID:Content-Description; bh=jIAAqbOjLXn9SpFAIPe1XonPGSZocSAJ6jlcffPGnyY=; b=UZlwcWfdpJKrAIU0IOPnnYhCru GEXy8xbETixU/FmEq+JlnxeB5G2TZggF7G03CHUXw4xIr5wrQ9fqWCiEFgkSmyojbJcZnZouURtDB onXdxrah/A2yLjLjI7iWfWmbctEmljdxpzRzGsJSAEGMcGnA5CF4lQdNhVdbJyv0wAdJzwIRkJnzm TQsSnUa4De8sJed3xNCEqlD4jnVuDLqg9s1ejRIpTxb3q4H9n+REwPk7EXuA9v87kmE1QDKLrO3k5 hBiLPWx6rWsoRWYZP8urDD6w8DOgyO+Jz2CB2iQG2aa7yErx/8SgepLRJTxMdcFAKPxeTQ7MVEfmA vq7H6Scw==; Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by bombadil.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lbhQg-00HMRK-Oz for barebox@lists.infradead.org; Wed, 28 Apr 2021 10:28:29 +0000 Received: from dude02.hi.pengutronix.de ([2001:67c:670:100:1d::28]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1lbhQe-0005sR-F1 for barebox@lists.infradead.org; Wed, 28 Apr 2021 12:28:24 +0200 Received: from mfe by dude02.hi.pengutronix.de with local (Exim 4.92) (envelope-from ) id 1lbhQe-0000bz-60 for barebox@lists.infradead.org; Wed, 28 Apr 2021 12:28:24 +0200 From: Marco Felsch To: barebox@lists.infradead.org Date: Wed, 28 Apr 2021 12:28:19 +0200 Message-Id: <20210428102821.2287-1-m.felsch@pengutronix.de> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210416094943.3648-1-s.hauer@pengutronix.de> References: <20210416094943.3648-1-s.hauer@pengutronix.de> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210428_032826_877755_31FF8603 X-CRM114-Status: GOOD ( 17.14 ) X-BeenThere: barebox@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "barebox" X-SA-Exim-Connect-IP: 2001:8b0:10b:1:d65d:64ff:fe57:4e05 X-SA-Exim-Mail-From: barebox-bounces+lore=pengutronix.de@lists.infradead.org X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.ext.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-3.7 required=4.0 tests=AWL,BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_NONE autolearn=unavailable autolearn_force=no version=3.4.2 Subject: [PATCH 1/3] fixup! common: add initial barebox deep-probe support X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on metis.ext.pengutronix.de) --- Hi, this is just a proposal to change the current linker array approach to an initcall approach. Why? Because now we can simply register a board-driver without having to list each compatible. I used the pure_initcall without adding a new one, since the documentation says that pure_initcalls are used to init variables. In our case we init boards_list. Regards, Marco common/deep-probe.c | 38 +++++++++++++++++++++++++++++-- include/asm-generic/barebox.lds.h | 10 +------- include/deep-probe.h | 34 +++++++++++++++------------ 3 files changed, 56 insertions(+), 26 deletions(-) diff --git a/common/deep-probe.c b/common/deep-probe.c index 9fc67f170c..6b04b4f5da 100644 --- a/common/deep-probe.c +++ b/common/deep-probe.c @@ -2,8 +2,16 @@ #include #include +#include #include +struct deep_probe_entry { + struct list_head entry; + const char *compatible; +}; + +LIST_HEAD(boards_list); + enum deep_probe_state { DEEP_PROBE_UNKONWN = -1, DEEP_PROBE_NOT_SUPPORTED, @@ -12,6 +20,33 @@ enum deep_probe_state { static enum deep_probe_state boardstate = DEEP_PROBE_UNKONWN; +int deep_probe_enable_board(const struct driver_d *board_driver, const char *compatible) +{ + struct deep_probe_entry *new; + + if (!board_driver && !compatible) + return -EINVAL; + + if (board_driver) { + const struct of_device_id *of_device_ids = board_driver->of_compatible; + + for (; of_device_ids->compatible; of_device_ids++) { + new = xzalloc(sizeof(*new)); + new->compatible = of_device_ids->compatible; + list_add(&new->entry, &boards_list); + } + } + + if (compatible) { + new = xzalloc(sizeof(*new)); + new->compatible = compatible; + list_add(&new->entry, &boards_list); + } + + return 0; +} +EXPORT_SYMBOL_GPL(deep_probe_enable_board); + bool deep_probe_is_supported(void) { struct deep_probe_entry *board; @@ -20,8 +55,7 @@ bool deep_probe_is_supported(void) return boardstate; /* determine boardstate */ - for (board = &__barebox_deep_probe_start; - board != &__barebox_deep_probe_end; board++) { + list_for_each_entry(board, &boards_list, entry) { if (of_machine_is_compatible(board->compatible)) { boardstate = DEEP_PROBE_SUPPORTED; return true; diff --git a/include/asm-generic/barebox.lds.h b/include/asm-generic/barebox.lds.h index c5f9d97547..a7d32160d1 100644 --- a/include/asm-generic/barebox.lds.h +++ b/include/asm-generic/barebox.lds.h @@ -114,13 +114,6 @@ KEEP(*(.rsa_keys.rodata.*)); \ __rsa_keys_end = .; \ -#define BAREBOX_DEEP_PROBE \ - STRUCT_ALIGN(); \ - __barebox_deep_probe_start = .; \ - KEEP(*(SORT_BY_NAME(.barebox_deep_probe*))) \ - __barebox_deep_probe_end = .; - - #ifdef CONFIG_CONSTRUCTORS #define KERNEL_CTORS() . = ALIGN(8); \ __ctors_start = .; \ @@ -143,8 +136,7 @@ BAREBOX_CLK_TABLE \ BAREBOX_DTB \ BAREBOX_RSA_KEYS \ - BAREBOX_PCI_FIXUP \ - BAREBOX_DEEP_PROBE + BAREBOX_PCI_FIXUP #if defined(CONFIG_ARCH_BAREBOX_MAX_BARE_INIT_SIZE) && \ CONFIG_ARCH_BAREBOX_MAX_BARE_INIT_SIZE < CONFIG_BAREBOX_MAX_BARE_INIT_SIZE diff --git a/include/deep-probe.h b/include/deep-probe.h index a646c10340..e00bd9bafe 100644 --- a/include/deep-probe.h +++ b/include/deep-probe.h @@ -2,25 +2,29 @@ #ifndef __DEEP_PROBE_H #define __DEEP_PROBE_H -#include -#include - -struct deep_probe_entry { - const char *compatible; -}; +struct driver_d; bool deep_probe_is_supported(void); +int deep_probe_enable_board(const struct driver_d *board_driver, const char *compatible); + +#define _deep_probe_enable_driver(id,drv) \ + static int __init id(void) \ + { \ + return deep_probe_enable_board(&drv,NULL); \ + } \ + pure_initcall(id) -extern struct deep_probe_entry __barebox_deep_probe_start; -extern struct deep_probe_entry __barebox_deep_probe_end; +#define deep_probe_enable_board_driver(drv) \ + _deep_probe_enable_driver(__UNIQUE_ID(deepprobe),drv) -#define __BAREBOX_DEEP_PROBE_ENABLE(_entry,_compatible) \ - static const struct deep_probe_entry _entry \ - __attribute__ ((used,section (".barebox_deep_probe_" __stringify(_entry)))) = { \ - .compatible = _compatible, \ - } +#define _deep_probe_enable_compatible(id,compatible) \ + static int __init id(void) \ + { \ + return deep_probe_enable_board(NULL,compatible);\ + } \ + pure_initcall(id) -#define BAREBOX_DEEP_PROBE_ENABLE(_compatible) \ - __BAREBOX_DEEP_PROBE_ENABLE(__UNIQUE_ID(deepprobe),_compatible) +#define deep_probe_enable_board_compatible(compatible) \ + _deep_probe_enable_compatible(__UNIQUE_ID(deepprobe),compatible) #endif /* __DEEP_PROBE_H */ -- 2.29.2 _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox