From patchwork Wed Jul 9 03:38:13 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 368083 X-Patchwork-Delegate: sjg@chromium.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id D4D99140087 for ; Wed, 9 Jul 2014 13:43:54 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id F0E20A753C; Wed, 9 Jul 2014 05:42:53 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id iYHI+FlXkzi8; Wed, 9 Jul 2014 05:42:53 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id C2A2AAB60D; Wed, 9 Jul 2014 05:40:05 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 2FD10A743F for ; Wed, 9 Jul 2014 05:39:50 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id O1cQ5Qmj+GDT for ; Wed, 9 Jul 2014 05:39:46 +0200 (CEST) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from mail-oa0-f73.google.com (mail-oa0-f73.google.com [209.85.219.73]) by theia.denx.de (Postfix) with ESMTPS id 49DA3A7449 for ; Wed, 9 Jul 2014 05:38:58 +0200 (CEST) Received: by mail-oa0-f73.google.com with SMTP id eb12so1470615oac.2 for ; Tue, 08 Jul 2014 20:38:57 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=xg0S35HrMljFvmSmPTdLXkjcflZjGf6ke4jsMS+E3GA=; b=Oq0Q+8LiHP372WQK0bHuwjes3zIz/WORow5hmYN9poBZgT8WMikGXXWQ7M5jyKXnpi AH0DACiTKwbW0gVnchCV+TPA20Xy/BfPvlZUc5dJ3fMA2bEi5uE/3LLiSFGaA2mGcMFk KYZoplS4DNDLoaa7jOwlbLGTWHQeUwxqOfsXEYxiAmtsWR/+xo0QAsWdNyO775Czzglj XG4VqcOdcGIQTTqq55IP7Wm25CS6xQZX0dbeqPDw9H4GLVeCeJ8TRXyZ0RbkBUjczWsK WXxAYESqNSNlgHz3bS0KlT3s/TRVYZb0xOItgpfxU58qEbWx2QCunwU+VB6i3DOma/Io 3TYQ== X-Gm-Message-State: ALoCoQl0lUUFyFvzAVWgzg6xN1GnGXu3aeCLHnd6VdtVuH8GeR6Vz2isbXNJf0ZXb3wcDkHv97sa X-Received: by 10.182.123.232 with SMTP id md8mr1146629obb.41.1404877137455; Tue, 08 Jul 2014 20:38:57 -0700 (PDT) Received: from corp2gmr1-2.hot.corp.google.com (corp2gmr1-2.hot.corp.google.com [172.24.189.93]) by gmr-mx.google.com with ESMTPS id o69si2680724yhp.6.2014.07.08.20.38.57 for (version=TLSv1.1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 08 Jul 2014 20:38:57 -0700 (PDT) Received: from kaki.bld.corp.google.com (kaki.bld.corp.google.com [172.29.216.32]) by corp2gmr1-2.hot.corp.google.com (Postfix) with ESMTP id 430675A4ADE; Tue, 8 Jul 2014 20:38:57 -0700 (PDT) Received: by kaki.bld.corp.google.com (Postfix, from userid 121222) id DC77B220B08; Tue, 8 Jul 2014 21:38:56 -0600 (MDT) From: Simon Glass To: U-Boot Mailing List Date: Tue, 8 Jul 2014 21:38:13 -0600 Message-Id: <1404877099-7314-24-git-send-email-sjg@chromium.org> X-Mailer: git-send-email 2.0.0.526.g5318336 In-Reply-To: <1404877099-7314-1-git-send-email-sjg@chromium.org> References: <1404877099-7314-1-git-send-email-sjg@chromium.org> Subject: [U-Boot] [PATCH v2 23/29] dm: Provide a function to scan child FDT nodes X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.11 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de At present only root nodes in the device tree are scanned for devices. But some devices can have children. For example a SPI bus may have several children for each of its chip selects. Add a function which scans subnodes and binds devices for each one. This can be used for the root node scan also, so change it. A device can call this function in its bind() or probe() methods to bind its children. Signed-off-by: Simon Glass --- Changes in v2: None doc/driver-model/README.txt | 6 ++++- drivers/core/root.c | 34 +++++++++++++----------- include/dm/root.h | 16 ++++++++++++ include/dm/test.h | 9 +++++++ include/dm/uclass-id.h | 1 + test/dm/Makefile | 1 + test/dm/bus.c | 63 +++++++++++++++++++++++++++++++++++++++++++++ test/dm/test-fdt.c | 63 +++++++++++++++++++++++++++------------------ test/dm/test.dts | 16 +++++++++++- 9 files changed, 167 insertions(+), 42 deletions(-) create mode 100644 test/dm/bus.c diff --git a/doc/driver-model/README.txt b/doc/driver-model/README.txt index 33f077c..a191f47 100644 --- a/doc/driver-model/README.txt +++ b/doc/driver-model/README.txt @@ -95,9 +95,13 @@ are provided in test/dm. To run them, try: You should see something like this: <...U-Boot banner...> - Running 17 driver model tests + Running 18 driver model tests Test: dm_test_autobind Test: dm_test_autoprobe + Test: dm_test_bus_children + Device 'd-test': seq 3 is in use by 'b-test' + Device 'c-test@0': seq 0 is in use by 'a-test' + Device 'c-test@1': seq 1 is in use by 'd-test' Test: dm_test_children Test: dm_test_fdt Device 'd-test': seq 3 is in use by 'b-test' diff --git a/drivers/core/root.c b/drivers/core/root.c index 9a7df11..bb535e0 100644 --- a/drivers/core/root.c +++ b/drivers/core/root.c @@ -15,6 +15,7 @@ #include #include #include +#include #include #include #include @@ -79,29 +80,32 @@ int dm_scan_platdata(bool pre_reloc_only) } #ifdef CONFIG_OF_CONTROL -int dm_scan_fdt(const void *blob, bool pre_reloc_only) +int dm_scan_fdt_node(struct udevice *parent, const void *blob, int offset, + bool pre_reloc_only) { - int offset = 0; int ret = 0, err; - int depth = 0; - - do { - offset = fdt_next_node(blob, offset, &depth); - if (offset > 0 && depth == 1) { - if (pre_reloc_only && - !fdt_getprop(blob, offset, "dm,pre-reloc", NULL)) - continue; - err = lists_bind_fdt(gd->dm_root, blob, offset); - if (err && !ret) - ret = err; - } - } while (offset > 0); + + for (offset = fdt_first_subnode(blob, offset); + offset > 0; + offset = fdt_next_subnode(blob, offset)) { + if (pre_reloc_only && + !fdt_getprop(blob, offset, "dm,pre-reloc", NULL)) + continue; + err = lists_bind_fdt(parent, blob, offset); + if (err && !ret) + ret = err; + } if (ret) dm_warn("Some drivers failed to bind\n"); return ret; } + +int dm_scan_fdt(const void *blob, bool pre_reloc_only) +{ + return dm_scan_fdt_node(gd->dm_root, blob, 0, pre_reloc_only); +} #endif int dm_init_and_scan(bool pre_reloc_only) diff --git a/include/dm/root.h b/include/dm/root.h index 02c7788..33f951b 100644 --- a/include/dm/root.h +++ b/include/dm/root.h @@ -46,6 +46,22 @@ int dm_scan_platdata(bool pre_reloc_only); int dm_scan_fdt(const void *blob, bool pre_reloc_only); /** + * dm_scan_fdt_node() - Scan the device tree and bind drivers for a node + * + * This scans the subnodes of a device tree node and and creates a driver + * for each one. + * + * @parent: Parent device for the devices that will be created + * @blob: Pointer to device tree blob + * @offset: Offset of node to scan + * @pre_reloc_only: If true, bind only drivers with the DM_FLAG_PRE_RELOC + * flag. If false bind all drivers. + * @return 0 if OK, -ve on error + */ +int dm_scan_fdt_node(struct udevice *parent, const void *blob, int offset, + bool pre_reloc_only); + +/** * dm_init_and_scan() - Initialise Driver Model structures and scan for devices * * This function initialises the roots of the driver tree and uclass trees, diff --git a/include/dm/test.h b/include/dm/test.h index 409f1a3..e8e1c0b 100644 --- a/include/dm/test.h +++ b/include/dm/test.h @@ -156,6 +156,15 @@ int dm_check_operations(struct dm_test_state *dms, struct udevice *dev, uint32_t base, struct dm_test_priv *priv); /** + * dm_check_devices() - check the devices respond to operations correctly + * + * @dms: Overall test state + * @num_devices: Number of test devices to check + * @return 0 if OK, -ve on error + */ +int dm_check_devices(struct dm_test_state *dms, int num_devices); + +/** * dm_test_main() - Run all the tests * * This runs all available driver model tests diff --git a/include/dm/uclass-id.h b/include/dm/uclass-id.h index 77ff9ea..dd95fca 100644 --- a/include/dm/uclass-id.h +++ b/include/dm/uclass-id.h @@ -17,6 +17,7 @@ enum uclass_id { UCLASS_DEMO, UCLASS_TEST, UCLASS_TEST_FDT, + UCLASS_TEST_BUS, /* U-Boot uclasses start here */ UCLASS_GPIO, /* Bank of general-purpose I/O pins */ diff --git a/test/dm/Makefile b/test/dm/Makefile index c0f2135..5c2415e 100644 --- a/test/dm/Makefile +++ b/test/dm/Makefile @@ -5,6 +5,7 @@ # obj-$(CONFIG_CMD_DM) += cmd_dm.o +obj-$(CONFIG_DM_TEST) += bus.o obj-$(CONFIG_DM_TEST) += test-driver.o obj-$(CONFIG_DM_TEST) += test-fdt.o obj-$(CONFIG_DM_TEST) += test-main.o diff --git a/test/dm/bus.c b/test/dm/bus.c new file mode 100644 index 0000000..cfb9934 --- /dev/null +++ b/test/dm/bus.c @@ -0,0 +1,63 @@ +/* + * Copyright (c) 2014 Google, Inc + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#include +#include +#include +#include +#include +#include + +DECLARE_GLOBAL_DATA_PTR; + +static int testbus_drv_probe(struct udevice *dev) +{ + return dm_scan_fdt_node(dev, gd->fdt_blob, dev->of_offset, false); +} + +static const struct udevice_id testbus_ids[] = { + { + .compatible = "denx,u-boot-test-bus", + .data = DM_TEST_TYPE_FIRST }, + { } +}; + +U_BOOT_DRIVER(testbus_drv) = { + .name = "testbus_drv", + .of_match = testbus_ids, + .id = UCLASS_TEST_BUS, + .probe = testbus_drv_probe, + .priv_auto_alloc_size = sizeof(struct dm_test_priv), + .platdata_auto_alloc_size = sizeof(struct dm_test_pdata), +}; + +UCLASS_DRIVER(testbus) = { + .name = "testbus", + .id = UCLASS_TEST_BUS, +}; + +/* Test that we can probe for children */ +static int dm_test_bus_children(struct dm_test_state *dms) +{ + int num_devices = 4; + struct udevice *bus; + struct uclass *uc; + + ut_assertok(uclass_get(UCLASS_TEST_FDT, &uc)); + ut_asserteq(num_devices, list_count_items(&uc->dev_head)); + + /* Probe the bus, which should yield 3 more devices */ + ut_assertok(uclass_get_device(UCLASS_TEST_BUS, 0, &bus)); + num_devices += 3; + + ut_assertok(uclass_get(UCLASS_TEST_FDT, &uc)); + ut_asserteq(num_devices, list_count_items(&uc->dev_head)); + + ut_assert(!dm_check_devices(dms, num_devices)); + + return 0; +} +DM_TEST(dm_test_bus_children, DM_TESTF_SCAN_PDATA | DM_TESTF_SCAN_FDT); diff --git a/test/dm/test-fdt.c b/test/dm/test-fdt.c index 7980a68..cd2c389 100644 --- a/test/dm/test-fdt.c +++ b/test/dm/test-fdt.c @@ -91,37 +91,17 @@ UCLASS_DRIVER(testfdt) = { .id = UCLASS_TEST_FDT, }; -/* Test that FDT-based binding works correctly */ -static int dm_test_fdt(struct dm_test_state *dms) +int dm_check_devices(struct dm_test_state *dms, int num_devices) { - const int num_drivers = 4; struct udevice *dev; - struct uclass *uc; int ret; int i; - ret = dm_scan_fdt(gd->fdt_blob, false); - ut_assert(!ret); - - ret = uclass_get(UCLASS_TEST_FDT, &uc); - ut_assert(!ret); - - /* These are num_drivers compatible root-level device tree nodes */ - ut_asserteq(num_drivers, list_count_items(&uc->dev_head)); - - /* Each should have no platdata / priv */ - for (i = 0; i < num_drivers; i++) { - ret = uclass_find_device(UCLASS_TEST_FDT, i, &dev); - ut_assert(!ret); - ut_assert(!dev_get_priv(dev)); - ut_assert(!dev->platdata); - } - /* * Now check that the ping adds are what we expect. This is using the * ping-add property in each node. */ - for (i = 0; i < num_drivers; i++) { + for (i = 0; i < num_devices; i++) { uint32_t base; ret = uclass_get_device(UCLASS_TEST_FDT, i, &dev); @@ -144,6 +124,37 @@ static int dm_test_fdt(struct dm_test_state *dms) return 0; } + +/* Test that FDT-based binding works correctly */ +static int dm_test_fdt(struct dm_test_state *dms) +{ + const int num_devices = 4; + struct udevice *dev; + struct uclass *uc; + int ret; + int i; + + ret = dm_scan_fdt(gd->fdt_blob, false); + ut_assert(!ret); + + ret = uclass_get(UCLASS_TEST_FDT, &uc); + ut_assert(!ret); + + /* These are num_devices compatible root-level device tree nodes */ + ut_asserteq(num_devices, list_count_items(&uc->dev_head)); + + /* Each should have no platdata / priv */ + for (i = 0; i < num_devices; i++) { + ret = uclass_find_device(UCLASS_TEST_FDT, i, &dev); + ut_assert(!ret); + ut_assert(!dev_get_priv(dev)); + ut_assert(!dev->platdata); + } + + ut_assertok(dm_check_devices(dms, num_devices)); + + return 0; +} DM_TEST(dm_test_fdt, 0); static int dm_test_fdt_pre_reloc(struct dm_test_state *dms) @@ -187,7 +198,10 @@ static int dm_test_fdt_uclass_seq(struct dm_test_state *dms) ut_asserteq(-ENODEV, uclass_find_device_by_seq(UCLASS_TEST_FDT, 7, true, &dev)); - /* Note that c-test is not probed since it is not a top-level node */ + /* + * Note that c-test nodes are not probed since it is not a top-level + * node + */ ut_assertok(uclass_get_device_by_seq(UCLASS_TEST_FDT, 3, &dev)); ut_asserteq_str("b-test", dev->name); @@ -236,12 +250,11 @@ static int dm_test_fdt_offset(struct dm_test_state *dms) node, &dev)); /* This is not a top level node so should not be probed */ - node = fdt_path_offset(blob, "/some-bus/c-test"); + node = fdt_path_offset(blob, "/some-bus/c-test@5"); ut_assert(node > 0); ut_asserteq(-ENODEV, uclass_get_device_by_of_offset(UCLASS_TEST_FDT, node, &dev)); return 0; } - DM_TEST(dm_test_fdt_offset, DM_TESTF_SCAN_PDATA | DM_TESTF_SCAN_FDT); diff --git a/test/dm/test.dts b/test/dm/test.dts index d8d7e0f..141d82c 100644 --- a/test/dm/test.dts +++ b/test/dm/test.dts @@ -44,14 +44,28 @@ some-bus { #address-cells = <1>; #size-cells = <0>; + compatible = "denx,u-boot-test-bus"; reg = <3>; ping-expect = <4>; ping-add = <4>; - c-test { + c-test@5 { compatible = "denx,u-boot-fdt-test"; reg = <5>; + ping-expect = <5>; ping-add = <5>; }; + c-test@0 { + compatible = "denx,u-boot-fdt-test"; + reg = <0>; + ping-expect = <6>; + ping-add = <6>; + }; + c-test@1 { + compatible = "denx,u-boot-fdt-test"; + reg = <1>; + ping-expect = <7>; + ping-add = <7>; + }; }; d-test {