From: Andrew Murray <andrew.murray@arm.com>
To: Simon Horman <horms@verge.net.au>,
Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>,
Phil Edworthy <phil.edworthy@renesas.com>,
Marek Vasut <marek.vasut+renesas@gmail.com>,
Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Cc: linux-pci@vger.kernel.org, linux-renesas-soc@vger.kernel.org
Subject: Re: [RFC PATCH] PCI: rcar: Fix incorrect programming of OB windows
Date: Mon, 16 Dec 2019 12:06:07 +0000 [thread overview]
Message-ID: <20191216120607.GV24359@e119886-lin.cambridge.arm.com> (raw)
In-Reply-To: <20191004132941.6660-1-andrew.murray@arm.com>
On Fri, Oct 04, 2019 at 02:29:41PM +0100, Andrew Murray wrote:
> The outbound windows (PCIEPAUR(x), PCIEPALR(x)) describe a mapping between
> a CPU address (which is determined by the window number 'x') and a
> programmed PCI address - Thus allowing the controller to translate CPU
> accesses into PCI accesses.
>
> However the existing code incorrectly writes the CPU address - lets fix
> this by writing the PCI address instead.
>
> For memory transactions, existing DT users describe a 1:1 identity mapping
> and thus this change should have no effect. However the same isn't true for
> I/O.
>
> Fixes: c25da4778803 ("PCI: rcar: Add Renesas R-Car PCIe driver")
> Signed-off-by: Andrew Murray <andrew.murray@arm.com>
>
> ---
> This hasn't been tested, so keen for someone to give it a try.
>
> Also keen for someone to confirm my understanding that the RCar windows
> expect PCI addresses and that res->start refers to CPU addresses. If this
> is correct then it's possible the I/O doesn't work correctly.
Marek/Yoshihiro - any feedback on this?
Thanks,
Andrew Murray
> ---
> drivers/pci/controller/pcie-rcar.c | 9 +++++----
> 1 file changed, 5 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/pci/controller/pcie-rcar.c b/drivers/pci/controller/pcie-rcar.c
> index f6a669a9af41..b28d726b4aba 100644
> --- a/drivers/pci/controller/pcie-rcar.c
> +++ b/drivers/pci/controller/pcie-rcar.c
> @@ -332,11 +332,12 @@ static struct pci_ops rcar_pcie_ops = {
> };
>
> static void rcar_pcie_setup_window(int win, struct rcar_pcie *pcie,
> - struct resource *res)
> + struct resource_entry *window)
> {
> /* Setup PCIe address space mappings for each resource */
> resource_size_t size;
> resource_size_t res_start;
> + struct resource *res = window->res;
> u32 mask;
>
> rcar_pci_write_reg(pcie, 0x00000000, PCIEPTCTLR(win));
> @@ -350,9 +351,9 @@ static void rcar_pcie_setup_window(int win, struct rcar_pcie *pcie,
> rcar_pci_write_reg(pcie, mask << 7, PCIEPAMR(win));
>
> if (res->flags & IORESOURCE_IO)
> - res_start = pci_pio_to_address(res->start);
> + res_start = pci_pio_to_address(res->start) - window->offset;
> else
> - res_start = res->start;
> + res_start = res->start - window->offset;
>
> rcar_pci_write_reg(pcie, upper_32_bits(res_start), PCIEPAUR(win));
> rcar_pci_write_reg(pcie, lower_32_bits(res_start) & ~0x7F,
> @@ -381,7 +382,7 @@ static int rcar_pcie_setup(struct list_head *resource, struct rcar_pcie *pci)
> switch (resource_type(res)) {
> case IORESOURCE_IO:
> case IORESOURCE_MEM:
> - rcar_pcie_setup_window(i, pci, res);
> + rcar_pcie_setup_window(i, pci, win);
> i++;
> break;
> case IORESOURCE_BUS:
> --
> 2.21.0
>
next prev parent reply other threads:[~2019-12-16 12:06 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-04 13:29 [RFC PATCH] PCI: rcar: Fix incorrect programming of OB windows Andrew Murray
2019-12-16 12:06 ` Andrew Murray [this message]
2020-02-08 9:46 ` Marek Vasut
2020-02-08 18:41 ` Andrew Murray
2020-04-11 17:27 ` Marek Vasut
2020-04-24 11:50 ` Lorenzo Pieralisi
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=20191216120607.GV24359@e119886-lin.cambridge.arm.com \
--to=andrew.murray@arm.com \
--cc=horms@verge.net.au \
--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=phil.edworthy@renesas.com \
--cc=yoshihiro.shimoda.uh@renesas.com \
/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).