From: Simon Horman <horms@verge.net.au>
To: marek.vasut@gmail.com
Cc: linux-pci@vger.kernel.org,
Marek Vasut <marek.vasut+renesas@gmail.com>,
Geert Uytterhoeven <geert+renesas@glider.be>,
Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>,
Wolfram Sang <wsa@the-dreams.de>,
linux-renesas-soc@vger.kernel.org
Subject: Re: [PATCH 2/2] PCI: rcar: Recalculate inbound range alignment for each controller entry
Date: Wed, 10 Jul 2019 09:13:57 +0200 [thread overview]
Message-ID: <20190710071355.x5uxc5rvnv7cq5go@verge.net.au> (raw)
In-Reply-To: <20190709011559.12379-2-marek.vasut@gmail.com>
On Tue, Jul 09, 2019 at 03:15:59AM +0200, marek.vasut@gmail.com wrote:
> From: Marek Vasut <marek.vasut+renesas@gmail.com>
>
> Due to hardware constraints, the size of each inbound range entry
> populated into the controller cannot be larger than the alignment
> of the entry's start address. Currently, the alignment for each
> "dma-ranges" inbound range is calculated only once for each range
> and the increment for programming the controller is also derived
> from it only once. Thus, a "dma-ranges" entry describing a memory
> at 0x48000000 and size 0x38000000 would lead to multiple controller
> entries, each 0x08000000 long.
>
> This is inefficient, especially considering that by adding the size
> to the start address, the alignment increases. This patch moves the
> alignment calculation into the loop populating the controller entries,
> thus updating the alignment for each controller entry.
>
> Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
> Cc: Geert Uytterhoeven <geert+renesas@glider.be>
> Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
> Cc: Wolfram Sang <wsa@the-dreams.de>
> Cc: linux-renesas-soc@vger.kernel.org
> To: linux-pci@vger.kernel.org
Reviewed-by: Simon Horman <horms+renesas@verge.net.au>
> ---
> drivers/pci/controller/pcie-rcar.c | 33 +++++++++++++++---------------
> 1 file changed, 17 insertions(+), 16 deletions(-)
>
> diff --git a/drivers/pci/controller/pcie-rcar.c b/drivers/pci/controller/pcie-rcar.c
> index 938adff4148f..48f361b5d690 100644
> --- a/drivers/pci/controller/pcie-rcar.c
> +++ b/drivers/pci/controller/pcie-rcar.c
> @@ -1029,25 +1029,26 @@ static int rcar_pcie_inbound_ranges(struct rcar_pcie *pcie,
> if (restype & IORESOURCE_PREFETCH)
> flags |= LAM_PREFETCH;
>
> - /*
> - * If the size of the range is larger than the alignment of the start
> - * address, we have to use multiple entries to perform the mapping.
> - */
> - if (cpu_addr > 0) {
> - unsigned long nr_zeros = __ffs64(cpu_addr);
> - u64 alignment = 1ULL << nr_zeros;
> + while (cpu_addr < cpu_end) {
> + /*
> + * If the size of the range is larger than the alignment of
> + * the start address, we have to use multiple entries to
> + * perform the mapping.
> + */
> + if (cpu_addr > 0) {
> + unsigned long nr_zeros = __ffs64(cpu_addr);
> + u64 alignment = 1ULL << nr_zeros;
>
> - size = min(range->size, alignment);
> - } else {
> - size = range->size;
> - }
> - /* Hardware supports max 4GiB inbound region */
> - size = min(size, 1ULL << 32);
> + size = min(range->size, alignment);
> + } else {
> + size = range->size;
> + }
> + /* Hardware supports max 4GiB inbound region */
> + size = min(size, 1ULL << 32);
>
> - mask = roundup_pow_of_two(size) - 1;
> - mask &= ~0xf;
> + mask = roundup_pow_of_two(size) - 1;
> + mask &= ~0xf;
>
> - while (cpu_addr < cpu_end) {
> /*
> * Set up 64-bit inbound regions as the range parser doesn't
> * distinguish between 32 and 64-bit types.
> --
> 2.20.1
>
next prev parent reply other threads:[~2019-07-10 7:14 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-09 1:15 [PATCH 1/2] PCI: rcar: Do not abort on too many inbound dma-ranges marek.vasut
2019-07-09 1:15 ` [PATCH 2/2] PCI: rcar: Recalculate inbound range alignment for each controller entry marek.vasut
2019-07-10 7:13 ` Simon Horman [this message]
2019-07-09 6:58 ` [PATCH 1/2] PCI: rcar: Do not abort on too many inbound dma-ranges Geert Uytterhoeven
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=20190710071355.x5uxc5rvnv7cq5go@verge.net.au \
--to=horms@verge.net.au \
--cc=geert+renesas@glider.be \
--cc=linux-pci@vger.kernel.org \
--cc=linux-renesas-soc@vger.kernel.org \
--cc=lorenzo.pieralisi@arm.com \
--cc=marek.vasut+renesas@gmail.com \
--cc=marek.vasut@gmail.com \
--cc=wsa@the-dreams.de \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).