From: Bjorn Helgaas <helgaas@kernel.org>
To: George Cherian <george.cherian@marvell.com>
Cc: "linux-pci@vger.kernel.org" <linux-pci@vger.kernel.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
"shannon.zhao@linux.alibaba.com" <shannon.zhao@linux.alibaba.com>,
Robert Richter <rrichter@marvell.com>,
George Cherian <gcherian@marvell.com>
Subject: Re: [PATCH v2] PCI: Enhance the ACS quirk for Cavium devices
Date: Mon, 11 Nov 2019 17:01:22 -0600 [thread overview]
Message-ID: <20191111230122.GA59296@google.com> (raw)
In-Reply-To: <20191111024243.GA11408@dc5-eodlnx05.marvell.com>
On Mon, Nov 11, 2019 at 02:43:03AM +0000, George Cherian wrote:
> Enhance the ACS quirk for Cavium Processors. Add the root port
> vendor ID's for ThunderX2 and ThunderX3 series of processors.
>
> Signed-off-by: George Cherian <george.cherian@marvell.com>
> Reviewed-by: Robert Richter <rrichter@marvell.com>
Applied to pci/virtualization for v5.5, thanks!
I added a Fixes: f2ddaf8dfd4a ("PCI: Apply Cavium ThunderX ACS quirk
to more Root Ports") since it refines that patch, and also a stable
tag (like f2ddaf8dfd4a).
> ---
> drivers/pci/quirks.c | 20 +++++++++++++-------
> 1 file changed, 13 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
> index 44c4ae1abd00..19821d5d0ef3 100644
> --- a/drivers/pci/quirks.c
> +++ b/drivers/pci/quirks.c
> @@ -4243,15 +4243,21 @@ static int pci_quirk_amd_sb_acs(struct pci_dev *dev, u16 acs_flags)
>
> static bool pci_quirk_cavium_acs_match(struct pci_dev *dev)
> {
> + if (!pci_is_pcie(dev) || pci_pcie_type(dev) != PCI_EXP_TYPE_ROOT_PORT)
> + return false;
> +
> + switch (dev->device) {
> /*
> - * Effectively selects all downstream ports for whole ThunderX 1
> - * family by 0xf800 mask (which represents 8 SoCs), while the lower
> - * bits of device ID are used to indicate which subdevice is used
> - * within the SoC.
> + * Effectively selects all downstream ports for whole ThunderX1
> + * (which represents 8 SoCs).
> */
> - return (pci_is_pcie(dev) &&
> - (pci_pcie_type(dev) == PCI_EXP_TYPE_ROOT_PORT) &&
> - ((dev->device & 0xf800) == 0xa000));
> + case 0xa000 ... 0xa7ff: /* ThunderX1 */
> + case 0xaf84: /* ThunderX2 */
> + case 0xb884: /* ThunderX3 */
> + return true;
> + default:
> + return false;
> + }
> }
>
> static int pci_quirk_cavium_acs(struct pci_dev *dev, u16 acs_flags)
> --
> 2.17.1
>
prev parent reply other threads:[~2019-11-11 23:01 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-11 2:43 [PATCH v2] PCI: Enhance the ACS quirk for Cavium devices George Cherian
2019-11-11 23:01 ` Bjorn Helgaas [this message]
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=20191111230122.GA59296@google.com \
--to=helgaas@kernel.org \
--cc=gcherian@marvell.com \
--cc=george.cherian@marvell.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=rrichter@marvell.com \
--cc=shannon.zhao@linux.alibaba.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).