From: Bjorn Helgaas <helgaas@kernel.org>
To: Rick Wertenbroek <rick.wertenbroek@gmail.com>
Cc: rick.wertenbroek@heig-vd.ch, dlemoal@kernel.org,
stable@vger.kernel.org, "Shawn Lin" <shawn.lin@rock-chips.com>,
"Lorenzo Pieralisi" <lpieralisi@kernel.org>,
"Krzysztof Wilczyński" <kw@linux.com>,
"Rob Herring" <robh@kernel.org>,
"Bjorn Helgaas" <bhelgaas@google.com>,
"Heiko Stuebner" <heiko@sntech.de>,
linux-pci@vger.kernel.org, linux-rockchip@lists.infradead.org,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH] PCI: rockchip-ep: Remove wrong mask on subsys_vendor_id
Date: Wed, 15 May 2024 16:13:50 -0500 [thread overview]
Message-ID: <20240515211350.GA2139074@bhelgaas> (raw)
In-Reply-To: <20240515205547.GA2137633@bhelgaas>
On Wed, May 15, 2024 at 03:55:49PM -0500, Bjorn Helgaas wrote:
> On Wed, Apr 03, 2024 at 04:45:08PM +0200, Rick Wertenbroek wrote:
> > Remove wrong mask on subsys_vendor_id. Both the Vendor ID and Subsystem
> > Vendor ID are u16 variables and are written to a u32 register of the
> > controller. The Subsystem Vendor ID was always 0 because the u16 value
> > was masked incorrectly with GENMASK(31,16) resulting in all lower 16
> > bits being set to 0 prior to the shift.
> >
> > Remove both masks as they are unnecessary and set the register correctly
> > i.e., the lower 16-bits are the Vendor ID and the upper 16-bits are the
> > Subsystem Vendor ID.
> >
> > This is documented in the RK3399 TRM section 17.6.7.1.17
> >
> > Fixes: cf590b078391 ("PCI: rockchip: Add EP driver for Rockchip PCIe controller")
> > Signed-off-by: Rick Wertenbroek <rick.wertenbroek@gmail.com>
> > Cc: stable@vger.kernel.org
>
> Applied to pci/controller/rockchip by Krzysztof, but his outgoing mail
> queue got stuck. I added Damien's Reviewed-by. Trying to squeeze
> into v6.9.
Sorry, I meant v6.10. v6.9 is already done.
> > ---
> > drivers/pci/controller/pcie-rockchip-ep.c | 7 +++----
> > 1 file changed, 3 insertions(+), 4 deletions(-)
> >
> > diff --git a/drivers/pci/controller/pcie-rockchip-ep.c b/drivers/pci/controller/pcie-rockchip-ep.c
> > index c9046e97a1d2..37d4bcb8bd5b 100644
> > --- a/drivers/pci/controller/pcie-rockchip-ep.c
> > +++ b/drivers/pci/controller/pcie-rockchip-ep.c
> > @@ -98,10 +98,9 @@ static int rockchip_pcie_ep_write_header(struct pci_epc *epc, u8 fn, u8 vfn,
> >
> > /* All functions share the same vendor ID with function 0 */
> > if (fn == 0) {
> > - u32 vid_regs = (hdr->vendorid & GENMASK(15, 0)) |
> > - (hdr->subsys_vendor_id & GENMASK(31, 16)) << 16;
> > -
> > - rockchip_pcie_write(rockchip, vid_regs,
> > + rockchip_pcie_write(rockchip,
> > + hdr->vendorid |
> > + hdr->subsys_vendor_id << 16,
> > PCIE_CORE_CONFIG_VENDOR);
> > }
> >
> > --
> > 2.25.1
> >
next prev parent reply other threads:[~2024-05-15 21:13 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-03 14:45 [PATCH] PCI: rockchip-ep: Remove wrong mask on subsys_vendor_id Rick Wertenbroek
2024-04-03 14:55 ` Rick Wertenbroek
2024-05-07 7:39 ` Damien Le Moal
2024-05-15 20:55 ` Bjorn Helgaas
2024-05-15 21:13 ` Bjorn Helgaas [this message]
2024-05-17 11:18 ` Krzysztof Wilczyński
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=20240515211350.GA2139074@bhelgaas \
--to=helgaas@kernel.org \
--cc=bhelgaas@google.com \
--cc=dlemoal@kernel.org \
--cc=heiko@sntech.de \
--cc=kw@linux.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=linux-rockchip@lists.infradead.org \
--cc=lpieralisi@kernel.org \
--cc=rick.wertenbroek@gmail.com \
--cc=rick.wertenbroek@heig-vd.ch \
--cc=robh@kernel.org \
--cc=shawn.lin@rock-chips.com \
--cc=stable@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: 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 read-only IMAP folder(s) and NNTP newsgroup(s).