From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 37662C2D0A8 for ; Mon, 28 Sep 2020 23:13:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0039723A5A for ; Mon, 28 Sep 2020 23:13:22 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=mg.codeaurora.org header.i=@mg.codeaurora.org header.b="DIE/ZWig" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726338AbgI1XNW (ORCPT ); Mon, 28 Sep 2020 19:13:22 -0400 Received: from m42-4.mailgun.net ([69.72.42.4]:61694 "EHLO m42-4.mailgun.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726986AbgI1XNR (ORCPT ); Mon, 28 Sep 2020 19:13:17 -0400 DKIM-Signature: a=rsa-sha256; v=1; c=relaxed/relaxed; d=mg.codeaurora.org; q=dns/txt; s=smtp; t=1601334796; h=References: In-Reply-To: Message-Id: Date: Subject: Cc: To: From: Sender; bh=5ydwwoPH0vzMULKKAwDBo8+rkUZ/yDV80PlP9evcwY8=; b=DIE/ZWign6yorgtr8BWLYhhoNwugITc8tBDGpHD9gl3jLn6uibDAtBeydW1jE739Ep1mYJRN 9UbkhHWizJJJPlzWXQQpC+S0AYrKiYuqhHcWzXCzrEPYQOIVJMoguAqi7PXlQQL9pKRWu1b9 ClOgjwE2bdI/G7z7njaTce+VhQo= X-Mailgun-Sending-Ip: 69.72.42.4 X-Mailgun-Sid: WyI4ZWZiZiIsICJsaW51eC1yZW1vdGVwcm9jQHZnZXIua2VybmVsLm9yZyIsICJiZTllNGEiXQ== Received: from smtp.codeaurora.org (ec2-35-166-182-171.us-west-2.compute.amazonaws.com [35.166.182.171]) by smtp-out-n02.prod.us-east-1.postgun.com with SMTP id 5f726112cc21f6157ab96fe2 (version=TLS1.2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256); Mon, 28 Sep 2020 22:17:54 GMT Sender: rishabhb=codeaurora.org@mg.codeaurora.org Received: by smtp.codeaurora.org (Postfix, from userid 1001) id 56038C433CA; Mon, 28 Sep 2020 22:17:53 +0000 (UTC) Received: from rishabhb-linux.qualcomm.com (i-global254.qualcomm.com [199.106.103.254]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: rishabhb) by smtp.codeaurora.org (Postfix) with ESMTPSA id 49FFBC433FF; Mon, 28 Sep 2020 22:17:52 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 49FFBC433FF Authentication-Results: aws-us-west-2-caf-mail-1.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: aws-us-west-2-caf-mail-1.web.codeaurora.org; spf=fail smtp.mailfrom=rishabhb@codeaurora.org From: Rishabh Bhatnagar To: linux-remoteproc@vger.kernel.org, linux-kernel@vger.kernel.org, bjorn.andersson@linaro.org Cc: tsoni@codeaurora.org, psodagud@codeaurora.org, sidgup@codeaurora.org, Rishabh Bhatnagar Subject: [PATCH v6 2/3] remoteproc: Move recovery configuration to sysfs Date: Mon, 28 Sep 2020 15:17:35 -0700 Message-Id: <1601331456-20432-3-git-send-email-rishabhb@codeaurora.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1601331456-20432-1-git-send-email-rishabhb@codeaurora.org> References: <1601331456-20432-1-git-send-email-rishabhb@codeaurora.org> Precedence: bulk List-ID: X-Mailing-List: linux-remoteproc@vger.kernel.org Move recovery configuration from debugfs to sysfs.This will allow usage of this configuration feature in production devices where access to debugfs might be limited. Signed-off-by: Rishabh Bhatnagar --- Documentation/ABI/testing/sysfs-class-remoteproc | 20 ++++++ drivers/remoteproc/remoteproc_debugfs.c | 78 ------------------------ drivers/remoteproc/remoteproc_sysfs.c | 56 +++++++++++++++++ 3 files changed, 76 insertions(+), 78 deletions(-) diff --git a/Documentation/ABI/testing/sysfs-class-remoteproc b/Documentation/ABI/testing/sysfs-class-remoteproc index f6c44fa..7368b50 100644 --- a/Documentation/ABI/testing/sysfs-class-remoteproc +++ b/Documentation/ABI/testing/sysfs-class-remoteproc @@ -82,3 +82,23 @@ Description: Remote processor coredump configuration all data is read by usersapce. "disabled" means no dump will be collected. + +What: /sys/class/remoteproc/.../recovery +Date: July 2020 +Contact: Bjorn Andersson , Ohad Ben-Cohen +Description: Remote processor recovery mechanism + + Reports the recovery mechanism of the remote processor, + which will be one of: + + "enabled" + "disabled" + + "enabled" means, the remote processor will be automatically + recovered whenever it crashes. Moreover, if the remote + processor crashes while recovery is disabled, it will + be automatically recovered too as soon as recovery is enabled. + + "disabled" means, a remote processor will remain in a crashed + state if it crashes. This is useful for debugging purposes; + without it, debugging a crash is substantially harder. diff --git a/drivers/remoteproc/remoteproc_debugfs.c b/drivers/remoteproc/remoteproc_debugfs.c index 732770e..c505f0e 100644 --- a/drivers/remoteproc/remoteproc_debugfs.c +++ b/drivers/remoteproc/remoteproc_debugfs.c @@ -84,82 +84,6 @@ static const struct file_operations rproc_name_ops = { .llseek = generic_file_llseek, }; -/* expose recovery flag via debugfs */ -static ssize_t rproc_recovery_read(struct file *filp, char __user *userbuf, - size_t count, loff_t *ppos) -{ - struct rproc *rproc = filp->private_data; - char *buf = rproc->recovery_disabled ? "disabled\n" : "enabled\n"; - - return simple_read_from_buffer(userbuf, count, ppos, buf, strlen(buf)); -} - -/* - * By writing to the 'recovery' debugfs entry, we control the behavior of the - * recovery mechanism dynamically. The default value of this entry is "enabled". - * - * The 'recovery' debugfs entry supports these commands: - * - * enabled: When enabled, the remote processor will be automatically - * recovered whenever it crashes. Moreover, if the remote - * processor crashes while recovery is disabled, it will - * be automatically recovered too as soon as recovery is enabled. - * - * disabled: When disabled, a remote processor will remain in a crashed - * state if it crashes. This is useful for debugging purposes; - * without it, debugging a crash is substantially harder. - * - * recover: This function will trigger an immediate recovery if the - * remote processor is in a crashed state, without changing - * or checking the recovery state (enabled/disabled). - * This is useful during debugging sessions, when one expects - * additional crashes to happen after enabling recovery. In this - * case, enabling recovery will make it hard to debug subsequent - * crashes, so it's recommended to keep recovery disabled, and - * instead use the "recover" command as needed. - */ -static ssize_t -rproc_recovery_write(struct file *filp, const char __user *user_buf, - size_t count, loff_t *ppos) -{ - struct rproc *rproc = filp->private_data; - char buf[10]; - int ret; - - if (count < 1 || count > sizeof(buf)) - return -EINVAL; - - ret = copy_from_user(buf, user_buf, count); - if (ret) - return -EFAULT; - - /* remove end of line */ - if (buf[count - 1] == '\n') - buf[count - 1] = '\0'; - - if (!strncmp(buf, "enabled", count)) { - /* change the flag and begin the recovery process if needed */ - rproc->recovery_disabled = false; - rproc_trigger_recovery(rproc); - } else if (!strncmp(buf, "disabled", count)) { - rproc->recovery_disabled = true; - } else if (!strncmp(buf, "recover", count)) { - /* begin the recovery process without changing the flag */ - rproc_trigger_recovery(rproc); - } else { - return -EINVAL; - } - - return count; -} - -static const struct file_operations rproc_recovery_ops = { - .read = rproc_recovery_read, - .write = rproc_recovery_write, - .open = simple_open, - .llseek = generic_file_llseek, -}; - /* expose the crash trigger via debugfs */ static ssize_t rproc_crash_write(struct file *filp, const char __user *user_buf, @@ -329,8 +253,6 @@ void rproc_create_debug_dir(struct rproc *rproc) debugfs_create_file("name", 0400, rproc->dbg_dir, rproc, &rproc_name_ops); - debugfs_create_file("recovery", 0600, rproc->dbg_dir, - rproc, &rproc_recovery_ops); debugfs_create_file("crash", 0200, rproc->dbg_dir, rproc, &rproc_crash_ops); debugfs_create_file("resource_table", 0400, rproc->dbg_dir, diff --git a/drivers/remoteproc/remoteproc_sysfs.c b/drivers/remoteproc/remoteproc_sysfs.c index 2a44571..e60a014 100644 --- a/drivers/remoteproc/remoteproc_sysfs.c +++ b/drivers/remoteproc/remoteproc_sysfs.c @@ -10,6 +10,61 @@ #define to_rproc(d) container_of(d, struct rproc, dev) +static ssize_t recovery_show(struct device *dev, + struct device_attribute *attr, char *buf) +{ + struct rproc *rproc = to_rproc(dev); + + return sprintf(buf, "%s", rproc->recovery_disabled ? "disabled\n" : "enabled\n"); +} + +/* + * By writing to the 'recovery' sysfs entry, we control the behavior of the + * recovery mechanism dynamically. The default value of this entry is "enabled". + * + * The 'recovery' sysfs entry supports these commands: + * + * enabled: When enabled, the remote processor will be automatically + * recovered whenever it crashes. Moreover, if the remote + * processor crashes while recovery is disabled, it will + * be automatically recovered too as soon as recovery is enabled. + * + * disabled: When disabled, a remote processor will remain in a crashed + * state if it crashes. This is useful for debugging purposes; + * without it, debugging a crash is substantially harder. + * + * recover: This function will trigger an immediate recovery if the + * remote processor is in a crashed state, without changing + * or checking the recovery state (enabled/disabled). + * This is useful during debugging sessions, when one expects + * additional crashes to happen after enabling recovery. In this + * case, enabling recovery will make it hard to debug subsequent + * crashes, so it's recommended to keep recovery disabled, and + * instead use the "recover" command as needed. + */ +static ssize_t recovery_store(struct device *dev, + struct device_attribute *attr, + const char *buf, size_t count) +{ + struct rproc *rproc = to_rproc(dev); + + if (sysfs_streq(buf, "enabled")) { + /* change the flag and begin the recovery process if needed */ + rproc->recovery_disabled = false; + rproc_trigger_recovery(rproc); + } else if (sysfs_streq(buf, "disabled")) { + rproc->recovery_disabled = true; + } else if (sysfs_streq(buf, "recover")) { + /* begin the recovery process without changing the flag */ + rproc_trigger_recovery(rproc); + } else { + return -EINVAL; + } + + return count; +} +static DEVICE_ATTR_RW(recovery); + /* * A coredump-configuration-to-string lookup table, for exposing a * human readable configuration via sysfs. Always keep in sync with @@ -202,6 +257,7 @@ static DEVICE_ATTR_RO(name); static struct attribute *rproc_attrs[] = { &dev_attr_coredump.attr, + &dev_attr_recovery.attr, &dev_attr_firmware.attr, &dev_attr_state.attr, &dev_attr_name.attr, -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project