From patchwork Fri Nov 18 11:19:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: MD Danish Anwar X-Patchwork-Id: 22277 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp134087wrr; Fri, 18 Nov 2022 03:24:40 -0800 (PST) X-Google-Smtp-Source: AA0mqf6nK5mxeJnqmqMpS8NVpJvIKfB+B+hZq9yECnWUcNCg9419VylGhAH9HBNffU9aAHB25Y39 X-Received: by 2002:a05:6402:389:b0:459:2515:b27b with SMTP id o9-20020a056402038900b004592515b27bmr5841119edv.338.1668770680004; Fri, 18 Nov 2022 03:24:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668770679; cv=none; d=google.com; s=arc-20160816; b=rtgtmERBjdMfZwqMKDNuIYdmPVC980tfyau68c+8zciIsSzWUcO9gwN4ZFLocGH+fl 53XP8SCVj3bm5o6S/z9V82rRp4Hh8YrA2b+ydWEAWtwrXqyg7vcnNjdVmtsUJIYHXpt+ ar67ZxyGGqETLOVpLShN4C8nyKpO+vTrzQkKst4wt3eG1rrFzU2D/JQQREoWS/FEVm8l iTMyxo/hDkNZRe4d5XZIsF8GkDortpiIIqmR3w+wLbxSJwJ4OjEnniicxfKZI22R3bea btyVnRbCVGuFdd3xxzAFvPniSruXG8TEqZ8y9rU4Ef2jrqtlOiEHxjmOQmsXBNyjuvE1 2s2A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=AJIGQ1xf19B/ECiK/jFZy+fX171KnjSiBsh+JAXWCkg=; b=YFhGhl1EZTSLSuyF0WQVykJjDlLc9q8eVIlFaTSvhkHiD7snJ59ds9kYjTf7rLgbyG SqJ1622Et6/JMPPDo6aNDdKpbfSvs4leAWzU/BweqEAvgifRqAfIyhx2zLzbv63um2GF i7nND//MuHmoZxjcBqDm+Ki02ObZR00I7DtMLB3r7K4kFgD7xF05lhZttLQ4B/q4jiDT oz6xEco68rF+AI+gfymJ85lifwCK9pEvuVChORTAv03UB2sUkU/WtSm3LFArx/OAWBWZ WTKu8zczlSGQgqY6a1bx0MvSNbxK56hgVpMOPw0VpTIAfPvLoKNCQAnAXXGwavQHk0Sh oBog== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=mnJoOOJ1; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id mp9-20020a1709071b0900b007aea5ae39b1si2812131ejc.443.2022.11.18.03.24.15; Fri, 18 Nov 2022 03:24:39 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=mnJoOOJ1; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241326AbiKRLVT (ORCPT + 99 others); Fri, 18 Nov 2022 06:21:19 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53698 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241589AbiKRLTz (ORCPT ); Fri, 18 Nov 2022 06:19:55 -0500 Received: from lelv0142.ext.ti.com (lelv0142.ext.ti.com [198.47.23.249]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E07A320984; Fri, 18 Nov 2022 03:19:46 -0800 (PST) Received: from fllv0034.itg.ti.com ([10.64.40.246]) by lelv0142.ext.ti.com (8.15.2/8.15.2) with ESMTP id 2AIBJgeT117817; Fri, 18 Nov 2022 05:19:42 -0600 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1668770382; bh=AJIGQ1xf19B/ECiK/jFZy+fX171KnjSiBsh+JAXWCkg=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=mnJoOOJ1vX8gjNOTcH0pX5AhlRUr57hLd+OPKYHdL/IJOaYC77ujsURiaEdRhAFM7 SaAQLsU+EMBTO5iZndde9UpqWpKQf2w34TvrW8yH6iiBYDnP3ZWYJ9f7zzzULQi2Z3 9QVu6hOFiDYomhTHaArXrbu+feeF4n6wSTk+r88A= Received: from DFLE113.ent.ti.com (dfle113.ent.ti.com [10.64.6.34]) by fllv0034.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 2AIBJgjR086423 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Fri, 18 Nov 2022 05:19:42 -0600 Received: from DFLE115.ent.ti.com (10.64.6.36) by DFLE113.ent.ti.com (10.64.6.34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.16; Fri, 18 Nov 2022 05:19:42 -0600 Received: from fllv0039.itg.ti.com (10.64.41.19) by DFLE115.ent.ti.com (10.64.6.36) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.16 via Frontend Transport; Fri, 18 Nov 2022 05:19:42 -0600 Received: from lelv0854.itg.ti.com (lelv0854.itg.ti.com [10.181.64.140]) by fllv0039.itg.ti.com (8.15.2/8.15.2) with ESMTP id 2AIBJfSE028234; Fri, 18 Nov 2022 05:19:41 -0600 Received: from localhost (a0501179-pc.dhcp.ti.com [10.24.69.114]) by lelv0854.itg.ti.com (8.14.7/8.14.7) with ESMTP id 2AIBJexp017154; Fri, 18 Nov 2022 05:19:41 -0600 From: MD Danish Anwar To: Mathieu Poirier , Krzysztof Kozlowski , Rob Herring CC: Suman Anna , Roger Quadros , "Andrew F . Davis" , , , , , , , , MD Danish Anwar Subject: [PATCH v9 6/6] remoteproc: pru: Configure firmware based on client setup Date: Fri, 18 Nov 2022 16:49:24 +0530 Message-ID: <20221118111924.3277838-7-danishanwar@ti.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221118111924.3277838-1-danishanwar@ti.com> References: <20221118111924.3277838-1-danishanwar@ti.com> MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1749832884532351212?= X-GMAIL-MSGID: =?utf-8?q?1749832884532351212?= 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: Suman Anna Signed-off-by: Tero Kristo Signed-off-by: Grzegorz Jaszczyk Signed-off-by: MD Danish Anwar Reviewed-by: Roger Quadros --- drivers/remoteproc/pru_rproc.c | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/drivers/remoteproc/pru_rproc.c b/drivers/remoteproc/pru_rproc.c index f4a34cc6bcc6..39e05623a84e 100644 --- a/drivers/remoteproc/pru_rproc.c +++ b/drivers/remoteproc/pru_rproc.c @@ -172,6 +172,23 @@ 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 + * + * Return: 0 on success, or errno in error case. + */ +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 rproc *rproc; @@ -228,6 +245,7 @@ struct rproc *pru_rproc_get(struct device_node *np, int index, struct rproc *rproc; struct pru_rproc *pru; struct device *dev; + const char *fw_name; int ret; rproc = __pru_rproc_get(np, index); @@ -254,11 +272,25 @@ struct rproc *pru_rproc_get(struct device_node *np, int index, if (pru_id) *pru_id = pru->id; + 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_no_rproc_handle: rproc_put(rproc); return ERR_PTR(ret); + +err: + pru_rproc_put(rproc); + return ERR_PTR(ret); } EXPORT_SYMBOL_GPL(pru_rproc_get); @@ -278,6 +310,8 @@ void pru_rproc_put(struct rproc *rproc) pru = rproc->priv; + pru_rproc_set_firmware(rproc, NULL); + mutex_lock(&pru->lock); if (!pru->client_np) {