From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 66CF2A0547; Wed, 12 Oct 2022 10:42:21 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0162F42D6E; Wed, 12 Oct 2022 10:42:21 +0200 (CEST) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2089.outbound.protection.outlook.com [40.107.220.89]) by mails.dpdk.org (Postfix) with ESMTP id B9C9E42B7D for ; Tue, 11 Oct 2022 16:09:00 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nLA/djR9rqhpC79GPCjB8dcnjD843Ff2UwqFvopfPEqphSppCyRuhoyQEWrgT4qiPuSX38vE7zJDPvrIJB0W1jukPMN64mM6USGxVfXp7bhENUAQSe+w9et9cwMRepBITz2CE8OkJcXLo8gS1aQmH91lBOl23zojHvropxKPBnV+IcJM1gf5SxwFvgm6C/RPa7qpdosQGolegrM735m8rLCVKbBkVGDTkAfy0RknLa1poAA+uuWsUK0Tv0K3XTYI7fS6vRxwTCJM6FMbuHsd7cxFkMGCvbaNWPO9RRQRGeHOW2AgCFGZg5ARhBY3pS194EG9D0QqpA989NDyuBwVsQ== 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=GTZgVeQs1qN+I4Sfu0CfZX9eRcqd+A0qIyY9OamxJnU=; b=Y5uXzlVYSbvrRLaDqv5cwZttyIVdRnjxj0v3luYnjvIIP6eJjvJHJA8moW6n0aIcyYD5zZsUIvPmW//K7kZsRXItPHI4v4o7DFo8Vl0KE+HFaT9i0MzK2jO7KsvFc2lMQwIMmg/xgomFIjVAPfTZ/KFWtk+R6pPfIjAC8Jxiw2toXSghp3XTkBA39QJYh6PTWQqX99rYA7u9SzWVtX1+YFPM26/jrfg26TLNTGYqXlloQKu/iBmJSgknrNGdgvHov4JMw7PWO0YSAU8BwuBp4rh7IIiZ8DcDgq4TIDaHXvKLw5ey/kUR1mMtJ7i5RhUc5LbVQc5L5Q6NI2tbp3OvHQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 50.222.100.11) smtp.rcpttodomain=amd.com smtp.mailfrom=ddn.com; dmarc=pass (p=reject sp=none pct=100) action=none header.from=ddn.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ddn.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=GTZgVeQs1qN+I4Sfu0CfZX9eRcqd+A0qIyY9OamxJnU=; b=Q9Uo8Jj3vp76liYBlTvvUFDz7O7p3S1/VsJ6eDfTyeKlCwFtHlr6uB/gxJtQxHchDH9ktbfnVxuoJkuTHT03DytN53SNAMJXGspOcUgNW6BgsjGN9nFs58wd5EdjMPasqCzsK5SLqHvSt1fzyv4fINLEgOjEEMSF0W64qo5WTDA= Received: from BN9PR03CA0348.namprd03.prod.outlook.com (2603:10b6:408:f6::23) by MW5PR19MB5604.namprd19.prod.outlook.com (2603:10b6:303:194::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5709.15; Tue, 11 Oct 2022 14:08:57 +0000 Received: from BN8NAM04FT019.eop-NAM04.prod.protection.outlook.com (2603:10b6:408:f6:cafe::59) by BN9PR03CA0348.outlook.office365.com (2603:10b6:408:f6::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5709.20 via Frontend Transport; Tue, 11 Oct 2022 14:08:57 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 50.222.100.11) smtp.mailfrom=ddn.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=ddn.com; Received-SPF: Pass (protection.outlook.com: domain of ddn.com designates 50.222.100.11 as permitted sender) receiver=protection.outlook.com; client-ip=50.222.100.11; helo=uww-mx01.datadirectnet.com; pr=C Received: from uww-mx01.datadirectnet.com (50.222.100.11) by BN8NAM04FT019.mail.protection.outlook.com (10.13.160.221) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5709.10 via Frontend Transport; Tue, 11 Oct 2022 14:08:57 +0000 Received: from localhost (unknown [10.68.0.8]) by uww-mx01.datadirectnet.com (Postfix) with ESMTP id 530D220C684C; Tue, 11 Oct 2022 08:10:07 -0600 (MDT) From: Michael Piszczek To: dev@dpdk.org Cc: Vipin.Varghese@amd.com, Michael Piszczek Subject: [PATCH v4] pci: read amd iommu virtual address width Date: Tue, 11 Oct 2022 16:08:53 +0200 Message-Id: <20221011140854.777428-1-mpiszczek@ddn.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220912160157.3642968-2-mpiszczek@ddn.com> References: <20220912160157.3642968-2-mpiszczek@ddn.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN8NAM04FT019:EE_|MW5PR19MB5604:EE_ Content-Type: text/plain X-MS-Office365-Filtering-Correlation-Id: 022a9063-48ec-4da8-f50a-08daab92237a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: JdRHjyoOE33Pg9npmD1MnZnDmAyOV6JJaugkb4X63cE8PQUNK2HoRipZJyuUEXfrOBVdQfoQnSthSerBXek5jx2L1EQQlspolfJW7+aia4bi8xstfnUFSNz+m0x7cgBWvqaOXOnEMwPlQEi4gn5L6pCfowkZ3XiR/wE7PZ804dslno2dGdn4u23Ehvwid06bEGP33I6w5+wI6lymJ3i89OkGyec63YvgZdjOH8ti5h4uiYiAJFGrkx5dsrASMzn6b5ACvTXsgbeow0ho8WWleqL9BB/iGFmlJqf9ARt10k+/Z0OBJJ+k3snPxqAc21seJi7elZ5+my8DhPuM43nk7eZD07SVslHQ2Lt6WF9+gdU1E+OWBfKTk+iQy8l0XIDPPFGRemqyd2gb2XSrCzywXXxRQ6L1jw1lfo62o9I7GfsRI9twdbm/tz6E57xcggCFvlD8b+Ac0ejpkV5EByDjO7Std5IVdh4TmpwZaVa5VaqREZuXVmch1/AudTB71aF4vDCeohXEbFc3RbtQuhAoJa1XeDLZhNoJFSuG54YjNwww2WtJnxxB1XEmw/U6YTnCecnX5qRk6WQE9ERAFBS3MB6OsUsVBifBJC/gGr0j9cW5y98N/yov23neXWhosGsySDWR1N1SOWcKQwyn6ndSCoBy21UEnTmnJyBQUiqRViBjTlVGZqY/XEhEor7m7lErbMgwQ5Egqab9n2JWQ+d2RPmUKCoWQEh0hQDSqmF8RsdK9EloLjN4ExIG7zYhRRYBrbFtlV5rE1SXd2QND9obrg== X-Forefront-Antispam-Report: CIP:50.222.100.11; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:uww-mx01.datadirectnet.com; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(13230022)(4636009)(136003)(346002)(376002)(39850400004)(396003)(451199015)(36840700001)(46966006)(2906002)(6916009)(316002)(40480700001)(82310400005)(186003)(1076003)(41300700001)(2616005)(70586007)(6666004)(81166007)(83380400001)(336012)(8936002)(8676002)(4326008)(5660300002)(47076005)(82740400003)(356005)(26005)(70206006)(36860700001)(86362001)(478600001)(6266002)(36756003)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: ddn.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Oct 2022 14:08:57.3775 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 022a9063-48ec-4da8-f50a-08daab92237a X-MS-Exchange-CrossTenant-Id: 753b6e26-6fd3-43e6-8248-3f1735d59bb4 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=753b6e26-6fd3-43e6-8248-3f1735d59bb4; Ip=[50.222.100.11]; Helo=[uww-mx01.datadirectnet.com] X-MS-Exchange-CrossTenant-AuthSource: BN8NAM04FT019.eop-NAM04.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW5PR19MB5604 X-Mailman-Approved-At: Wed, 12 Oct 2022 10:42:19 +0200 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Add code to read the virtual address width for AMD processors. Signed-off-by: Michael Piszczek --- drivers/bus/pci/linux/pci.c | 48 ++++++++++++++++++++++++------------- 1 file changed, 32 insertions(+), 16 deletions(-) diff --git a/drivers/bus/pci/linux/pci.c b/drivers/bus/pci/linux/pci.c index ebd1395502..cdac634e6c 100644 --- a/drivers/bus/pci/linux/pci.c +++ b/drivers/bus/pci/linux/pci.c @@ -480,15 +480,18 @@ rte_pci_scan(void) } #if defined(RTE_ARCH_X86) + bool pci_device_iommu_support_va(const struct rte_pci_device *dev) { #define VTD_CAP_MGAW_SHIFT 16 #define VTD_CAP_MGAW_MASK (0x3fULL << VTD_CAP_MGAW_SHIFT) +#define RD_AMD_CAP_VASIZE_SHIFT 15 +#define RD_AMD_CAP_VASIZE_MASK (0x7F << RD_AMD_CAP_VASIZE_SHIFT) const struct rte_pci_addr *addr = &dev->addr; char filename[PATH_MAX]; FILE *fp; - uint64_t mgaw, vtd_cap_reg = 0; + uint64_t mgaw = 0, cap_reg = 0; snprintf(filename, sizeof(filename), "%s/" PCI_PRI_FMT "/iommu/intel-iommu/cap", @@ -496,26 +499,39 @@ pci_device_iommu_support_va(const struct rte_pci_device *dev) addr->function); fp = fopen(filename, "r"); - if (fp == NULL) { - /* We don't have an Intel IOMMU, assume VA supported */ - if (errno == ENOENT) - return true; - - RTE_LOG(ERR, EAL, "%s(): can't open %s: %s\n", - __func__, filename, strerror(errno)); - return false; - } + if (fp != NULL) { + /* We have an Intel IOMMU */ + if (fscanf(fp, "%" PRIx64, &cap_reg) != 1) { + RTE_LOG(ERR, EAL, "%s(): can't read %s\n", __func__, filename); + fclose(fp); + return false; + } - /* We have an Intel IOMMU */ - if (fscanf(fp, "%" PRIx64, &vtd_cap_reg) != 1) { - RTE_LOG(ERR, EAL, "%s(): can't read %s\n", __func__, filename); fclose(fp); - return false; + mgaw = ((cap_reg & VTD_CAP_MGAW_MASK) >> VTD_CAP_MGAW_SHIFT) + 1; } + else { + snprintf(filename, sizeof(filename), + "%s/" PCI_PRI_FMT "/iommu/amd-iommu/cap", + rte_pci_get_sysfs_path(), addr->domain, addr->bus, addr->devid, + addr->function); + + fp = fopen(filename, "r"); + if (fp != NULL) { + /* We have an Amd IOMMU */ + if (fscanf(fp, "%" PRIx64, &cap_reg) != 1) { + RTE_LOG(ERR, EAL, "%s(): can't read %s\n", __func__, filename); + fclose(fp); + return false; + } - fclose(fp); + fclose(fp); + mgaw = ((cap_reg & RD_AMD_CAP_VASIZE_MASK) >> RD_AMD_CAP_VASIZE_SHIFT) + 1; + } + } - mgaw = ((vtd_cap_reg & VTD_CAP_MGAW_MASK) >> VTD_CAP_MGAW_SHIFT) + 1; + if (mgaw == 0) + return false; /* * Assuming there is no limitation by now. We can not know at this point -- 2.34.1