From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752954AbdHJRpt (ORCPT ); Thu, 10 Aug 2017 13:45:49 -0400 Received: from mail.kernel.org ([198.145.29.99]:52056 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752597AbdHJRpr (ORCPT ); Thu, 10 Aug 2017 13:45:47 -0400 DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1530A2156A Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=helgaas@kernel.org Date: Thu, 10 Aug 2017 12:45:33 -0500 From: Bjorn Helgaas To: Feng Kan Cc: linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org, bhelgaas@google.com, alex.williamson@redhat.com, Tanmay Inamdar Subject: Re: [PATCH V4] pci: quirk: Apply APM ACS quirk to XGene devices Message-ID: <20170810174533.GA18397@bhelgaas-glaptop.roam.corp.google.com> References: <1501628893-28492-1-git-send-email-fkan@apm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1501628893-28492-1-git-send-email-fkan@apm.com> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org [+cc Tanmay] On Tue, Aug 01, 2017 at 04:08:13PM -0700, Feng Kan wrote: > The APM X-Gene PCIe root port does not support ACS at this point. > However, the hw provides isolation and source validation through > the SMMU. The stream ID generated by the PCIe ports contain both > the BDF as well as the port ID in its 3 most significant bits. > Turn on ACS but disable all the peer to peer features. > > Signed-off-by: Feng Kan This should really have Tanmay's ack (cc'd). Provisionally applied to pci/host-xgene for v4.14. > --- > V4 Change: Remove TB & TD flags from ACS mask > V3 Change: Add comment regarding unique port id in stream ID > V2 Change: Move XGene ACS quirk to unique XGene function > > drivers/pci/quirks.c | 14 ++++++++++++++ > 1 file changed, 14 insertions(+) > > diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c > index 085fb78..22343b3 100644 > --- a/drivers/pci/quirks.c > +++ b/drivers/pci/quirks.c > @@ -4120,6 +4120,18 @@ static int pci_quirk_cavium_acs(struct pci_dev *dev, u16 acs_flags) > return acs_flags ? 0 : 1; > } > > +static int pci_quirk_xgene_acs(struct pci_dev *dev, u16 acs_flags) > +{ > + /* > + * XGene root matching this quirk do not allow peer-to-peer > + * transactions with others, allowing masking out these bits as if they > + * were unimplemented in the ACS capability. > + */ > + acs_flags &= ~(PCI_ACS_SV | PCI_ACS_RR | PCI_ACS_CR | PCI_ACS_UF); > + > + return acs_flags ? 0 : 1; > +} > + > /* > * Many Intel PCH root ports do provide ACS-like features to disable peer > * transactions and validate bus numbers in requests, but do not provide an > @@ -4368,6 +4380,8 @@ static int pci_quirk_mf_endpoint_acs(struct pci_dev *dev, u16 acs_flags) > { 0x10df, 0x720, pci_quirk_mf_endpoint_acs }, /* Emulex Skyhawk-R */ > /* Cavium ThunderX */ > { PCI_VENDOR_ID_CAVIUM, PCI_ANY_ID, pci_quirk_cavium_acs }, > + /* APM XGene */ > + { PCI_VENDOR_ID_AMCC, 0xE004, pci_quirk_xgene_acs }, > { 0 } > }; > > -- > 1.8.3.1 >