From patchwork Tue May 15 20:53:43 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Elder X-Patchwork-Id: 135930 Delivered-To: patch@linaro.org Received: by 2002:a2e:9706:0:0:0:0:0 with SMTP id r6-v6csp27643lji; Tue, 15 May 2018 13:54:07 -0700 (PDT) X-Google-Smtp-Source: AB8JxZokFwHZrfVxqbu3ftQqlwGRCfWlACOjtr7LPGj9iTJik6/UCRiUE2olFfnW8QDd5NOhicOd X-Received: by 2002:a62:3ec2:: with SMTP id y63-v6mr16836276pfj.102.1526417647143; Tue, 15 May 2018 13:54:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1526417647; cv=none; d=google.com; s=arc-20160816; b=lF7YFNbYXGD0+f75o7vqOi9wurXNhVZhT+O5taansBCUgZH0a4GiLmchQR4/9b7J4B TwGubdJ89u0AcrxIHdU0AaufL+Cc/WIDv+kHvgPwZflumzZAoyxiPVB3Vnmv9YnQIddN CnoWz+QxUWZMhdrhm/eb58PKIugFsaFj6yP9MymoiGuXaxZJPONIrOpVyAp7Kw8RK3ze SBHitAgUX5QgoDihR+NigsMtOcqrA6uKCUuqHVXrubKy7rpCeKxHcx0X/kDqqe4uWrd6 7SOO+oReVbgiZAA3Wuol5b2x/kiNIxfGJzuCo4AkNV9/dH0zeXYbG8jQpysXr+wOSLN/ 8sWg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=1USLf+ROdp0pEraa+9s3mOQ8XazU1dl3mt/Jidd9z/0=; b=PB9BTgcuEcIXAgMCm3wA0AYjTetZwWOW2iiZKYyhKzjcLaLYcntO2c1GOMTdjaDGin nstCLMmDWloCtZ5V6xCLHjGvSptmg9UwXgJZvxs5cEPYWI4Zl11m3DRt7ScttSOH9AOC /cUqpSTiqyP/fhNewudeF16mxC+F+6dclb94KjBRIxvpJtGuRV5nQqxlydpGUN0xdlad rYB4okvU14QVV+uT2jpexbb/Scnb+UVWXifXnAGZGLURm8+6QYA9SBWwVMWlfmSFcpQT mUgZitAK9BRmVTog6LrHrWKYrinUDBMowpdLN7jhA6AIx/74G595HcH/X6XMIAymjNlh alyA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=HLfwoXxR; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id h190-v6si698561pgc.663.2018.05.15.13.54.06; Tue, 15 May 2018 13:54:07 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=HLfwoXxR; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752728AbeEOUyE (ORCPT + 29 others); Tue, 15 May 2018 16:54:04 -0400 Received: from mail-it0-f66.google.com ([209.85.214.66]:37371 "EHLO mail-it0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752594AbeEOUx5 (ORCPT ); Tue, 15 May 2018 16:53:57 -0400 Received: by mail-it0-f66.google.com with SMTP id 70-v6so5375680ity.2 for ; Tue, 15 May 2018 13:53:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=1USLf+ROdp0pEraa+9s3mOQ8XazU1dl3mt/Jidd9z/0=; b=HLfwoXxRDPM1KXXR7XXsHr7w4dSBCu1PuNjCPZlDsJOTK/B6S31Hrjcj0bW083ZEZW mG9c+mgjgBeuBiRrIs7dLTPpIh/ygre/7TMtFksauBVac7tvVOzocgtdcf30bC4/Z0M9 +2//VI2e+to8Ty+CoWj2mMguGZ6jRYjttjp7A= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=1USLf+ROdp0pEraa+9s3mOQ8XazU1dl3mt/Jidd9z/0=; b=IjrV/X6Sve4SnlmA2tadlgQn8gj0lxdFg07vigi3zjLlvzw4BxDjscuz4mPdLvqMXo liakPvMwERuYo4J6Fz1wQJq0db1IFV3y7/oAJA7pixr7dy+YNMx5N4EZAR2gh1NxNQUT SEc7UdW8rqj8IilMNNe8OXYhdwoqlbz6p9OSoZOhGvhb/6C7pWS26URVLsGwjwFv6ssM 0FsqrPVr7OjomH7BPpUwZps/MIp20ZLKsGGDz8bHcTCerOkoQXCKIaxLWVGf6nJsTi2Q Ljt46TAFfr4Mooa3/DVRquO2/pq3F1odvJrf00uLsV9nPJD/Ezh6B0bb9bqfzPyjS0AV SEyw== X-Gm-Message-State: ALKqPwdwCprVrTTc6xV8OTFerHeXpeVJPmL+qipvKI0n4zJTgzsXQQ17 2ZiuSVtgsmuMopfggf3eFfAnlqHiC+k= X-Received: by 2002:a24:e983:: with SMTP id f125-v6mr16054954ith.36.1526417637138; Tue, 15 May 2018 13:53:57 -0700 (PDT) Received: from localhost.localdomain (c-71-195-29-92.hsd1.mn.comcast.net. [71.195.29.92]) by smtp.gmail.com with ESMTPSA id t9-v6sm440407ioa.82.2018.05.15.13.53.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 15 May 2018 13:53:56 -0700 (PDT) From: Alex Elder To: ohad@wizery.com, bjorn.andersson@linaro.org Cc: linux-remoteproc@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 3/5] remoteproc: Make client initialize ops in rproc_subdev Date: Tue, 15 May 2018 15:53:43 -0500 Message-Id: <20180515205345.8090-4-elder@linaro.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180515205345.8090-1-elder@linaro.org> References: <20180515205345.8090-1-elder@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Bjorn Andersson In preparation of adding the additional prepare and unprepare operations make the client responsible for filling out the function pointers of the rproc_subdev. This makes the arguments to rproc_add_subdev() more manageable, in particular when some of the functions are left out. [elder@linaro.org: added comment about assigning function pointers] Signed-off-by: Bjorn Andersson Acked-by: Alex Elder --- drivers/remoteproc/qcom_common.c | 18 ++++++++++-------- drivers/remoteproc/qcom_sysmon.c | 5 ++++- drivers/remoteproc/remoteproc_core.c | 18 +++++++----------- include/linux/remoteproc.h | 5 +---- 4 files changed, 22 insertions(+), 24 deletions(-) -- 2.17.0 diff --git a/drivers/remoteproc/qcom_common.c b/drivers/remoteproc/qcom_common.c index acfc99f82fb8..4ae87c5b8793 100644 --- a/drivers/remoteproc/qcom_common.c +++ b/drivers/remoteproc/qcom_common.c @@ -64,7 +64,10 @@ void qcom_add_glink_subdev(struct rproc *rproc, struct qcom_rproc_glink *glink) return; glink->dev = dev; - rproc_add_subdev(rproc, &glink->subdev, glink_subdev_probe, glink_subdev_remove); + glink->subdev.start = glink_subdev_probe; + glink->subdev.stop = glink_subdev_remove; + + rproc_add_subdev(rproc, &glink->subdev); } EXPORT_SYMBOL_GPL(qcom_add_glink_subdev); @@ -157,7 +160,10 @@ void qcom_add_smd_subdev(struct rproc *rproc, struct qcom_rproc_subdev *smd) return; smd->dev = dev; - rproc_add_subdev(rproc, &smd->subdev, smd_subdev_probe, smd_subdev_remove); + smd->subdev.start = smd_subdev_probe; + smd->subdev.stop = smd_subdev_remove; + + rproc_add_subdev(rproc, &smd->subdev); } EXPORT_SYMBOL_GPL(qcom_add_smd_subdev); @@ -202,11 +208,6 @@ void qcom_unregister_ssr_notifier(struct notifier_block *nb) } EXPORT_SYMBOL_GPL(qcom_unregister_ssr_notifier); -static int ssr_notify_start(struct rproc_subdev *subdev) -{ - return 0; -} - static void ssr_notify_stop(struct rproc_subdev *subdev, bool crashed) { struct qcom_rproc_ssr *ssr = to_ssr_subdev(subdev); @@ -227,8 +228,9 @@ void qcom_add_ssr_subdev(struct rproc *rproc, struct qcom_rproc_ssr *ssr, const char *ssr_name) { ssr->name = ssr_name; + ssr->subdev.stop = ssr_notify_stop; - rproc_add_subdev(rproc, &ssr->subdev, ssr_notify_start, ssr_notify_stop); + rproc_add_subdev(rproc, &ssr->subdev); } EXPORT_SYMBOL_GPL(qcom_add_ssr_subdev); diff --git a/drivers/remoteproc/qcom_sysmon.c b/drivers/remoteproc/qcom_sysmon.c index f085545d7da5..e976a602b015 100644 --- a/drivers/remoteproc/qcom_sysmon.c +++ b/drivers/remoteproc/qcom_sysmon.c @@ -469,7 +469,10 @@ struct qcom_sysmon *qcom_add_sysmon_subdev(struct rproc *rproc, qmi_add_lookup(&sysmon->qmi, 43, 0, 0); - rproc_add_subdev(rproc, &sysmon->subdev, sysmon_start, sysmon_stop); + sysmon->subdev.start = sysmon_start; + sysmon->subdev.stop = sysmon_stop; + + rproc_add_subdev(rproc, &sysmon->subdev); sysmon->nb.notifier_call = sysmon_notify; blocking_notifier_chain_register(&sysmon_notifiers, &sysmon->nb); diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c index 981ae6dff145..ca39fad175f2 100644 --- a/drivers/remoteproc/remoteproc_core.c +++ b/drivers/remoteproc/remoteproc_core.c @@ -399,8 +399,10 @@ static int rproc_handle_vdev(struct rproc *rproc, struct fw_rsc_vdev *rsc, list_add_tail(&rvdev->node, &rproc->rvdevs); - rproc_add_subdev(rproc, &rvdev->subdev, - rproc_vdev_do_probe, rproc_vdev_do_remove); + rvdev->subdev.start = rproc_vdev_do_probe; + rvdev->subdev.stop = rproc_vdev_do_remove; + + rproc_add_subdev(rproc, &rvdev->subdev); return 0; @@ -1663,17 +1665,11 @@ EXPORT_SYMBOL(rproc_del); * rproc_add_subdev() - add a subdevice to a remoteproc * @rproc: rproc handle to add the subdevice to * @subdev: subdev handle to register - * @start: function to call after the rproc is started - * @stop: function to call before the rproc is stopped + * + * Caller is responsible for populating optional subdevice function pointers. */ -void rproc_add_subdev(struct rproc *rproc, - struct rproc_subdev *subdev, - int (*start)(struct rproc_subdev *subdev), - void (*stop)(struct rproc_subdev *subdev, bool crashed)) +void rproc_add_subdev(struct rproc *rproc, struct rproc_subdev *subdev) { - subdev->start = start; - subdev->stop = stop; - list_add_tail(&subdev->node, &rproc->subdevs); } EXPORT_SYMBOL(rproc_add_subdev); diff --git a/include/linux/remoteproc.h b/include/linux/remoteproc.h index bf55bf2a5ee1..8f1426330cca 100644 --- a/include/linux/remoteproc.h +++ b/include/linux/remoteproc.h @@ -566,10 +566,7 @@ static inline struct rproc *vdev_to_rproc(struct virtio_device *vdev) return rvdev->rproc; } -void rproc_add_subdev(struct rproc *rproc, - struct rproc_subdev *subdev, - int (*start)(struct rproc_subdev *subdev), - void (*stop)(struct rproc_subdev *subdev, bool crashed)); +void rproc_add_subdev(struct rproc *rproc, struct rproc_subdev *subdev); void rproc_remove_subdev(struct rproc *rproc, struct rproc_subdev *subdev);