From: vinod.koul@intel.com (Vinod Koul)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 3/7] dmaengine: st_fdma: Add STMicroelectronics FDMA engine driver support
Date: Wed, 19 Aug 2015 21:10:07 +0530 [thread overview]
Message-ID: <20150819154007.GB13546@localhost> (raw)
In-Reply-To: <1436371888-27863-4-git-send-email-peter.griffin@linaro.org>
On Wed, Jul 08, 2015 at 05:11:24PM +0100, Peter Griffin wrote:
> +static int
> +st_fdma_elf_sanity_check(struct st_fdma_dev *fdev, const struct firmware *fw)
> +{
> + const char *fw_name = fdev->pdata->fw_name;
> + struct elf32_hdr *ehdr;
> + char class;
> +
> + if (!fw) {
> + dev_err(fdev->dev, "failed to load %s\n", fw_name);
> + return -EINVAL;
> + }
> +
> + if (fw->size < sizeof(struct elf32_hdr)) {
sizeof(*ehdr) ?
> + dev_err(fdev->dev, "Image is too small\n");
> + return -EINVAL;
> + }
> +
> + ehdr = (struct elf32_hdr *)fw->data;
> +
> + /* We only support ELF32 at this point */
> + class = ehdr->e_ident[EI_CLASS];
> + if (class != ELFCLASS32) {
> + dev_err(fdev->dev, "Unsupported class: %d\n", class);
> + return -EINVAL;
> + }
> +
> + if (ehdr->e_ident[EI_DATA] != ELFDATA2LSB) {
> + dev_err(fdev->dev, "Unsupported firmware endianness\n");
would be worth printing the value for debug
> + return -EINVAL;
> + }
> +
> + if (fw->size < ehdr->e_shoff + sizeof(struct elf32_shdr)) {
> + dev_err(fdev->dev, "Image is too small\n");
Again printing size helps when you get a log trace and have no idea why size
was small. Similar one other places
> + dst = st_fdma_seg_to_mem(fdev, da, memsz);
> + if (!dst) {
> + dev_err(dev, "bad phdr da 0x%x mem 0x%x\n", da, memsz);
> + break;
> + }
> +
> + if (phdr->p_filesz)
> + memcpy(dst, elf_data + phdr->p_offset, filesz);
> +
> + if (memsz > filesz)
> + memset(dst + filesz, 0, memsz - filesz);
> +
> + mem_loaded++;
> + }
> +
> + return (mem_loaded != fdev->drvdata->num_mem) ? -EINVAL : 0;
so you are not expecting any segment with PT_LOAD otherwise this check will
fail as num_mem is assigned from e_phnum.
Also perhaps EIO will be better return?
> +}
> +
> +static void st_fdma_enable(struct st_fdma_dev *fdev)
> +{
> + unsigned long hw_id, hw_ver, fw_rev;
> + u32 val;
> +
> + /* disable CPU pipeline clock & reset cpu pipeline */
> + val = FDMA_CLK_GATE_DIS | FDMA_CLK_GATE_RESET;
> + fdma_write(fdev, val, CLK_GATE);
empty line here
> + /* disable SLIM core STBus sync */
> + fdma_write(fdev, FDMA_STBUS_SYNC_DIS, STBUS_SYNC);
> + /* enable cpu pipeline clock */
> + fdma_write(fdev, !FDMA_CLK_GATE_DIS, CLK_GATE);
> +
> + /* clear int & cmd mailbox */
> + fdma_write(fdev, ~0UL, INT_CLR);
> + fdma_write(fdev, ~0UL, CMD_CLR);
here too
> +static int st_fdma_get_fw(struct st_fdma_dev *fdev)
> +{
> + int ret;
> +
> + init_completion(&fdev->fw_ack);
> + atomic_set(&fdev->fw_loaded, 0);
> +
> + ret = request_firmware_nowait(THIS_MODULE, FW_ACTION_HOTPLUG,
> + fdev->pdata->fw_name, fdev->dev,
> + GFP_KERNEL, fdev, st_fdma_fw_cb);
Isn't doing this in device probe too stringent and holding up load...
> + fdesc = st_fdma_alloc_desc(fchan, sg_len);
> + if (!fdesc) {
> + dev_err(fchan->fdev->dev, "no memory for desc\n");
> + return NULL;
> + }
> +
> + fdesc->iscyclic = false;
> +
> + for_each_sg(sgl, sg, sg_len, i) {
> + hw_node = fdesc->node[i].desc;
> +
> + hw_node->next = fdesc->node[(i + 1) % sg_len].pdesc;
> + hw_node->control = NODE_CTRL_REQ_MAP_DREQ(fchan->dreq_line);
> +
> + if (direction == DMA_MEM_TO_DEV) {
> + hw_node->control |= NODE_CTRL_SRC_INCR;
> + hw_node->control |= NODE_CTRL_DST_STATIC;
> + hw_node->saddr = sg_dma_address(sg);
> + hw_node->daddr = fchan->cfg.dev_addr;
> + } else {
> + hw_node->control |= NODE_CTRL_SRC_STATIC;
> + hw_node->control |= NODE_CTRL_DST_INCR;
> + hw_node->saddr = fchan->cfg.dev_addr;
> + hw_node->daddr = sg_dma_address(sg);
> + }
> +
> + hw_node->nbytes = sg_dma_len(sg);
> + hw_node->generic.length = sg_dma_len(sg);
> + hw_node->generic.sstride = 0;
> + hw_node->generic.dstride = 0;
This looks quite similar to previous one, I think some bits can be reused
> +static int st_fdma_slave_config(struct dma_chan *chan,
> + struct dma_slave_config *slave_cfg)
> +{
> + u32 maxburst = 0, addr = 0;
> + enum dma_slave_buswidth width;
> + struct st_fdma_chan *fchan = to_st_fdma_chan(chan);
> + int ch_id = fchan->vchan.chan.chan_id;
> + struct st_fdma_dev *fdev = fchan->fdev;
> +
> + if (slave_cfg->direction == DMA_DEV_TO_MEM) {
This is depreciated, you can't use direction here. Please save the fields and
then use them in prep_ call
Also this is quite big patch, consider splitting it up for faster review
--
~Vinod
WARNING: multiple messages have this Message-ID (diff)
From: Vinod Koul <vinod.koul@intel.com>
To: Peter Griffin <peter.griffin@linaro.org>
Cc: linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, srinivas.kandagatla@gmail.com,
maxime.coquelin@st.com, patrice.chotard@st.com,
dan.j.williams@intel.com, lee.jones@linaro.org,
devicetree@vger.kernel.org, dmaengine@vger.kernel.org,
ludovic.barre@st.com
Subject: Re: [PATCH 3/7] dmaengine: st_fdma: Add STMicroelectronics FDMA engine driver support
Date: Wed, 19 Aug 2015 21:10:07 +0530 [thread overview]
Message-ID: <20150819154007.GB13546@localhost> (raw)
In-Reply-To: <1436371888-27863-4-git-send-email-peter.griffin@linaro.org>
On Wed, Jul 08, 2015 at 05:11:24PM +0100, Peter Griffin wrote:
> +static int
> +st_fdma_elf_sanity_check(struct st_fdma_dev *fdev, const struct firmware *fw)
> +{
> + const char *fw_name = fdev->pdata->fw_name;
> + struct elf32_hdr *ehdr;
> + char class;
> +
> + if (!fw) {
> + dev_err(fdev->dev, "failed to load %s\n", fw_name);
> + return -EINVAL;
> + }
> +
> + if (fw->size < sizeof(struct elf32_hdr)) {
sizeof(*ehdr) ?
> + dev_err(fdev->dev, "Image is too small\n");
> + return -EINVAL;
> + }
> +
> + ehdr = (struct elf32_hdr *)fw->data;
> +
> + /* We only support ELF32 at this point */
> + class = ehdr->e_ident[EI_CLASS];
> + if (class != ELFCLASS32) {
> + dev_err(fdev->dev, "Unsupported class: %d\n", class);
> + return -EINVAL;
> + }
> +
> + if (ehdr->e_ident[EI_DATA] != ELFDATA2LSB) {
> + dev_err(fdev->dev, "Unsupported firmware endianness\n");
would be worth printing the value for debug
> + return -EINVAL;
> + }
> +
> + if (fw->size < ehdr->e_shoff + sizeof(struct elf32_shdr)) {
> + dev_err(fdev->dev, "Image is too small\n");
Again printing size helps when you get a log trace and have no idea why size
was small. Similar one other places
> + dst = st_fdma_seg_to_mem(fdev, da, memsz);
> + if (!dst) {
> + dev_err(dev, "bad phdr da 0x%x mem 0x%x\n", da, memsz);
> + break;
> + }
> +
> + if (phdr->p_filesz)
> + memcpy(dst, elf_data + phdr->p_offset, filesz);
> +
> + if (memsz > filesz)
> + memset(dst + filesz, 0, memsz - filesz);
> +
> + mem_loaded++;
> + }
> +
> + return (mem_loaded != fdev->drvdata->num_mem) ? -EINVAL : 0;
so you are not expecting any segment with PT_LOAD otherwise this check will
fail as num_mem is assigned from e_phnum.
Also perhaps EIO will be better return?
> +}
> +
> +static void st_fdma_enable(struct st_fdma_dev *fdev)
> +{
> + unsigned long hw_id, hw_ver, fw_rev;
> + u32 val;
> +
> + /* disable CPU pipeline clock & reset cpu pipeline */
> + val = FDMA_CLK_GATE_DIS | FDMA_CLK_GATE_RESET;
> + fdma_write(fdev, val, CLK_GATE);
empty line here
> + /* disable SLIM core STBus sync */
> + fdma_write(fdev, FDMA_STBUS_SYNC_DIS, STBUS_SYNC);
> + /* enable cpu pipeline clock */
> + fdma_write(fdev, !FDMA_CLK_GATE_DIS, CLK_GATE);
> +
> + /* clear int & cmd mailbox */
> + fdma_write(fdev, ~0UL, INT_CLR);
> + fdma_write(fdev, ~0UL, CMD_CLR);
here too
> +static int st_fdma_get_fw(struct st_fdma_dev *fdev)
> +{
> + int ret;
> +
> + init_completion(&fdev->fw_ack);
> + atomic_set(&fdev->fw_loaded, 0);
> +
> + ret = request_firmware_nowait(THIS_MODULE, FW_ACTION_HOTPLUG,
> + fdev->pdata->fw_name, fdev->dev,
> + GFP_KERNEL, fdev, st_fdma_fw_cb);
Isn't doing this in device probe too stringent and holding up load...
> + fdesc = st_fdma_alloc_desc(fchan, sg_len);
> + if (!fdesc) {
> + dev_err(fchan->fdev->dev, "no memory for desc\n");
> + return NULL;
> + }
> +
> + fdesc->iscyclic = false;
> +
> + for_each_sg(sgl, sg, sg_len, i) {
> + hw_node = fdesc->node[i].desc;
> +
> + hw_node->next = fdesc->node[(i + 1) % sg_len].pdesc;
> + hw_node->control = NODE_CTRL_REQ_MAP_DREQ(fchan->dreq_line);
> +
> + if (direction == DMA_MEM_TO_DEV) {
> + hw_node->control |= NODE_CTRL_SRC_INCR;
> + hw_node->control |= NODE_CTRL_DST_STATIC;
> + hw_node->saddr = sg_dma_address(sg);
> + hw_node->daddr = fchan->cfg.dev_addr;
> + } else {
> + hw_node->control |= NODE_CTRL_SRC_STATIC;
> + hw_node->control |= NODE_CTRL_DST_INCR;
> + hw_node->saddr = fchan->cfg.dev_addr;
> + hw_node->daddr = sg_dma_address(sg);
> + }
> +
> + hw_node->nbytes = sg_dma_len(sg);
> + hw_node->generic.length = sg_dma_len(sg);
> + hw_node->generic.sstride = 0;
> + hw_node->generic.dstride = 0;
This looks quite similar to previous one, I think some bits can be reused
> +static int st_fdma_slave_config(struct dma_chan *chan,
> + struct dma_slave_config *slave_cfg)
> +{
> + u32 maxburst = 0, addr = 0;
> + enum dma_slave_buswidth width;
> + struct st_fdma_chan *fchan = to_st_fdma_chan(chan);
> + int ch_id = fchan->vchan.chan.chan_id;
> + struct st_fdma_dev *fdev = fchan->fdev;
> +
> + if (slave_cfg->direction == DMA_DEV_TO_MEM) {
This is depreciated, you can't use direction here. Please save the fields and
then use them in prep_ call
Also this is quite big patch, consider splitting it up for faster review
--
~Vinod
next prev parent reply other threads:[~2015-08-19 15:40 UTC|newest]
Thread overview: 61+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-08 16:11 [PATCH 0/7] Add support for FDMA DMA controller found on STi chipsets Peter Griffin
2015-07-08 16:11 ` Peter Griffin
2015-07-08 16:11 ` [PATCH 1/7] dmaengine: st_fdma: Add STMicroelectronics FDMA DT binding documentation Peter Griffin
2015-07-08 16:11 ` Peter Griffin
2015-08-19 15:06 ` Vinod Koul
2015-08-19 15:06 ` Vinod Koul
2015-08-19 15:06 ` Vinod Koul
2015-08-25 17:08 ` Peter Griffin
2015-08-25 17:08 ` Peter Griffin
2015-08-26 7:12 ` Lee Jones
2015-08-26 7:12 ` Lee Jones
2015-08-26 7:12 ` Lee Jones
2015-09-03 9:18 ` Peter Griffin
2015-09-03 9:18 ` Peter Griffin
2015-07-08 16:11 ` [PATCH 2/7] dmaengine: st_fdma: Add STMicroelectronics FDMA xbar " Peter Griffin
2015-07-08 16:11 ` Peter Griffin
2015-07-08 16:11 ` Peter Griffin
2015-07-08 16:11 ` [PATCH 3/7] dmaengine: st_fdma: Add STMicroelectronics FDMA engine driver support Peter Griffin
2015-07-08 16:11 ` Peter Griffin
2015-07-08 16:11 ` Peter Griffin
2015-07-09 8:17 ` Paul Bolle
2015-07-09 8:17 ` Paul Bolle
2015-08-28 17:59 ` Peter Griffin
2015-08-28 17:59 ` Peter Griffin
2015-08-28 17:59 ` Peter Griffin
2015-08-31 7:49 ` Maxime Coquelin
2015-08-31 7:49 ` Maxime Coquelin
2015-08-31 7:49 ` Maxime Coquelin
2015-08-31 8:08 ` Paul Bolle
2015-08-31 8:08 ` Paul Bolle
2015-08-31 8:08 ` Paul Bolle
2015-08-31 8:44 ` Maxime Coquelin
2015-08-31 8:44 ` Maxime Coquelin
2015-08-31 8:44 ` Maxime Coquelin
2015-08-19 15:40 ` Vinod Koul [this message]
2015-08-19 15:40 ` Vinod Koul
2015-09-02 17:42 ` Peter Griffin
2015-09-02 17:42 ` Peter Griffin
2015-09-02 17:42 ` Peter Griffin
2015-07-08 16:11 ` [PATCH 4/7] dmaengine: st_fdma: Add xbar support Peter Griffin
2015-07-08 16:11 ` Peter Griffin
2015-07-08 16:11 ` Peter Griffin
2015-07-09 8:27 ` Paul Bolle
2015-07-09 8:27 ` Paul Bolle
2015-07-08 16:11 ` [PATCH 5/7] ARM: STi: DT: STiH407: Add FDMA driver and xbar driver dt nodes Peter Griffin
2015-07-08 16:11 ` Peter Griffin
2015-08-26 7:46 ` Lee Jones
2015-08-26 7:46 ` Lee Jones
2015-09-03 14:12 ` Peter Griffin
2015-09-03 14:12 ` Peter Griffin
2015-09-03 14:12 ` Peter Griffin
2015-07-08 16:11 ` [PATCH 6/7] MAINTAINERS: Add FDMA driver files to STi section Peter Griffin
2015-07-08 16:11 ` Peter Griffin
2015-08-26 7:33 ` Lee Jones
2015-08-26 7:33 ` Lee Jones
2015-08-26 7:33 ` Lee Jones
2015-09-02 15:14 ` Peter Griffin
2015-09-02 15:14 ` Peter Griffin
2015-09-02 15:14 ` Peter Griffin
2015-07-08 16:11 ` [PATCH 7/7] ARM: multi_v7_defconfig: Enable STi FDMA driver Peter Griffin
2015-07-08 16:11 ` Peter Griffin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20150819154007.GB13546@localhost \
--to=vinod.koul@intel.com \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.