Message ID | 20230111190533.29979-1-vidyas@nvidia.com |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp3493846wrt; Wed, 11 Jan 2023 11:18:10 -0800 (PST) X-Google-Smtp-Source: AMrXdXu3+6IZyjIbpiZ60xxzxYaNiNzL+yDrjDT/QGDQA6FpL1HvvVsfSExCBfuCzwTvwYROJ/Xg X-Received: by 2002:a05:6402:2909:b0:499:b674:5a1f with SMTP id ee9-20020a056402290900b00499b6745a1fmr9376793edb.28.1673464690392; Wed, 11 Jan 2023 11:18:10 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1673464690; cv=pass; d=google.com; s=arc-20160816; b=DZG3J7/hbH41pCI7v26AsTS0GIG5D6Cd4kM5JC4Hq50XQ0nfebJpwjk52fJJzNrGMZ 4IM/N6Pe/gz7PcY7gUzqQZyATDWSvH9YKK5YJ6ZeEisAbHdbSvDwTMss/0eeqXZeKNyz mKRzxtIK0V6qCpVP7ZvNLt3xbPd6wEc6+GnC/o3nbVdxZlF65VEhbR4efJTRV0e1mY8R tIchhyRDBqPQWijs+K7xDaZs8qQA1byBr2NK8K51DOQxndM9pkYJMKrEKCnmj+MDN9kM UaCK4ZqZJgeJg0fgg2FJ6VLkYaljG9C3plY4QGPmLXqrsw/UWRokloVyVLnEHOaAYg4G FZ2g== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=VlGtpj1hFMlePbUiz2GjxUz+0VUauZy4uNYRZ77KOXI=; b=Buxq5p6sjGoB5gnTbw0xPeYqGcw9OoALJdZ4a3Mi4yE/I7DbkWHCc/fnALioBCKUPb RV6pc4/VICg6XWwSftPiW6h/QrIk6Ic4ZrCOWQWftmZv/1F1Ljfi6lhViBnH497MoDdk SIcOjC/gqJ4IXHbBPPexAnRnhnx9KElogBmco/hmf1678BdrNoIKWE+5I/dmkKjhjjYN eST0kEQJDqRBTtdZFtHu5gSLQqYsHW9TXVeJ/NxMbHC2VSjxxNgRhX2xKDSqoopyufwb qorm2M8jsCMy1RuY4ohtEgndmzuh7Xv1tL2P+qNRLCnEUqYwBuszsaK5hIiI90+XGIIb KQvg== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@Nvidia.com header.s=selector2 header.b=uDagvio6; arc=pass (i=1 spf=pass spfdomain=nvidia.com dmarc=pass fromdomain=nvidia.com); spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=nvidia.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id q16-20020a056402519000b0048d06445a1asi18522010edd.286.2023.01.11.11.17.46; Wed, 11 Jan 2023 11:18:10 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@Nvidia.com header.s=selector2 header.b=uDagvio6; arc=pass (i=1 spf=pass spfdomain=nvidia.com dmarc=pass fromdomain=nvidia.com); spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=nvidia.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236169AbjAKTGA (ORCPT <rfc822;syz17693488234@gmail.com> + 99 others); Wed, 11 Jan 2023 14:06:00 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55950 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235772AbjAKTF5 (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Wed, 11 Jan 2023 14:05:57 -0500 Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2084.outbound.protection.outlook.com [40.107.92.84]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 20901B01; Wed, 11 Jan 2023 11:05:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kubdJqDUqAlNPEGd7J/wAJRGsM/3hM9JjDQ8iFpsJ66VG+bmLp1kVk+Qe/ZjzlPKrARGbGxpt0u/zg5vwE4kMihKUtIq2sUgGtuuUaeEAVm07uvVkxUFD2My1LG26knaoi/wA28ZqC1e/xsN9U03+8wPaJpwlZymzeWSiaRqGEWdGfsTVffp89Z0V0KfIl0znKpITyD13/KnunC+u5SGXBQyS0qi7E5dP2erbh3TNbHr+SZaWToMqQtySJbl1DdZULPJmfYOiXi82cAl2xqhzGdkRaRLy42DNQoPQStZpCbXqWVd1Rh99S/Dq2Pc6oOOz64wfl3OkjdqJ/rn8JNMqQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=VlGtpj1hFMlePbUiz2GjxUz+0VUauZy4uNYRZ77KOXI=; b=RoTf8GFxq3OM/Xp+trBvn/XFcBbgJBEJnjJgXPGKanvinVCKyl5+I2Dlz+li5VkjBuxOREXW/M8rlo504usjgf4qr891EPml/OzJMkFZ8JhctZTBGc2zkKzsdgv7CQs7p9RB+YaCUP2hnwJcyFQpph/xGWGQ716+AENViQONjDQHjS777C8S5IE2iZFfu8FYHH/Gw4MqAdijVVFBqxKbKO+6QqmjGwblElPrn9wj9tpoi0JLdJ1qmrN4LFIkaaZgXDMaf1VDcC8c5Eeu8rM/ykUhhe1O/TvbECnEflumZixgdUvX4x/hGTNYRJm4MBiWo1lTccuNvIPaVTmpmX/fwA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=google.com smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=VlGtpj1hFMlePbUiz2GjxUz+0VUauZy4uNYRZ77KOXI=; b=uDagvio6qJSjt7F6M9oD0kMjN02zUUI0FFbxDmNbOAOm9AzI4QTmImnvDP9klBCwuZLwg3bsevkAzaGMmgPjH5vk05o+7RNA/AcTtjyF5FovqSIXOVe58GrcLuqQS7jvgYS2d1DfiTVHThMdUfFRm67KJjDc0JERwwPXoWo6jg3983HZ3nNp40liYbds+xEQMMJRaPs+TE5sp7//q7AJj7U2SYcYSEpJCiGfRr5PRtlEydIJrgBFw3iC2ICam8q0DSo8BB0VjVR7yKK7Pqtu5Qjx82anYVwI+6CnsjZBNkL1BIP6JR7OtVUsmE+eqRDSdFJZrBdqdT5Oo5gQw90Lxg== Received: from BN9PR03CA0202.namprd03.prod.outlook.com (2603:10b6:408:f9::27) by MW4PR12MB6950.namprd12.prod.outlook.com (2603:10b6:303:207::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5986.18; Wed, 11 Jan 2023 19:05:54 +0000 Received: from BN8NAM11FT007.eop-nam11.prod.protection.outlook.com (2603:10b6:408:f9:cafe::cc) by BN9PR03CA0202.outlook.office365.com (2603:10b6:408:f9::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5986.18 via Frontend Transport; Wed, 11 Jan 2023 19:05:54 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by BN8NAM11FT007.mail.protection.outlook.com (10.13.177.109) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5986.18 via Frontend Transport; Wed, 11 Jan 2023 19:05:53 +0000 Received: from rnnvmail203.nvidia.com (10.129.68.9) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.36; Wed, 11 Jan 2023 11:05:41 -0800 Received: from rnnvmail201.nvidia.com (10.129.68.8) by rnnvmail203.nvidia.com (10.129.68.9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.36; Wed, 11 Jan 2023 11:05:41 -0800 Received: from vidyas-desktop.nvidia.com (10.127.8.9) by mail.nvidia.com (10.129.68.8) with Microsoft SMTP Server id 15.2.986.36 via Frontend Transport; Wed, 11 Jan 2023 11:05:38 -0800 From: Vidya Sagar <vidyas@nvidia.com> To: <bhelgaas@google.com>, <treding@nvidia.com>, <jonathanh@nvidia.com> CC: <linux-pci@vger.kernel.org>, <linux-kernel@vger.kernel.org>, <vsethi@nvidia.com>, <kthota@nvidia.com>, <mmaddireddy@nvidia.com>, <vidyas@nvidia.com>, <sagar.tv@gmail.com> Subject: [PATCH V2] PCI: pciehp: Disable ACS Source Validation during hot-remove Date: Thu, 12 Jan 2023 00:35:33 +0530 Message-ID: <20230111190533.29979-1-vidyas@nvidia.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230111145206.23919-1-vidyas@nvidia.com> References: <20230111145206.23919-1-vidyas@nvidia.com> X-NVConfidentiality: public MIME-Version: 1.0 Content-Type: text/plain X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN8NAM11FT007:EE_|MW4PR12MB6950:EE_ X-MS-Office365-Filtering-Correlation-Id: 9908a17e-aa7c-4e5f-d0c9-08daf406dcef X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: GrLke1T1/4GBmu/cVh9AYXT9HRFb7y4Ht9cULDhkRPDqXS0EM1eeVk4OQFA1YOkE3L53uzMq6d7S5AH89wqV3C84IkrBbT9/e0WPvaeXVVfWLTUeV1PAIeiKj3Q5iR5VFMswOVk9mocSiMpM2nJOKlNrdSWkgFmM5kA7nnbQruRP7G4rS3AGHj1QWsJaH6R9q+NrqOXcSHdFApCe8qGCmxggJhTCGlXZBuw4oOCQkL0+LQSfiqNRfZPJsCrrkLkyPjHz9wVP9QpjealvK0GJ6B0QyqreoZgqAsVyd5xmwLCQPfWOviG6lJvHuXGXYpjmLn0a1YGkI74ZESBVooYdUWcCwnqBrMJ2dYFW75JpW2o/FomKBR0JE0JTzwEo1X2CHE9CW42P/M0zpqyhzDrlZW1SOYpt5Iwr4etPhC1v7r8IBTSMol2gwOz3GbLLtxP/XGj4NLRszrQnDvA2yhMEQztbkIaVlwVIw+M4HtZX4nqX30QzpJfXyubxovbNrxGh3r3GyVkzl2PjPpYheNIZ/RdtELqIzI6IP4teaeVckx1QhphaVPyH6sz2Plkli5fPHjtyV4CiBVbruI2KtimB0JNOivjqXTV4jyemIl+P2avCwJ5MY39Ph1gIF1qqOXuDhLmeuPZcVtoj/Lydplj/+eXapKi1BzbS7ZqbCYDZ4Y+pavJ1uGZAHAk+ZQx57w2t1UH7F6ZkaNu73cH8oV9+lw== X-Forefront-Antispam-Report: CIP:216.228.117.160;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:mail.nvidia.com;PTR:dc6edge1.nvidia.com;CAT:NONE;SFS:(13230022)(4636009)(346002)(376002)(136003)(396003)(39860400002)(451199015)(46966006)(36840700001)(40470700004)(40460700003)(1076003)(426003)(36860700001)(41300700001)(36756003)(110136005)(54906003)(4326008)(316002)(2616005)(70206006)(8676002)(336012)(70586007)(86362001)(82310400005)(7636003)(356005)(8936002)(82740400003)(83380400001)(6636002)(5660300002)(47076005)(40480700001)(2906002)(7696005)(186003)(6666004)(478600001)(26005);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jan 2023 19:05:53.8156 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 9908a17e-aa7c-4e5f-d0c9-08daf406dcef X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a;Ip=[216.228.117.160];Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BN8NAM11FT007.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW4PR12MB6950 X-Spam-Status: No, score=-1.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO, RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_NONE autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1754738293707198534?= X-GMAIL-MSGID: =?utf-8?q?1754754911260332372?= |
Series |
[V2] PCI: pciehp: Disable ACS Source Validation during hot-remove
|
|
Commit Message
Vidya Sagar
Jan. 11, 2023, 7:05 p.m. UTC
PCIe 6.0, 6.12.1.1 specifies that downstream devices are permitted to
send upstream messages before they have been assigned a bus number and
such messages have a Requester ID with Bus number set to 00h.
If the Downstrem port has ACS Source Validation enabled, these messages
will be detected as ACS violation error.
Hence, disable ACS Source Validation in the bridge device during
hot-remove operation and re-enable it after enumeration of the
downstream hierarchy but before binding the respective device drivers.
Signed-off-by: Vidya Sagar <vidyas@nvidia.com>
---
v2:
* Fixed build issues
drivers/pci/hotplug/pciehp_pci.c | 13 ++++++++++++-
drivers/pci/pci.c | 22 ++++++++++++++++++++++
include/linux/pci.h | 6 ++++++
3 files changed, 40 insertions(+), 1 deletion(-)
Comments
[+cc Lukas, Alex for pciehp and ACS comments] On Thu, Jan 12, 2023 at 12:35:33AM +0530, Vidya Sagar wrote: > PCIe 6.0, 6.12.1.1 specifies that downstream devices are permitted to > send upstream messages before they have been assigned a bus number and > such messages have a Requester ID with Bus number set to 00h. > If the Downstrem port has ACS Source Validation enabled, these messages > will be detected as ACS violation error. > Hence, disable ACS Source Validation in the bridge device during > hot-remove operation and re-enable it after enumeration of the > downstream hierarchy but before binding the respective device drivers. s/Downstrem/Downstream/ Format as paragraphs (blank line between). > Signed-off-by: Vidya Sagar <vidyas@nvidia.com> > --- > v2: > * Fixed build issues > > drivers/pci/hotplug/pciehp_pci.c | 13 ++++++++++++- > drivers/pci/pci.c | 22 ++++++++++++++++++++++ > include/linux/pci.h | 6 ++++++ > 3 files changed, 40 insertions(+), 1 deletion(-) > > diff --git a/drivers/pci/hotplug/pciehp_pci.c b/drivers/pci/hotplug/pciehp_pci.c > index d17f3bf36f70..ad90bcf3f621 100644 > --- a/drivers/pci/hotplug/pciehp_pci.c > +++ b/drivers/pci/hotplug/pciehp_pci.c > @@ -63,6 +63,7 @@ int pciehp_configure_device(struct controller *ctrl) > > pci_assign_unassigned_bridge_resources(bridge); > pcie_bus_configure_settings(parent); > + pci_configure_acs_sv(bridge, true); > pci_bus_add_devices(parent); > > out: > @@ -117,6 +118,16 @@ void pciehp_unconfigure_device(struct controller *ctrl, bool presence) > } > pci_dev_put(dev); > } > - > + /* > + * PCIe 6.0, 6.12.1.1 specifies that downstream devices are permitted > + * to send upstream messages before they have been assigned a bus > + * number and such messages have a Requester ID with Bus number > + * set to 00h. If the Downstrem port has ACS Source Validation enabled, s/Downstrem/Downstream/ > + * these messages will be detected as ACS violation error. > + * Hence, disable ACS Source Validation here and re-enable it after > + * enumeration of the downstream hierarchy and before binding the > + * respective device drivers in pciehp_configure_device(). > + */ > + pci_configure_acs_sv(ctrl->pcie->port, false); What if we have a slot that's empty at boot and we add a device later? It looks like we still might see ACS errors there because the add happens before a remove? > pci_unlock_rescan_remove(); > } > diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c > index 95bc329e74c0..9cefaf814f49 100644 > --- a/drivers/pci/pci.c > +++ b/drivers/pci/pci.c > @@ -991,6 +991,28 @@ static void pci_enable_acs(struct pci_dev *dev) > pci_disable_acs_redir(dev); > } > > +#ifdef CONFIG_HOTPLUG_PCI_PCIE > +void pci_configure_acs_sv(struct pci_dev *dev, bool flag) > +{ > + u16 cap; > + u16 ctrl; > + > + if (!pci_acs_enable || !dev->acs_cap) > + return; > + > + pci_read_config_word(dev, dev->acs_cap + PCI_ACS_CAP, &cap); > + pci_read_config_word(dev, dev->acs_cap + PCI_ACS_CTRL, &ctrl); > + > + if (flag) > + ctrl |= (cap & PCI_ACS_SV); > + else > + ctrl &= ~(cap & PCI_ACS_SV); > + > + pci_write_config_word(dev, dev->acs_cap + PCI_ACS_CTRL, ctrl); I guess we don't have a way to do this for the non-standard ACS-like devices, i.e., pci_dev_specific_enable_acs(). Not the end of the world, just unfortunate that we'll have different behavior there. > +} > +EXPORT_SYMBOL_GPL(pci_configure_acs_sv); Doesn't seem like this needs to be exported or exposed via linux/pci.h. pciehp cannot be built as a module. > +#endif > + > /** > * pci_restore_bars - restore a device's BAR values (e.g. after wake-up) > * @dev: PCI device to have its BARs restored > diff --git a/include/linux/pci.h b/include/linux/pci.h > index 060af91bafcd..edf516e39764 100644 > --- a/include/linux/pci.h > +++ b/include/linux/pci.h > @@ -2239,6 +2239,12 @@ void pci_hp_create_module_link(struct pci_slot *pci_slot); > void pci_hp_remove_module_link(struct pci_slot *pci_slot); > #endif > > +#ifdef CONFIG_HOTPLUG_PCI_PCIE > +void pci_configure_acs_sv(struct pci_dev *dev, bool flag); > +#else > +static inline void pci_configure_acs_sv(struct pci_dev *dev, bool flag) { } > +#endif > + > /** > * pci_pcie_cap - get the saved PCIe capability offset > * @dev: PCI device > -- > 2.17.1 >
On 2/15/2023 5:00 AM, Bjorn Helgaas wrote: > External email: Use caution opening links or attachments > > > [+cc Lukas, Alex for pciehp and ACS comments] > > On Thu, Jan 12, 2023 at 12:35:33AM +0530, Vidya Sagar wrote: >> PCIe 6.0, 6.12.1.1 specifies that downstream devices are permitted to >> send upstream messages before they have been assigned a bus number and >> such messages have a Requester ID with Bus number set to 00h. >> If the Downstrem port has ACS Source Validation enabled, these messages >> will be detected as ACS violation error. >> Hence, disable ACS Source Validation in the bridge device during >> hot-remove operation and re-enable it after enumeration of the >> downstream hierarchy but before binding the respective device drivers. > > s/Downstrem/Downstream/ > > Format as paragraphs (blank line between). > >> Signed-off-by: Vidya Sagar <vidyas@nvidia.com> >> --- >> v2: >> * Fixed build issues >> >> drivers/pci/hotplug/pciehp_pci.c | 13 ++++++++++++- >> drivers/pci/pci.c | 22 ++++++++++++++++++++++ >> include/linux/pci.h | 6 ++++++ >> 3 files changed, 40 insertions(+), 1 deletion(-) >> >> diff --git a/drivers/pci/hotplug/pciehp_pci.c b/drivers/pci/hotplug/pciehp_pci.c >> index d17f3bf36f70..ad90bcf3f621 100644 >> --- a/drivers/pci/hotplug/pciehp_pci.c >> +++ b/drivers/pci/hotplug/pciehp_pci.c >> @@ -63,6 +63,7 @@ int pciehp_configure_device(struct controller *ctrl) >> >> pci_assign_unassigned_bridge_resources(bridge); >> pcie_bus_configure_settings(parent); >> + pci_configure_acs_sv(bridge, true); >> pci_bus_add_devices(parent); >> >> out: >> @@ -117,6 +118,16 @@ void pciehp_unconfigure_device(struct controller *ctrl, bool presence) >> } >> pci_dev_put(dev); >> } >> - >> + /* >> + * PCIe 6.0, 6.12.1.1 specifies that downstream devices are permitted >> + * to send upstream messages before they have been assigned a bus >> + * number and such messages have a Requester ID with Bus number >> + * set to 00h. If the Downstrem port has ACS Source Validation enabled, > > s/Downstrem/Downstream/ > >> + * these messages will be detected as ACS violation error. >> + * Hence, disable ACS Source Validation here and re-enable it after >> + * enumeration of the downstream hierarchy and before binding the >> + * respective device drivers in pciehp_configure_device(). >> + */ >> + pci_configure_acs_sv(ctrl->pcie->port, false); > > What if we have a slot that's empty at boot and we add a device later? > It looks like we still might see ACS errors there because the add > happens before a remove? Yes I'm afraid. But, looking at the implementation note in 6.22.1 and 6.12.1.1, I think it is expected and spec thought through this scenario. So, does it all come down to how the ASIC designers treat different messages (case-by-case) and see which of them need not have to be validated for source? For example, a DRS (Device Readiness Status) from an endpoint during enumeration (i.e. before the endpoint is being assigned with a valid bus number) can be ignored for ACS source validation? > >> pci_unlock_rescan_remove(); >> } >> diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c >> index 95bc329e74c0..9cefaf814f49 100644 >> --- a/drivers/pci/pci.c >> +++ b/drivers/pci/pci.c >> @@ -991,6 +991,28 @@ static void pci_enable_acs(struct pci_dev *dev) >> pci_disable_acs_redir(dev); >> } >> >> +#ifdef CONFIG_HOTPLUG_PCI_PCIE >> +void pci_configure_acs_sv(struct pci_dev *dev, bool flag) >> +{ >> + u16 cap; >> + u16 ctrl; >> + >> + if (!pci_acs_enable || !dev->acs_cap) >> + return; >> + >> + pci_read_config_word(dev, dev->acs_cap + PCI_ACS_CAP, &cap); >> + pci_read_config_word(dev, dev->acs_cap + PCI_ACS_CTRL, &ctrl); >> + >> + if (flag) >> + ctrl |= (cap & PCI_ACS_SV); >> + else >> + ctrl &= ~(cap & PCI_ACS_SV); >> + >> + pci_write_config_word(dev, dev->acs_cap + PCI_ACS_CTRL, ctrl); > > I guess we don't have a way to do this for the non-standard ACS-like > devices, i.e., pci_dev_specific_enable_acs(). Not the end of the > world, just unfortunate that we'll have different behavior there. I'll remove the exporting part in the next patch. As far as exposing it in the pci.h is concerned, since the actual usage of this function is in pciehp_pci.c file, I thought the best place to keep the declaration is pci.h file. Let me know if you have any other suggestion. > >> +} >> +EXPORT_SYMBOL_GPL(pci_configure_acs_sv); > > Doesn't seem like this needs to be exported or exposed via > linux/pci.h. pciehp cannot be built as a module. > >> +#endif >> + >> /** >> * pci_restore_bars - restore a device's BAR values (e.g. after wake-up) >> * @dev: PCI device to have its BARs restored >> diff --git a/include/linux/pci.h b/include/linux/pci.h >> index 060af91bafcd..edf516e39764 100644 >> --- a/include/linux/pci.h >> +++ b/include/linux/pci.h >> @@ -2239,6 +2239,12 @@ void pci_hp_create_module_link(struct pci_slot *pci_slot); >> void pci_hp_remove_module_link(struct pci_slot *pci_slot); >> #endif >> >> +#ifdef CONFIG_HOTPLUG_PCI_PCIE >> +void pci_configure_acs_sv(struct pci_dev *dev, bool flag); >> +#else >> +static inline void pci_configure_acs_sv(struct pci_dev *dev, bool flag) { } >> +#endif >> + >> /** >> * pci_pcie_cap - get the saved PCIe capability offset >> * @dev: PCI device >> -- >> 2.17.1 >>
diff --git a/drivers/pci/hotplug/pciehp_pci.c b/drivers/pci/hotplug/pciehp_pci.c index d17f3bf36f70..ad90bcf3f621 100644 --- a/drivers/pci/hotplug/pciehp_pci.c +++ b/drivers/pci/hotplug/pciehp_pci.c @@ -63,6 +63,7 @@ int pciehp_configure_device(struct controller *ctrl) pci_assign_unassigned_bridge_resources(bridge); pcie_bus_configure_settings(parent); + pci_configure_acs_sv(bridge, true); pci_bus_add_devices(parent); out: @@ -117,6 +118,16 @@ void pciehp_unconfigure_device(struct controller *ctrl, bool presence) } pci_dev_put(dev); } - + /* + * PCIe 6.0, 6.12.1.1 specifies that downstream devices are permitted + * to send upstream messages before they have been assigned a bus + * number and such messages have a Requester ID with Bus number + * set to 00h. If the Downstrem port has ACS Source Validation enabled, + * these messages will be detected as ACS violation error. + * Hence, disable ACS Source Validation here and re-enable it after + * enumeration of the downstream hierarchy and before binding the + * respective device drivers in pciehp_configure_device(). + */ + pci_configure_acs_sv(ctrl->pcie->port, false); pci_unlock_rescan_remove(); } diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index 95bc329e74c0..9cefaf814f49 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -991,6 +991,28 @@ static void pci_enable_acs(struct pci_dev *dev) pci_disable_acs_redir(dev); } +#ifdef CONFIG_HOTPLUG_PCI_PCIE +void pci_configure_acs_sv(struct pci_dev *dev, bool flag) +{ + u16 cap; + u16 ctrl; + + if (!pci_acs_enable || !dev->acs_cap) + return; + + pci_read_config_word(dev, dev->acs_cap + PCI_ACS_CAP, &cap); + pci_read_config_word(dev, dev->acs_cap + PCI_ACS_CTRL, &ctrl); + + if (flag) + ctrl |= (cap & PCI_ACS_SV); + else + ctrl &= ~(cap & PCI_ACS_SV); + + pci_write_config_word(dev, dev->acs_cap + PCI_ACS_CTRL, ctrl); +} +EXPORT_SYMBOL_GPL(pci_configure_acs_sv); +#endif + /** * pci_restore_bars - restore a device's BAR values (e.g. after wake-up) * @dev: PCI device to have its BARs restored diff --git a/include/linux/pci.h b/include/linux/pci.h index 060af91bafcd..edf516e39764 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -2239,6 +2239,12 @@ void pci_hp_create_module_link(struct pci_slot *pci_slot); void pci_hp_remove_module_link(struct pci_slot *pci_slot); #endif +#ifdef CONFIG_HOTPLUG_PCI_PCIE +void pci_configure_acs_sv(struct pci_dev *dev, bool flag); +#else +static inline void pci_configure_acs_sv(struct pci_dev *dev, bool flag) { } +#endif + /** * pci_pcie_cap - get the saved PCIe capability offset * @dev: PCI device