From patchwork Mon Apr 13 19:34:00 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Poirier X-Patchwork-Id: 11486145 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 30476913 for ; Mon, 13 Apr 2020 19:34:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 17FDC20731 for ; Mon, 13 Apr 2020 19:34:12 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="d9U8U4mS" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387903AbgDMTeL (ORCPT ); Mon, 13 Apr 2020 15:34:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58440 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S2387887AbgDMTeK (ORCPT ); Mon, 13 Apr 2020 15:34:10 -0400 Received: from mail-pg1-x542.google.com (mail-pg1-x542.google.com [IPv6:2607:f8b0:4864:20::542]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 331D0C00860B for ; Mon, 13 Apr 2020 12:34:07 -0700 (PDT) Received: by mail-pg1-x542.google.com with SMTP id d17so4929481pgo.0 for ; Mon, 13 Apr 2020 12:34:07 -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 :mime-version:content-transfer-encoding; bh=CbfVjk3n7dmtNabMVVrC9yJ09gyFOYpKGc85h9CW1lY=; b=d9U8U4mSflEe4j0ZiTHJv35UwXRhVJ6QMZ+zO0JqNkV1GgmqV90Rb0/4+crhwnfLC8 xqF6GP1ev/WVIK2HJORf8n+ak1kc6JX4ZXSoAB6fxMYEyG788bXAbE51VRWOe6CaCBxs 2/0IgpNVCE/emIsUO91F29x7Ls9fgsm9bw1aVBRCUNDWQiSGz3L2j123CgwVImEq5fzC B/03oKZ6RoNdcrH9vKZCKIQ5HhTDzR5JVocDGQcbq7ytU9MiChJ0BqUgJSodelh8Dcbu BNpUOZ2vwiBKNi9tOoZMVTYRbA2APdRQBkz8jNU4jRDD7Xe3J8AHr/BfXhvi29LIPp25 Wrmw== 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:mime-version:content-transfer-encoding; bh=CbfVjk3n7dmtNabMVVrC9yJ09gyFOYpKGc85h9CW1lY=; b=mqjjzVPzL51Od/f+ekgJAQqH/8LdKSAY5h4Q6apoLtc5IV6nNk0wYRkqp+FzISMcyg +6IUCBEoQ3EN8RnQTFm4XHHUBdv9wcqn12Go6+ERoif2UtazBjqtbuuQwo6fUJXG0GxK KnDvmZtBbzL+2kiHphKU9sdHa7Uq4SbfTcPpDfxg7YXLsrWI5sxpoD0JDSYvNPT2kNBa BvMmYYfyKOsRptIITDScUST+4hCMv1AVABjN7vcIa5fAlrXCAczxUV1KTFEEBahXEXyQ ZzAdmZDSCn6geBDgUdz3gP9Ur6wCyPESSXIK9BKgaIE4mi7RTcH17zI9O/y53r8Mkfsc yIGA== X-Gm-Message-State: AGi0PuZwBJM/qQ53vU6gCOstmwMY+/jROh5fSnNBlLsBGKWZG45tp8P3 7rGNoNu5Ua5wsPElh4Y+Xcg2juT+LdY= X-Google-Smtp-Source: APiQypISK1cjUZOJJw7oxYyo4pLuVlNFM1tkqhgi6XI1egohf6p7Zoqspbr9PWLC3pqLQirvf6uSHw== X-Received: by 2002:a63:6604:: with SMTP id a4mr17533914pgc.381.1586806446754; Mon, 13 Apr 2020 12:34:06 -0700 (PDT) Received: from xps15.cg.shawcable.net (S0106002369de4dac.cg.shawcable.net. [68.147.8.254]) by smtp.gmail.com with ESMTPSA id ml24sm7032330pjb.48.2020.04.13.12.34.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Apr 2020 12:34:06 -0700 (PDT) From: Mathieu Poirier To: bjorn.andersson@linaro.org, ohad@wizery.com Cc: s-anna@ti.com, elder@linaro.org, linux-remoteproc@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 3/4] remoteproc: Split rproc_ops allocation from rproc_alloc() Date: Mon, 13 Apr 2020 13:34:00 -0600 Message-Id: <20200413193401.27234-4-mathieu.poirier@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200413193401.27234-1-mathieu.poirier@linaro.org> References: <20200413193401.27234-1-mathieu.poirier@linaro.org> MIME-Version: 1.0 Sender: linux-remoteproc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-remoteproc@vger.kernel.org Make the rproc_ops allocation a function on its own in order to introduce more flexibility to function rproc_alloc(). Signed-off-by: Mathieu Poirier Reviewed-by: Alex Elder --- drivers/remoteproc/remoteproc_core.c | 32 +++++++++++++++++----------- 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c index 4dee63f319ba..c272d78f07e8 100644 --- a/drivers/remoteproc/remoteproc_core.c +++ b/drivers/remoteproc/remoteproc_core.c @@ -2006,6 +2006,25 @@ static int rproc_alloc_firmware(struct rproc *rproc, return 0; } +static int rproc_alloc_ops(struct rproc *rproc, const struct rproc_ops *ops) +{ + rproc->ops = kmemdup(ops, sizeof(*ops), GFP_KERNEL); + if (!rproc->ops) + return -ENOMEM; + + /* Default to ELF loader if no load function is specified */ + if (!rproc->ops->load) { + rproc->ops->load = rproc_elf_load_segments; + rproc->ops->parse_fw = rproc_elf_load_rsc_table; + rproc->ops->find_loaded_rsc_table = + rproc_elf_find_loaded_rsc_table; + rproc->ops->sanity_check = rproc_elf_sanity_check; + rproc->ops->get_boot_addr = rproc_elf_get_boot_addr; + } + + return 0; +} + /** * rproc_alloc() - allocate a remote processor handle * @dev: the underlying device @@ -2045,8 +2064,7 @@ struct rproc *rproc_alloc(struct device *dev, const char *name, if (rproc_alloc_firmware(rproc, name, firmware)) goto free_rproc; - rproc->ops = kmemdup(ops, sizeof(*ops), GFP_KERNEL); - if (!rproc->ops) + if (rproc_alloc_ops(rproc, ops)) goto free_firmware; rproc->name = name; @@ -2073,16 +2091,6 @@ struct rproc *rproc_alloc(struct device *dev, const char *name, atomic_set(&rproc->power, 0); - /* Default to ELF loader if no load function is specified */ - if (!rproc->ops->load) { - rproc->ops->load = rproc_elf_load_segments; - rproc->ops->parse_fw = rproc_elf_load_rsc_table; - rproc->ops->find_loaded_rsc_table = rproc_elf_find_loaded_rsc_table; - if (!rproc->ops->sanity_check) - rproc->ops->sanity_check = rproc_elf32_sanity_check; - rproc->ops->get_boot_addr = rproc_elf_get_boot_addr; - } - mutex_init(&rproc->lock); INIT_LIST_HEAD(&rproc->carveouts);