From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-dy1-f182.google.com (mail-dy1-f182.google.com [74.125.82.182]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7E96E3B38B1 for ; Thu, 12 Mar 2026 21:12:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.182 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773349930; cv=none; b=r/X1WUOkZ/V6zyZ4Q2M+r3OQd8PTmpzUMKw8cVvVlkSQ3auoBQjlA2iRSf/Bwi4soNiOo/Cy/D/139i3tvbrhw7jZiO7EJxGi/7seZi6p+Gmar3iLn8rGMUvGv/Iurhwc2TyA0Zo+ltmyFH2EbaGA8NkbhzUDM0CL9jFeRBzUgw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773349930; c=relaxed/simple; bh=5b/6GD002MR+eoOsPs5DQxi2rxO2VnEEpDkYvEKDilU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=GCE75itbj8R/KPmSXMz7SEDJdqwFLI9YMn633FvLRbKRo1e6cNd+TbUQ0JEPeitw8HBwNswGiAS4QcD2ozLjQKetHcIBcwRKxNWxMTO7gZ1vCRONV7P8NgPhjjC5qZCT8sICNx2dhmnaKGa65TdeeDR41sHtB4jaC1MHy7x0/78= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=Qyafq9VP; arc=none smtp.client-ip=74.125.82.182 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Qyafq9VP" Received: by mail-dy1-f182.google.com with SMTP id 5a478bee46e88-2bea8220c38so295243eec.1 for ; Thu, 12 Mar 2026 14:12:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1773349922; x=1773954722; darn=lists.linux.dev; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=QCcxD94e+pZHMn3iBx4K7NeqBTodfkJrHpwmp+Hbtls=; b=Qyafq9VPlIK3P3Sv1c5aVgDqLzKUlt9WylxEH0YNmahPVUrzckCNnJ4yfpQzTF9OS4 p5c28BmJ81ByaZmcIG4wGhbSuYqJcu0s0njUCelu27E5cTOinNKZ+i+LibrnKDUdnUot t/ndI/ee8CoI6s9V5AGHOQpccY3Ua/lKd+BbhE/X9yIyXaUaDneJklQiDhpgOKxOJmwX OGwa40ETUlwINja4dzyEox150BDR+dGmo+D6wS3HP+EXR/oPf1li26weB+4wPukdQNBe cCrXPBeRpOjRlWmEItU0NzdxZ3KUBJc7QUPBJMha3TyURiI6hV/sCA7Ed2Mp89YemsMx FXgQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773349922; x=1773954722; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=QCcxD94e+pZHMn3iBx4K7NeqBTodfkJrHpwmp+Hbtls=; b=Ru9umFOsfPJS83mKHG2QHwJGjGlcoZsvfSfnD0jtSi4a/SJmm1qssjN4euUFG1XOd4 eKDOdIB1jjX6IT/YBvBK7DXBvW4L5QE0FgZWyS8FczpnKadmqV6ie7iiJ33bn2zBHj8/ Gev4Ekz1KQvMta9JwVuV/AR0wtiivehf/UiZOPqNiYexnMseA+uDP/0weSjIIaJbr6zh WW/4XklIN1f2xK0CZRgb3f5EwwuZ9y9uNmNJIoQRTysWamaa/pg4ewoblDPqgstVRxZr iVNhtDw2CMdvV4FVAOXnGQduc+kyn2Po7H9NzUl5QrLdCVTPJoLoihRCKmiV5NBWaBLt VRSg== X-Gm-Message-State: AOJu0YwrTd5/ZJzQmeTSAx7YE9Yzo6Mo3uEZMimX86gT7Zrx31rl+3iD C18yujVaTE5+BE6jTJs0RGfLFw9DO2aikzvxFe2PJK1i18XDTr0jAzy8 X-Gm-Gg: ATEYQzyCM1bwDzcRn9VNkIU3wd6i5iEoDLXrlFI3eqzlnoLkfSpAohUgZybcQmMNLcc Kuf3MpP4HztCNmDDG3De8PEJFHrPlKCfUSf9+3Z3MpGmR27Wf0eUxsn9QMVdD9ZzmM96vFwI+0U HiL/MiZ2IVnCuWDtoZQuwYMKP6hDR5A7eAYyf8W61lGjPPkBItkMQyn9fKjSJpnD1n9VY1PIFO4 tvKwqPG8bqkA4paOmpECBRGvHmChiOWpu3wGv8IEnXxSLdOLPeiPubpRr8R8gK7itjzW1clgIwA YRTe1LETb+LQQpRseOmB6iSqMhJdah5jPgWd47rOgIeix2ZhkBJcnmWwXqDObJtrGrGBkS2FDlV ndqXozNF11d+FIhZhH6znBzbMSabg73r5H+KyPhlgFZfaL+X1+Q5GicosdJUH8b2gFcBD3q2au7 3LUfbmfrLHd02myoFtkQRAS8Ni5MJ96CFZN9aPyiP1Y7A= X-Received: by 2002:a05:7300:2389:b0:2be:617:2dec with SMTP id 5a478bee46e88-2bea54973f3mr548232eec.17.1773349922061; Thu, 12 Mar 2026 14:12:02 -0700 (PDT) Received: from localhost.localdomain ([2804:d59:7f1c:1e00:6632:a8ff:fea4:c8d3]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-2be8a83514asm8422272eec.4.2026.03.12.14.11.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Mar 2026 14:12:01 -0700 (PDT) From: Gustavo Arantes To: gregkh@linuxfoundation.org, marvin24@gmx.de Cc: linux-staging@lists.linux.dev, ac100@lists.launchpad.net, linux-tegra@vger.kernel.org, linux-kernel@vger.kernel.org, dev.gustavoa@gmail.com Subject: [PATCH 1/2] staging: nvec_power: make EC queries synchronous Date: Thu, 12 Mar 2026 18:11:50 -0300 Message-ID: <20260312211151.85379-2-dev.gustavoa@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260312211151.85379-1-dev.gustavoa@gmail.com> References: <20260312211151.85379-1-dev.gustavoa@gmail.com> Precedence: bulk X-Mailing-List: linux-staging@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit The nvec power driver still submits its periodic AC and battery queries, as well as the battery metadata requests, asynchronously. That leaves it with several independent request sources and makes it hard to quiesce the driver cleanly before system sleep. Add a small core helper to feed a synchronous reply back through the normal NVEC message parser, then switch nvec_power over to synchronous queries. Move the battery metadata requests out of the notifier callback into a worker so they can use the same synchronous path. This keeps the existing notifier-based state updates intact while serializing the driver's EC traffic. Signed-off-by: Gustavo Arantes --- drivers/staging/nvec/nvec.c | 7 ++-- drivers/staging/nvec/nvec.h | 2 + drivers/staging/nvec/nvec_power.c | 70 ++++++++++++++++++++++++------- 3 files changed, 61 insertions(+), 18 deletions(-) diff --git a/drivers/staging/nvec/nvec.c b/drivers/staging/nvec/nvec.c index 952c5a849a56..cb1d92769941 100644 --- a/drivers/staging/nvec/nvec.c +++ b/drivers/staging/nvec/nvec.c @@ -408,14 +408,14 @@ static void nvec_request_master(struct work_struct *work) } /** - * parse_msg - Print some information and call the notifiers on an RX message + * nvec_msg_parse - Print some information and call the notifiers on an RX message * @nvec: A &struct nvec_chip * @msg: A message received by @nvec * * Paarse some pieces of the message and then call the chain of notifiers * registered via nvec_register_notifier. */ -static int parse_msg(struct nvec_chip *nvec, struct nvec_msg *msg) +int nvec_msg_parse(struct nvec_chip *nvec, struct nvec_msg *msg) { if ((msg->data[0] & 1 << 7) == 0 && msg->data[3]) { dev_err(nvec->dev, "ec responded %*ph\n", 4, msg->data); @@ -432,6 +432,7 @@ static int parse_msg(struct nvec_chip *nvec, struct nvec_msg *msg) return 0; } +EXPORT_SYMBOL_GPL(nvec_msg_parse); /** * nvec_dispatch - Process messages received from the EC @@ -459,7 +460,7 @@ static void nvec_dispatch(struct work_struct *work) nvec->last_sync_msg = msg; complete(&nvec->sync_write); } else { - parse_msg(nvec, msg); + nvec_msg_parse(nvec, msg); nvec_msg_free(nvec, msg); } spin_lock_irqsave(&nvec->rx_lock, flags); diff --git a/drivers/staging/nvec/nvec.h b/drivers/staging/nvec/nvec.h index 80c0353f141c..d6854c9d629d 100644 --- a/drivers/staging/nvec/nvec.h +++ b/drivers/staging/nvec/nvec.h @@ -168,6 +168,8 @@ int nvec_write_sync(struct nvec_chip *nvec, const unsigned char *data, short size, struct nvec_msg **msg); +int nvec_msg_parse(struct nvec_chip *nvec, struct nvec_msg *msg); + int nvec_register_notifier(struct nvec_chip *nvec, struct notifier_block *nb, unsigned int events); diff --git a/drivers/staging/nvec/nvec_power.c b/drivers/staging/nvec/nvec_power.c index 2faab9fdedef..6b3235f41d07 100644 --- a/drivers/staging/nvec/nvec_power.c +++ b/drivers/staging/nvec/nvec_power.c @@ -23,6 +23,7 @@ struct nvec_power { struct notifier_block notifier; struct delayed_work poller; + struct work_struct bat_init; struct nvec_chip *nvec; int on; int bat_present; @@ -106,14 +107,38 @@ static const int bat_init[] = { MANUFACTURER, MODEL, TYPE, }; -static void get_bat_mfg_data(struct nvec_power *power) +static int nvec_power_write_sync(struct nvec_power *power, + unsigned char *buf, short size) { + struct nvec_msg *msg; + int ret; + + ret = nvec_write_sync(power->nvec, buf, size, &msg); + if (ret < 0) + return ret; + + nvec_msg_parse(power->nvec, msg); + nvec_msg_free(power->nvec, msg); + + return 0; +} + +static void nvec_power_bat_init(struct work_struct *work) +{ + struct nvec_power *power = container_of(work, struct nvec_power, + bat_init); + unsigned char buf[] = { NVEC_BAT, 0 }; int i; - char buf[] = { NVEC_BAT, SLOT_STATUS }; + int ret; for (i = 0; i < ARRAY_SIZE(bat_init); i++) { buf[1] = bat_init[i]; - nvec_write_async(power->nvec, buf, 2); + + ret = nvec_power_write_sync(power, buf, sizeof(buf)); + if (ret < 0) + dev_warn(power->nvec->dev, + "failed to query battery data %u: %d\n", + bat_init[i], ret); } } @@ -133,7 +158,7 @@ static int nvec_power_bat_notifier(struct notifier_block *nb, if (res->plc[0] & 1) { if (power->bat_present == 0) { status_changed = 1; - get_bat_mfg_data(power); + schedule_work(&power->bat_init); } power->bat_present = 1; @@ -347,15 +372,19 @@ static const int bat_iter[] = { static void nvec_power_poll(struct work_struct *work) { - char buf[] = { NVEC_SYS, GET_SYSTEM_STATUS }; + unsigned char buf[] = { NVEC_SYS, GET_SYSTEM_STATUS }; struct nvec_power *power = container_of(work, struct nvec_power, - poller.work); + poller.work); + int ret; if (counter >= ARRAY_SIZE(bat_iter)) counter = 0; /* AC status via sys req */ - nvec_write_async(power->nvec, buf, 2); + ret = nvec_power_write_sync(power, buf, sizeof(buf)); + if (ret < 0) + dev_warn(power->nvec->dev, + "failed to query AC status: %d\n", ret); msleep(100); /* @@ -364,7 +393,10 @@ static void nvec_power_poll(struct work_struct *work) */ buf[0] = NVEC_BAT; buf[1] = bat_iter[counter++]; - nvec_write_async(power->nvec, buf, 2); + ret = nvec_power_write_sync(power, buf, sizeof(buf)); + if (ret < 0) + dev_warn(power->nvec->dev, + "failed to query battery status: %d\n", ret); schedule_delayed_work(to_delayed_work(work), msecs_to_jiffies(5000)); }; @@ -394,13 +426,13 @@ static int nvec_power_probe(struct platform_device *pdev) power->notifier.notifier_call = nvec_power_notifier; INIT_DELAYED_WORK(&power->poller, nvec_power_poll); - schedule_delayed_work(&power->poller, msecs_to_jiffies(5000)); break; case BAT: psy = &nvec_bat_psy; psy_desc = &nvec_bat_psy_desc; power->notifier.notifier_call = nvec_power_bat_notifier; + INIT_WORK(&power->bat_init, nvec_power_bat_init); break; default: return -ENODEV; @@ -408,25 +440,33 @@ static int nvec_power_probe(struct platform_device *pdev) nvec_register_notifier(nvec, &power->notifier, NVEC_SYS); - if (pdev->id == BAT) - get_bat_mfg_data(power); - *psy = power_supply_register(&pdev->dev, psy_desc, &psy_cfg); - return PTR_ERR_OR_ZERO(*psy); + if (IS_ERR(*psy)) { + nvec_unregister_notifier(nvec, &power->notifier); + return PTR_ERR(*psy); + } + + if (pdev->id == AC) + schedule_delayed_work(&power->poller, msecs_to_jiffies(5000)); + else + schedule_work(&power->bat_init); + + return 0; } static void nvec_power_remove(struct platform_device *pdev) { struct nvec_power *power = platform_get_drvdata(pdev); - cancel_delayed_work_sync(&power->poller); nvec_unregister_notifier(power->nvec, &power->notifier); switch (pdev->id) { case AC: + cancel_delayed_work_sync(&power->poller); power_supply_unregister(nvec_psy); break; case BAT: + cancel_work_sync(&power->bat_init); power_supply_unregister(nvec_bat_psy); } } @@ -435,7 +475,7 @@ static struct platform_driver nvec_power_driver = { .probe = nvec_power_probe, .remove = nvec_power_remove, .driver = { - .name = "nvec-power", + .name = "nvec-power", } }; -- 2.53.0