From patchwork Fri Dec 16 05:33:13 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: 33863 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:e747:0:0:0:0:0 with SMTP id c7csp784142wrn; Thu, 15 Dec 2022 21:37:57 -0800 (PST) X-Google-Smtp-Source: AA0mqf5DGoa5fyqK+hKhugyDfJzPVhE2Ao9CLjd2TZ9Hyc6WiVnrJOLBuxavgeEShV+i/fAkgBlK X-Received: by 2002:a17:90a:4a97:b0:213:a9e1:fa89 with SMTP id f23-20020a17090a4a9700b00213a9e1fa89mr31324260pjh.37.1671169076915; Thu, 15 Dec 2022 21:37:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671169076; cv=none; d=google.com; s=arc-20160816; b=sefvT7O8CXBmoX1LNV+W+QxtArF1d83m6x/D5lNQ5CMP+BHi6xDNP27BF5xv9PRVz5 2UUOOcXFC987YSL2qHUqWvoRA2fxHp/pGlvsdU5A4YH1XfzoNfsTzDq70LwBTE4F+wrK GtWa49tiB0lWkLHRJ121RWXaXoCv2p/qaAb+m2STgx6jcyivfuew+K8yBRdp/36yGjJt CzFCOCnBHDJhus1SehwAa02eflh2kw1C808V3nlXi6nX/ieUAaNBwyGiSZ43TBYlCPuo UeFFAcdTYh4xyF+nyx3oYhcjF67vUmcmnPI6PMIF7VtU0bnJKLGRv6QHCithou7kXhR5 YFoQ== 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=qbzCdbRyuvvR8jqC9LmudOVpCjSq86n2tpLu4mzvF2E=; b=v2htESKebvxJWbVPUCGucF28xby/PaG//W/bblq93IcEEkcMxinIUosCK7wRUCxJoR 99hnnKRDFqlt2VQxxf9DrxEzEWm1HgDYwTG/vRkY9hGj4GqWdNkYahcPl7P2IA3UC0bF Y3uSnF15xTwLhqkJzyW5Rpkw5QsHENq/ZiS5pJgVXwZId42cZAfNTxwBYhgZj6Znw8CO 6TzfoegBEFo2VMhovFUI8y+coQCy0mtTbGLPL/dBqdDBqb0M/JqI0iI5NEkHwsYBAD2g JkEe5zH1FUmmE6pSRELB+45zaONqiAyj4XE0gdB1kf1JP/UKYjF+OTgZVjEQIDWIY5Pb Q6Zw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=NS15k0eh; 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 l8-20020a63ba48000000b00478c46e8f96si1760818pgu.140.2022.12.15.21.37.44; Thu, 15 Dec 2022 21:37:56 -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=NS15k0eh; 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 S229976AbiLPFeB (ORCPT + 99 others); Fri, 16 Dec 2022 00:34:01 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59738 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229901AbiLPFdm (ORCPT ); Fri, 16 Dec 2022 00:33:42 -0500 Received: from fllv0016.ext.ti.com (fllv0016.ext.ti.com [198.47.19.142]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E0ADC18377; Thu, 15 Dec 2022 21:33:39 -0800 (PST) Received: from fllv0035.itg.ti.com ([10.64.41.0]) by fllv0016.ext.ti.com (8.15.2/8.15.2) with ESMTP id 2BG5XTUQ019041; Thu, 15 Dec 2022 23:33:29 -0600 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1671168809; bh=qbzCdbRyuvvR8jqC9LmudOVpCjSq86n2tpLu4mzvF2E=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=NS15k0ehMhD8MaEwYwRtfjuTpKWUQr87N/klYaQGPH6ZTkckar3p/FB7LPS6KwQur bt4ND3Pe28sDQLczHEAvvBTXjdftM98hN38fMS80qSmUWye0hLXIyxM5juNBR5PoHq 2p2pnH6ifuWjUE4mFIeJNuw9mL04zGEQs5sjV91M= Received: from DLEE112.ent.ti.com (dlee112.ent.ti.com [157.170.170.23]) by fllv0035.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 2BG5XTIB076832 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Thu, 15 Dec 2022 23:33:29 -0600 Received: from DLEE102.ent.ti.com (157.170.170.32) by DLEE112.ent.ti.com (157.170.170.23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.16; Thu, 15 Dec 2022 23:33:29 -0600 Received: from lelv0326.itg.ti.com (10.180.67.84) by DLEE102.ent.ti.com (157.170.170.32) 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; Thu, 15 Dec 2022 23:33:29 -0600 Received: from fllv0122.itg.ti.com (fllv0122.itg.ti.com [10.247.120.72]) by lelv0326.itg.ti.com (8.15.2/8.15.2) with ESMTP id 2BG5XT3l018808; Thu, 15 Dec 2022 23:33:29 -0600 Received: from localhost (a0501179-pc.dhcp.ti.com [10.24.69.114]) by fllv0122.itg.ti.com (8.14.7/8.14.7) with ESMTP id 2BG5XSlr023214; Thu, 15 Dec 2022 23:33:28 -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 v12 6/6] remoteproc: pru: Configure firmware based on client setup Date: Fri, 16 Dec 2022 11:03:13 +0530 Message-ID: <20221216053313.2974826-7-danishanwar@ti.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221216053313.2974826-1-danishanwar@ti.com> References: <20221216053313.2974826-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?1752347785890475453?= X-GMAIL-MSGID: =?utf-8?q?1752347785890475453?= 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 176186882acf..cc74786c4a12 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; @@ -224,6 +241,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); @@ -249,11 +267,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); @@ -273,6 +305,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) {