From nobody Tue May 14 18:26:29 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=amd.com); dmarc=pass(p=quarantine dis=none) header.from=amd.com ARC-Seal: i=2; a=rsa-sha256; t=1692667887; cv=pass; d=zohomail.com; s=zohoarc; b=E6WpDOSyT23dQzdu8Mu+ub17eV41aSxSozgTcXDVcXlnapCtGwExZ0Q5S0uD99/5sbjgDKQRVTv6uqGgKNqopBbgASsrm+etQaywMpIOIQXsoSC4267dFwE/zx5xYK7GVxWEi3G5Vma1dflqY2ajRI6pUnq8BhOWTiFeghKTp6Q= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1692667887; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=5oL8/mLXOI79PD0AEV7EPeuneKGMtclOpYPZNKxydew=; b=eA4fiVEx2Za9hg9mXY9OJPE+LEMOktB/5rjabBeWfxougj26AUaE+Ww1N78sYj/Pkcg6zxi2JxVQCWojVaE1wgq51zOSV6XRFLJRN1sTyUQQubnRkku1TWWDl2zns8m0OiOX/m/Hy/Ye4ZG5W4QLF6ZXon9ArJZussg2xaRMevw= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=amd.com); dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1692667887106485.7397992415033; Mon, 21 Aug 2023 18:31:27 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.587995.919418 (Exim 4.92) (envelope-from ) id 1qYGEe-00021I-SU; Tue, 22 Aug 2023 01:31:08 +0000 Received: by outflank-mailman (output) from mailman id 587995.919418; Tue, 22 Aug 2023 01:31:08 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qYGEe-00021B-Mg; Tue, 22 Aug 2023 01:31:08 +0000 Received: by outflank-mailman (input) for mailman id 587995; Tue, 22 Aug 2023 01:31:07 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qYGEd-0000x4-E3 for xen-devel@lists.xenproject.org; Tue, 22 Aug 2023 01:31:07 +0000 Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2061f.outbound.protection.outlook.com [2a01:111:f400:7e8a::61f]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 8f54285e-408b-11ee-9b0c-b553b5be7939; Tue, 22 Aug 2023 03:31:05 +0200 (CEST) Received: from SJ0PR05CA0059.namprd05.prod.outlook.com (2603:10b6:a03:33f::34) by CY8PR12MB7414.namprd12.prod.outlook.com (2603:10b6:930:5e::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6699.24; Tue, 22 Aug 2023 01:31:01 +0000 Received: from CO1PEPF000042AD.namprd03.prod.outlook.com (2603:10b6:a03:33f:cafe::b5) by SJ0PR05CA0059.outlook.office365.com (2603:10b6:a03:33f::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6723.14 via Frontend Transport; Tue, 22 Aug 2023 01:31:01 +0000 Received: from SATLEXMB03.amd.com (165.204.84.17) by CO1PEPF000042AD.mail.protection.outlook.com (10.167.243.42) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.6699.14 via Frontend Transport; Tue, 22 Aug 2023 01:31:00 +0000 Received: from SATLEXMB06.amd.com (10.181.40.147) by SATLEXMB03.amd.com (10.181.40.144) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.27; Mon, 21 Aug 2023 20:30:58 -0500 Received: from SATLEXMB04.amd.com (10.181.40.145) by SATLEXMB06.amd.com (10.181.40.147) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.27; Mon, 21 Aug 2023 20:30:34 -0500 Received: from ubuntu.mshome.net (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server id 15.1.2507.27 via Frontend Transport; Mon, 21 Aug 2023 20:30:32 -0500 X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 8f54285e-408b-11ee-9b0c-b553b5be7939 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=m4WdhzEJ06FDB4ekZ+JGQ2ejilZ3m4iTzIFV/aeMTKcj9oDZiLKgWgVX1KcihrirBORH53syIgjXv4eN87MJ2si5MLYvAG6dr2+p13yiIHhZheoxBc6c0Cdrhlt8hHAFAmDSRnFVTvWpNRtfNu8fLxocDmbbV2DEu4fi933hBEprEP1yU44MjCR72iwq1qo2R6nKMjMEJfQILo30IQ4dyTcSyPj8xR5+bPgXQbnYdDnBMv9PD0FVZFamvw+zcoXIAXd8PJD3f4t3pAIDwj6kI/GFf2j/tsr3en4bN/Kfn/t4pmkT4aenIuTjM8QWXHNFwwrzf2BOb/F0WbiOJt+aAA== 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=5oL8/mLXOI79PD0AEV7EPeuneKGMtclOpYPZNKxydew=; b=WfrTgmYedw6X+swMhkiUdPSnXgd7wOAqMa+CsyIL+F2tbohoLFccyKNjh7BrCkq6+1aTo6BRmiuC49ehDq+pR9Z2sa9QC6D5F9KOS9nDgcxPAb4HdV14/QGVtTf8V5aI15htpXOsPyi8DCq2Z4HRbdsIhazb7VEKgIq+1RKBlXT0LCUUyLrGLyTg4P7vtEYM+Zz2AF/9jZxJbPN4XA1sCNg9P2OwGkpA0A/zKxZj058bmuWatMnqzYjk2oHBgW6rleTnWzf/s3pm3Vu6eGTbXa8ZjoDmNW2KpW8+F5uxGAIX8vMNu+cQgzZwfIr9M3yDgQKmoYmMlm4Flb1orCd0XA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=lists.xenproject.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=5oL8/mLXOI79PD0AEV7EPeuneKGMtclOpYPZNKxydew=; b=xrJiYlomGx1oG5ZCnKJYFl4tsFEZruyhSmBmhbPceZ+GCfWfzYG1gUjYKja6j92IkyrrOqfYTzTDfgCkBovdcMqy1WqoSHHC5O3jNhZosK9Hn3xE+Zx7gw3tBTWXbWkolYyQxonEKQESLEuvob5dKWc9fWbWp4ka1iBx4Ufqq4Y= X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB03.amd.com; pr=C From: Stewart Hildebrand To: CC: Stewart Hildebrand , Andrew Cooper , George Dunlap , "Jan Beulich" , Julien Grall , "Stefano Stabellini" , Wei Liu Subject: [PATCH v3 1/4] xen/pci: address a violation of MISRA C:2012 Rule 8.3 Date: Mon, 21 Aug 2023 21:29:49 -0400 Message-ID: <20230822012955.312930-2-stewart.hildebrand@amd.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230822012955.312930-1-stewart.hildebrand@amd.com> References: <20230822012955.312930-1-stewart.hildebrand@amd.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1PEPF000042AD:EE_|CY8PR12MB7414:EE_ X-MS-Office365-Filtering-Correlation-Id: 6d7cdd29-a747-4aa5-7240-08dba2af716d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: JQaaAb5rIfVljNLCymAZsdvg09nnVBRrV7eHjCXyw/7WfCzcOhbNyzzISmtXBFfc1enZSTOEZ9bjH5mAzW6jUIwPZIOBebanCu+Y20EhDs4YweCy9TUZhlG3rPz0oaJYjCBuUXCeBMGPyQcxalfR7d5HHI8EfRFV9Zq1DKV0owT6BRO/sKp6RiPk9I8JOYlGvNyjyfHcr02NnkHL0AVZP2ilPMdhqbhlp+sPuGy167jFBIFv4k1QRHxXXoqszf51wzy+hATgbhlC+f8FqoSFlVcKveKgMGfgLJMZqu4FrSfGylvYuSDu1Lbs4BKmab2LNtqHAiChJA885HTLP3sU9JIJPP+Kpq1jJe1WL1zX1j+yFnoQ8g3aLPnXfviTs8MHjg0B8lqhYlyhmRrYPcAPlkjV/xlKC5Rnho44swE69gLhvU2QnN/XubDiilRX6NqKCHlUTPv3sxpGZg9jJW7PErftIrL8qANYkb+FrbrqL4ZD79fzQqvlv7Y5yzYsZbT5qn59iEdcTTW8WDu5v3IbQ8WAhH+KnA5tbn5FsrZiZiMjHG43Pi5Sni2WZTSmBqIHAKNKjR5WWO5BzW2G4HUgbJs4kQyByCDF+Ip/xjwOGTg5aG9qC9lrnV/hH8W10DBnnCtmKp4K+IuTBvPW0uInTul8U6cxNUSIqrWSYXrgc4pJmdIA9shrX4ADO7xK7q9W95XaJIKA8iZPX0HLixYfi573B85RXqSau87XObnhrWzrX5x7fstAmd46Rkod1EwNAEPJyFlNSB4dWnEfo8sCEw== X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB03.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230031)(4636009)(346002)(39860400002)(136003)(376002)(396003)(82310400011)(451199024)(1800799009)(186009)(36840700001)(40470700004)(46966006)(2906002)(40480700001)(83380400001)(5660300002)(44832011)(336012)(426003)(26005)(86362001)(36860700001)(47076005)(8676002)(2616005)(8936002)(4326008)(70206006)(316002)(70586007)(6916009)(54906003)(478600001)(356005)(82740400003)(81166007)(6666004)(36756003)(41300700001)(40460700003)(1076003)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Aug 2023 01:31:00.7312 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 6d7cdd29-a747-4aa5-7240-08dba2af716d X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB03.amd.com] X-MS-Exchange-CrossTenant-AuthSource: CO1PEPF000042AD.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY8PR12MB7414 X-ZohoMail-DKIM: pass (identity @amd.com) X-ZM-MESSAGEID: 1692667889518100001 Content-Type: text/plain; charset="utf-8" Make the paramater names of the prototype match the definition. No function= al change. Signed-off-by: Stewart Hildebrand Reviewed-by: Jan Beulich --- v2->v3: * new patch --- xen/drivers/pci/pci.c | 2 +- xen/include/xen/pci.h | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/xen/drivers/pci/pci.c b/xen/drivers/pci/pci.c index e411876a1518..c73a8c4124af 100644 --- a/xen/drivers/pci/pci.c +++ b/xen/drivers/pci/pci.c @@ -80,7 +80,7 @@ int pci_find_ext_capability(int seg, int bus, int devfn, = int cap) /** * pci_find_next_ext_capability - Find another extended capability * @seg/@bus/@devfn: PCI device to query - * @pos: starting position + * @start: starting position * @cap: capability code * * Returns the address of the requested extended capability structure diff --git a/xen/include/xen/pci.h b/xen/include/xen/pci.h index 5975ca2f3032..a8c8c4ff11c3 100644 --- a/xen/include/xen/pci.h +++ b/xen/include/xen/pci.h @@ -196,7 +196,8 @@ int pci_mmcfg_write(unsigned int seg, unsigned int bus, int pci_find_cap_offset(u16 seg, u8 bus, u8 dev, u8 func, u8 cap); int pci_find_next_cap(u16 seg, u8 bus, unsigned int devfn, u8 pos, int cap= ); int pci_find_ext_capability(int seg, int bus, int devfn, int cap); -int pci_find_next_ext_capability(int seg, int bus, int devfn, int pos, int= cap); +int pci_find_next_ext_capability(int seg, int bus, int devfn, int start, + int cap); const char *parse_pci(const char *, unsigned int *seg, unsigned int *bus, unsigned int *dev, unsigned int *func); const char *parse_pci_seg(const char *, unsigned int *seg, unsigned int *b= us, --=20 2.41.0 From nobody Tue May 14 18:26:29 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=amd.com); dmarc=pass(p=quarantine dis=none) header.from=amd.com ARC-Seal: i=2; a=rsa-sha256; t=1692667912; cv=pass; d=zohomail.com; s=zohoarc; b=Ix0EasU09f4XcR5O48wf3VQW6fMqWH6GbpISiCfnwTs2DIb5TZ3nrff/tRL94qlXxekFAr1tJhXfjsRlY4DPzBiQ4byVLW0+7GwNoAxRbtk2Iph+vYh9KW4RyiM+aEsuAMj8HkkHoKKTHybY+mJbnpmZ9CsphX1NQywlvuAQr9w= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1692667912; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Z48CuLPSHvch6OlJ6rBBQjOhGn404jnXwk0sx8bu/wA=; b=DqqZTrlgU1PMWGOaBuGJ98WXernnIgLHlQEaTY6EiEFHXFN3x9SVw5UZyqalXHSmeFT4vXjxeOvE1IoWnr2q4/Rr/ND/76MN2U7Z53vY5+Pmwi2//Eyprdo9c/46wFWkVi6caIbHkdUGWMPj0fGY9u4cUCzX1CEDZa2HUA3IEuo= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=amd.com); dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1692667912350535.2847074573014; Mon, 21 Aug 2023 18:31:52 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.588001.919427 (Exim 4.92) (envelope-from ) id 1qYGF3-0002VB-3P; Tue, 22 Aug 2023 01:31:33 +0000 Received: by outflank-mailman (output) from mailman id 588001.919427; Tue, 22 Aug 2023 01:31:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qYGF3-0002V4-0D; Tue, 22 Aug 2023 01:31:33 +0000 Received: by outflank-mailman (input) for mailman id 588001; Tue, 22 Aug 2023 01:31:31 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qYGF1-0000x4-1U for xen-devel@lists.xenproject.org; Tue, 22 Aug 2023 01:31:31 +0000 Received: from NAM02-BN1-obe.outbound.protection.outlook.com (mail-bn1nam02on20610.outbound.protection.outlook.com [2a01:111:f400:7eb2::610]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 9cc527ed-408b-11ee-9b0c-b553b5be7939; Tue, 22 Aug 2023 03:31:28 +0200 (CEST) Received: from MW4PR04CA0386.namprd04.prod.outlook.com (2603:10b6:303:81::31) by CH0PR12MB8531.namprd12.prod.outlook.com (2603:10b6:610:181::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6699.24; Tue, 22 Aug 2023 01:31:24 +0000 Received: from CO1PEPF000044F5.namprd05.prod.outlook.com (2603:10b6:303:81:cafe::af) by MW4PR04CA0386.outlook.office365.com (2603:10b6:303:81::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6699.20 via Frontend Transport; Tue, 22 Aug 2023 01:31:23 +0000 Received: from SATLEXMB04.amd.com (165.204.84.17) by CO1PEPF000044F5.mail.protection.outlook.com (10.167.241.75) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.6699.15 via Frontend Transport; Tue, 22 Aug 2023 01:31:22 +0000 Received: from SATLEXMB04.amd.com (10.181.40.145) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.27; Mon, 21 Aug 2023 20:31:21 -0500 Received: from ubuntu.mshome.net (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server id 15.1.2507.27 via Frontend Transport; Mon, 21 Aug 2023 20:31:20 -0500 X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 9cc527ed-408b-11ee-9b0c-b553b5be7939 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=bpyQdlPYuaT7L+0tvcW8UVhtSzAikGq7V1RtNyl7qQOPhFH7Q7I8gf8yi2PEJB6nxrbSx72hSjyn2qZqgOR63Ri0pfx34nRfJloMvfxS594QxTpxYBZArXo9MLsm6lIzIM304qJKjrbFF9ClYDUmv/eATu1mEelKaKn130b5uWQsYWT2ui/0XGHU+BNL9xvkqGAZosFGWRzhMF4p2Vwvm1ysetVYGWveN1PLO9H1zQwo8DJJmnTVlmCewH1P//uZMSO3d3R1hRJznaMSFS63ZJ+YpMJqUuOFGs+xO63+lcx8JBONaO4FiWX1tJUB3Q7llmvzt9Y9W0u+HYPdGbLhrg== 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=Z48CuLPSHvch6OlJ6rBBQjOhGn404jnXwk0sx8bu/wA=; b=cCs0EnuIddXvqkkCND40qU8Tpx1uqnJipnm+cUIpb7OCFjiPxjRb/xDykgzOXNUAGkvR3kcj8+sO4uAyJMRooR+ifM6Xd5FRE/79jyovKJXjSKZnZlszhI3/fTEbiIMG0wHikn7Ayfd5ER8mMsRI6/4NoZUbuUEsz9Gof+cIBQJB+XRZFo1eb2yRSa34VgXoBasuyTyKYLRtpzVoxuUomkTnCzccLh9KHLdlyTQjAJIU0gFA6kL28y8pbIHekI+lDR9d5e22OeNWWIEt15ti8wYQEuV6S9c5kA2s543wLHqtMW5Dg/zBQv9s8kBQWlPB17GI6rbk8HaQt/UkY/vh/Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=lists.xenproject.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Z48CuLPSHvch6OlJ6rBBQjOhGn404jnXwk0sx8bu/wA=; b=LBaj930kzzLLAfdJmXCmJH73iXI7I2vH7CnCtg8DUtTURYdaJG+eBdj4hB9yA/6bx2//61Z8Vf6/gTq2W7lHIqREbj5ljDipKbygYeeWO7lXjTXmH4aBURyPZqSIGvMNoLmHBJlQ/kdcvqnUM3MsRG+U+Ky9uUcN/rJvojoQb/g= X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C From: Stewart Hildebrand To: CC: Stewart Hildebrand , Jan Beulich , Andrew Cooper , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= , Wei Liu , George Dunlap , Julien Grall , Stefano Stabellini , Paul Durrant , Kevin Tian Subject: [PATCH v3 2/4] xen/pci: convert pci_find_*cap* to pci_sbdf_t Date: Mon, 21 Aug 2023 21:29:50 -0400 Message-ID: <20230822012955.312930-3-stewart.hildebrand@amd.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230822012955.312930-1-stewart.hildebrand@amd.com> References: <20230822012955.312930-1-stewart.hildebrand@amd.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1PEPF000044F5:EE_|CH0PR12MB8531:EE_ X-MS-Office365-Filtering-Correlation-Id: 2379a4e4-acc9-491e-c50c-08dba2af7e9e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: D+rUf/7jWu+iLY9fSUbL1lgpk0ZZyiyGag45j8BygHj+jrvIGn+vOrrFA8VwnNQI3ZVZhNTqyPhVS4f3awIcU6vohYgHGGWPFXs9M+iPVYxtjI/J9Bg37cB8dzYAckIeaWJyD8b/vql4+4VfILQqHqEEUod2lp3SglxOSthapHqlSoEM5AugXAwPPzAvED6h+MLltsDfxnEv5T+AN2KjdSan6YkuzoOM25+ahTVdi619TjPR5QRVmBdpz7bLfQzOR7Ghk4npaBtaaMjtEeiwXarU5S3Wm4AMIdPy6yUzW/hQ/cUtGj0HEEtPJ6dGBVyW5xH0zNvq75B3pwHmArk1rXyTqmnZOQIDnapgp/uRtl0UXOHq/A6NDIQ+nft5m53t39SATjrguyMaC+tk9EuJ6iLTDIVwdgY3KxIFFOsgUi/y+Kc9en17BOqsm9jnTOdaBCmg9I8Ac7M2v0JdHERWCKrZAiStI9HC8dwkH3pSQ0Wg7eVDEaBDcZ/zegDPCNS5+9jkany3e8w1/YRKymET5vvC0f1S0H6CkeEzR0wVnhMQpdtYKexsqcH+OSbRvjkEXSdrgAEsmXAXr/CP0mbJm8AtM7HrAILAqV4pifPRBzTyMfllx5Lyq3aREF6wlm/om8Nbne13TxQCXmJgK4vJvPgPvLnKiCBxqEOATMG4OwFCHVlI3qeUzyhSRsoglfYHcwRFARqCz/PNiuo9zW1/rRPRrPWCmUOmeBoLnMzVxJ/PJvnSz5OtydTagI4jNc1gle4mDUT/VCTIBJiAMXyMNg== X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230031)(4636009)(346002)(39860400002)(136003)(376002)(396003)(82310400011)(451199024)(1800799009)(186009)(36840700001)(40470700004)(46966006)(2906002)(30864003)(7416002)(40480700001)(83380400001)(5660300002)(44832011)(336012)(426003)(26005)(86362001)(36860700001)(47076005)(8676002)(2616005)(8936002)(4326008)(70206006)(316002)(70586007)(6916009)(54906003)(478600001)(356005)(82740400003)(81166007)(6666004)(36756003)(41300700001)(40460700003)(1076003)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Aug 2023 01:31:22.8649 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 2379a4e4-acc9-491e-c50c-08dba2af7e9e X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: CO1PEPF000044F5.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH0PR12MB8531 X-ZohoMail-DKIM: pass (identity @amd.com) X-ZM-MESSAGEID: 1692667913460100001 Content-Type: text/plain; charset="utf-8" Convert pci_find_*cap* functions and call sites to pci_sbdf_t, and remove s= ome now unused local variables. No functional change. Signed-off-by: Stewart Hildebrand --- I built with EXTRA_CFLAGS_XEN_CORE=3D"-Wunused-but-set-variable" (and unfortunately -Wno-error=3Dunused-but-set-variable too) to identify locatio= ns of unneeded local variables as a result of the change to pci_sbdf_t. v2->v3: * new patch --- xen/arch/x86/msi.c | 47 ++++++---------------- xen/drivers/char/ehci-dbgp.c | 3 +- xen/drivers/passthrough/amd/iommu_detect.c | 2 +- xen/drivers/passthrough/ats.c | 4 +- xen/drivers/passthrough/ats.h | 6 ++- xen/drivers/passthrough/msi.c | 6 +-- xen/drivers/passthrough/pci.c | 20 ++++----- xen/drivers/passthrough/vtd/quirks.c | 10 ++--- xen/drivers/passthrough/vtd/x86/ats.c | 3 +- xen/drivers/pci/pci.c | 28 ++++++------- xen/drivers/vpci/msi.c | 4 +- xen/drivers/vpci/msix.c | 4 +- xen/include/xen/pci.h | 9 ++--- 13 files changed, 53 insertions(+), 93 deletions(-) diff --git a/xen/arch/x86/msi.c b/xen/arch/x86/msi.c index d0bf63df1def..13a1f0319a8a 100644 --- a/xen/arch/x86/msi.c +++ b/xen/arch/x86/msi.c @@ -283,7 +283,7 @@ static void msi_set_enable(struct pci_dev *dev, int ena= ble) u8 slot =3D PCI_SLOT(dev->devfn); u8 func =3D PCI_FUNC(dev->devfn); =20 - pos =3D pci_find_cap_offset(seg, bus, slot, func, PCI_CAP_ID_MSI); + pos =3D pci_find_cap_offset(dev->sbdf, PCI_CAP_ID_MSI); if ( pos ) __msi_set_enable(seg, bus, slot, func, pos, enable); } @@ -291,12 +291,9 @@ static void msi_set_enable(struct pci_dev *dev, int en= able) static void msix_set_enable(struct pci_dev *dev, int enable) { int pos; - u16 control, seg =3D dev->seg; - u8 bus =3D dev->bus; - u8 slot =3D PCI_SLOT(dev->devfn); - u8 func =3D PCI_FUNC(dev->devfn); + u16 control; =20 - pos =3D pci_find_cap_offset(seg, bus, slot, func, PCI_CAP_ID_MSIX); + pos =3D pci_find_cap_offset(dev->sbdf, PCI_CAP_ID_MSIX); if ( pos ) { control =3D pci_conf_read16(dev->sbdf, msix_control_reg(pos)); @@ -318,17 +315,12 @@ static bool msi_set_mask_bit(struct irq_desc *desc, b= ool host, bool guest) { struct msi_desc *entry =3D desc->msi_desc; struct pci_dev *pdev; - u16 seg, control; - u8 bus, slot, func; + u16 control; bool flag =3D host || guest, maskall; =20 ASSERT(spin_is_locked(&desc->lock)); BUG_ON(!entry || !entry->dev); pdev =3D entry->dev; - seg =3D pdev->seg; - bus =3D pdev->bus; - slot =3D PCI_SLOT(pdev->devfn); - func =3D PCI_FUNC(pdev->devfn); switch ( entry->msi_attrib.type ) { case PCI_CAP_ID_MSI: @@ -608,13 +600,10 @@ static int msi_capability_init(struct pci_dev *dev, struct msi_desc *entry; int pos; unsigned int i, mpos; - u16 control, seg =3D dev->seg; - u8 bus =3D dev->bus; - u8 slot =3D PCI_SLOT(dev->devfn); - u8 func =3D PCI_FUNC(dev->devfn); + u16 control; =20 ASSERT(pcidevs_locked()); - pos =3D pci_find_cap_offset(seg, bus, slot, func, PCI_CAP_ID_MSI); + pos =3D pci_find_cap_offset(dev->sbdf, PCI_CAP_ID_MSI); if ( !pos ) return -ENODEV; control =3D pci_conf_read16(dev->sbdf, msi_control_reg(pos)); @@ -685,8 +674,8 @@ static u64 read_pci_mem_bar(u16 seg, u8 bus, u8 slot, u= 8 func, u8 bir, int vf) { struct pci_dev *pdev =3D pci_get_pdev(NULL, PCI_SBDF(seg, bus, slot, func)= ); - unsigned int pos =3D pci_find_ext_capability(seg, bus, - PCI_DEVFN(slot, func), + unsigned int pos =3D pci_find_ext_capability(PCI_SBDF(seg, bus, sl= ot, + func), PCI_EXT_CAP_ID_SRIOV); uint16_t ctrl =3D pci_conf_read16(PCI_SBDF(seg, bus, slot, func), pos + PCI_SRIOV_CTRL); @@ -777,8 +766,7 @@ static int msix_capability_init(struct pci_dev *dev, u8 slot =3D PCI_SLOT(dev->devfn); u8 func =3D PCI_FUNC(dev->devfn); bool maskall =3D msix->host_maskall, zap_on_error =3D false; - unsigned int pos =3D pci_find_cap_offset(seg, bus, slot, func, - PCI_CAP_ID_MSIX); + unsigned int pos =3D pci_find_cap_offset(dev->sbdf, PCI_CAP_ID_MSIX); =20 if ( !pos ) return -ENODEV; @@ -1102,12 +1090,7 @@ static void _pci_cleanup_msix(struct arch_msix *msix) static void __pci_disable_msix(struct msi_desc *entry) { struct pci_dev *dev =3D entry->dev; - u16 seg =3D dev->seg; - u8 bus =3D dev->bus; - u8 slot =3D PCI_SLOT(dev->devfn); - u8 func =3D PCI_FUNC(dev->devfn); - unsigned int pos =3D pci_find_cap_offset(seg, bus, slot, func, - PCI_CAP_ID_MSIX); + unsigned int pos =3D pci_find_cap_offset(dev->sbdf, PCI_CAP_ID_MSIX); u16 control =3D pci_conf_read16(dev->sbdf, msix_control_reg(entry->msi_attrib.pos)); bool maskall =3D dev->msix->host_maskall; @@ -1211,8 +1194,7 @@ void pci_cleanup_msi(struct pci_dev *pdev) =20 int pci_reset_msix_state(struct pci_dev *pdev) { - unsigned int pos =3D pci_find_cap_offset(pdev->seg, pdev->bus, pdev->s= bdf.dev, - pdev->sbdf.fn, PCI_CAP_ID_MSIX); + unsigned int pos =3D pci_find_cap_offset(pdev->sbdf, PCI_CAP_ID_MSIX); =20 ASSERT(pos); /* @@ -1234,10 +1216,6 @@ int pci_reset_msix_state(struct pci_dev *pdev) int pci_msi_conf_write_intercept(struct pci_dev *pdev, unsigned int reg, unsigned int size, uint32_t *data) { - u16 seg =3D pdev->seg; - u8 bus =3D pdev->bus; - u8 slot =3D PCI_SLOT(pdev->devfn); - u8 func =3D PCI_FUNC(pdev->devfn); struct msi_desc *entry; unsigned int pos; =20 @@ -1245,8 +1223,7 @@ int pci_msi_conf_write_intercept(struct pci_dev *pdev= , unsigned int reg, { entry =3D find_msi_entry(pdev, -1, PCI_CAP_ID_MSIX); pos =3D entry ? entry->msi_attrib.pos - : pci_find_cap_offset(seg, bus, slot, func, - PCI_CAP_ID_MSIX); + : pci_find_cap_offset(pdev->sbdf, PCI_CAP_ID_MSIX); ASSERT(pos); =20 if ( reg >=3D pos && reg < msix_pba_offset_reg(pos) + 4 ) diff --git a/xen/drivers/char/ehci-dbgp.c b/xen/drivers/char/ehci-dbgp.c index 72be4d9cc970..00cbdd5454dd 100644 --- a/xen/drivers/char/ehci-dbgp.c +++ b/xen/drivers/char/ehci-dbgp.c @@ -687,7 +687,8 @@ static unsigned int __init __find_dbgp(u8 bus, u8 slot,= u8 func) if ( (class >> 8) !=3D PCI_CLASS_SERIAL_USB_EHCI ) return 0; =20 - return pci_find_cap_offset(0, bus, slot, func, PCI_CAP_ID_EHCI_DEBUG); + return pci_find_cap_offset(PCI_SBDF(0, bus, slot, func), + PCI_CAP_ID_EHCI_DEBUG); } =20 static unsigned int __init find_dbgp(struct ehci_dbgp *dbgp, diff --git a/xen/drivers/passthrough/amd/iommu_detect.c b/xen/drivers/passt= hrough/amd/iommu_detect.c index 2317fa6a7d8d..cede44e6518f 100644 --- a/xen/drivers/passthrough/amd/iommu_detect.c +++ b/xen/drivers/passthrough/amd/iommu_detect.c @@ -27,7 +27,7 @@ static int __init get_iommu_msi_capabilities( { int pos; =20 - pos =3D pci_find_cap_offset(seg, bus, dev, func, PCI_CAP_ID_MSI); + pos =3D pci_find_cap_offset(PCI_SBDF(seg, bus, dev, func), PCI_CAP_ID_= MSI); =20 if ( !pos ) return -ENODEV; diff --git a/xen/drivers/passthrough/ats.c b/xen/drivers/passthrough/ats.c index 7f7b16dc490c..eec6eec00043 100644 --- a/xen/drivers/passthrough/ats.c +++ b/xen/drivers/passthrough/ats.c @@ -24,11 +24,9 @@ boolean_param("ats", ats_enabled); int enable_ats_device(struct pci_dev *pdev, struct list_head *ats_list) { u32 value; - u16 seg =3D pdev->seg; - u8 bus =3D pdev->bus, devfn =3D pdev->devfn; int pos; =20 - pos =3D pci_find_ext_capability(seg, bus, devfn, PCI_EXT_CAP_ID_ATS); + pos =3D pci_find_ext_capability(pdev->sbdf, PCI_EXT_CAP_ID_ATS); BUG_ON(!pos); =20 if ( iommu_verbose ) diff --git a/xen/drivers/passthrough/ats.h b/xen/drivers/passthrough/ats.h index c202f4ecdd67..08a901187c54 100644 --- a/xen/drivers/passthrough/ats.h +++ b/xen/drivers/passthrough/ats.h @@ -32,7 +32,8 @@ static inline int pci_ats_enabled(int seg, int bus, int d= evfn) u32 value; int pos; =20 - pos =3D pci_find_ext_capability(seg, bus, devfn, PCI_EXT_CAP_ID_ATS); + pos =3D pci_find_ext_capability(PCI_SBDF(seg, bus, devfn), + PCI_EXT_CAP_ID_ATS); BUG_ON(!pos); =20 value =3D pci_conf_read16(PCI_SBDF(seg, bus, devfn), pos + ATS_REG_CTL= ); @@ -45,7 +46,8 @@ static inline int pci_ats_device(int seg, int bus, int de= vfn) if ( !ats_enabled ) return 0; =20 - return pci_find_ext_capability(seg, bus, devfn, PCI_EXT_CAP_ID_ATS); + return pci_find_ext_capability(PCI_SBDF(seg, bus, devfn), + PCI_EXT_CAP_ID_ATS); } =20 #endif /* _ATS_H_ */ diff --git a/xen/drivers/passthrough/msi.c b/xen/drivers/passthrough/msi.c index fb78e2ebe8a4..13d904692ef8 100644 --- a/xen/drivers/passthrough/msi.c +++ b/xen/drivers/passthrough/msi.c @@ -24,8 +24,7 @@ int pdev_msi_init(struct pci_dev *pdev) =20 INIT_LIST_HEAD(&pdev->msi_list); =20 - pos =3D pci_find_cap_offset(pdev->seg, pdev->bus, PCI_SLOT(pdev->devfn= ), - PCI_FUNC(pdev->devfn), PCI_CAP_ID_MSI); + pos =3D pci_find_cap_offset(pdev->sbdf, PCI_CAP_ID_MSI); if ( pos ) { uint16_t ctrl =3D pci_conf_read16(pdev->sbdf, msi_control_reg(pos)= ); @@ -33,8 +32,7 @@ int pdev_msi_init(struct pci_dev *pdev) pdev->msi_maxvec =3D multi_msi_capable(ctrl); } =20 - pos =3D pci_find_cap_offset(pdev->seg, pdev->bus, PCI_SLOT(pdev->devfn= ), - PCI_FUNC(pdev->devfn), PCI_CAP_ID_MSIX); + pos =3D pci_find_cap_offset(pdev->sbdf, PCI_CAP_ID_MSIX); if ( pos ) { struct arch_msix *msix =3D xzalloc(struct arch_msix); diff --git a/xen/drivers/passthrough/pci.c b/xen/drivers/passthrough/pci.c index 33452791a8e0..219b357efb14 100644 --- a/xen/drivers/passthrough/pci.c +++ b/xen/drivers/passthrough/pci.c @@ -361,8 +361,7 @@ static struct pci_dev *alloc_pdev(struct pci_seg *pseg,= u8 bus, u8 devfn) break; =20 case DEV_TYPE_PCIe_ENDPOINT: - pos =3D pci_find_cap_offset(pseg->nr, bus, PCI_SLOT(devfn), - PCI_FUNC(devfn), PCI_CAP_ID_EXP); + pos =3D pci_find_cap_offset(pdev->sbdf, PCI_CAP_ID_EXP); BUG_ON(!pos); cap =3D pci_conf_read16(pdev->sbdf, pos + PCI_EXP_DEVCAP); if ( cap & PCI_EXP_DEVCAP_PHANTOM ) @@ -565,13 +564,12 @@ struct pci_dev *pci_get_pdev(const struct domain *d, = pci_sbdf_t sbdf) static void pci_enable_acs(struct pci_dev *pdev) { int pos; - u16 cap, ctrl, seg =3D pdev->seg; - u8 bus =3D pdev->bus; + u16 cap, ctrl; =20 if ( !is_iommu_enabled(pdev->domain) ) return; =20 - pos =3D pci_find_ext_capability(seg, bus, pdev->devfn, PCI_EXT_CAP_ID_= ACS); + pos =3D pci_find_ext_capability(pdev->sbdf, PCI_EXT_CAP_ID_ACS); if (!pos) return; =20 @@ -704,7 +702,7 @@ int pci_add_device(u16 seg, u8 bus, u8 devfn, =20 if ( !pdev->info.is_virtfn && !pdev->vf_rlen[0] ) { - unsigned int pos =3D pci_find_ext_capability(seg, bus, devfn, + unsigned int pos =3D pci_find_ext_capability(pdev->sbdf, PCI_EXT_CAP_ID_SRIOV); uint16_t ctrl =3D pci_conf_read16(pdev->sbdf, pos + PCI_SRIOV_CTRL= ); =20 @@ -916,7 +914,7 @@ enum pdev_type pdev_type(u16 seg, u8 bus, u8 devfn) { u16 class_device, creg; u8 d =3D PCI_SLOT(devfn), f =3D PCI_FUNC(devfn); - int pos =3D pci_find_cap_offset(seg, bus, d, f, PCI_CAP_ID_EXP); + int pos =3D pci_find_cap_offset(PCI_SBDF(seg, bus, devfn), PCI_CAP_ID_= EXP); =20 class_device =3D pci_conf_read16(PCI_SBDF(seg, bus, d, f), PCI_CLASS_D= EVICE); switch ( class_device ) @@ -1184,10 +1182,7 @@ static int hest_match_pci(const struct acpi_hest_aer= _common *p, static bool_t hest_match_type(const struct acpi_hest_header *hest_hdr, const struct pci_dev *pdev) { - unsigned int pos =3D pci_find_cap_offset(pdev->seg, pdev->bus, - PCI_SLOT(pdev->devfn), - PCI_FUNC(pdev->devfn), - PCI_CAP_ID_EXP); + unsigned int pos =3D pci_find_cap_offset(pdev->sbdf, PCI_CAP_ID_EXP); u8 pcie =3D MASK_EXTR(pci_conf_read16(pdev->sbdf, pos + PCI_EXP_FLAGS), PCI_EXP_FLAGS_TYPE); =20 @@ -1258,8 +1253,7 @@ bool_t pcie_aer_get_firmware_first(const struct pci_d= ev *pdev) { struct aer_hest_parse_info info =3D { .pdev =3D pdev }; =20 - return pci_find_cap_offset(pdev->seg, pdev->bus, PCI_SLOT(pdev->devfn), - PCI_FUNC(pdev->devfn), PCI_CAP_ID_EXP) && + return pci_find_cap_offset(pdev->sbdf, PCI_CAP_ID_EXP) && apei_hest_parse(aer_hest_parse, &info) >=3D 0 && info.firmware_first; } diff --git a/xen/drivers/passthrough/vtd/quirks.c b/xen/drivers/passthrough= /vtd/quirks.c index fcc8f73e8b90..e1946c268beb 100644 --- a/xen/drivers/passthrough/vtd/quirks.c +++ b/xen/drivers/passthrough/vtd/quirks.c @@ -495,8 +495,6 @@ int me_wifi_quirk(struct domain *domain, uint8_t bus, u= int8_t devfn, =20 void pci_vtd_quirk(const struct pci_dev *pdev) { - int seg =3D pdev->seg; - int bus =3D pdev->bus; int pos; bool_t ff; u32 val, val2; @@ -532,12 +530,10 @@ void pci_vtd_quirk(const struct pci_dev *pdev) /* Sandybridge-EP (Romley) */ case 0x3c00: /* host bridge */ case 0x3c01 ... 0x3c0b: /* root ports */ - pos =3D pci_find_ext_capability(seg, bus, pdev->devfn, - PCI_EXT_CAP_ID_ERR); + pos =3D pci_find_ext_capability(pdev->sbdf, PCI_EXT_CAP_ID_ERR); if ( !pos ) { - pos =3D pci_find_ext_capability(seg, bus, pdev->devfn, - PCI_EXT_CAP_ID_VNDR); + pos =3D pci_find_ext_capability(pdev->sbdf, PCI_EXT_CAP_ID_VND= R); while ( pos ) { val =3D pci_conf_read32(pdev->sbdf, pos + PCI_VNDR_HEADER); @@ -546,7 +542,7 @@ void pci_vtd_quirk(const struct pci_dev *pdev) pos +=3D PCI_VNDR_HEADER; break; } - pos =3D pci_find_next_ext_capability(seg, bus, pdev->devfn= , pos, + pos =3D pci_find_next_ext_capability(pdev->sbdf, pos, PCI_EXT_CAP_ID_VNDR); } ff =3D 0; diff --git a/xen/drivers/passthrough/vtd/x86/ats.c b/xen/drivers/passthroug= h/vtd/x86/ats.c index 04d702b1d6b1..d9d93df0260f 100644 --- a/xen/drivers/passthrough/vtd/x86/ats.c +++ b/xen/drivers/passthrough/vtd/x86/ats.c @@ -57,8 +57,7 @@ int ats_device(const struct pci_dev *pdev, const struct a= cpi_drhd_unit *drhd) return 0; =20 ats_drhd =3D find_ats_dev_drhd(drhd->iommu); - pos =3D pci_find_ext_capability(pdev->seg, pdev->bus, pdev->devfn, - PCI_EXT_CAP_ID_ATS); + pos =3D pci_find_ext_capability(pdev->sbdf, PCI_EXT_CAP_ID_ATS); =20 if ( pos && (ats_drhd =3D=3D NULL) ) { diff --git a/xen/drivers/pci/pci.c b/xen/drivers/pci/pci.c index c73a8c4124af..3bcb74040284 100644 --- a/xen/drivers/pci/pci.c +++ b/xen/drivers/pci/pci.c @@ -8,25 +8,25 @@ #include #include =20 -int pci_find_cap_offset(u16 seg, u8 bus, u8 dev, u8 func, u8 cap) +int pci_find_cap_offset(pci_sbdf_t sbdf, u8 cap) { u8 id; int max_cap =3D 48; u8 pos =3D PCI_CAPABILITY_LIST; u16 status; =20 - status =3D pci_conf_read16(PCI_SBDF(seg, bus, dev, func), PCI_STATUS); + status =3D pci_conf_read16(sbdf, PCI_STATUS); if ( (status & PCI_STATUS_CAP_LIST) =3D=3D 0 ) return 0; =20 while ( max_cap-- ) { - pos =3D pci_conf_read8(PCI_SBDF(seg, bus, dev, func), pos); + pos =3D pci_conf_read8(sbdf, pos); if ( pos < 0x40 ) break; =20 pos &=3D ~3; - id =3D pci_conf_read8(PCI_SBDF(seg, bus, dev, func), pos + PCI_CAP= _LIST_ID); + id =3D pci_conf_read8(sbdf, pos + PCI_CAP_LIST_ID); =20 if ( id =3D=3D 0xff ) break; @@ -39,19 +39,19 @@ int pci_find_cap_offset(u16 seg, u8 bus, u8 dev, u8 fun= c, u8 cap) return 0; } =20 -int pci_find_next_cap(u16 seg, u8 bus, unsigned int devfn, u8 pos, int cap) +int pci_find_next_cap(pci_sbdf_t sbdf, u8 pos, int cap) { u8 id; int ttl =3D 48; =20 while ( ttl-- ) { - pos =3D pci_conf_read8(PCI_SBDF(seg, bus, devfn), pos); + pos =3D pci_conf_read8(sbdf, pos); if ( pos < 0x40 ) break; =20 pos &=3D ~3; - id =3D pci_conf_read8(PCI_SBDF(seg, bus, devfn), pos + PCI_CAP_LIS= T_ID); + id =3D pci_conf_read8(sbdf, pos + PCI_CAP_LIST_ID); =20 if ( id =3D=3D 0xff ) break; @@ -65,21 +65,21 @@ int pci_find_next_cap(u16 seg, u8 bus, unsigned int dev= fn, u8 pos, int cap) =20 /** * pci_find_ext_capability - Find an extended capability - * @seg/@bus/@devfn: PCI device to query + * @sbdf: PCI device to query * @cap: capability code * * Returns the address of the requested extended capability structure * within the device's PCI configuration space or 0 if the device does * not support it. */ -int pci_find_ext_capability(int seg, int bus, int devfn, int cap) +int pci_find_ext_capability(pci_sbdf_t sbdf, int cap) { - return pci_find_next_ext_capability(seg, bus, devfn, 0, cap); + return pci_find_next_ext_capability(sbdf, 0, cap); } =20 /** * pci_find_next_ext_capability - Find another extended capability - * @seg/@bus/@devfn: PCI device to query + * @sbdf: PCI device to query * @start: starting position * @cap: capability code * @@ -87,13 +87,13 @@ int pci_find_ext_capability(int seg, int bus, int devfn= , int cap) * within the device's PCI configuration space or 0 if the device does * not support it. */ -int pci_find_next_ext_capability(int seg, int bus, int devfn, int start, i= nt cap) +int pci_find_next_ext_capability(pci_sbdf_t sbdf, int start, int cap) { u32 header; int ttl =3D 480; /* 3840 bytes, minimum 8 bytes per capability */ int pos =3D max(start, 0x100); =20 - header =3D pci_conf_read32(PCI_SBDF(seg, bus, devfn), pos); + header =3D pci_conf_read32(sbdf, pos); =20 /* * If we have no capabilities, this is indicated by cap ID, @@ -109,7 +109,7 @@ int pci_find_next_ext_capability(int seg, int bus, int = devfn, int start, int cap pos =3D PCI_EXT_CAP_NEXT(header); if ( pos < 0x100 ) break; - header =3D pci_conf_read32(PCI_SBDF(seg, bus, devfn), pos); + header =3D pci_conf_read32(sbdf, pos); } return 0; } diff --git a/xen/drivers/vpci/msi.c b/xen/drivers/vpci/msi.c index 8f2b59e61aa4..78261c3f6e37 100644 --- a/xen/drivers/vpci/msi.c +++ b/xen/drivers/vpci/msi.c @@ -184,9 +184,7 @@ static void cf_check mask_write( =20 static int cf_check init_msi(struct pci_dev *pdev) { - uint8_t slot =3D PCI_SLOT(pdev->devfn), func =3D PCI_FUNC(pdev->devfn); - unsigned int pos =3D pci_find_cap_offset(pdev->seg, pdev->bus, slot, f= unc, - PCI_CAP_ID_MSI); + unsigned int pos =3D pci_find_cap_offset(pdev->sbdf, PCI_CAP_ID_MSI); uint16_t control; int ret; =20 diff --git a/xen/drivers/vpci/msix.c b/xen/drivers/vpci/msix.c index 25bde77586a4..626e7058c964 100644 --- a/xen/drivers/vpci/msix.c +++ b/xen/drivers/vpci/msix.c @@ -659,14 +659,12 @@ int vpci_make_msix_hole(const struct pci_dev *pdev) static int cf_check init_msix(struct pci_dev *pdev) { struct domain *d =3D pdev->domain; - uint8_t slot =3D PCI_SLOT(pdev->devfn), func =3D PCI_FUNC(pdev->devfn); unsigned int msix_offset, i, max_entries; uint16_t control; struct vpci_msix *msix; int rc; =20 - msix_offset =3D pci_find_cap_offset(pdev->seg, pdev->bus, slot, func, - PCI_CAP_ID_MSIX); + msix_offset =3D pci_find_cap_offset(pdev->sbdf, PCI_CAP_ID_MSIX); if ( !msix_offset ) return 0; =20 diff --git a/xen/include/xen/pci.h b/xen/include/xen/pci.h index a8c8c4ff11c3..8a482b15745c 100644 --- a/xen/include/xen/pci.h +++ b/xen/include/xen/pci.h @@ -193,11 +193,10 @@ int pci_mmcfg_read(unsigned int seg, unsigned int bus, unsigned int devfn, int reg, int len, u32 *value); int pci_mmcfg_write(unsigned int seg, unsigned int bus, unsigned int devfn, int reg, int len, u32 value); -int pci_find_cap_offset(u16 seg, u8 bus, u8 dev, u8 func, u8 cap); -int pci_find_next_cap(u16 seg, u8 bus, unsigned int devfn, u8 pos, int cap= ); -int pci_find_ext_capability(int seg, int bus, int devfn, int cap); -int pci_find_next_ext_capability(int seg, int bus, int devfn, int start, - int cap); +int pci_find_cap_offset(pci_sbdf_t sbdf, u8 cap); +int pci_find_next_cap(pci_sbdf_t sbdf, u8 pos, int cap); +int pci_find_ext_capability(pci_sbdf_t sbdf, int cap); +int pci_find_next_ext_capability(pci_sbdf_t sbdf, int start, int cap); const char *parse_pci(const char *, unsigned int *seg, unsigned int *bus, unsigned int *dev, unsigned int *func); const char *parse_pci_seg(const char *, unsigned int *seg, unsigned int *b= us, --=20 2.41.0 From nobody Tue May 14 18:26:29 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=amd.com); dmarc=pass(p=quarantine dis=none) header.from=amd.com ARC-Seal: i=2; a=rsa-sha256; t=1692667937; cv=pass; d=zohomail.com; s=zohoarc; b=SwNnL0QSFRAlvnxZfQODTYalE0lKz909Xf1ZMntDHiXcof/eXAkHpouxNebWpEJUa8AgTeKAlrZDsjbTSuLp1D4qKDRTz1QfJ4FTHmTMXrCus9cPli1AcKIiNJ4jkjPu1Q9KVsndvckJq5VBFTamQGZN2OhggkKBT33ZllgVUHw= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1692667937; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=2dly4to6LYqbONjIY1DEXYph5RrSOJfNV6FXB7NX/h0=; b=XeEPyti8gwNSo8ncFxLKy6XtB4TQ6p1XDAQlmdPj3d3JNoOrL8NVWOaVG71E9XJvyyfCVJ21YNIv2k3vC7gaPcBJP7UHF+4qopz6k8S8tZr0/oHZUyrXpV+DeaZ/LqB11qvJGtKn7xkbr7o6d8tHUpg4+ipTyanwszKOTQndm2U= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=amd.com); dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1692667937147524.5693516068801; Mon, 21 Aug 2023 18:32:17 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.588008.919437 (Exim 4.92) (envelope-from ) id 1qYGFT-00038g-JU; Tue, 22 Aug 2023 01:31:59 +0000 Received: by outflank-mailman (output) from mailman id 588008.919437; Tue, 22 Aug 2023 01:31:59 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qYGFT-00038Z-EN; Tue, 22 Aug 2023 01:31:59 +0000 Received: by outflank-mailman (input) for mailman id 588008; Tue, 22 Aug 2023 01:31:57 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qYGFR-0000x4-Mj for xen-devel@lists.xenproject.org; Tue, 22 Aug 2023 01:31:57 +0000 Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on20601.outbound.protection.outlook.com [2a01:111:f400:7eae::601]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id adc9c927-408b-11ee-9b0c-b553b5be7939; Tue, 22 Aug 2023 03:31:55 +0200 (CEST) Received: from MW4PR04CA0380.namprd04.prod.outlook.com (2603:10b6:303:81::25) by MW5PR12MB5682.namprd12.prod.outlook.com (2603:10b6:303:19f::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6699.24; Tue, 22 Aug 2023 01:31:51 +0000 Received: from CO1PEPF000044F5.namprd05.prod.outlook.com (2603:10b6:303:81:cafe::34) by MW4PR04CA0380.outlook.office365.com (2603:10b6:303:81::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6699.20 via Frontend Transport; Tue, 22 Aug 2023 01:31:51 +0000 Received: from SATLEXMB04.amd.com (165.204.84.17) by CO1PEPF000044F5.mail.protection.outlook.com (10.167.241.75) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.6699.15 via Frontend Transport; Tue, 22 Aug 2023 01:31:50 +0000 Received: from SATLEXMB04.amd.com (10.181.40.145) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.27; Mon, 21 Aug 2023 20:31:50 -0500 Received: from ubuntu.mshome.net (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server id 15.1.2507.27 via Frontend Transport; Mon, 21 Aug 2023 20:31:48 -0500 X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: adc9c927-408b-11ee-9b0c-b553b5be7939 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CdZXYD8eMfHrczPHd31YEBi7lKuPsgOr3FP41IwcQy0BzruO/2uSriZhlxFxsmjRa4Gf98WObc26f3257uxPoio3mVKE8QGauEQkji/t3oTFJF/Dz1X6R1PfSr7Fq76i7ZF7gjfpzx+EcDB5K4/z1bgkTIMMOH8eCzhtgCfg2C+58BXhDQzV38KcprcL6wTByB7pFhWa0oI82uj9O0ICxw36CJNHMebf6eCJaBU/+ddTQsEJiVSd7SuYvHUHfI4h8Xark0ImEyIGf2PeGiIUMEJYoa4Ue8BrTMceY/uFJTkXdwypS1CA2W0RCXeYakjir44OwKwGHW1exwAH3wiXYw== 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=2dly4to6LYqbONjIY1DEXYph5RrSOJfNV6FXB7NX/h0=; b=NdzxPmUDpLt66evvqFUNki/1AtbTSrz8tpXxlwM1ae+JolAHLhtvN7YD07UM2VGf9Z5sbAdMMDggUAXFyZK5yGIxDQcR2by+8Li7x8AGGrGIgIpeOHUKNRQvVhyIdaw/4mQJlH6GQqfiEWWUj3mK7cI655xIhFdBCyd08fHp/D+72NqSPP/Z+dJHuI0RmelxFkx8yu9NJkQzAOKt5c9jRqo2uxOD1/d9UMxcXj5omy6FldS//uFLLlSkpenKGArCFkAhAhTCU1FbcyXUjLVTov+5T2DJJCpGAJROfBwqQCEt75Ka4d1BJ8e1RctzkC9RyH1F78Oe5fAAKFMRIQaO3Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=lists.xenproject.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=2dly4to6LYqbONjIY1DEXYph5RrSOJfNV6FXB7NX/h0=; b=UA5a6x8bMuVNwbTzR8Ijcn55KTqAVPzFY09kK7h/eQTb1kgwxU8FPY45X22nk841Q2sSpx16rLsK5TLI0c4mu6ywBTZ0pes3VXWEqDzu9DTscp2OK4b6CSRKwopxmY3zgHDA9OvR8vR9L3sygrdspHFvSIH2Vz5GW8HarDrBj7w= X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C From: Stewart Hildebrand To: CC: Stewart Hildebrand , Andrew Cooper , George Dunlap , "Jan Beulich" , Julien Grall , "Stefano Stabellini" , Wei Liu , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= Subject: [PATCH v3 3/4] xen/vpci: header: filter PCI capabilities Date: Mon, 21 Aug 2023 21:29:51 -0400 Message-ID: <20230822012955.312930-4-stewart.hildebrand@amd.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230822012955.312930-1-stewart.hildebrand@amd.com> References: <20230822012955.312930-1-stewart.hildebrand@amd.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1PEPF000044F5:EE_|MW5PR12MB5682:EE_ X-MS-Office365-Filtering-Correlation-Id: 597c7468-e19e-4d5a-3e7e-08dba2af8f4f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: qK/Rz00xXvTtSo3waVIr3BihBIYM3A7A5IA6RP+2d+ztn/vcUa69lcpnu5u5voG1wajIhGEyMCSQyi9W7rtV0RpwZsVRpa99+6UIPqtCgl9VblHanrAleL72cOfwjYw1nGgPgYU2F/f44BwJPDSPyzfZkfHzj/QzEtMcyvWTPttwi8M2gbPoD9cqvuXEGjVErDdE25lf01EwjGjIKxXWzEBjOeyc54B7D3a++P3/OMChezYqCRh7mDip4TskEAb9qMtF8uOGLFF41+1cHHybSY/fTWsiJ66bdUpIHlyxtyDiv8MGsoMNSFzjFDktN7mVlIRTqtTkKs16SlO7Mmo2wHH0ibtseemRpiduZ4ZfAc9D9qniatvM6z5yiqQgf2MREXNOYsFwfoUJ/HPYsic4eJDcQ6VePZp1ddEFKR+qbfME3SMmxct9mLZDkmTv03A9oIKNuzCS+1le160ITPiV6M+2AzZjdjsIcvpq9QUT2O/xauOMf43VzKzZ9c3R1QcHdDR+B8KCb5tkGS6XahGhuBe3jAH1ZR5S3warm1meBm701d2EyYKO+cJ2nFcFJdRvggmeC9UDoJ8tSigjYPl2bomAfSNpqcWo8AuXGHyFsfcXSMuX2yayg8lIZqkB/RGZvPk4jR0mwvLZzicYHBgD3whpfu2A7lAMNhekmjTjF1e8dle89agYWhj1zmntTffHDffWub8OGTMA5Ou15GHU0+fvRd1eMQHC2bOKFRmpJuydWXINZuMPSKgGnxncPYdIEzLtNXTOnjy0OUZ+eGMvrA== X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230031)(4636009)(346002)(39860400002)(136003)(376002)(396003)(82310400011)(451199024)(1800799009)(186009)(36840700001)(40470700004)(46966006)(2906002)(40480700001)(83380400001)(5660300002)(44832011)(336012)(426003)(26005)(86362001)(36860700001)(47076005)(8676002)(2616005)(8936002)(4326008)(70206006)(316002)(70586007)(6916009)(54906003)(478600001)(356005)(82740400003)(81166007)(6666004)(36756003)(41300700001)(40460700003)(1076003)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Aug 2023 01:31:50.8806 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 597c7468-e19e-4d5a-3e7e-08dba2af8f4f X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: CO1PEPF000044F5.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW5PR12MB5682 X-ZohoMail-DKIM: pass (identity @amd.com) X-ZM-MESSAGEID: 1692667939300100001 Content-Type: text/plain; charset="utf-8" Currently, Xen vPCI only supports virtualizing the MSI and MSI-X capabiliti= es. Hide all other PCI capabilities (including extended capabilities) from domU= s for now, even though there may be certain devices/drivers that depend on being = able to discover certain capabilities. We parse the physical PCI capabilities linked list and add vPCI register handlers for the next elements, inserting our own next value, thus presenti= ng a modified linked list to the domU. Introduce helper functions vpci_hw_read8 and vpci_read_val. The vpci_read_v= al helper function returns a fixed value, which may be used for RAZ registers,= or registers whose value doesn't change. Introduce pci_find_next_cap_ttl() helper while adapting the logic from pci_find_next_cap() to suit our needs, and implement the existing pci_find_next_cap() in terms of the new helper. Signed-off-by: Stewart Hildebrand --- v2->v3: * get rid of > 0 in loop condition * implement pci_find_next_cap in terms of new pci_find_next_cap_ttl functio= n so that hypothetical future callers wouldn't be required to pass &ttl. * change NULL to (void *)0 for RAZ value passed to vpci_read_val * change type of ttl to unsigned int * remember to mask off the low 2 bits of next in the initial loop iteration * change return type of pci_find_next_cap and pci_find_next_cap_ttl * avoid wrapping the PCI_STATUS_CAP_LIST condition by using ! instead of = =3D=3D 0 v1->v2: * change type of ttl to int * use switch statement instead of if/else * adapt existing pci_find_next_cap helper instead of rolling our own * pass ttl as in/out * "pass through" the lower 2 bits of the next pointer * squash helper functions into this patch to avoid transient dead code situ= ation * extended capabilities RAZ/WI --- xen/drivers/pci/pci.c | 24 +++++++++----- xen/drivers/vpci/header.c | 69 +++++++++++++++++++++++++++++++++++++++ xen/drivers/vpci/vpci.c | 12 +++++++ xen/include/xen/pci.h | 5 ++- xen/include/xen/vpci.h | 5 +++ 5 files changed, 106 insertions(+), 9 deletions(-) diff --git a/xen/drivers/pci/pci.c b/xen/drivers/pci/pci.c index 3bcb74040284..f60051694dc5 100644 --- a/xen/drivers/pci/pci.c +++ b/xen/drivers/pci/pci.c @@ -39,30 +39,38 @@ int pci_find_cap_offset(pci_sbdf_t sbdf, u8 cap) return 0; } =20 -int pci_find_next_cap(pci_sbdf_t sbdf, u8 pos, int cap) +uint8_t pci_find_next_cap_ttl(pci_sbdf_t sbdf, uint8_t pos, + bool (*is_match)(uint8_t), unsigned int *ttl) { - u8 id; - int ttl =3D 48; + uint8_t id; =20 - while ( ttl-- ) + while ( (*ttl)-- ) { pos =3D pci_conf_read8(sbdf, pos); if ( pos < 0x40 ) break; =20 - pos &=3D ~3; - id =3D pci_conf_read8(sbdf, pos + PCI_CAP_LIST_ID); + id =3D pci_conf_read8(sbdf, (pos & ~3) + PCI_CAP_LIST_ID); =20 if ( id =3D=3D 0xff ) break; - if ( id =3D=3D cap ) + if ( is_match(id) ) return pos; =20 - pos +=3D PCI_CAP_LIST_NEXT; + pos =3D (pos & ~3) + PCI_CAP_LIST_NEXT; } + return 0; } =20 +uint8_t pci_find_next_cap(pci_sbdf_t sbdf, uint8_t pos, + bool (*is_match)(uint8_t)) +{ + unsigned int ttl =3D 48; + + return pci_find_next_cap_ttl(sbdf, pos, is_match, &ttl) & ~3; +} + /** * pci_find_ext_capability - Find an extended capability * @sbdf: PCI device to query diff --git a/xen/drivers/vpci/header.c b/xen/drivers/vpci/header.c index 60f7049e3498..b531ab03cec1 100644 --- a/xen/drivers/vpci/header.c +++ b/xen/drivers/vpci/header.c @@ -513,6 +513,18 @@ static void cf_check rom_write( rom->addr =3D val & PCI_ROM_ADDRESS_MASK; } =20 +static bool cf_check vpci_cap_supported(uint8_t id) +{ + switch ( id ) + { + case PCI_CAP_ID_MSI: + case PCI_CAP_ID_MSIX: + return true; + default: + return false; + } +} + static int cf_check init_bars(struct pci_dev *pdev) { uint16_t cmd; @@ -544,6 +556,63 @@ static int cf_check init_bars(struct pci_dev *pdev) if ( rc ) return rc; =20 + if ( !is_hardware_domain(pdev->domain) ) + { + if ( !(pci_conf_read16(pdev->sbdf, PCI_STATUS) & PCI_STATUS_CAP_LI= ST) ) + { + /* RAZ/WI */ + rc =3D vpci_add_register(pdev->vpci, vpci_read_val, NULL, + PCI_CAPABILITY_LIST, 1, (void *)0); + if ( rc ) + return rc; + } + else + { + /* Only expose capabilities to the guest that vPCI can handle.= */ + uint8_t next; + unsigned int ttl =3D 48; + + next =3D pci_find_next_cap_ttl(pdev->sbdf, PCI_CAPABILITY_LIST, + vpci_cap_supported, &ttl); + + rc =3D vpci_add_register(pdev->vpci, vpci_read_val, NULL, + PCI_CAPABILITY_LIST, 1, + (void *)(uintptr_t)next); + if ( rc ) + return rc; + + next &=3D ~3; + + while ( next && ttl ) + { + uint8_t pos =3D next; + + next =3D pci_find_next_cap_ttl(pdev->sbdf, + pos + PCI_CAP_LIST_NEXT, + vpci_cap_supported, &ttl); + + rc =3D vpci_add_register(pdev->vpci, vpci_hw_read8, NULL, + pos + PCI_CAP_LIST_ID, 1, NULL); + if ( rc ) + return rc; + + rc =3D vpci_add_register(pdev->vpci, vpci_read_val, NULL, + pos + PCI_CAP_LIST_NEXT, 1, + (void *)(uintptr_t)next); + if ( rc ) + return rc; + + next &=3D ~3; + } + } + + /* Extended capabilities RAZ/WI */ + rc =3D vpci_add_register(pdev->vpci, vpci_read_val, NULL, 0x100, 4, + (void *)0); + if ( rc ) + return rc; + } + if ( pdev->ignore_bars ) return 0; =20 diff --git a/xen/drivers/vpci/vpci.c b/xen/drivers/vpci/vpci.c index d73fa7630237..4a96aa50494d 100644 --- a/xen/drivers/vpci/vpci.c +++ b/xen/drivers/vpci/vpci.c @@ -133,6 +133,18 @@ static void cf_check vpci_ignored_write( { } =20 +uint32_t cf_check vpci_read_val( + const struct pci_dev *pdev, unsigned int reg, void *data) +{ + return (uintptr_t)data; +} + +uint32_t cf_check vpci_hw_read8( + const struct pci_dev *pdev, unsigned int reg, void *data) +{ + return pci_conf_read8(pdev->sbdf, reg); +} + uint32_t cf_check vpci_hw_read16( const struct pci_dev *pdev, unsigned int reg, void *data) { diff --git a/xen/include/xen/pci.h b/xen/include/xen/pci.h index 8a482b15745c..b30034ecccba 100644 --- a/xen/include/xen/pci.h +++ b/xen/include/xen/pci.h @@ -194,7 +194,10 @@ int pci_mmcfg_read(unsigned int seg, unsigned int bus, int pci_mmcfg_write(unsigned int seg, unsigned int bus, unsigned int devfn, int reg, int len, u32 value); int pci_find_cap_offset(pci_sbdf_t sbdf, u8 cap); -int pci_find_next_cap(pci_sbdf_t sbdf, u8 pos, int cap); +uint8_t pci_find_next_cap_ttl(pci_sbdf_t sbdf, uint8_t pos, + bool (*is_match)(uint8_t), unsigned int *ttl= ); +uint8_t pci_find_next_cap(pci_sbdf_t sbdf, uint8_t pos, + bool (*is_match)(uint8_t)); int pci_find_ext_capability(pci_sbdf_t sbdf, int cap); int pci_find_next_ext_capability(pci_sbdf_t sbdf, int start, int cap); const char *parse_pci(const char *, unsigned int *seg, unsigned int *bus, diff --git a/xen/include/xen/vpci.h b/xen/include/xen/vpci.h index 0b8a2a3c745b..17fd252746ec 100644 --- a/xen/include/xen/vpci.h +++ b/xen/include/xen/vpci.h @@ -45,7 +45,12 @@ uint32_t vpci_read(pci_sbdf_t sbdf, unsigned int reg, un= signed int size); void vpci_write(pci_sbdf_t sbdf, unsigned int reg, unsigned int size, uint32_t data); =20 +uint32_t cf_check vpci_read_val( + const struct pci_dev *pdev, unsigned int reg, void *data); + /* Passthrough handlers. */ +uint32_t cf_check vpci_hw_read8( + const struct pci_dev *pdev, unsigned int reg, void *data); uint32_t cf_check vpci_hw_read16( const struct pci_dev *pdev, unsigned int reg, void *data); uint32_t cf_check vpci_hw_read32( --=20 2.41.0 From nobody Tue May 14 18:26:29 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=amd.com); dmarc=pass(p=quarantine dis=none) header.from=amd.com ARC-Seal: i=2; a=rsa-sha256; t=1692667955; cv=pass; d=zohomail.com; s=zohoarc; b=iRE2tR64KWSB8NIVz1RZDXFuI2NTgy4FxLL3NczawuUDgZsbzJdLfzZUgp6vk1NdSe2rVFFzy2Lq7XVlSY5pO8lQxiVh/0BFIgg/ZgKnAa6W29oMPlh7nVIE4UERGe46GR74o5JYfMntFzha7pC9YVou3KlLQe2zdyrF4LSO4jQ= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1692667955; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=0n1yyNK6sHaopm2rNEybK0BDTFSOqSy/3YHjVA/ulc0=; b=iLpHLET4NYhIZgUVuNUqJDGW3i+6UB/4kSiV699EkQXjVJ3eyE+vWd+pKCmUCJKnqhQD3hMJgIQwazLf5NY+LDRXchxrdeilUwl5Bn67vSu1VBYQjZ8zDEg/vWlCJnu/8ql91cXbxhHNYV6TLi5CNpT6DD5dUX+HtsXZQf1G9rw= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=amd.com); dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1692667955975671.2850129964171; Mon, 21 Aug 2023 18:32:35 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.588011.919447 (Exim 4.92) (envelope-from ) id 1qYGFl-0003Yh-SG; Tue, 22 Aug 2023 01:32:17 +0000 Received: by outflank-mailman (output) from mailman id 588011.919447; Tue, 22 Aug 2023 01:32:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qYGFl-0003YW-NX; Tue, 22 Aug 2023 01:32:17 +0000 Received: by outflank-mailman (input) for mailman id 588011; Tue, 22 Aug 2023 01:32:17 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qYGFl-0000x3-18 for xen-devel@lists.xenproject.org; Tue, 22 Aug 2023 01:32:17 +0000 Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2062e.outbound.protection.outlook.com [2a01:111:f400:7eaa::62e]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id b9fd4221-408b-11ee-8782-cb3800f73035; Tue, 22 Aug 2023 03:32:16 +0200 (CEST) Received: from MW4PR04CA0235.namprd04.prod.outlook.com (2603:10b6:303:87::30) by SJ2PR12MB8955.namprd12.prod.outlook.com (2603:10b6:a03:542::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6699.20; Tue, 22 Aug 2023 01:32:11 +0000 Received: from CO1PEPF000042AB.namprd03.prod.outlook.com (2603:10b6:303:87:cafe::7d) by MW4PR04CA0235.outlook.office365.com (2603:10b6:303:87::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6699.20 via Frontend Transport; Tue, 22 Aug 2023 01:32:11 +0000 Received: from SATLEXMB03.amd.com (165.204.84.17) by CO1PEPF000042AB.mail.protection.outlook.com (10.167.243.40) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.6699.15 via Frontend Transport; Tue, 22 Aug 2023 01:32:11 +0000 Received: from SATLEXMB04.amd.com (10.181.40.145) by SATLEXMB03.amd.com (10.181.40.144) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.27; Mon, 21 Aug 2023 20:32:10 -0500 Received: from ubuntu.mshome.net (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server id 15.1.2507.27 via Frontend Transport; Mon, 21 Aug 2023 20:32:09 -0500 X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: b9fd4221-408b-11ee-8782-cb3800f73035 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=c8OEjwnlsvr7Lk9u/0W5YWXHeZT5a2US3Ixw5ZJiTrOeTiaYE5VoSh4NW2XsOBE9trfo8OEKoHUAV3MXS26IVXmyinz2ne2Jn5v7lg/esU8zJ7p5m7oU5R6jS8LzGR3iEhu7x1ycF9xJMotVZSORVP1Dg21XXenowaPxGGFJx9W5+4LEDMsKcxTCyIW6ur91y1a3VYtmf9/+Yy4JDLwQJgIICgU8r6c8tOeXP2u6PTDFtEp21QPACNKL2rHXyTut55wDhiliPN9N0+fVuVh4IiQf/m6RdbV5l6XRwCD7NrNeYgpR5gfQWoek26QTKND8WvC4fvSsN8Y0HqXZc3B2VA== 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=0n1yyNK6sHaopm2rNEybK0BDTFSOqSy/3YHjVA/ulc0=; b=OiHtNLn1vuFjBt2sfCrLYT1uk5odD78ncqrL6w0S3kV7fdQb2/kyZnXLHzePjviXPNTd9JdqUDPVb8ACb8xtnEhJtBzAaDaDvYVv8k0Os+ZoAmUYecZ8mQKdyiSMu2HSDzr7SfshKDtv+hWJXPY2VR2oVZVQKzzFZ3XYkAHgP+yvsO9A7B2wtr5iOhHP5OAUn/J/ui3DZFl7Rtq0FkZmhUF9tOFqPS3Y1OtZNSS8vB3EzumAWQRCc2xtBVT4THV0o5O8CUD9KdebEZ7E64vJD1c0lWp4s3lXJ0j91ykw+K3ykWIrwrPzSyEHW9pGaAOPfZR3Dwc4u/bzgAE+wirtZA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=lists.xenproject.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=0n1yyNK6sHaopm2rNEybK0BDTFSOqSy/3YHjVA/ulc0=; b=2LCh8dP6COnO9KItM2RD80vyBfTzzrU1nDlTA/laucbg3nu4RAMGm5dLl8lFl2PnS4LNZsvC2n3YXXao9tkh1qdj+LwwQIkpQCIB+rJPXYfH02vPCvDsscqKhkRL6vbrT7f5kJQXNX0XZQxu/Gw3fJmmzLqdcOKG2qqj7JX44Qc= X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB03.amd.com; pr=C From: Stewart Hildebrand To: CC: Stewart Hildebrand , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= Subject: [PATCH v3 4/4] xen/vpci: header: status register handler Date: Mon, 21 Aug 2023 21:29:52 -0400 Message-ID: <20230822012955.312930-5-stewart.hildebrand@amd.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230822012955.312930-1-stewart.hildebrand@amd.com> References: <20230822012955.312930-1-stewart.hildebrand@amd.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1PEPF000042AB:EE_|SJ2PR12MB8955:EE_ X-MS-Office365-Filtering-Correlation-Id: f5def659-3b9b-4ad9-1f94-08dba2af9b8b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: MsQb/n10me63qZXGgoZJ2qBLKZmjWw8KNEdalPBGgW+ryqY63xwiNauy6CFV+hCLRzjrx5x725yvpdMm+OMJZlEQjyXMDOLee5Q6wwPzf0Pp5+5Kmy7xrwzuyIkeVFyKxymcAEmbhD7b1Wu7bb/XawhLyqkpDAyX13UXlh4hyMQO/U4y7sTfT2o/BPw7FKdwz4MUVXzaBVoYgDWyq5T0HyiVDizr+CIEVV+BKZa08aSGOQRVjYk+u+KxeZvJyGXXfmDV4s5uD/zxT6Gx8zWs6lhYGep03hzt8CTUgua83ue4iPri0bMRob1MG5gm2EmlZgRXr1XgbJHLEBeQ73L+94RBC2RS6EUEFD4/LpJfWanMVEAu8hrBip1b5j/lULJWXYldm3adJLUreo5k6QFBbB9tbS1bP0loQxhEwqPYTPL6ZoF4UYh4zrO6zM0rGGk8iavToTJ2bNI+Z70ov0PUT90ApnI8sVYo55g+1/6KdOuDEW35f1gYk0h1ev4wXsoS4pih68K0flj580pzWZbmu37FoEW2LULQSY4oh+6tzsigeYslpZVW5hTfvSn5vlogiID1/cMxXRrMh8V+X3D4Hl6bPfLl4WoBUT0DgSc7IWWwd2MHcxEGUTaNuNbx8RaPi5tERv1RpTwvGunMcJRM/TXuvCWZM5q3NBBrQ1KZOIHu55f+2TY+Z4xbUlId8vcUx9vt8XKajEDrXFOBhg7DNtjBBOO6RivQLuFqxnlyhEe4cqdDfkFk9Plttz5zcuB4pQAxfjCiZMtaeOx5VMCFLw0O/CuwIY0YrGLcIMoLiXI= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB03.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230031)(4636009)(346002)(39860400002)(136003)(396003)(376002)(82310400011)(451199024)(186009)(1800799009)(40470700004)(46966006)(36840700001)(356005)(40460700003)(66899024)(1076003)(36860700001)(2616005)(336012)(426003)(6666004)(26005)(47076005)(83380400001)(5660300002)(44832011)(8936002)(4326008)(8676002)(2906002)(478600001)(41300700001)(70586007)(54906003)(316002)(70206006)(6916009)(82740400003)(40480700001)(86362001)(36756003)(81166007)(36900700001)(357404004);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Aug 2023 01:32:11.3588 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f5def659-3b9b-4ad9-1f94-08dba2af9b8b X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB03.amd.com] X-MS-Exchange-CrossTenant-AuthSource: CO1PEPF000042AB.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ2PR12MB8955 X-ZohoMail-DKIM: pass (identity @amd.com) X-ZM-MESSAGEID: 1692667957356100001 Content-Type: text/plain; charset="utf-8" Introduce a handler for the PCI status register, with ability to mask the capabilities bit. The status register is write-1-to-clear, so introduce han= dling for this type of register in vPCI. Signed-off-by: Stewart Hildebrand --- v2->v3: * new patch --- xen/drivers/vpci/header.c | 24 +++++++++++++++++++++++ xen/drivers/vpci/vpci.c | 41 +++++++++++++++++++++++++++++---------- xen/include/xen/vpci.h | 9 +++++++++ 3 files changed, 64 insertions(+), 10 deletions(-) diff --git a/xen/drivers/vpci/header.c b/xen/drivers/vpci/header.c index b531ab03cec1..7061b85e337b 100644 --- a/xen/drivers/vpci/header.c +++ b/xen/drivers/vpci/header.c @@ -413,6 +413,17 @@ static void cf_check cmd_write( pci_conf_write16(pdev->sbdf, reg, cmd); } =20 +static uint32_t cf_check status_read(const struct pci_dev *pdev, + unsigned int reg, void *data) +{ + struct vpci_header *header =3D data; + + if ( header->mask_cap_list ) + return pci_conf_read16(pdev->sbdf, reg) & ~(PCI_STATUS_CAP_LIST); + + return pci_conf_read16(pdev->sbdf, reg); +} + static void cf_check bar_write( const struct pci_dev *pdev, unsigned int reg, uint32_t val, void *data) { @@ -556,6 +567,11 @@ static int cf_check init_bars(struct pci_dev *pdev) if ( rc ) return rc; =20 + rc =3D vpci_add_rw1c_register(pdev->vpci, status_read, vpci_hw_write16, + PCI_STATUS, 2, header); + if ( rc ) + return rc; + if ( !is_hardware_domain(pdev->domain) ) { if ( !(pci_conf_read16(pdev->sbdf, PCI_STATUS) & PCI_STATUS_CAP_LI= ST) ) @@ -583,6 +599,14 @@ static int cf_check init_bars(struct pci_dev *pdev) =20 next &=3D ~3; =20 + if ( !next ) + /* + * If we don't have any supported capabilities to expose t= o the + * guest, mask the PCI_STATUS_CAP_LIST bit in the status + * register. + */ + header->mask_cap_list =3D true; + while ( next && ttl ) { uint8_t pos =3D next; diff --git a/xen/drivers/vpci/vpci.c b/xen/drivers/vpci/vpci.c index 4a96aa50494d..a34d85f4ed3c 100644 --- a/xen/drivers/vpci/vpci.c +++ b/xen/drivers/vpci/vpci.c @@ -29,6 +29,7 @@ struct vpci_register { unsigned int offset; void *private; struct list_head node; + bool rw1c : 1; }; =20 #ifdef __XEN__ @@ -157,9 +158,15 @@ uint32_t cf_check vpci_hw_read32( return pci_conf_read32(pdev->sbdf, reg); } =20 -int vpci_add_register(struct vpci *vpci, vpci_read_t *read_handler, - vpci_write_t *write_handler, unsigned int offset, - unsigned int size, void *data) +void cf_check vpci_hw_write16( + const struct pci_dev *pdev, unsigned int reg, uint32_t val, void *data) +{ + pci_conf_write16(pdev->sbdf, reg, val); +} + +static int _vpci_add_register(struct vpci *vpci, vpci_read_t *read_handler, + vpci_write_t *write_handler, unsigned int of= fset, + unsigned int size, void *data, bool rw1c) { struct list_head *prev; struct vpci_register *r; @@ -179,6 +186,7 @@ int vpci_add_register(struct vpci *vpci, vpci_read_t *r= ead_handler, r->size =3D size; r->offset =3D offset; r->private =3D data; + r->rw1c =3D rw1c; =20 spin_lock(&vpci->lock); =20 @@ -205,6 +213,22 @@ int vpci_add_register(struct vpci *vpci, vpci_read_t *= read_handler, return 0; } =20 +int vpci_add_register(struct vpci *vpci, vpci_read_t *read_handler, + vpci_write_t *write_handler, unsigned int offset, + unsigned int size, void *data) +{ + return _vpci_add_register(vpci, read_handler, write_handler, offset, s= ize, + data, false); +} + +int vpci_add_rw1c_register(struct vpci *vpci, vpci_read_t *read_handler, + vpci_write_t *write_handler, unsigned int offse= t, + unsigned int size, void *data) +{ + return _vpci_add_register(vpci, read_handler, write_handler, offset, s= ize, + data, true); +} + int vpci_remove_register(struct vpci *vpci, unsigned int offset, unsigned int size) { @@ -419,11 +443,6 @@ uint32_t vpci_read(pci_sbdf_t sbdf, unsigned int reg, = unsigned int size) =20 /* * Perform a maybe partial write to a register. - * - * Note that this will only work for simple registers, if Xen needs to - * trap accesses to rw1c registers (like the status PCI header register) - * the logic in vpci_write will have to be expanded in order to correctly - * deal with them. */ static void vpci_write_helper(const struct pci_dev *pdev, const struct vpci_register *r, unsigned int = size, @@ -433,9 +452,11 @@ static void vpci_write_helper(const struct pci_dev *pd= ev, =20 if ( size !=3D r->size ) { - uint32_t val; + uint32_t val =3D 0; + + if ( !r->rw1c ) + val =3D r->read(pdev, r->offset, r->private); =20 - val =3D r->read(pdev, r->offset, r->private); data =3D merge_result(val, data, size, offset); } =20 diff --git a/xen/include/xen/vpci.h b/xen/include/xen/vpci.h index 17fd252746ec..518d381b2df7 100644 --- a/xen/include/xen/vpci.h +++ b/xen/include/xen/vpci.h @@ -37,6 +37,11 @@ int __must_check vpci_add_register(struct vpci *vpci, vpci_write_t *write_handler, unsigned int offset, unsigned int size, void *data); +int __must_check vpci_add_rw1c_register(struct vpci *vpci, + vpci_read_t *read_handler, + vpci_write_t *write_handler, + unsigned int offset, unsigned int = size, + void *data); int __must_check vpci_remove_register(struct vpci *vpci, unsigned int offs= et, unsigned int size); =20 @@ -55,6 +60,8 @@ uint32_t cf_check vpci_hw_read16( const struct pci_dev *pdev, unsigned int reg, void *data); uint32_t cf_check vpci_hw_read32( const struct pci_dev *pdev, unsigned int reg, void *data); +void cf_check vpci_hw_write16( + const struct pci_dev *pdev, unsigned int reg, uint32_t val, void *data= ); =20 /* * Check for pending vPCI operations on this vcpu. Returns true if the vcpu @@ -99,6 +106,8 @@ struct vpci { * upon to know whether BARs are mapped into the guest p2m. */ bool bars_mapped : 1; + /* Store whether to hide all capabilities from the guest. */ + bool mask_cap_list : 1; /* FIXME: currently there's no support for SR-IOV. */ } header; =20 --=20 2.41.0