From patchwork Wed Jul 25 10:24:52 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Ohad Ben-Cohen X-Patchwork-Id: 173135 Return-Path: X-Original-To: incoming-imx@patchwork.ozlabs.org Delivered-To: patchwork-incoming-imx@bilbo.ozlabs.org Received: from merlin.infradead.org (unknown [IPv6:2001:4978:20e::2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 3DF832C0081 for ; Wed, 25 Jul 2012 20:30:27 +1000 (EST) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1Stymc-00072r-CX; Wed, 25 Jul 2012 10:25:34 +0000 Received: from mail-vc0-f177.google.com ([209.85.220.177]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1StymK-00072d-J9 for linux-arm-kernel@lists.infradead.org; Wed, 25 Jul 2012 10:25:17 +0000 Received: by vcbfl13 with SMTP id fl13so416466vcb.36 for ; Wed, 25 Jul 2012 03:25:12 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=mime-version:x-originating-ip:from:date:message-id:subject:to:cc :content-type:content-transfer-encoding:x-gm-message-state; bh=eFYwgRPykjQyGQUjQPmB9RWP5PgF1GJXLOCUTWhgPDE=; b=iSl3BMvk2i1CQ1PCTn28VmBwOS89rcJn4tCBozm6ygCIhNiseaBw4Q53ISe9rSNOMU 3xkTVPaZqEoacIpHdum2KRkKSvp57RgnPjJtZ4buRlYMDIcv9LlRUvVsZfVgOnUu55qm 7GEDgmVYkBxwO0/u8DPM054RmhBuBZxLvL+jZqN+J7014IBg1jNT+XRWRqaNW/1E2kvW SwCi3BD0TFUYDsS4f0n9GaqxyCo08N38Zn8ws6gZUXur9sKjNsZPIhkoMuAEjpJlbGSD MkPNCnX25wieGzZOiRNTXwkd3xMzipxB4zpt0I8S6iNIgvsHxU7XnJwQC1nWxZYgrIqL O0mQ== Received: by 10.52.21.174 with SMTP id w14mr15557047vde.24.1343211912466; Wed, 25 Jul 2012 03:25:12 -0700 (PDT) MIME-Version: 1.0 Received: by 10.52.162.197 with HTTP; Wed, 25 Jul 2012 03:24:52 -0700 (PDT) X-Originating-IP: [89.139.38.29] From: Ohad Ben-Cohen Date: Wed, 25 Jul 2012 13:24:52 +0300 Message-ID: Subject: [GIT PULL] remoteproc for 3.6 To: Linus Torvalds X-Gm-Message-State: ALoCoQlBebO5TrfOWZ9oKvYNWoRfZtiCPWHstgCgXbe7hFEXtu+eZV5vQd/CGwaV1C6LQpcEfEwk X-Spam-Note: CRM114 invocation failed X-Spam-Score: -2.6 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.220.177 listed in list.dnswl.org] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Fernando Guzman Lugo , Stephen Boyd , linux-kernel@vger.kernel.org, linux-omap@vger.kernel.org, linux-arm , =?ISO-8859-1?Q?Sjur_Br=E6ndeland?= X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org List-Id: linux-imx-kernel.lists.patchwork.ozlabs.org Hi Linus, There are a few merge conflicts which are mostly trivial, but there's also a sneaky one which is easy to miss (I missed it when I reviewed the merge in linux-next) so I also pushed a 3.6-merge-reference branch (for reference). (in short, e981f6d "remoteproc: fix print format warnings" fixed a line in rproc_load_segments(), but that function was relocated to remoteproc_elf_loader.c by 72854fb "remoteproc: Move Elf related functions to separate file", and since 72854fb is based on the pre-fixed version of the function, it does not carry the 1-liner fix to remoteproc_elf_loader.c, so the merge commit should. Thanks a lot!). Without further ado, The following changes since commit 485802a6c524e62b5924849dd727ddbb1497cc71: Linux 3.5-rc3 (2012-06-16 17:25:17 -0700) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/ohad/remoteproc.git tags/remoteproc-for-3.6 for you to fetch changes up to 6bb697b6b06041d2d0affc862b17b4b443a107e0: MAINTAINERS: add remoteproc's git (2012-07-15 11:39:02 +0300) ---------------------------------------------------------------- A batch of remoteproc patches for 3.6: - custom binary format support from Sjur Brændeland - groundwork for recovery and runtime pm support - some cleanups and API simplifications ---------------------------------------------------------------- Ohad Ben-Cohen (8): remoteproc: allocate vrings on demand, free when not needed remoteproc: maintain a generic child device for each rproc remoteproc: remove the now-redundant kref remoteproc: simplify unregister/free interfaces remoteproc: support non-iommu carveout assignment remoteproc: remove the get_by_name/put API remoteproc: adopt the driver core's alloc/add/del/put naming MAINTAINERS: add remoteproc's git Sjur Brændeland (4): remoteproc: Pass struct fw to load_segments and find_rsc_table. remoteproc: Add function rproc_get_boot_addr remoteproc: Move Elf related functions to separate file remoteproc: Support custom firmware handlers Documentation/remoteproc.txt | 58 +-- MAINTAINERS | 1 + drivers/remoteproc/Makefile | 1 + drivers/remoteproc/omap_remoteproc.c | 26 +- drivers/remoteproc/remoteproc_core.c | 726 ++++++++--------------------- drivers/remoteproc/remoteproc_debugfs.c | 4 +- drivers/remoteproc/remoteproc_elf_loader.c | 295 ++++++++++++ drivers/remoteproc/remoteproc_internal.h | 62 +++ drivers/remoteproc/remoteproc_virtio.c | 34 +- drivers/rpmsg/virtio_rpmsg_bus.c | 3 +- include/linux/remoteproc.h | 20 +- 11 files changed, 613 insertions(+), 617 deletions(-) create mode 100644 drivers/remoteproc/remoteproc_elf_loader.c