From patchwork Mon Nov 26 07:52:47 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roger Quadros X-Patchwork-Id: 151985 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp5329221ljp; Sun, 25 Nov 2018 23:53:58 -0800 (PST) X-Google-Smtp-Source: AFSGD/XSdP2hqpNPswMNcvLufFBpB0V+cvgmXS7IOKUPWkE8tIXF9TuZTvKYLQSTZl175pjjVNtP X-Received: by 2002:a17:902:9a07:: with SMTP id v7mr7874632plp.247.1543218838462; Sun, 25 Nov 2018 23:53:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1543218838; cv=none; d=google.com; s=arc-20160816; b=H2pId37ePjyhUm4Ix2iS6nUcsOWrPi1b0OjEmwy2AkNglxK5vKA+ogfrJAighefiii a4RtZtmuiC4+MjhJfhs5w2eEMcwPdhpTUpZgJ2fE7NpLlHuqYQqhJDqLmed1CeKJYZcN RyvAualezIJYE+VkEyS88sUJE6MlEdBm9fmqQ6kFzpsIp2fn2vQp7qeSkJB/SG+BhuEL mM4puZEkxnWXC3ki8ceR28Dq7jCW/ekxZ9pB9MORPQKDDMPlNitlSVg45CUc1OIa+AEf VEsftXw59Cbu7232g/UGbo4CAC5e09dycRsTSVGDipoQx8+dEW9ebJt+JZpvmmrI8avc b3Nw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=qOWcnKY6j9Ncdl7ThfjVQ7uHztiyrAIG1hrANVfZq78=; b=IvwtZiPG1Ah8bwHHq3SIlUiJDcHZdyjaBgjO+4i6Vlnpled2qZLb+IIhBZJzMzvZGq nXdEAB5oMr+kYpFPIYdlRWKG6JdLw1s6arwXlFii0FoeU0OvoDDsW2HtQJ1oAyjJxVJs drUYQ9TCEOAuMDTVuFEBiX+nnqcTJ+4pGI5h+4CpZYaP+EziHp32mFl2QabjLz/7zYUs tzmM0jbKAYAMUUFcWMUUYaHoa+S75KTn1IPOXjWNOXSwR8YzgovXFCUc06ERum4AvPYX x3n1nZ6zoRyeH53t69Ctw4KKHGT/VWDDcXCjQyq6K0bk2rY5yljTYlBMHjPnEUocYNhM kKQg== ARC-Authentication-Results: i=1; mx.google.com; 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=fail (p=QUARANTINE sp=NONE dis=QUARANTINE) header.from=ti.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id e1-v6si65161954plk.4.2018.11.25.23.53.58; Sun, 25 Nov 2018 23:53:58 -0800 (PST) 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; 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=fail (p=QUARANTINE sp=NONE dis=QUARANTINE) header.from=ti.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726783AbeKZSrM (ORCPT + 32 others); Mon, 26 Nov 2018 13:47:12 -0500 Received: from fllv0016.ext.ti.com ([198.47.19.142]:36592 "EHLO fllv0016.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726287AbeKZSrL (ORCPT ); Mon, 26 Nov 2018 13:47:11 -0500 Received: from lelv0266.itg.ti.com ([10.180.67.225]) by fllv0016.ext.ti.com (8.15.2/8.15.2) with ESMTP id wAQ7rqTm102568; Mon, 26 Nov 2018 01:53:52 -0600 Received: from DFLE102.ent.ti.com (dfle102.ent.ti.com [10.64.6.23]) by lelv0266.itg.ti.com (8.15.2/8.15.2) with ESMTPS id wAQ7rq3M084122 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Mon, 26 Nov 2018 01:53:52 -0600 Received: from DFLE112.ent.ti.com (10.64.6.33) by DFLE102.ent.ti.com (10.64.6.23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1591.10; Mon, 26 Nov 2018 01:53:51 -0600 Received: from dlep33.itg.ti.com (157.170.170.75) by DFLE112.ent.ti.com (10.64.6.33) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.1591.10 via Frontend Transport; Mon, 26 Nov 2018 01:53:51 -0600 Received: from dlelxv97.itg.ti.com (dlelxv97.itg.ti.com [172.17.2.193]) by dlep33.itg.ti.com (8.14.3/8.13.8) with ESMTP id wAQ7rpPK020138; Mon, 26 Nov 2018 01:53:51 -0600 Received: from localhost.localdomain (vboxa0400828d.dhcp.ti.com [172.22.237.3]) by dlelxv97.itg.ti.com (8.14.3/8.13.8) with ESMTP id wAQ7qn1S024490; Mon, 26 Nov 2018 01:53:47 -0600 From: Roger Quadros To: , CC: , , , , , , , , , , , , , , , Subject: [PATCH 14/16] remoteproc/pru: configure firmware based on client setup Date: Mon, 26 Nov 2018 09:52:47 +0200 Message-ID: <1543218769-5507-15-git-send-email-rogerq@ti.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1543218769-5507-1-git-send-email-rogerq@ti.com> References: <1543218769-5507-1-git-send-email-rogerq@ti.com> MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Tero Kristo Client device node property firmware-name is now used to configure firmware for the PRU instances. The default firmware is also restored once releasing the PRU resource. Signed-off-by: Tero Kristo Reviewed-by: Roger Quadros Signed-off-by: Suman Anna --- drivers/remoteproc/pru_rproc.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) -- Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki diff --git a/drivers/remoteproc/pru_rproc.c b/drivers/remoteproc/pru_rproc.c index 9a08937..84f006b 100644 --- a/drivers/remoteproc/pru_rproc.c +++ b/drivers/remoteproc/pru_rproc.c @@ -132,6 +132,21 @@ void pru_control_set_reg(struct pru_rproc *pru, unsigned int reg, spin_unlock_irqrestore(&pru->rmw_lock, flags); } +/** + * pru_rproc_set_firmware() - set firmware for a pru core + * @rproc: the rproc instance of the PRU + * @fw_name: the new firmware name, or NULL if default is desired + */ +static int pru_rproc_set_firmware(struct rproc *rproc, const char *fw_name) +{ + struct pru_rproc *pru = rproc->priv; + + if (!fw_name) + fw_name = pru->fw_name; + + return rproc_set_firmware(rproc, fw_name); +} + static struct rproc *__pru_rproc_get(struct device_node *np, int index) { struct device_node *rproc_np = NULL; @@ -189,6 +204,7 @@ struct rproc *pru_rproc_get(struct device_node *np, int index) struct device *dev; int ret; u32 mux; + const char *fw_name; rproc = __pru_rproc_get(np, index); if (IS_ERR(rproc)) @@ -225,6 +241,16 @@ struct rproc *pru_rproc_get(struct device_node *np, int index) } } + ret = of_property_read_string_index(np, "firmware-name", index, + &fw_name); + if (!ret) { + ret = pru_rproc_set_firmware(rproc, fw_name); + if (ret) { + dev_err(dev, "failed to set firmware: %d\n", ret); + goto err; + } + } + return rproc; err: @@ -255,6 +281,7 @@ void pru_rproc_put(struct rproc *rproc) if (!pru->client_np) return; + pru_rproc_set_firmware(rproc, NULL); pruss_cfg_set_gpmux(pru->pruss, pru->id, pru->gpmux_save); mutex_lock(&pru->lock);