From nobody Tue Sep 9 12:06:36 2025 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 6C0C7C64ED8 for ; Fri, 24 Feb 2023 07:05:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229643AbjBXHFW (ORCPT ); Fri, 24 Feb 2023 02:05:22 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54574 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229746AbjBXHFR (ORCPT ); Fri, 24 Feb 2023 02:05:17 -0500 Received: from mail-yw1-x114a.google.com (mail-yw1-x114a.google.com [IPv6:2607:f8b0:4864:20::114a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5823112BEA for ; Thu, 23 Feb 2023 23:05:13 -0800 (PST) Received: by mail-yw1-x114a.google.com with SMTP id 00721157ae682-536be78056eso170520347b3.1 for ; Thu, 23 Feb 2023 23:05:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=+l/gP+iysqsRB43duh9kZBtRtq2LAAnIWFg2+WPan3g=; b=tKcK63JCvyHP6aNIn2Nj1rJm0q9cxOHq4V6Iler+RDxxKJLit2PtpGCgFjpyQWp+7Y lrC/n+V5jBAPtWnGtRVJrXagNs2VEw/yYnlBjo96u7Lyi59lMiWxRzjXRCu0uoYMYjnj R9CLDF7NDek6Aa2iHh6zQ3RwHoj3Ir73i+3rP9pkwrXNm0q5qO55mS3yr0CfZSEUO4// mpQeMUQPS0ish9GA5I7D36Kk6vvFUuJ9bcOXCV3snvoaCE1rxnRqk5TNLFcS7DQQqLU+ A91SY4AspGe8Q3oNXJNALZiz1wy1EeyxeNjIb8dmLQwmvg+TCa772SuFnZSMKdu144ff qJaw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=+l/gP+iysqsRB43duh9kZBtRtq2LAAnIWFg2+WPan3g=; b=udYFqGGqRuUN0EA5NeV4iaxoyQ3rggCRXpyylcxnNRP4a07q7lLF2AbPXLyHkyRoym 0+A6aFBWy4je+XQAl7quH03jJ3lBHyEaIVgyXaI8f4MlMQixq0DKyWR61bBlKo/fsbt1 5yt+XKJ5mfkX3qMmR6PsaNVE/ZoLjoUX2y66skhoMhJOgEpewBEAW5DtpfDi4MvHNC8Z 4cyQcfl5wKDrYE1OR/siD1DD8Y4wYM+cz3RRMwT1drjITENUmj9xIDplwerwZ9VOmqJU MX4Gwk16fGNai2C6GdOgwPT7sb8Rujc4a+7W/wR8RV4jqZjMfAmX8xv2AXpOWByEfi4W /mhQ== X-Gm-Message-State: AO0yUKW2RcC0jASj4yrUa0whBssXCFQYpH29GB0Ery0bN0Yi/Dy9cBHl Jmz4EblYyWh6SeK6/P0ArZfouJo0tEJ/mtQ= X-Google-Smtp-Source: AK7set/AEl/qdaXCnJyTf3ldjNvJ9jpRjl9vHLc1DehB3WZkwKF3/cc/isZ5YdYM/GaHCvRWJXk4SNXA5+jx+1U= X-Received: from saravanak.san.corp.google.com ([2620:15c:2d:3:8a2e:9303:e359:c4d6]) (user=saravanak job=sendgmr) by 2002:a05:6902:1449:b0:a06:538f:265f with SMTP id a9-20020a056902144900b00a06538f265fmr4528972ybv.4.1677222312599; Thu, 23 Feb 2023 23:05:12 -0800 (PST) Date: Thu, 23 Feb 2023 23:05:03 -0800 In-Reply-To: <20230224070506.4157738-1-saravanak@google.com> Message-Id: <20230224070506.4157738-2-saravanak@google.com> Mime-Version: 1.0 References: <20230224070506.4157738-1-saravanak@google.com> X-Mailer: git-send-email 2.39.2.637.g21b0678d19-goog Subject: [PATCH v1 1/2] driver core: Add fw_devlink.sync_state command line param From: Saravana Kannan To: Jonathan Corbet , Greg Kroah-Hartman , "Rafael J. Wysocki" Cc: Saravana Kannan , Abel Vesa , Bjorn Andersson , Dmitry Baryshkov , Doug Anderson , Matthias Kaehlcke , kernel-team@android.com, linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" When all devices that could probe have finished probing, this parameter controls what to do with devices that haven't yet received their sync_state() calls. fw_devlink.sync_state=3Dstrict is the default and the driver core will continue waiting on consumers to probe successfully in the future. This is the default behavior since calling sync_state() when all the consumers haven't probed could make some systems unusable/unstable. fw_devlink.sync_state=3Dtimeout will cause the driver core to give up waiting on consumers and call sync_state() on any devices that haven't yet received their sync_state() calls. This option is provided for systems that won't become unusable/unstable as they might be able to save power (depends on state of hardware before kernel starts) if all devices get their sync_state(). Signed-off-by: Saravana Kannan --- .../admin-guide/kernel-parameters.txt | 12 ++++ drivers/base/base.h | 1 + drivers/base/core.c | 58 +++++++++++++++++++ drivers/base/dd.c | 6 ++ 4 files changed, 77 insertions(+) diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentatio= n/admin-guide/kernel-parameters.txt index 6cfa6e3996cf..f0bf2f40af64 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt @@ -1594,6 +1594,18 @@ dependencies. This only applies for fw_devlink=3Don|rpm. Format: =20 + fw_devlink.sync_state =3D + [KNL] When all devices that could probe have finished + probing, this parameter controls what to do with + devices that haven't yet received their sync_state() + calls. + Format: { strict | timeout } + strict -- Default. Continue waiting on consumers to + probe successfully. + timeout -- Give up waiting on consumers and call + sync_state() on any devices that haven't yet + received their sync_state() calls. + gamecon.map[2|3]=3D [HW,JOY] Multisystem joystick and NES/SNES/PSX pad support via parallel port (up to 5 devices per port) diff --git a/drivers/base/base.h b/drivers/base/base.h index 726a12a244c0..6fcd71803d35 100644 --- a/drivers/base/base.h +++ b/drivers/base/base.h @@ -209,6 +209,7 @@ extern void device_links_no_driver(struct device *dev); extern bool device_links_busy(struct device *dev); extern void device_links_unbind_consumers(struct device *dev); extern void fw_devlink_drivers_done(void); +extern void fw_devlink_probing_done(void); =20 /* device pm support */ void device_pm_move_to_tail(struct device *dev); diff --git a/drivers/base/core.c b/drivers/base/core.c index f9297c68214a..929ec218f180 100644 --- a/drivers/base/core.c +++ b/drivers/base/core.c @@ -1727,6 +1727,26 @@ static int __init fw_devlink_strict_setup(char *arg) } early_param("fw_devlink.strict", fw_devlink_strict_setup); =20 +#define FW_DEVLINK_SYNC_STATE_STRICT 0 +#define FW_DEVLINK_SYNC_STATE_TIMEOUT 1 + +static int fw_devlink_sync_state; +static int __init fw_devlink_sync_state_setup(char *arg) +{ + if (!arg) + return -EINVAL; + + if (strcmp(arg, "strict") =3D=3D 0) { + fw_devlink_sync_state =3D FW_DEVLINK_SYNC_STATE_STRICT; + return 0; + } else if (strcmp(arg, "timeout") =3D=3D 0) { + fw_devlink_sync_state =3D FW_DEVLINK_SYNC_STATE_TIMEOUT; + return 0; + } + return -EINVAL; +} +early_param("fw_devlink.sync_state", fw_devlink_sync_state_setup); + static inline u32 fw_devlink_get_flags(u8 fwlink_flags) { if (fwlink_flags & FWLINK_FLAG_CYCLE) @@ -1797,6 +1817,44 @@ void fw_devlink_drivers_done(void) device_links_write_unlock(); } =20 +static int fw_devlink_dev_sync_state(struct device *dev, void *data) +{ + struct device_link *link =3D to_devlink(dev); + struct device *sup =3D link->supplier; + + if (!(link->flags & DL_FLAG_MANAGED) || + link->status =3D=3D DL_STATE_ACTIVE || sup->state_synced || + !dev_has_sync_state(sup)) + return 0; + + if (fw_devlink_sync_state =3D=3D FW_DEVLINK_SYNC_STATE_STRICT) { + dev_warn(sup, "sync_state() pending due to %s\n", + dev_name(link->consumer)); + return 0; + } + + if (!list_empty(&sup->links.defer_sync)) + return 0; + + dev_warn(sup, "Timed out. Calling sync_state()\n"); + sup->state_synced =3D true; + get_device(sup); + list_add_tail(&sup->links.defer_sync, data); + + return 0; +} + +void fw_devlink_probing_done(void) +{ + LIST_HEAD(sync_list); + + device_links_write_lock(); + class_for_each_device(&devlink_class, NULL, &sync_list, + fw_devlink_dev_sync_state); + device_links_write_unlock(); + device_links_flush_sync_list(&sync_list, NULL); +} + /** * wait_for_init_devices_probe - Try to probe any device needed for init * diff --git a/drivers/base/dd.c b/drivers/base/dd.c index 8def2ba08a82..84f07e0050dd 100644 --- a/drivers/base/dd.c +++ b/drivers/base/dd.c @@ -315,6 +315,8 @@ static void deferred_probe_timeout_work_func(struct wor= k_struct *work) list_for_each_entry(p, &deferred_probe_pending_list, deferred_probe) dev_info(p->device, "deferred probe pending\n"); mutex_unlock(&deferred_probe_mutex); + + fw_devlink_probing_done(); } static DECLARE_DELAYED_WORK(deferred_probe_timeout_work, deferred_probe_ti= meout_work_func); =20 @@ -364,6 +366,10 @@ static int deferred_probe_initcall(void) schedule_delayed_work(&deferred_probe_timeout_work, driver_deferred_probe_timeout * HZ); } + + if (!IS_ENABLED(CONFIG_MODULES)) + fw_devlink_probing_done(); + return 0; } late_initcall(deferred_probe_initcall); --=20 2.39.2.637.g21b0678d19-goog From nobody Tue Sep 9 12:06:36 2025 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 D4E4CC677F1 for ; Fri, 24 Feb 2023 07:05:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229771AbjBXHF0 (ORCPT ); Fri, 24 Feb 2023 02:05:26 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54558 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229454AbjBXHFS (ORCPT ); Fri, 24 Feb 2023 02:05:18 -0500 Received: from mail-yw1-x114a.google.com (mail-yw1-x114a.google.com [IPv6:2607:f8b0:4864:20::114a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5EDC361EF9 for ; Thu, 23 Feb 2023 23:05:16 -0800 (PST) Received: by mail-yw1-x114a.google.com with SMTP id 00721157ae682-536a545bfbaso192210277b3.20 for ; Thu, 23 Feb 2023 23:05:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=boN8GR+RC2zBXUFGY3OBay8cFyH3d1pnu8yUsPsz3UU=; b=Lzu4FZ/2+IAFgD3r2mu4VrNMIWJ/M20IXsMptzTfTL3RQ96fOc8JTZ+X85JOAGW29g tFTdVZ9mBY3fqh9dvEkz4O8NzcBgunII/lKVEwJnKemFPnQ6oQ1vI00WhLPJcgpMTe1G ILyuFtghlKUwXabXKfzhkcp2SJJzrPRvCV+O7kG0F4ljk8G23ocKoxDM6UWQfffNNbR0 lFLzIR4dL523V7FHew/eTBbEonBLNHfktmidC8grkjjusUUWnoMSL0OJ9qIlgx/jcb/H OBwaMfhiYLb+OWlXZYJoCYxNPOvoTH1zDxjmGd1D9GyY6t6Rw9V2eR8XfyPSF53MpUWb rLog== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=boN8GR+RC2zBXUFGY3OBay8cFyH3d1pnu8yUsPsz3UU=; b=hUy69hKiOFd/m5TLGFwYEeG4Gs4uZBdSmyz2EyS0mC+JBu6Q44h0yvpYVt2YGKYn+2 eIrn3RMPVqr1CtHbIPHY9fj05j0EfPG7p2H5LIUQ80PZ7PjOvWh+LmmcNoZE8UCuxyjL dlCrl0jGVCdNr4QDD4+D7OmWd454mRTT6nt6jjQ/egXNgvP9bbZOvaMTHYrhCYNyMbN/ N+gngHJaTERVp9M6edGfQ79MQIGLKK4nUp6PvnsaTABKxcVnp5AtjVb0WygMM5dlPjrX Cb+7AxjykcmlaPuXFG2cgjwa+gWHTeJzwIbHWckcHUDVOQyPHpmY6ja+hwkDdwqBw3LL DFpg== X-Gm-Message-State: AO0yUKXsbCTtBksJ1HKdAWcbd6ovjGGEXA1+PUvho8lisVxUX4YaXr6W vb+LY0N4JVxM6qTbxVobDG0RXiFKYIQTxWI= X-Google-Smtp-Source: AK7set+BFvw5AwfqVRQ9cgZZnPmX0Eeckvjo9wYvrimg+TyWEhj7vRVu5PuhKnh+Iiy+/m2WRi2HHd/VpXS6pkU= X-Received: from saravanak.san.corp.google.com ([2620:15c:2d:3:8a2e:9303:e359:c4d6]) (user=saravanak job=sendgmr) by 2002:a81:a784:0:b0:52e:ce9e:f0a4 with SMTP id e126-20020a81a784000000b0052ece9ef0a4mr4054788ywh.1.1677222315686; Thu, 23 Feb 2023 23:05:15 -0800 (PST) Date: Thu, 23 Feb 2023 23:05:04 -0800 In-Reply-To: <20230224070506.4157738-1-saravanak@google.com> Message-Id: <20230224070506.4157738-3-saravanak@google.com> Mime-Version: 1.0 References: <20230224070506.4157738-1-saravanak@google.com> X-Mailer: git-send-email 2.39.2.637.g21b0678d19-goog Subject: [PATCH v1 2/2] driver core: Make state_synced device attribute writeable From: Saravana Kannan To: Jonathan Corbet , Greg Kroah-Hartman , "Rafael J. Wysocki" Cc: Saravana Kannan , Abel Vesa , Bjorn Andersson , Dmitry Baryshkov , Doug Anderson , Matthias Kaehlcke , kernel-team@android.com, linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" If the file is written to and sync_state() hasn't been called for the device yet, then call sync_state() for the device independent of the state of its consumers. This is useful for supplier devices that have one or more consumers that don't have a driver but the consumers are in a state that don't use the resources supplied by the supplier device. This gives finer grained control than using the fw_devlink.sync_state=3Dtimeout kernel commandline parameter. Signed-off-by: Saravana Kannan --- .../ABI/testing/sysfs-devices-state_synced | 5 +++++ drivers/base/base.h | 8 ++++++++ drivers/base/core.c | 5 +---- drivers/base/dd.c | 18 +++++++++++++++++- 4 files changed, 31 insertions(+), 5 deletions(-) diff --git a/Documentation/ABI/testing/sysfs-devices-state_synced b/Documen= tation/ABI/testing/sysfs-devices-state_synced index 0c922d7d02fc..cc4090c9df75 100644 --- a/Documentation/ABI/testing/sysfs-devices-state_synced +++ b/Documentation/ABI/testing/sysfs-devices-state_synced @@ -21,4 +21,9 @@ Description: at the time the kernel starts are not affected or limited in any way by sync_state() callbacks. =20 + Writing anything to this file will force a call to the device's + sync_state() function if it hasn't been called already. The + sync_state() call happens is independent of the state of the + consumer devices. + =20 diff --git a/drivers/base/base.h b/drivers/base/base.h index 6fcd71803d35..b055eba1ec30 100644 --- a/drivers/base/base.h +++ b/drivers/base/base.h @@ -164,6 +164,14 @@ static inline int driver_match_device(struct device_dr= iver *drv, return drv->bus->match ? drv->bus->match(dev, drv) : 1; } =20 +static inline void dev_sync_state(struct device *dev) +{ + if (dev->bus->sync_state) + dev->bus->sync_state(dev); + else if (dev->driver && dev->driver->sync_state) + dev->driver->sync_state(dev); +} + extern int driver_add_groups(struct device_driver *drv, const struct attribute_group **groups); extern void driver_remove_groups(struct device_driver *drv, diff --git a/drivers/base/core.c b/drivers/base/core.c index 929ec218f180..60bb3551977b 100644 --- a/drivers/base/core.c +++ b/drivers/base/core.c @@ -1215,10 +1215,7 @@ static void device_links_flush_sync_list(struct list= _head *list, if (dev !=3D dont_lock_dev) device_lock(dev); =20 - if (dev->bus->sync_state) - dev->bus->sync_state(dev); - else if (dev->driver && dev->driver->sync_state) - dev->driver->sync_state(dev); + dev_sync_state(dev); =20 if (dev !=3D dont_lock_dev) device_unlock(dev); diff --git a/drivers/base/dd.c b/drivers/base/dd.c index 84f07e0050dd..17b51573f794 100644 --- a/drivers/base/dd.c +++ b/drivers/base/dd.c @@ -510,6 +510,22 @@ EXPORT_SYMBOL_GPL(device_bind_driver); static atomic_t probe_count =3D ATOMIC_INIT(0); static DECLARE_WAIT_QUEUE_HEAD(probe_waitqueue); =20 +static ssize_t state_synced_store(struct device *dev, + struct device_attribute *attr, + const char *buf, size_t count) +{ + device_lock(dev); + if (!dev->state_synced) { + dev->state_synced =3D true; + dev_sync_state(dev); + } else { + count =3D -EINVAL; + } + device_unlock(dev); + + return count; +} + static ssize_t state_synced_show(struct device *dev, struct device_attribute *attr, char *buf) { @@ -521,7 +537,7 @@ static ssize_t state_synced_show(struct device *dev, =20 return sysfs_emit(buf, "%u\n", val); } -static DEVICE_ATTR_RO(state_synced); +static DEVICE_ATTR_RW(state_synced); =20 static void device_unbind_cleanup(struct device *dev) { --=20 2.39.2.637.g21b0678d19-goog