[{"id":12210,"web_url":"https://patchwork.libcamera.org/comment/12210/","msgid":"<20200828160033.GG10034@pendragon.ideasonboard.com>","date":"2020-08-28T16:00:33","subject":"Re: [libcamera-devel] [PATCH v2 1/3] libcamera: raspberrypi:\n\tdmaheaps: Improve device open","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Jacopo,\n\nThank you for the patch.\n\nOn Fri, Aug 28, 2020 at 05:51:34PM +0200, Jacopo Mondi wrote:\n> Improve the device opening at class construction time by testing all\n> the available device paths and printout the appropriate error message.\n> \n> While at it, initialize dmaHeapHandle_ to -1 and check for it's value\n\ns/it's/its/\n\n> at destruction time.\n> \n> Signed-off-by: Jacopo Mondi \n> ---\n> .../pipeline/raspberrypi/dma_heaps.cpp | 28 +++++++++++++------\n> 1 file changed, 20 insertions(+), 8 deletions(-)\n> \n> diff --git a/src/libcamera/pipeline/raspberrypi/dma_heaps.cpp b/src/libcamera/pipeline/raspberrypi/dma_heaps.cpp\n> index 6769c04640f1..4d5dd6cb87cc 100644\n> --- a/src/libcamera/pipeline/raspberrypi/dma_heaps.cpp\n> +++ b/src/libcamera/pipeline/raspberrypi/dma_heaps.cpp\n> @@ -7,6 +7,7 @@\n> \n> #include \"dma_heaps.h\"\n> \n> +#include \n> #include \n> #include \n> #include \n> @@ -22,8 +23,10 @@\n> * Annoyingly, should the cma heap size be specified on the kernel command line\n> * instead of DT, the heap gets named \"reserved\" instead.\n> */\n> -#define DMA_HEAP_CMA_NAME \"/dev/dma_heap/linux,cma\"\n> -#define DMA_HEAP_CMA_ALT_NAME \"/dev/dma_heap/reserved\"\n> +static constexpr std::array heapNames = {\n> +\t\"/dev/dma_heap/linux,cma\",\n> +\t\"/dev/dma_heap/reserved\"\n> +};\n> \n> namespace libcamera {\n> \n> @@ -32,19 +35,28 @@ LOG_DECLARE_CATEGORY(RPI)\n> namespace RPi {\n> \n> DmaHeap::DmaHeap()\n> +\t: dmaHeapHandle_(-1)\n> {\n> -\tdmaHeapHandle_ = ::open(DMA_HEAP_CMA_NAME, O_RDWR, 0);\n> -\tif (dmaHeapHandle_ == -1) {\n> -\t\tdmaHeapHandle_ = ::open(DMA_HEAP_CMA_ALT_NAME, O_RDWR, 0);\n> -\t\tif (dmaHeapHandle_ == -1) {\n> -\t\t\tLOG(RPI, Error) << \"Could not open dmaHeap device\";\n> +\tfor (const char *name : heapNames) {\n> +\t\tint ret = ::open(name, O_RDWR, 0);\n\nI wonder if we should set O_CLOEXEC. That's out of scope for this patch\nanyway.\n\nReviewed-by: Laurent Pinchart \n\n> +\t\tif (ret < 0) {\n> +\t\t\tret = errno;\n> +\t\t\tLOG(RPI, Debug) << \"Failed to open \" << name << \": \"\n> +\t\t\t\t\t<< strerror(ret);\n> +\t\t\tcontinue;\n> \t\t}\n> +\n> +\t\tdmaHeapHandle_ = ret;\n> +\t\tbreak;\n> \t}\n> +\n> +\tif (dmaHeapHandle_ < 0)\n> +\t\tLOG(RPI, Error) << \"Could not open any dmaHeap device\";\n> }\n> \n> DmaHeap::~DmaHeap()\n> {\n> -\tif (dmaHeapHandle_)\n> +\tif (dmaHeapHandle_ > -1)\n> \t\t::close(dmaHeapHandle_);\n> }","headers":{"Return-Path":"","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id E6822BF019\n\tfor ;\n\tFri, 28 Aug 2020 16:00:56 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 6902F628F3;\n\tFri, 28 Aug 2020 18:00:56 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id D0FBA6037B\n\tfor ;\n\tFri, 28 Aug 2020 18:00:54 +0200 (CEST)","from pendragon.ideasonboard.com (62-78-145-57.bb.dnainternet.fi\n\t[62.78.145.57])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 2DA83303;\n\tFri, 28 Aug 2020 18:00:54 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"Nj14m3iO\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1598630454;\n\tbh=P8OCd7vqcoPmsWl6pNynO3gcMUetq6kPvFAB686sXO4=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=Nj14m3iOxaqGqZjVpsrFzeTyeodbkspK0yjozgn++DtkqbncWuSfTAvl6TFGgH/g1\n\tiMQ37uz99XA8Iyq2+KVRhUGHUekrmUCV4xu+jXCnAHYnStc1xA6cmKyuvOu3I3dEoj\n\t4D7W/lW0V7bQXqYf4I7OtEyvKE//ptc7hNbRhIic=","Date":"Fri, 28 Aug 2020 19:00:33 +0300","From":"Laurent Pinchart ","To":"Jacopo Mondi ","Message-ID":"<20200828160033.GG10034@pendragon.ideasonboard.com>","References":"<20200828155136.541696-1-jacopo@jmondi.org>","MIME-Version":"1.0","Content-Disposition":"inline","In-Reply-To":"<20200828155136.541696-1-jacopo@jmondi.org>","Subject":"Re: [libcamera-devel] [PATCH v2 1/3] libcamera: raspberrypi:\n\tdmaheaps: Improve device open","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"libcamera-devel@lists.libcamera.org","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}},{"id":12211,"web_url":"https://patchwork.libcamera.org/comment/12211/","msgid":"<39472fd7-1fa8-8c42-e30b-c681fb585700@ideasonboard.com>","date":"2020-08-28T16:00:55","subject":"Re: [libcamera-devel] [PATCH v2 1/3] libcamera: raspberrypi:\n\tdmaheaps: Improve device open","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"content":"Hi Jacopo,\n\nOn 28/08/2020 16:51, Jacopo Mondi wrote:\n> Improve the device opening at class construction time by testing all\n> the available device paths and printout the appropriate error message.\n> \n> While at it, initialize dmaHeapHandle_ to -1 and check for it's value\n> at destruction time.\n> \n> Signed-off-by: Jacopo Mondi \n\nReviewed-by: Kieran Bingham \n\n> ---\n> .../pipeline/raspberrypi/dma_heaps.cpp | 28 +++++++++++++------\n> 1 file changed, 20 insertions(+), 8 deletions(-)\n> \n> diff --git a/src/libcamera/pipeline/raspberrypi/dma_heaps.cpp b/src/libcamera/pipeline/raspberrypi/dma_heaps.cpp\n> index 6769c04640f1..4d5dd6cb87cc 100644\n> --- a/src/libcamera/pipeline/raspberrypi/dma_heaps.cpp\n> +++ b/src/libcamera/pipeline/raspberrypi/dma_heaps.cpp\n> @@ -7,6 +7,7 @@\n> \n> #include \"dma_heaps.h\"\n> \n> +#include \n> #include \n> #include \n> #include \n> @@ -22,8 +23,10 @@\n> * Annoyingly, should the cma heap size be specified on the kernel command line\n> * instead of DT, the heap gets named \"reserved\" instead.\n> */\n> -#define DMA_HEAP_CMA_NAME \"/dev/dma_heap/linux,cma\"\n> -#define DMA_HEAP_CMA_ALT_NAME \"/dev/dma_heap/reserved\"\n> +static constexpr std::array heapNames = {\n> +\t\"/dev/dma_heap/linux,cma\",\n> +\t\"/dev/dma_heap/reserved\"\n> +};\n> \n> namespace libcamera {\n> \n> @@ -32,19 +35,28 @@ LOG_DECLARE_CATEGORY(RPI)\n> namespace RPi {\n> \n> DmaHeap::DmaHeap()\n> +\t: dmaHeapHandle_(-1)\n> {\n> -\tdmaHeapHandle_ = ::open(DMA_HEAP_CMA_NAME, O_RDWR, 0);\n> -\tif (dmaHeapHandle_ == -1) {\n> -\t\tdmaHeapHandle_ = ::open(DMA_HEAP_CMA_ALT_NAME, O_RDWR, 0);\n> -\t\tif (dmaHeapHandle_ == -1) {\n> -\t\t\tLOG(RPI, Error) << \"Could not open dmaHeap device\";\n> +\tfor (const char *name : heapNames) {\n> +\t\tint ret = ::open(name, O_RDWR, 0);\n> +\t\tif (ret < 0) {\n> +\t\t\tret = errno;\n> +\t\t\tLOG(RPI, Debug) << \"Failed to open \" << name << \": \"\n> +\t\t\t\t\t<< strerror(ret);\n> +\t\t\tcontinue;\n> \t\t}\n> +\n> +\t\tdmaHeapHandle_ = ret;\n> +\t\tbreak;\n> \t}\n> +\n> +\tif (dmaHeapHandle_ < 0)\n> +\t\tLOG(RPI, Error) << \"Could not open any dmaHeap device\";\n> }\n> \n> DmaHeap::~DmaHeap()\n> {\n> -\tif (dmaHeapHandle_)\n> +\tif (dmaHeapHandle_ > -1)\n> \t\t::close(dmaHeapHandle_);\n> }\n> \n>","headers":{"Return-Path":"","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id F151ABF019\n\tfor ;\n\tFri, 28 Aug 2020 16:00:59 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id BF9C7628F3;\n\tFri, 28 Aug 2020 18:00:59 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 73F1261EA0\n\tfor ;\n\tFri, 28 Aug 2020 18:00:58 +0200 (CEST)","from [192.168.0.20]\n\t(cpc89244-aztw30-2-0-cust3082.18-1.cable.virginm.net [86.31.172.11])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id EDA749CE;\n\tFri, 28 Aug 2020 18:00:57 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"evmg9PEs\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1598630458;\n\tbh=WnsLZHH5DgpxnsxQr3RSDw25PwUkWkXKr+hoUr1NLZQ=;\n\th=Reply-To:Subject:To:References:From:Date:In-Reply-To:From;\n\tb=evmg9PEsoVmXXX8weptVZ3VfYO9901+phxgHA6NQhXfFSPwyGlVBaOBBMVwK5+Mb2\n\tJVtbJH0NNjKvKpCUQjdHtTl90StfoGB/9KBEonAj2+xq4C1R858MtN0M9/4g5dELPY\n\tVKmpP+vn7ntq9oth3mvzTHQb6mI0PrAmaQA097L0=","To":"Jacopo Mondi , libcamera-devel@lists.libcamera.org","References":"<20200828155136.541696-1-jacopo@jmondi.org>","From":"Kieran Bingham ","Autocrypt":"addr=kieran.bingham@ideasonboard.com; keydata=\n\t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\n\tWZw01QYHU/GUV/zHJSFk","Organization":"Ideas on Board","Message-ID":"<39472fd7-1fa8-8c42-e30b-c681fb585700@ideasonboard.com>","Date":"Fri, 28 Aug 2020 17:00:55 +0100","User-Agent":"Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101\n\tThunderbird/68.10.0","MIME-Version":"1.0","In-Reply-To":"<20200828155136.541696-1-jacopo@jmondi.org>","Content-Language":"en-GB","Subject":"Re: [libcamera-devel] [PATCH v2 1/3] libcamera: raspberrypi:\n\tdmaheaps: Improve device open","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Reply-To":"kieran.bingham@ideasonboard.com","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}}]