At present each device has two sequence numbers, with 'req_seq' being set up at bind time and 'seq' at probe time. The idea is that devices can 'request' a sequence number and then the conflicts are resolved when the device is probed.
This makes things complicated in a few cases, since we don't really know what the sequence number will end up being. We want to honour the bind-time requests if at all possible, but in fact the only source of these at present is the devicetree aliases. Since we have the devicetree available at bind time, we may as well just use it, in the hope that the required processing will turn out to be useful later (i.e. the device actually gets used).
Add a new 'sqq' member, the bind-time sequence number. It operates in parallel to the old values for now. All devices get a valid sqq value, i.e. it is never -1.
Drop an #ifdef while we are here.
Signed-off-by: Simon Glass sjg@chromium.org ---
drivers/core/device.c | 22 ++++++++++++----- drivers/core/root.c | 21 +++++++++++++--- drivers/core/uclass.c | 40 +++++++++++++++++++++++++++++++ include/asm-generic/global_data.h | 2 ++ include/dm/device.h | 8 +++++++ include/dm/uclass.h | 8 +++++++ 6 files changed, 92 insertions(+), 9 deletions(-)
diff --git a/drivers/core/device.c b/drivers/core/device.c index 5febdb67503..2f449b3e8fa 100644 --- a/drivers/core/device.c +++ b/drivers/core/device.c @@ -41,6 +41,7 @@ static int device_bind_common(struct udevice *parent, const struct driver *drv, struct udevice *dev; struct uclass *uc; int size, ret = 0; + bool auto_seq = false;
if (devp) *devp = NULL; @@ -73,6 +74,7 @@ static int device_bind_common(struct udevice *parent, const struct driver *drv,
dev->seq = -1; dev->req_seq = -1; + dev->sqq = -1; if (CONFIG_IS_ENABLED(DM_SEQ_ALIAS) && (uc->uc_drv->flags & DM_UC_FLAG_SEQ_ALIAS)) { /* @@ -84,16 +86,24 @@ static int device_bind_common(struct udevice *parent, const struct driver *drv, */ if (CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA)) { - if (uc->uc_drv->name && ofnode_valid(node)) + if (uc->uc_drv->name && ofnode_valid(node)) { + dev_read_alias_seq(dev, &dev->sqq); dev_read_alias_seq(dev, &dev->req_seq); -#if CONFIG_IS_ENABLED(OF_PRIOR_STAGE) - if (dev->req_seq == -1) - dev->req_seq = - uclass_find_next_free_req_seq(uc); -#endif + } + if (CONFIG_IS_ENABLED(OF_PRIOR_STAGE)) { + if (dev->req_seq == -1) { + auto_seq = true; + dev->req_seq = + uclass_find_next_free_req_seq( + uc); + } + } } else { + auto_seq = true; dev->req_seq = uclass_find_next_free_req_seq(uc); } + if (auto_seq && !(gd->flags & GD_FLG_DM_NO_SEQ)) + dev->sqq = uclass_find_next_free_req_seq(uc); }
if (drv->platdata_auto_alloc_size) { diff --git a/drivers/core/root.c b/drivers/core/root.c index 6f8168bb92d..66aabc4b19b 100644 --- a/drivers/core/root.c +++ b/drivers/core/root.c @@ -308,25 +308,40 @@ int dm_init_and_scan(bool pre_reloc_only) debug("dm_init() failed: %d\n", ret); return ret; } + gd->flags |= GD_FLG_DM_NO_SEQ; ret = dm_scan_platdata(pre_reloc_only); if (ret) { debug("dm_scan_platdata() failed: %d\n", ret); - return ret; + goto fail; }
if (CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA)) { ret = dm_extended_scan(pre_reloc_only); if (ret) { debug("dm_extended_scan() failed: %d\n", ret); - return ret; + goto fail; } }
ret = dm_scan_other(pre_reloc_only); if (ret) - return ret; + goto fail; + + /* + * Now that all the alisas have been used to claim sequence numbers, we + * can allocate every non-aliased device a sequence number + */ + uclass_alloc_all_seqs(); + + /* + * From now on, assign sequence numbers when binding, to ensure that + * every new device has a sequence number too + */ + gd->flags &= ~GD_FLG_DM_NO_SEQ;
return 0; +fail: + return ret; }
#ifdef CONFIG_ACPIGEN diff --git a/drivers/core/uclass.c b/drivers/core/uclass.c index cdf0674cd82..d4de88bfb57 100644 --- a/drivers/core/uclass.c +++ b/drivers/core/uclass.c @@ -288,6 +288,46 @@ int uclass_find_next_free_req_seq(struct uclass *uc) return max + 1; }
+static int uclass_find_first_free_seq(struct uclass *uc) +{ + struct udevice *dev; + bool in_use = true; + int cur; + + /* Increment cur until we get to a value not used in the devices */ + for (cur = 0; in_use;) { + in_use = false; + list_for_each_entry(dev, &uc->dev_head, uclass_node) { + if (dev->sqq == cur) { + in_use = true; + cur++; + break; + } + } + } + + return cur; +} + +static void uclass_alloc_seqs(struct uclass *uc) +{ + struct udevice *dev; + + list_for_each_entry(dev, &uc->dev_head, uclass_node) { + if (dev->sqq == -1) + dev->sqq = uclass_find_first_free_seq(uc); + } +} + +void uclass_alloc_all_seqs(void) +{ + struct uclass *uc; + + list_for_each_entry(uc, &gd->uclass_root, sibling_node) { + uclass_alloc_seqs(uc); + } +} + int uclass_find_device_by_seq(enum uclass_id id, int seq_or_req_seq, bool find_req_seq, struct udevice **devp) { diff --git a/include/asm-generic/global_data.h b/include/asm-generic/global_data.h index 87d827d0f43..0179567a2bb 100644 --- a/include/asm-generic/global_data.h +++ b/include/asm-generic/global_data.h @@ -547,6 +547,8 @@ enum gd_flags { * @GD_FLG_SMP_READY: SMP initialization is complete */ GD_FLG_SMP_READY = 0x40000, + /** @GD_FLG_DM_NO_SEQ: Don't assign devices a sequence number on bind */ + GD_FLG_DM_NO_SEQ = 0x80000, };
#endif /* __ASSEMBLY__ */ diff --git a/include/dm/device.h b/include/dm/device.h index 9a171e523f3..80cd0955362 100644 --- a/include/dm/device.h +++ b/include/dm/device.h @@ -131,6 +131,13 @@ enum { * @child_head: List of children of this device * @sibling_node: Next device in list of all devices * @flags: Flags for this device DM_FLAG_... + * @sqq: Allocated sequence number for this device (-1 = none). This is set up + * when the device is bound and is unique within the device's uclass. If the + * device has an alias in the devicetree then that is used to set the sequence + * number. Otherwise, the next available number is used. Sequence numbers are + * used by certain commands that need device to be numbered (e.g. 'mmc dev') + * + * The following two fields are deprecated: * @req_seq: Requested sequence number for this device (-1 = any) * @seq: Allocated sequence number for this device (-1 = none). This is set up * when the device is probed and will be unique within the device's uclass. @@ -156,6 +163,7 @@ struct udevice { struct list_head child_head; struct list_head sibling_node; uint32_t flags; + int sqq; int req_seq; int seq; #ifdef CONFIG_DEVRES diff --git a/include/dm/uclass.h b/include/dm/uclass.h index 71883043046..d1906236976 100644 --- a/include/dm/uclass.h +++ b/include/dm/uclass.h @@ -380,6 +380,14 @@ int uclass_first_device_drvdata(enum uclass_id id, ulong driver_data, */ int uclass_resolve_seq(struct udevice *dev);
+/** + * uclass_alloc_all_seqs() - Make sure that all devices have sequence numbers + * + * This updates any sequence numbers that are unallocated (set to -1) to the + * next available number in the uclass, above all existing numbers + */ +void uclass_alloc_all_seqs(void); + /** * uclass_id_foreach_dev() - Helper function to iteration through devices *