From: Brian Norris <briannorris@chromium.org> To: Carl Huang <cjhuang@codeaurora.org> Cc: ath10k@lists.infradead.org, linux-wireless@vger.kernel.org Subject: Re: [PATCH 3/3] ath10k: download firmware via diag Copy Engine for QCA6174 and QCA9377. Date: Fri, 21 Sep 2018 17:53:27 -0700 [thread overview] Message-ID: <20180922005325.GA47003@ban.mtv.corp.google.com> (raw) In-Reply-To: <1535596182-18038-4-git-send-email-cjhuang@codeaurora.org> Hi again! One last (?) comment: On Thu, Aug 30, 2018 at 10:29:42AM +0800, Carl Huang wrote: > diff --git a/drivers/net/wireless/ath/ath10k/hw.c b/drivers/net/wireless/ath/ath10k/hw.c > index 677535b..25ee1c6 100644 > --- a/drivers/net/wireless/ath/ath10k/hw.c > +++ b/drivers/net/wireless/ath/ath10k/hw.c > @@ -918,6 +919,190 @@ static int ath10k_hw_qca6174_enable_pll_clock(struct ath10k *ar) > +static int ath10k_hw_diag_segment_download(struct ath10k *ar, > + const void *buffer, > + u32 address, > + u32 length) > +{ > + if (address >= DRAM_BASE_ADDRESS + REGION_ACCESS_SIZE_LIMIT) > + /* Needs to change MSB for memory write */ > + return ath10k_hw_diag_segment_msb_download(ar, buffer, > + address, length); > + else > + return ath10k_hif_diag_write(ar, address, buffer, length); > +} > + > +int ath10k_hw_diag_fast_download(struct ath10k *ar, > + u32 address, > + const void *buffer, > + u32 length) > +{ > + const u8 *buf = buffer; > + bool sgmt_end = false; > + u32 base_addr = 0; > + u32 base_len = 0; > + u32 left = 0; > + struct bmi_segmented_file_header *hdr; > + struct bmi_segmented_metadata *metadata; > + int ret = 0; > + > + if (length < sizeof(*hdr)) > + return -EINVAL; > + > + /* check firmware header. If it has no correct magic number > + * or it's compressed, returns error. > + */ > + hdr = (struct bmi_segmented_file_header *)buf; > + if (hdr->magic_num != BMI_SGMTFILE_MAGIC_NUM) { > + ath10k_dbg(ar, ATH10K_DBG_BOOT, > + "Not a supported firmware, magic_num:0x%x\n", > + hdr->magic_num); > + return -EINVAL; > + } > + > + if (hdr->file_flags != 0) { > + ath10k_dbg(ar, ATH10K_DBG_BOOT, > + "Not a supported firmware, file_flags:0x%x\n", > + hdr->file_flags); > + return -EINVAL; > + } > + > + metadata = (struct bmi_segmented_metadata *)hdr->data; > + left = length - sizeof(*hdr); > + > + while (left > 0) { > + base_addr = metadata->addr; > + base_len = metadata->length; > + buf = metadata->data; > + left -= sizeof(*metadata); > + > + switch (base_len) { ... > + default: > + if (base_len > left) { > + /* sanity check */ > + ath10k_warn(ar, > + "firmware has invalid segment length, %d > %d\n", > + base_len, left); > + ret = -EINVAL; > + break; > + } > + > + ret = ath10k_hw_diag_segment_download(ar, > + buf, > + base_addr, > + base_len); This 'base_len' is determined by the firmware blob and in common cases is over 500K. The PCI implementation currently tries to dma_alloc_coherent() a bounce buffer for this. Many systems can't acquire that large of contiguous DMA memory reliably, so this is isn't very effective. Can we improve the strategy here? Do you lose a lot of speed if you do this in smaller (a few pages?) chunks instead? Brian > + > + if (ret) > + ath10k_warn(ar, > + "failed to download firmware via diag interface:%d\n", > + ret); > + break; ...
WARNING: multiple messages have this Message-ID (diff)
From: Brian Norris <briannorris@chromium.org> To: Carl Huang <cjhuang@codeaurora.org> Cc: linux-wireless@vger.kernel.org, ath10k@lists.infradead.org Subject: Re: [PATCH 3/3] ath10k: download firmware via diag Copy Engine for QCA6174 and QCA9377. Date: Fri, 21 Sep 2018 17:53:27 -0700 [thread overview] Message-ID: <20180922005325.GA47003@ban.mtv.corp.google.com> (raw) In-Reply-To: <1535596182-18038-4-git-send-email-cjhuang@codeaurora.org> Hi again! One last (?) comment: On Thu, Aug 30, 2018 at 10:29:42AM +0800, Carl Huang wrote: > diff --git a/drivers/net/wireless/ath/ath10k/hw.c b/drivers/net/wireless/ath/ath10k/hw.c > index 677535b..25ee1c6 100644 > --- a/drivers/net/wireless/ath/ath10k/hw.c > +++ b/drivers/net/wireless/ath/ath10k/hw.c > @@ -918,6 +919,190 @@ static int ath10k_hw_qca6174_enable_pll_clock(struct ath10k *ar) > +static int ath10k_hw_diag_segment_download(struct ath10k *ar, > + const void *buffer, > + u32 address, > + u32 length) > +{ > + if (address >= DRAM_BASE_ADDRESS + REGION_ACCESS_SIZE_LIMIT) > + /* Needs to change MSB for memory write */ > + return ath10k_hw_diag_segment_msb_download(ar, buffer, > + address, length); > + else > + return ath10k_hif_diag_write(ar, address, buffer, length); > +} > + > +int ath10k_hw_diag_fast_download(struct ath10k *ar, > + u32 address, > + const void *buffer, > + u32 length) > +{ > + const u8 *buf = buffer; > + bool sgmt_end = false; > + u32 base_addr = 0; > + u32 base_len = 0; > + u32 left = 0; > + struct bmi_segmented_file_header *hdr; > + struct bmi_segmented_metadata *metadata; > + int ret = 0; > + > + if (length < sizeof(*hdr)) > + return -EINVAL; > + > + /* check firmware header. If it has no correct magic number > + * or it's compressed, returns error. > + */ > + hdr = (struct bmi_segmented_file_header *)buf; > + if (hdr->magic_num != BMI_SGMTFILE_MAGIC_NUM) { > + ath10k_dbg(ar, ATH10K_DBG_BOOT, > + "Not a supported firmware, magic_num:0x%x\n", > + hdr->magic_num); > + return -EINVAL; > + } > + > + if (hdr->file_flags != 0) { > + ath10k_dbg(ar, ATH10K_DBG_BOOT, > + "Not a supported firmware, file_flags:0x%x\n", > + hdr->file_flags); > + return -EINVAL; > + } > + > + metadata = (struct bmi_segmented_metadata *)hdr->data; > + left = length - sizeof(*hdr); > + > + while (left > 0) { > + base_addr = metadata->addr; > + base_len = metadata->length; > + buf = metadata->data; > + left -= sizeof(*metadata); > + > + switch (base_len) { ... > + default: > + if (base_len > left) { > + /* sanity check */ > + ath10k_warn(ar, > + "firmware has invalid segment length, %d > %d\n", > + base_len, left); > + ret = -EINVAL; > + break; > + } > + > + ret = ath10k_hw_diag_segment_download(ar, > + buf, > + base_addr, > + base_len); This 'base_len' is determined by the firmware blob and in common cases is over 500K. The PCI implementation currently tries to dma_alloc_coherent() a bounce buffer for this. Many systems can't acquire that large of contiguous DMA memory reliably, so this is isn't very effective. Can we improve the strategy here? Do you lose a lot of speed if you do this in smaller (a few pages?) chunks instead? Brian > + > + if (ret) > + ath10k_warn(ar, > + "failed to download firmware via diag interface:%d\n", > + ret); > + break; ... _______________________________________________ ath10k mailing list ath10k@lists.infradead.org http://lists.infradead.org/mailman/listinfo/ath10k
next prev parent reply other threads:[~2018-09-22 6:44 UTC|newest] Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-08-30 2:29 [PATCH 0/3] ath10k: download firmware via diag ce for qca6174 and qca9377 Carl Huang 2018-08-30 2:29 ` Carl Huang 2018-08-30 2:29 ` [PATCH 1/3] ath10k: optimize pci diag mem read & write operations Carl Huang 2018-08-30 2:29 ` Carl Huang 2018-09-06 16:10 ` Kalle Valo 2018-09-06 16:10 ` Kalle Valo 2018-08-30 2:29 ` [PATCH 2/3] ath10k: support to access target space below 1M for qca6174 and qca9377 Carl Huang 2018-08-30 2:29 ` Carl Huang 2018-08-30 2:29 ` [PATCH 3/3] ath10k: download firmware via diag Copy Engine for QCA6174 and QCA9377 Carl Huang 2018-08-30 2:29 ` Carl Huang 2018-09-05 4:52 ` Kalle Valo 2018-09-05 4:52 ` Kalle Valo 2018-09-05 5:33 ` Carl Huang 2018-09-05 5:33 ` Carl Huang 2018-09-21 20:10 ` Brian Norris 2018-09-21 20:10 ` Brian Norris 2018-09-21 20:39 ` Brian Norris 2018-09-21 20:39 ` Brian Norris 2018-09-22 0:53 ` Brian Norris [this message] 2018-09-22 0:53 ` Brian Norris 2018-09-25 6:19 ` Carl Huang 2018-09-25 6:19 ` Carl Huang
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=20180922005325.GA47003@ban.mtv.corp.google.com \ --to=briannorris@chromium.org \ --cc=ath10k@lists.infradead.org \ --cc=cjhuang@codeaurora.org \ --cc=linux-wireless@vger.kernel.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: linkBe 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.