From: "Pali Rohár" <pali@kernel.org>
To: Robin Murphy <robin.murphy@arm.com>
Cc: "Lorenzo Pieralisi" <lpieralisi@kernel.org>,
"Thomas Petazzoni" <thomas.petazzoni@bootlin.com>,
"Krzysztof Wilczyński" <kw@linux.com>,
"Bjorn Helgaas" <bhelgaas@google.com>,
linux-pci@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH] PCI: mvebu: Fix endianity when accessing pci emul bridge members
Date: Fri, 12 Aug 2022 15:58:41 +0200 [thread overview]
Message-ID: <20220812135841.uhmdkpvjok574ijf@pali> (raw)
In-Reply-To: <3096bb82-62e6-bc9f-1600-fb58d6826302@arm.com>
On Friday 12 August 2022 11:32:59 Robin Murphy wrote:
> On 2022-08-12 10:40, Pali Rohár wrote:
> > PCI emul bridge members iolimitupper, iobaseupper, memlimit and membase are
> > of type __le16, so correctly access these members via le16_to_cpu() macros.
> >
> > Fixes: 4ded69473adb ("PCI: mvebu: Propagate errors when updating PCI_IO_BASE and PCI_MEM_BASE registers")
> > Reported-by: kernel test robot <lkp@intel.com>
> > Signed-off-by: Pali Rohár <pali@kernel.org>
> > ---
> > drivers/pci/controller/pci-mvebu.c | 12 ++++++------
> > 1 file changed, 6 insertions(+), 6 deletions(-)
> >
> > diff --git a/drivers/pci/controller/pci-mvebu.c b/drivers/pci/controller/pci-mvebu.c
> > index c1ffdb06c971..00ea0836b81a 100644
> > --- a/drivers/pci/controller/pci-mvebu.c
> > +++ b/drivers/pci/controller/pci-mvebu.c
> > @@ -523,7 +523,7 @@ static int mvebu_pcie_handle_iobase_change(struct mvebu_pcie_port *port)
> > /* Are the new iobase/iolimit values invalid? */
> > if (conf->iolimit < conf->iobase ||
> > - conf->iolimitupper < conf->iobaseupper)
> > + le16_to_cpu(conf->iolimitupper) < le16_to_cpu(conf->iobaseupper))
> > return mvebu_pcie_set_window(port, port->io_target, port->io_attr,
> > &desired, &port->iowin);
> > @@ -535,10 +535,10 @@ static int mvebu_pcie_handle_iobase_change(struct mvebu_pcie_port *port)
> > * is the CPU address.
> > */
> > desired.remap = ((conf->iobase & 0xF0) << 8) |
> > - (conf->iobaseupper << 16);
> > + le16_to_cpu(conf->iobaseupper << 16);
>
> This will always give 0, even when natively LE.
You are right, I overlooked it and I put closing parenthesis at wrong
place. Bit shifting should be applied after le to cpu conversion. I will
fix it in V2.
> > desired.base = port->pcie->io.start + desired.remap;
> > desired.size = ((0xFFF | ((conf->iolimit & 0xF0) << 8) |
> > - (conf->iolimitupper << 16)) -
> > + le16_to_cpu(conf->iolimitupper << 16)) -
>
> Similarly here.
>
> Robin.
>
> > desired.remap) +
> > 1;
> > @@ -552,7 +552,7 @@ static int mvebu_pcie_handle_membase_change(struct mvebu_pcie_port *port)
> > struct pci_bridge_emul_conf *conf = &port->bridge.conf;
> > /* Are the new membase/memlimit values invalid? */
> > - if (conf->memlimit < conf->membase)
> > + if (le16_to_cpu(conf->memlimit) < le16_to_cpu(conf->membase))
> > return mvebu_pcie_set_window(port, port->mem_target, port->mem_attr,
> > &desired, &port->memwin);
> > @@ -562,8 +562,8 @@ static int mvebu_pcie_handle_membase_change(struct mvebu_pcie_port *port)
> > * window to setup, according to the PCI-to-PCI bridge
> > * specifications.
> > */
> > - desired.base = ((conf->membase & 0xFFF0) << 16);
> > - desired.size = (((conf->memlimit & 0xFFF0) << 16) | 0xFFFFF) -
> > + desired.base = ((le16_to_cpu(conf->membase) & 0xFFF0) << 16);
> > + desired.size = (((le16_to_cpu(conf->memlimit) & 0xFFF0) << 16) | 0xFFFFF) -
> > desired.base + 1;
> > return mvebu_pcie_set_window(port, port->mem_target, port->mem_attr, &desired,
next prev parent reply other threads:[~2022-08-12 13:58 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-12 9:40 [PATCH] PCI: mvebu: Fix endianity when accessing pci emul bridge members Pali Rohár
2022-08-12 10:32 ` Robin Murphy
2022-08-12 13:58 ` Pali Rohár [this message]
2022-08-12 14:11 ` [PATCH v2] " Pali Rohár
2022-08-23 10:23 ` Lorenzo Pieralisi
2022-08-12 21:12 ` [PATCH] " kernel test robot
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=20220812135841.uhmdkpvjok574ijf@pali \
--to=pali@kernel.org \
--cc=bhelgaas@google.com \
--cc=kw@linux.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=lpieralisi@kernel.org \
--cc=robin.murphy@arm.com \
--cc=thomas.petazzoni@bootlin.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).