From patchwork Thu Sep 3 13:59:39 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurentiu Tudor X-Patchwork-Id: 1356624 X-Patchwork-Delegate: priyanka.jain@nxp.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.a=rsa-sha256 header.s=selector2 header.b=HkYLZ/2o; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Bj2WG5SVcz9sW7 for ; Fri, 4 Sep 2020 00:00:10 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 9B84D82337; Thu, 3 Sep 2020 15:59:58 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="HkYLZ/2o"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id B757182337; Thu, 3 Sep 2020 15:59:57 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FORGED_SPF_HELO,MSGID_FROM_MTA_HEADER, SPF_HELO_PASS,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.2 Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04on061f.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0e::61f]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id E284F8232F for ; Thu, 3 Sep 2020 15:59:54 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=laurentiu.tudor@nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CFgeA9ogTWJgJ73jiCZJBh6sROLRNbaWXLAJh3etc0sIgMQE4KNeVkngZbDm42fOLeCqoH3LLvgB0eLR7s1NW/FvLR5mp+UEORR/3yAwjavPCPwQKQjaGb5FQJ8SfQIDTNKm4la6AfLXXZedT0EwKJc1CNTWvCuokBl1riSP7vIHoPwm8FTxe1GKlBZeESIupbxX+Mfv50BZcUWyrESSxYCdfgsToFTnoZdVUrbYpMn5h/YAXRzIz7G9CK/auY/OI3rbB2GDwUH9RAITqLPgV3Pehczwevea5Ng9S2N8VZkyNFtFoNLkHnNO+f6awDYS3D8Et1ORKQldOyT67+vhwA== 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-SenderADCheck; bh=Mvwh00WoKHncE4VD+0tKRCk0wmSQ0K9WtZzDXtJlwxc=; b=W7rZS807rDJkyrLFE1j7tt8/mazmCJq3AuMtYQLftGCkonGUAqnyQJ9xov7emeA17bXOByzkadeeRxfH5bFPjnHgGHUuABywHuk37UBPq4wqftLKOytkwWA6qO9v9uxBSTuE1aGdop0t6VXsnLt3Ad2vsUADPWHJRtxguW0cy90UzrIIsj7Vr2x/sEldI8Vp4YiqDrFrxynJMAy7P+ZPi/hKCbRNHg6eDSZjAMCWIPA+AoRbL6ytF6PYtJH3xUelopLkMLPjD6ar0zKvFmsYjb1k0jA4PBK6nQQUXLXhUsDMcZ5b/4zcE2EwB4L/MnLMV+D9b8WkBT5LekpoThLLzA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Mvwh00WoKHncE4VD+0tKRCk0wmSQ0K9WtZzDXtJlwxc=; b=HkYLZ/2op4r7WNFhy4TL6E+mDjE9Kh/uM1opNgUUj9r1mEocAKiUnzO3oYLhjinbpyMR2asJofhBj3DYwVrbG0b2TC3k4M8dgwdq6uIko82PfMnr52noqzcNZ/hHTgYDa8Izt7WDMKuzVmDgayoDsJd6CS1EIlqURfzbql/YomM= Authentication-Results: lists.denx.de; dkim=none (message not signed) header.d=none;lists.denx.de; dmarc=none action=none header.from=nxp.com; Received: from VI1PR0402MB3405.eurprd04.prod.outlook.com (2603:10a6:803:3::26) by VI1PR04MB7183.eurprd04.prod.outlook.com (2603:10a6:800:128::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3348.15; Thu, 3 Sep 2020 13:59:53 +0000 Received: from VI1PR0402MB3405.eurprd04.prod.outlook.com ([fe80::f960:c16d:16a5:6e7b]) by VI1PR0402MB3405.eurprd04.prod.outlook.com ([fe80::f960:c16d:16a5:6e7b%7]) with mapi id 15.20.3326.025; Thu, 3 Sep 2020 13:59:53 +0000 From: laurentiu.tudor@nxp.com To: u-boot@lists.denx.de, priyanka.jain@nxp.com Cc: zhiqiang.hou@nxp.com, Laurentiu Tudor Subject: [PATCH v4 1/4] pci: layerscape: move per-pci device fdt fixup in a function Date: Thu, 3 Sep 2020 16:59:39 +0300 Message-Id: <20200903135942.28548-2-laurentiu.tudor@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200903135942.28548-1-laurentiu.tudor@nxp.com> References: <20200903135942.28548-1-laurentiu.tudor@nxp.com> X-ClientProxiedBy: AM0PR10CA0099.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:208:e6::16) To VI1PR0402MB3405.eurprd04.prod.outlook.com (2603:10a6:803:3::26) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from fsr-ub1864-101.ea.freescale.net (83.217.231.2) by AM0PR10CA0099.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:208:e6::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3348.15 via Frontend Transport; Thu, 3 Sep 2020 13:59:52 +0000 X-Mailer: git-send-email 2.17.1 X-Originating-IP: [83.217.231.2] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 6585416d-ad90-42c3-45cd-08d85011a192 X-MS-TrafficTypeDiagnostic: VI1PR04MB7183: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:7691; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: kxBNRjoOVtqXTiI9r8M4Fih4UXSnDX9xelfXkXzZH+IZwGmeoMsbmX50riEFeg4/wSSx0i7dlG6zEFaWw3nhfYEMJEBi4FHKFgOHxW/tBh0ap3ZbvLjY+HXhsb6w0X3nG4HrBZUIulYdCcmEEmx8EG4z6BrgZUtbO8HUjQYcuTd1ctyv0hNHFGxrNBIDwDrnV7s8uvGnXrvt8XmMPkm/GobW16whT/k2+eOW9W9D6VOmgHmfvbCWZOumG/pl46qiv7HKNP+PNEnvWkII1hwds8oTwz2Z0QF0YsXfxnoaAPPNyevC1BmztxnRyVrP2ihIJovWE5P8B8Ix+3Hbj0TrGg== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:VI1PR0402MB3405.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(366004)(346002)(136003)(39860400002)(396003)(376002)(478600001)(86362001)(316002)(66556008)(6506007)(186003)(66946007)(66476007)(52116002)(26005)(36756003)(4326008)(6486002)(2906002)(83380400001)(16526019)(5660300002)(1076003)(6512007)(8676002)(8936002)(956004)(6666004)(9686003)(2616005); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: CQ9ArJNb3mZddKIhhs2OokHYLYoc4yBlrVIIpsWB5TFfT9vl1AIbR2wq0fCPgzLzQsE+/7yFegaNQehNnPOkZL1hbA1btJ+QVSv/7Gk0BPHqf5RjTAnXYHIKK4ZhpaMD0MgW3b0xcviJT1KhwFWGmo7gzu7cs3TX4/swH5qbD604u9aAQo3enWm5suFnFfhovmatiD3r8+MuEtX6QjkZWZCgjCOdvXNIrquxPp+M4lZQs+puLET1xVGMqmG1Ah58IVRvjA0/2vydasP+Z43WdShOMfTYtxNRFKQMN/qPXY0OUgzPbT1nG1lHmDxywDE1mLtW8aCMGyFinWuvgh0auVIT+/crLPwkYBp7SarM6Vxsa7pWl7/LYyeoxdvYFe8fur8iSBdLZWl6bwEaGA7A7CLBCDCpsL9mj4JSjB5+0hDZgOthAuTPxJFuC8NMtsk5bvVr6KC4odfZiEjt4+orol3MvUIhpTeR7DvXBuWWXMlDBkhSeO5/HE0xff7C/APbN60Wtwv2iL5l2xiWfaAMkRjkGfuGBXZQRrldbFUTuBthW2qMfteyS3mRva38V7tEIeDcoR5+eB2+B7IiEOOIIJ/PlPtV8W+FPmIZamLjIA1epOUIWLJpAHpaJQhGVdGC19BJlA7yBY86015mcJsg5g== X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6585416d-ad90-42c3-45cd-08d85011a192 X-MS-Exchange-CrossTenant-AuthSource: VI1PR0402MB3405.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Sep 2020 13:59:53.3665 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 2Hqc9Y8ZHX+Gse9vybAETYXbTuv1n2fITfYeh8vrlo3nhXkPYLRR9xVzXmDKBE/IKPJV2jugYKOjF5bb1T+3TQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB7183 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.102.3 at phobos.denx.de X-Virus-Status: Clean From: Laurentiu Tudor Move the pci device related fdt fixup in a function in order to re-use it in a following patch. While at it, improve the error handling. Signed-off-by: Laurentiu Tudor --- drivers/pci/pcie_layerscape_fixup.c | 60 ++++++++++++++++------------- 1 file changed, 34 insertions(+), 26 deletions(-) diff --git a/drivers/pci/pcie_layerscape_fixup.c b/drivers/pci/pcie_layerscape_fixup.c index 8315b0b590..7c55e3d249 100644 --- a/drivers/pci/pcie_layerscape_fixup.c +++ b/drivers/pci/pcie_layerscape_fixup.c @@ -174,12 +174,41 @@ static void fdt_pcie_set_iommu_map_entry_ls(void *blob, } } +static int fdt_fixup_pcie_device_ls(void *blob, pci_dev_t bdf, + struct ls_pcie_rc *pcie_rc) +{ + int streamid, index; + + streamid = pcie_next_streamid(pcie_rc->stream_id_cur, + pcie_rc->pcie->idx); + if (streamid < 0) { + printf("ERROR: out of stream ids for BDF %d.%d.%d\n", + PCI_BUS(bdf), PCI_DEV(bdf), PCI_FUNC(bdf)); + return -ENOENT; + } + pcie_rc->stream_id_cur++; + + index = ls_pcie_next_lut_index(pcie_rc); + if (index < 0) { + printf("ERROR: out of LUT indexes for BDF %d.%d.%d\n", + PCI_BUS(bdf), PCI_DEV(bdf), PCI_FUNC(bdf)); + return -ENOENT; + } + + /* map PCI b.d.f to streamID in LUT */ + ls_pcie_lut_set_mapping(pcie_rc, index, bdf >> 8, streamid); + /* update msi-map in device tree */ + fdt_pcie_set_msi_map_entry_ls(blob, pcie_rc, bdf >> 8, streamid); + /* update iommu-map in device tree */ + fdt_pcie_set_iommu_map_entry_ls(blob, pcie_rc, bdf >> 8, streamid); + + return 0; +} + static void fdt_fixup_pcie_ls(void *blob) { struct udevice *dev, *bus; struct ls_pcie_rc *pcie_rc; - int streamid; - int index; pci_dev_t bdf; /* Scan all known buses */ @@ -190,32 +219,11 @@ static void fdt_fixup_pcie_ls(void *blob) bus = bus->parent; pcie_rc = dev_get_priv(bus); - streamid = pcie_next_streamid(pcie_rc->stream_id_cur, - pcie_rc->pcie->idx); - if (streamid < 0) { - debug("ERROR: no stream ids free\n"); - continue; - } else { - pcie_rc->stream_id_cur++; - } - - index = ls_pcie_next_lut_index(pcie_rc); - if (index < 0) { - debug("ERROR: no LUT indexes free\n"); - continue; - } - /* the DT fixup must be relative to the hose first_busno */ bdf = dm_pci_get_bdf(dev) - PCI_BDF(bus->seq, 0, 0); - /* map PCI b.d.f to streamID in LUT */ - ls_pcie_lut_set_mapping(pcie_rc, index, bdf >> 8, - streamid); - /* update msi-map in device tree */ - fdt_pcie_set_msi_map_entry_ls(blob, pcie_rc, bdf >> 8, - streamid); - /* update iommu-map in device tree */ - fdt_pcie_set_iommu_map_entry_ls(blob, pcie_rc, bdf >> 8, - streamid); + + if (fdt_fixup_pcie_device_ls(blob, bdf, pcie_rc) < 0) + break; } pcie_board_fix_fdt(blob); } From patchwork Thu Sep 3 13:59:40 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurentiu Tudor X-Patchwork-Id: 1356626 X-Patchwork-Delegate: priyanka.jain@nxp.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.a=rsa-sha256 header.s=selector2 header.b=KtAvwi3v; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Bj2Wc4T0Gz9sW4 for ; Fri, 4 Sep 2020 00:00:27 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id ADE5282340; Thu, 3 Sep 2020 16:00:00 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="KtAvwi3v"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 6DEFC8233C; Thu, 3 Sep 2020 15:59:59 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FORGED_SPF_HELO,MSGID_FROM_MTA_HEADER, SPF_HELO_PASS,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.2 Received: from EUR03-DB5-obe.outbound.protection.outlook.com (mail-db5eur03on0609.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0a::609]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id CE38E82331 for ; Thu, 3 Sep 2020 15:59:55 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=laurentiu.tudor@nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=DI2TKgn+umw25tsSXUi1ra/c4j1OOVw/SEM9XJN92BubcZDN5Dz9DFnb0R51wLkp4PKAxwkoVUzNI+JTBv3OIpfLYVRdrXJu3+mxvHXwRX/lSIhR1ZRm0z2KUtUkYDYe4836/sZWjoLoNQnDm5d7+3ahlECpKTK9lb4BcjGP3uwosnUvbHlLQzxa1SDzU8Tbxrhy95ylBjU23hsQ/ZTT6FaV6TTbbHnZFB5Sp1lqlbgEPgzs5+EAHIt7sIk2FV/rH7R0Dar+XZKajL/0Lb50WyWttGBoFniy+LD26PpzU5owzBuWk1yFc9PLk2eRKUF02FHvf8iIo9Wsg7gg6tKyVg== 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-SenderADCheck; bh=SCqTRBMfu261sgFq/nrw5OSgHqKDUstVn2KKdDtLRO8=; b=WjLm8kj1sGTSxVfDEZk7l9JaS09CUv18fbPvVAcnT96KiDRpZrsrcaQ7CCZPVIH/eO4WaJY/tziybg1xk8WI0w5NHnJBpsyMucYfZ9I11z9UfmZ8pzMgnmdgGD3y/0PeFYVrUdJ4W9Pktb2kBIU8Oaza0uRbNvdHvo4t+aAyxbhQ7sFMEYiiWQiTQUz9ZCOi7UvrWtHeviGQx/jvSxZCVpzjaIUOfSyuXZcj32DBBL6w9RE7gzWKrRXfxgthj/M71YkwtxvQSC6BNCpcgve1AkPS8FopAVHtMSEWb7lYya1dLs0A57TPktF9nDVU5SBB2rfxME0iUI+KLaSDl/em6A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=SCqTRBMfu261sgFq/nrw5OSgHqKDUstVn2KKdDtLRO8=; b=KtAvwi3vurH0SL1ywYPD87mIbkC7xlIccQksLP7R/sfcoPo/WqV0/rRU/+taWaJSafOCYeL2F3tSDkdrWfcQy2mthCaZLevncRWCsdTnLHWEW1H/D/lbxrGVDtEvLk3ypFmc+8b/XZlkJUPrzfLCReqsUXIqKInmKlRTb+U4fM8= Authentication-Results: lists.denx.de; dkim=none (message not signed) header.d=none;lists.denx.de; dmarc=none action=none header.from=nxp.com; Received: from VI1PR0402MB3405.eurprd04.prod.outlook.com (2603:10a6:803:3::26) by VI1PR04MB2973.eurprd04.prod.outlook.com (2603:10a6:802:10::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3326.23; Thu, 3 Sep 2020 13:59:54 +0000 Received: from VI1PR0402MB3405.eurprd04.prod.outlook.com ([fe80::f960:c16d:16a5:6e7b]) by VI1PR0402MB3405.eurprd04.prod.outlook.com ([fe80::f960:c16d:16a5:6e7b%7]) with mapi id 15.20.3326.025; Thu, 3 Sep 2020 13:59:54 +0000 From: laurentiu.tudor@nxp.com To: u-boot@lists.denx.de, priyanka.jain@nxp.com Cc: zhiqiang.hou@nxp.com, Laurentiu Tudor Subject: [PATCH v4 2/4] pci: layerscape: move pci node search in a common function Date: Thu, 3 Sep 2020 16:59:40 +0300 Message-Id: <20200903135942.28548-3-laurentiu.tudor@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200903135942.28548-1-laurentiu.tudor@nxp.com> References: <20200903135942.28548-1-laurentiu.tudor@nxp.com> X-ClientProxiedBy: AM0PR10CA0099.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:208:e6::16) To VI1PR0402MB3405.eurprd04.prod.outlook.com (2603:10a6:803:3::26) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from fsr-ub1864-101.ea.freescale.net (83.217.231.2) by AM0PR10CA0099.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:208:e6::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3348.15 via Frontend Transport; Thu, 3 Sep 2020 13:59:53 +0000 X-Mailer: git-send-email 2.17.1 X-Originating-IP: [83.217.231.2] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 8e56587a-f24e-4e1d-d349-08d85011a283 X-MS-TrafficTypeDiagnostic: VI1PR04MB2973: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:5516; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Q3QY8uBh+31WNVUYUuQscx/lM54XbiaQAb1fbM+VYVV7ceJNHFnnr4t/tuo49lUSjQUy4YfXjRH6EzMlNwQDtY0O0KrjU9P9spfsqd5ckbhm/M0GNFuMWVcowegt2PPII12DBpnazEAhNN4xopHckBLnQGKL5QlwwX8KNLbry4HuWenv1kiO1SUXU+v9SyHRYvL9aXUfIE5zMCcoMIwvWUPCx7U1Lz/I1HLh1yGJYR+xU3BCqXO4A+Dfc4eEe+pkpXLSOpuOV7Dk+QQ0CJQmhGQLWkMtsaq+LdfWCiWmnYE5c0/iRU7EMoVQ1Lt9jj/Sc78eYFuIr/KmciArVteILQ== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:VI1PR0402MB3405.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(136003)(346002)(366004)(39860400002)(376002)(396003)(8936002)(8676002)(2906002)(316002)(186003)(1076003)(36756003)(6486002)(86362001)(6666004)(83380400001)(5660300002)(9686003)(2616005)(6512007)(66556008)(956004)(66476007)(6506007)(16526019)(66946007)(478600001)(26005)(52116002)(4326008); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: hVx6bT5C05pADyfU0q1IP+w93PFOyCj3vOe0IRA98ucQA5xnMuCF8jW50gEkLjdUMEPplO1scQBYQiB+ZeAhVMH1bo1HrnnOGPk1e3NCz0Ode5aPP48NKbQ2C9dzuTQFE8kFyvye6fBNuJ7jBDAzlw+bYBAWwLAi/nxUKXw2aVJ5icgq1/dYWOBG+cn77XdXtZ9CpAAiad+J8YscxQkOwleRMcGonjUKdDQVqXtMOu338nUPFmtZ8GLZrmDXMNbRd6oLYgjbh6B14P1UdJhLl74NI536phsLsW5oWnbQ5zTt0h1cKg8A19hqp4MCAWCn3mt6dGFmEc4E/OMxLt1hbP6VYhVqG0fsprL23Wy41yBT+qW3Bh1zcOVbahUQbwsns67imbg96PnEXIwq7wMQYdalDXC1dFii4vmTdm+v3JsIbzFb2ysQ5zaQGLRZE4AiICd1RkI37qUPrNUhrkF17lBrpjpnl7b8n5md5N6xOWm837ZKlArubQKOQ7GG7BtHuYIBtN8PlBhA7j66xYxz+Ze7RQ8lhNk+3Y4dsUQMnnx7jGfNX88OIF4/4PQQ7dECO1CyS1AuVwoh1GZFE4xd7H8wGaHVCon/YXYnSRe2i7eCIM38H7FFjl4/oeBxAgzBnKHA6uzwc+KAyHxNoRi+Pw== X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8e56587a-f24e-4e1d-d349-08d85011a283 X-MS-Exchange-CrossTenant-AuthSource: VI1PR0402MB3405.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Sep 2020 13:59:54.7287 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: bQOb0tflhocciPvhAnxv+P+JGKkZufybOLmLOaaz4jlgxyW74trFLA2ZG0LU2EGjZ7v9sE6mUWWxsB344HaRig== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB2973 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.102.3 at phobos.denx.de X-Virus-Status: Clean From: Laurentiu Tudor Fix duplication of this code by placing it in a common function. Furthermore, the resulting function will be re-used in upcoming patches. Signed-off-by: Laurentiu Tudor --- drivers/pci/pcie_layerscape_fixup.c | 78 +++++++++++++---------------- 1 file changed, 36 insertions(+), 42 deletions(-) diff --git a/drivers/pci/pcie_layerscape_fixup.c b/drivers/pci/pcie_layerscape_fixup.c index 7c55e3d249..715c1a7788 100644 --- a/drivers/pci/pcie_layerscape_fixup.c +++ b/drivers/pci/pcie_layerscape_fixup.c @@ -22,6 +22,36 @@ #include "pcie_layerscape.h" #include "pcie_layerscape_fixup_common.h" +static int fdt_pcie_get_nodeoffset(void *blob, struct ls_pcie_rc *pcie_rc) +{ + int nodeoffset; + uint svr; + char *compat = NULL; + + /* find pci controller node */ + nodeoffset = fdt_node_offset_by_compat_reg(blob, "fsl,ls-pcie", + pcie_rc->dbi_res.start); + if (nodeoffset < 0) { +#ifdef CONFIG_FSL_PCIE_COMPAT /* Compatible with older version of dts node */ + svr = (get_svr() >> SVR_VAR_PER_SHIFT) & 0xFFFFFE; + if (svr == SVR_LS2088A || svr == SVR_LS2084A || + svr == SVR_LS2048A || svr == SVR_LS2044A || + svr == SVR_LS2081A || svr == SVR_LS2041A) + compat = "fsl,ls2088a-pcie"; + else + compat = CONFIG_FSL_PCIE_COMPAT; + + if (!compat) + return nodeoffset; + nodeoffset = + fdt_node_offset_by_compat_reg(blob, compat, + pcie_rc->dbi_res.start); +#endif + } + + return nodeoffset; +} + #if defined(CONFIG_FSL_LSCH3) || defined(CONFIG_FSL_LSCH2) /* * Return next available LUT index. @@ -127,30 +157,11 @@ static void fdt_pcie_set_iommu_map_entry_ls(void *blob, u32 iommu_map[4]; int nodeoffset; int lenp; - uint svr; - char *compat = NULL; struct ls_pcie *pcie = pcie_rc->pcie; - /* find pci controller node */ - nodeoffset = fdt_node_offset_by_compat_reg(blob, "fsl,ls-pcie", - pcie_rc->dbi_res.start); - if (nodeoffset < 0) { -#ifdef CONFIG_FSL_PCIE_COMPAT /* Compatible with older version of dts node */ - svr = (get_svr() >> SVR_VAR_PER_SHIFT) & 0xFFFFFE; - if (svr == SVR_LS2088A || svr == SVR_LS2084A || - svr == SVR_LS2048A || svr == SVR_LS2044A || - svr == SVR_LS2081A || svr == SVR_LS2041A) - compat = "fsl,ls2088a-pcie"; - else - compat = CONFIG_FSL_PCIE_COMPAT; - - if (compat) - nodeoffset = fdt_node_offset_by_compat_reg(blob, - compat, pcie_rc->dbi_res.start); -#endif - if (nodeoffset < 0) - return; - } + nodeoffset = fdt_pcie_get_nodeoffset(blob, pcie_rc); + if (nodeoffset < 0) + return; /* get phandle to iommu controller */ prop = fdt_getprop_w(blob, nodeoffset, "iommu-map", &lenp); @@ -232,28 +243,11 @@ static void fdt_fixup_pcie_ls(void *blob) static void ft_pcie_rc_fix(void *blob, struct ls_pcie_rc *pcie_rc) { int off; - uint svr; - char *compat = NULL; struct ls_pcie *pcie = pcie_rc->pcie; - off = fdt_node_offset_by_compat_reg(blob, "fsl,ls-pcie", - pcie_rc->dbi_res.start); - if (off < 0) { -#ifdef CONFIG_FSL_PCIE_COMPAT /* Compatible with older version of dts node */ - svr = (get_svr() >> SVR_VAR_PER_SHIFT) & 0xFFFFFE; - if (svr == SVR_LS2088A || svr == SVR_LS2084A || - svr == SVR_LS2048A || svr == SVR_LS2044A || - svr == SVR_LS2081A || svr == SVR_LS2041A) - compat = "fsl,ls2088a-pcie"; - else - compat = CONFIG_FSL_PCIE_COMPAT; - if (compat) - off = fdt_node_offset_by_compat_reg(blob, - compat, pcie_rc->dbi_res.start); -#endif - if (off < 0) - return; - } + off = fdt_pcie_get_nodeoffset(blob, pcie_rc); + if (off < 0) + return; if (pcie_rc->enabled && pcie->mode == PCI_HEADER_TYPE_BRIDGE) fdt_set_node_status(blob, off, FDT_STATUS_OKAY, 0); From patchwork Thu Sep 3 13:59:41 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurentiu Tudor X-Patchwork-Id: 1356627 X-Patchwork-Delegate: priyanka.jain@nxp.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.a=rsa-sha256 header.s=selector2 header.b=R6b6PFsC; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Bj2Wr16FLz9sW4 for ; Fri, 4 Sep 2020 00:00:39 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 0B0C982320; Thu, 3 Sep 2020 16:00:20 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="R6b6PFsC"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 221868231C; Thu, 3 Sep 2020 16:00:09 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FORGED_SPF_HELO,MSGID_FROM_MTA_HEADER, SPF_HELO_PASS,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.2 Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-ve1eur02on0631.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe06::631]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 5F6CE82345 for ; Thu, 3 Sep 2020 16:00:01 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=laurentiu.tudor@nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=HKNm3ahsVsU0eR3BouJUpiggON9pmcXnW/8kCUdweD+KPKDmTJ8gtnZ6P0oRdTKq/TjWVUsapwmh4fai/hTS+U5AddTXPQsTCDit4qcyV8rkvdfrAqe1F6dMAq9vH0FjiK+spSV3w0+yZ8EpVre3oWSWN9WJWsgvtohMOU/7zA9a0D6iruWOsFgeNzl3hTF3AEFjb/RduM79jhfm+uZLbWIgK1tuMjVtQlHgmftUWL1wpuJX0R2OVLfmXws5hKhE9Xw2H1QKuPKUCQ+kJTQNE1beTU//+byGWOLNZCC8T4x14lGkp7d2uyGheFEXt/ENO1dDX4WH2myQKKuubfsUxw== 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-SenderADCheck; bh=4UshfzmIrvrMGHgd8YJjgH+3pIrrG3PanBd8hBPIxpA=; b=FlzxPgDIm7rLOmwK/6jPyBAWrqZmi5UEvE0P1ZdVoWlT0JIR+Qw9CJxPRHJxNXWOZx+XV8wZIZUDBp2KF81msaqCM6VJ3WFEScliDlxwr97eQLCuddEtRVwf9f8mmeMvBtYphuzATsGpGljFNzKBQWt7cCB1Fb6OAd32LSftBD4CTY3OBQFkqn0zFNhMMrWzT/vn+byyYBYe/4q06+uHrImjvl+1b1sgNpkKwezBKjmLGJ+wk1sc4rXN4FKL0gGHvTk4J6B50v2CIEWlnLr5tUQQWiZa0SM8IyVe/8y9is4VOs2Tm3xJK4tWrru3DqDtuk2QhkCSLggkiXpkavl1kg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=4UshfzmIrvrMGHgd8YJjgH+3pIrrG3PanBd8hBPIxpA=; b=R6b6PFsCkPCvKvt/cs7QpL3ik3wn6/mYWvSouw0ysb5nOB6RLMSyhhdugX0ZoAmlZpFqb704TdJbncid6FrTLyBjRQm799r4pjfvz/ZMVu62WBcy20FpJzh3A1CjgBiOFVD9cRlgbTx2MFJCWsH3WKdj4WDrCsDwsxT0/G3e0HQ= Authentication-Results: lists.denx.de; dkim=none (message not signed) header.d=none;lists.denx.de; dmarc=none action=none header.from=nxp.com; Received: from VI1PR0402MB3405.eurprd04.prod.outlook.com (2603:10a6:803:3::26) by VI1PR04MB2973.eurprd04.prod.outlook.com (2603:10a6:802:10::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3326.23; Thu, 3 Sep 2020 13:59:56 +0000 Received: from VI1PR0402MB3405.eurprd04.prod.outlook.com ([fe80::f960:c16d:16a5:6e7b]) by VI1PR0402MB3405.eurprd04.prod.outlook.com ([fe80::f960:c16d:16a5:6e7b%7]) with mapi id 15.20.3326.025; Thu, 3 Sep 2020 13:59:55 +0000 From: laurentiu.tudor@nxp.com To: u-boot@lists.denx.de, priyanka.jain@nxp.com Cc: zhiqiang.hou@nxp.com, Laurentiu Tudor Subject: [PATCH v4 3/4] pci: add a few ARI related defines Date: Thu, 3 Sep 2020 16:59:41 +0300 Message-Id: <20200903135942.28548-4-laurentiu.tudor@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200903135942.28548-1-laurentiu.tudor@nxp.com> References: <20200903135942.28548-1-laurentiu.tudor@nxp.com> X-ClientProxiedBy: AM0PR10CA0099.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:208:e6::16) To VI1PR0402MB3405.eurprd04.prod.outlook.com (2603:10a6:803:3::26) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from fsr-ub1864-101.ea.freescale.net (83.217.231.2) by AM0PR10CA0099.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:208:e6::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3348.15 via Frontend Transport; Thu, 3 Sep 2020 13:59:54 +0000 X-Mailer: git-send-email 2.17.1 X-Originating-IP: [83.217.231.2] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: e9891e16-7c10-40d4-acfc-08d85011a31f X-MS-TrafficTypeDiagnostic: VI1PR04MB2973: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:415; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ix4Z2bb4P46Lt2FhirKBTjnNI8ahTOBx7mcLeHekPt3+2I/Lm/nQuBIc3dhAw2ThVDl7cbSv88fKrHafgn1nT94VpiYR/+ZcPK8H4ft54c/zyiPc6FXla5+Io6oBn1RDOUvOblx1Aqy4odnRl5RNT7C87ZB74mt/yebiq1sFaZTDQn9YABxvV1Mt5nFZc6OPFaXGIzU8JwVfMY1Xo5ia86fzOyxtSNXfgoS86kYXXVKAQ3YVMwpGATblvpwWJJXeDK14lc55OlXMjmkMt/7U1mAnayY0INXdzyCJeJu10By68idMeDk/rQNBKRUvxlczAKcRqfJ0Ha0qk4WVIASxroXqBoAtP0YuWR9imc3zsct77UEXf20dCSOZBCC2kJTX X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:VI1PR0402MB3405.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(136003)(346002)(366004)(39860400002)(376002)(396003)(8936002)(8676002)(2906002)(316002)(186003)(1076003)(36756003)(6486002)(86362001)(6666004)(5660300002)(9686003)(2616005)(6512007)(66556008)(956004)(66476007)(6506007)(16526019)(66946007)(478600001)(26005)(52116002)(4326008)(334744003); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: /uUlvlC/6iwmbHZrT47OwHSUvB4AKCoVLHwL8C8LjUiAO2XU4EAlccgA3x6LVN2iZQk33GXEmu3lHO0c2essRY6R0x5+pmR+AH9atTlKlL7t/rYancZWDie4LP1C8A90iD1lRI/lrqsB8/8Jg+bd87y33rGuBSV0f0Z5pQc38nS76jZX3Sdv9tOldTSm46msm0wD+ethJjMi8yDhFxBHhPFC0Irwem7fpTHoePl/EMzin1JJjmzTnPJIU3+D+IL/LLh5Eag40MdnEeIx6T3qhVy1e2Gj7Z1rv4QdTlqkQUiP4aWhKgedJLo5+/ADcoEEEiDWkWotfZYFQTZA9HggUu/87MnYGAQqWha2TT1e3AqS6mBf+yxWJYbIxq1rIemqKfPVeYFqFX31wW6aBM3xTpWahtxQwK7o/EBfDvvqjTlZqxaaRkNXoyWaNk7l5nSsiV3xgh2TaitZ6OAoZFm39xdEhF1Qgy0c2PNFGirDZHYqahSi9sA5EglEBbog5iIlubpT+oIOFgnutI82YIfpsWwifVROfqfmcPZ3BPXGcqFGE/sc/JvWY3qtnKCyExp5g8U9BkRHk9b2FT4wwO6w7720MYsvuf08Ukxm/sW42i8QlRYrWzvtfb0+B27vlfh+k25de9SPbdQ5Rr/OQtzpQA== X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: e9891e16-7c10-40d4-acfc-08d85011a31f X-MS-Exchange-CrossTenant-AuthSource: VI1PR0402MB3405.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Sep 2020 13:59:55.7491 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: lMHcFV5u5LdUTzNpVpOpswmUXtAp/lWKa9j4/qn2A25iAdHVpqz2DJ+kRn/4IG+HJGR+KeGmG71Q3oJR04F0qQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB2973 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.102.3 at phobos.denx.de X-Virus-Status: Clean From: Laurentiu Tudor Add a few defines related to PCI ARI configuration. Signed-off-by: Laurentiu Tudor --- include/pci.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/include/pci.h b/include/pci.h index 1c5b36617e..d1ccf6c963 100644 --- a/include/pci.h +++ b/include/pci.h @@ -495,12 +495,18 @@ #define PCI_EXP_LNKSTA_DLLLA 0x2000 /* Data Link Layer Link Active */ #define PCI_EXP_SLTCAP 20 /* Slot Capabilities */ #define PCI_EXP_SLTCAP_PSN 0xfff80000 /* Physical Slot Number */ +#define PCI_EXP_DEVCAP2 36 /* Device Capabilities 2 */ +#define PCI_EXP_DEVCAP2_ARI 0x00000020 /* ARI Forwarding Supported */ +#define PCI_EXP_DEVCTL2 40 /* Device Control 2 */ +#define PCI_EXP_DEVCTL2_ARI 0x0020 /* Alternative Routing-ID */ + #define PCI_EXP_LNKCTL2 48 /* Link Control 2 */ /* Single Root I/O Virtualization Registers */ #define PCI_SRIOV_CAP 0x04 /* SR-IOV Capabilities */ #define PCI_SRIOV_CTRL 0x08 /* SR-IOV Control */ #define PCI_SRIOV_CTRL_VFE 0x01 /* VF Enable */ #define PCI_SRIOV_CTRL_MSE 0x08 /* VF Memory Space Enable */ +#define PCI_SRIOV_CTRL_ARI 0x10 /* ARI Capable Hierarchy */ #define PCI_SRIOV_INITIAL_VF 0x0c /* Initial VFs */ #define PCI_SRIOV_TOTAL_VF 0x0e /* Total VFs */ #define PCI_SRIOV_NUM_VF 0x10 /* Number of VFs */ From patchwork Thu Sep 3 13:59:42 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurentiu Tudor X-Patchwork-Id: 1356628 X-Patchwork-Delegate: priyanka.jain@nxp.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.a=rsa-sha256 header.s=selector2 header.b=R6xUq41K; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Bj2X26NCcz9sW4 for ; Fri, 4 Sep 2020 00:00:50 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id C44558233D; Thu, 3 Sep 2020 16:00:21 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="R6xUq41K"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 328AB81C31; Thu, 3 Sep 2020 16:00:09 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FORGED_SPF_HELO,MSGID_FROM_MTA_HEADER, SPF_HELO_PASS,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.2 Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-ve1eur02on0631.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe06::631]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 6A87582346 for ; Thu, 3 Sep 2020 16:00:02 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=laurentiu.tudor@nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=H52GxBfrnYL9wIba4L1viYHxR4tcYp8ukalps6eg75kuobLPINxUCPzdl7ycoDVHDdcDVsSwTkqT6JRowTlBLzXyfZ9tDZsOLjJjJOgN6teDt/OcqSvYWb5+Kkq7JnbmIh1vVM04SV3KAn5AWZBTXq9YAWSts+FVJdohnn8wmXJfvstGnvhgaFlyHqtXADH5GY7nsX2iAK/zoFeryPZj1mH3cI+YihRZNS6xkYDqL+A8cwsD6UqUGjQYLi9NmW9L9FJw6v7fUeBf70VX5HVtrGd9e02si96bZH6Usp2RySAT+5haofKT7oLfUd4OQV7QUSnrn9KHvWeWnT494ut7ZQ== 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-SenderADCheck; bh=a1NHgPBQWxEaapUKVPxOYXpU9w0lWqsgZ9ZaepTsr3o=; b=oT7sy7+Z/q6ArHWRkyZDBuR83XhlNVgyJIZwQW77rIFe4aDsInN+qW91/N+cZVWD58WcPwRR+mspjnGiBU4jxeJeUQtv55wEOlWVVY0Sl41EtcWiorCXP9TFXenaapSkyI7XDE6levddEKOQbcNSItzMQMzN/dV9EFm9V2ehIYNXAIKYIBIRjt3m0sTH8XQMoni+l2/t4oS4xuhNPVMEd3EV81A+TfBUcUWtW6GqQ4IDyfQCY9HyjDS2EryxczhyGWaQDyjxNsR91zUEGlCdwpfulcHCW4yaHCswh+sEDS0EosY40MwjzDRxPLR41ZbpASxSz2i/txcy767K+Ax05w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=a1NHgPBQWxEaapUKVPxOYXpU9w0lWqsgZ9ZaepTsr3o=; b=R6xUq41KklH6mWAETy7f+8fgCcX7WgEvRflWE0YxBKBU3DVvkqsrX1c0Avjpo2i6aF1QH3e5vn+V3nUng7QADhHNsMFYQQ7NbfIoJRMK5fcXFo9/h0FBfi1dvWCAUy3Cp7PbGSdN2ZpmYvTyo5vgeisppHXV+lxS8VkJH1rk1oU= Authentication-Results: lists.denx.de; dkim=none (message not signed) header.d=none;lists.denx.de; dmarc=none action=none header.from=nxp.com; Received: from VI1PR0402MB3405.eurprd04.prod.outlook.com (2603:10a6:803:3::26) by VI1PR04MB2973.eurprd04.prod.outlook.com (2603:10a6:802:10::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3326.23; Thu, 3 Sep 2020 13:59:57 +0000 Received: from VI1PR0402MB3405.eurprd04.prod.outlook.com ([fe80::f960:c16d:16a5:6e7b]) by VI1PR0402MB3405.eurprd04.prod.outlook.com ([fe80::f960:c16d:16a5:6e7b%7]) with mapi id 15.20.3326.025; Thu, 3 Sep 2020 13:59:57 +0000 From: laurentiu.tudor@nxp.com To: u-boot@lists.denx.de, priyanka.jain@nxp.com Cc: zhiqiang.hou@nxp.com, Laurentiu Tudor Subject: [PATCH v4 4/4] pci: layerscape: add a way of specifying additional iommu mappings Date: Thu, 3 Sep 2020 16:59:42 +0300 Message-Id: <20200903135942.28548-5-laurentiu.tudor@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200903135942.28548-1-laurentiu.tudor@nxp.com> References: <20200903135942.28548-1-laurentiu.tudor@nxp.com> X-ClientProxiedBy: AM0PR10CA0099.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:208:e6::16) To VI1PR0402MB3405.eurprd04.prod.outlook.com (2603:10a6:803:3::26) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from fsr-ub1864-101.ea.freescale.net (83.217.231.2) by AM0PR10CA0099.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:208:e6::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3348.15 via Frontend Transport; Thu, 3 Sep 2020 13:59:56 +0000 X-Mailer: git-send-email 2.17.1 X-Originating-IP: [83.217.231.2] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 3ba30024-13f2-4470-2cc0-08d85011a3e3 X-MS-TrafficTypeDiagnostic: VI1PR04MB2973: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:1923; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: v5Ksn5c5ouidNvcNKiuTkR1GZ5Lwouo2pyu3fyn9gQ8Afm5JBPHkw7rkdvgFNv2lMywitGoiwJlw3dsGUaIEV9nHXi4yMezvewY6u95l7E0y1f655coFCZG6mYOmKXSh+8kUN9rm+9Y0p9J/4IWk5KEPA+o1vIGLWNniIsbU4FoagPbK6JQLG+UcYojBhWuNBlNRerxy1ZC3CdI3qGVb/uFlR7mRTHSpwAnOpk8+XVfZDnw4V7CHejnuEMhDJZFQRsT1ZhhQkzZ5AFFByMvXBnhUhSPitVUykhtpuAInMkiW1PD3xs2vA+LFWi0svy6AZ5lHj6R3Es5GMSsmz8M1Lw== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:VI1PR0402MB3405.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(136003)(346002)(366004)(39860400002)(376002)(396003)(8936002)(8676002)(2906002)(316002)(186003)(1076003)(36756003)(6486002)(86362001)(6666004)(83380400001)(5660300002)(30864003)(9686003)(2616005)(6512007)(66556008)(956004)(66476007)(6506007)(16526019)(66946007)(478600001)(26005)(52116002)(4326008); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: CfEWFgMl714smJQFoauBHTPkrQamMEf8+JojdXaaWzxlYkuZQlgtCQxXnlbWw0J3Juj3r5M/gtTXZ0rS1JIhhBfRvF+VlTLVDkvAUllZFpTLGtdjz6aXk256BlWwiAAlNhiXQEdEo8EXWCDTc2I+5LFmDwnS1gi9SMK9DTmN2e7CzDydM2Roe8TVWsUSTm0dKD29jKdtZFogqOwVvu41ms3vjs8epbq9OjXm17p2ab3J/dWO5xte+3VvsQLWaNR5azuDLuVFV/zNmcfrt4/E0AB1Wdu4md6M990V8pR0CJn+nEKb8MNMbhncYIfj/U1qM8RqWBHk7zgNOBgjYPCBrsq9UhNqxnyy1cNX+Yj8+yShLrZLCZFXBDqPiGwpdkp12ZTjifb5dhlUtDjZdPTs3h1HjN5f3T37TeLowIOv1chUaDW9PHRhPN8R8EfiLjv2UKx6fAhz+gU4qH6Hx+wlZpM15UkE+75JdPgyIviWnDOL+s+fIksj3gomwz8g7RIMzIMlyIWKuwd83NuvTTZVzcllBXQKsWEEHmqd55LFfUyEerNTE4elZdZvpOnhdmxtNXFx8qiBt4U9bz1n+euR/YN3FEQMRMy74HvKuJB7MgNMIqP43jqhliOYHope9aKGdOpeNxC+/2Ql5DILe5AFwg== X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3ba30024-13f2-4470-2cc0-08d85011a3e3 X-MS-Exchange-CrossTenant-AuthSource: VI1PR0402MB3405.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Sep 2020 13:59:57.1423 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: smTlQuLauWj6CB4ruK0dE/AIWxjD+BI3mTJ0mENvVujs8ucFdeHPYADLpQ3BoBu+5VVEr1IOiq8iFmOpvuO+Pg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB2973 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.102.3 at phobos.denx.de X-Virus-Status: Clean From: Laurentiu Tudor In the current implementation, u-boot creates iommu mappings only for PCI devices enumarated at boot time thus does not take into account more dynamic scenarios such as SR-IOV or PCI hot-plug. Add an u-boot env var and a device tree property (to be used for example in more static scenarios such as hardwired PCI endpoints that get initialized later in the system setup) that would allow two things: - for a SRIOV capable PCI EP identified by its B.D.F specify the maximum number of VFs that will ever be created for it - for hot-plug case, specify the B.D.F with which the device will show up on the PCI bus More details can be found in the included documentation: arch/arm/cpu/armv8/fsl-layerscape/doc/README.pci_iommu_extra Signed-off-by: Laurentiu Tudor --- .../fsl-layerscape/doc/README.pci_iommu_extra | 67 ++++ drivers/pci/Kconfig | 12 + drivers/pci/pcie_layerscape_fixup.c | 328 ++++++++++++++++++ 3 files changed, 407 insertions(+) create mode 100644 arch/arm/cpu/armv8/fsl-layerscape/doc/README.pci_iommu_extra diff --git a/arch/arm/cpu/armv8/fsl-layerscape/doc/README.pci_iommu_extra b/arch/arm/cpu/armv8/fsl-layerscape/doc/README.pci_iommu_extra new file mode 100644 index 0000000000..43db4d8e94 --- /dev/null +++ b/arch/arm/cpu/armv8/fsl-layerscape/doc/README.pci_iommu_extra @@ -0,0 +1,67 @@ +# +# Copyright 2020 NXP +# +# SPDX-License-Identifier: GPL-2.0+ +# + +Specifying extra IOMMU mappings for PCI controllers + +This feature can be enabled through the PCI_IOMMU_EXTRA_MAPPINGS Kconfig option. + +The "pci_iommu_extra" env var or "pci-iommu-extra" device tree property (to be +used for example in more static scenarios such as hardwired PCI endpoints that +get initialized later in the system setup) allows two things: + - for a SRIOV capable PCI EP identified by its B.D.F specify the maximum number + of VFs that will ever be created for it + - for hot-plug case, specify the B.D.F with which the device will show up on + the PCI bus + +The env var consists of a list of , pairs for a certain pci bus +identified by its controller's base register address, as defined in the "reg" +property in the device tree. + +pci_iommu_extra = pci@,,,,, + pci@,,,,,... + +where: + is the base register address of the pci controller for which the + subsequent , pairs apply + identifies to which B.D.F the action applies to + can be: + - "vfs=" to specify that for the PCI EP identified previously by + the to include mappings for of VFs. + The variant "noari_vfs=" is available to disable taking ARI into + account. + - "hp" to specify that on this there will be a hot-plugged device so + it needs a mapping +The device tree property must be placed under the correct pci controller node +and only the bdf and action pairs need to be specified, like this: + +pci-iommu-extra = ",,,,..."; + +Note: the env var has priority over the device tree property. + +For example, given this configuration on bus 6: + +=> pci 6 +Scanning PCI devices on bus 6 +BusDevFun VendorId DeviceId Device Class Sub-Class +_____________________________________________________________ +06.00.00 0x8086 0x1572 Network controller 0x00 +06.00.01 0x8086 0x1572 Network controller 0x00 + +The following u-boot env var will create iommu mappings for 3 VFs for each PF: + +=> setenv pci_iommu_extra pci@0x3800000,6.0.0,vfs=3,6.0.1,vfs=3 + +For the device tree case, this would be specified like this: + +pci-iommu-extra = "6.0.0,vfs=3,6.0.1,vfs=3"; + +To add an iommu mapping for a hot-plugged device, please see following example: + +=> setenv pci_iommu_extra pci@0x3800000,2.16.0,hp + +For the device tree case, this would be specified like this: + +pci-iommu-extra = "2.16.0,hp"; diff --git a/drivers/pci/Kconfig b/drivers/pci/Kconfig index dd1cc65229..af92784950 100644 --- a/drivers/pci/Kconfig +++ b/drivers/pci/Kconfig @@ -179,6 +179,18 @@ config PCIE_LAYERSCAPE_RC configured to Root Complex mode by clearing the corresponding bit of RCW[HOST_AGT_PEX]. +config PCI_IOMMU_EXTRA_MAPPINGS + bool "Support for specifying extra IOMMU mappings for PCI" + depends on PCIE_LAYERSCAPE_RC + help + Enable support for specifying extra IOMMU mappings for PCI + controllers through a special env var called "pci_iommu_extra" or + through a device tree property named "pci-iommu-extra" placed in + the node describing the PCI controller. + The intent is to cover SR-IOV scenarios which need mappings for VFs + and PCI hot-plug scenarios. More documentation can be found under: + arch/arm/cpu/armv8/fsl-layerscape/doc/README.pci_iommu_extra + config PCIE_LAYERSCAPE_EP bool "Layerscape PCIe Endpoint mode support" depends on DM_PCI diff --git a/drivers/pci/pcie_layerscape_fixup.c b/drivers/pci/pcie_layerscape_fixup.c index 715c1a7788..72f16a3117 100644 --- a/drivers/pci/pcie_layerscape_fixup.c +++ b/drivers/pci/pcie_layerscape_fixup.c @@ -19,6 +19,8 @@ #ifdef CONFIG_ARM #include #endif +#include +#include #include "pcie_layerscape.h" #include "pcie_layerscape_fixup_common.h" @@ -216,11 +218,292 @@ static int fdt_fixup_pcie_device_ls(void *blob, pci_dev_t bdf, return 0; } +struct extra_iommu_entry { + int action; + pci_dev_t bdf; + int num_vfs; + bool noari; +}; + +#define EXTRA_IOMMU_ENTRY_HOTPLUG 1 +#define EXTRA_IOMMU_ENTRY_VFS 2 + +static struct extra_iommu_entry *get_extra_iommu_ents(void *blob, + int nodeoffset, + phys_addr_t addr, + int *cnt) +{ + const char *s, *p, *tok; + struct extra_iommu_entry *entries; + int i = 0, b, d, f; + + /* + * Retrieve extra IOMMU configuration from env var or from device tree. + * Env var is given priority. + */ + s = env_get("pci_iommu_extra"); + if (!s) { + s = fdt_getprop(blob, nodeoffset, "pci-iommu-extra", NULL); + } else { + phys_addr_t pci_base; + char *endp; + + /* + * In env var case the config string has "pci@0x..." in + * addition. Parse this part and match it by address against + * the input pci controller's registers base address. + */ + tok = s; + p = strchrnul(s + 1, ','); + s = NULL; + do { + if (!strncmp(tok, "pci", 3)) { + pci_base = simple_strtoul(tok + 4, &endp, 0); + if (pci_base == addr) { + s = endp + 1; + break; + } + } + p = strchrnul(p + 1, ','); + tok = p + 1; + } while (*p); + } + + /* + * If no env var or device tree property found or pci register base + * address mismatches, bail out + */ + if (!s) + return NULL; + + /* + * In order to find how many action entries to allocate, count number + * of actions by interating through the pairs of bdfs and actions. + */ + *cnt = 0; + p = s; + while (*p && strncmp(p, "pci", 3)) { + if (*p == ',') + (*cnt)++; + p++; + } + if (!(*p)) + (*cnt)++; + + if (!(*cnt) || (*cnt) % 2) { + printf("ERROR: invalid or odd extra iommu token count %d\n", + *cnt); + return NULL; + } + *cnt = (*cnt) / 2; + + entries = malloc((*cnt) * sizeof(*entries)); + if (!entries) { + printf("ERROR: fail to allocate extra iommu entries\n"); + return NULL; + } + + /* + * Parse action entries one by one and store the information in the + * newly allocated actions array. + */ + p = s; + while (p) { + /* Extract BDF */ + b = simple_strtoul(p, (char **)&p, 0); p++; + d = simple_strtoul(p, (char **)&p, 0); p++; + f = simple_strtoul(p, (char **)&p, 0); p++; + entries[i].bdf = PCI_BDF(b, d, f); + + /* Parse action */ + if (!strncmp(p, "hp", 2)) { + /* Hot-plug entry */ + entries[i].action = EXTRA_IOMMU_ENTRY_HOTPLUG; + p += 2; + } else if (!strncmp(p, "vfs", 3) || + !strncmp(p, "noari_vfs", 9)) { + /* VFs or VFs with ARI disabled entry */ + entries[i].action = EXTRA_IOMMU_ENTRY_VFS; + entries[i].noari = !strncmp(p, "noari_vfs", 9); + + /* + * Parse and store total number of VFs to allocate + * IOMMU entries for. + */ + p = strchr(p, '='); + entries[i].num_vfs = simple_strtoul(p + 1, (char **)&p, + 0); + if (*p) + p++; + } else { + printf("ERROR: invalid action in extra iommu entry\n"); + free(entries); + + return NULL; + } + + if (!(*p) || !strncmp(p, "pci", 3)) + break; + + i++; + } + + return entries; +} + +static void get_vf_offset_and_stride(struct udevice *dev, int sriov_pos, + struct extra_iommu_entry *entry, + u16 *offset, u16 *stride) +{ + u16 tmp16; + u32 tmp32; + bool have_ari = false; + int pos; + struct udevice *pf_dev; + + dm_pci_read_config16(dev, sriov_pos + PCI_SRIOV_TOTAL_VF, &tmp16); + if (entry->num_vfs > tmp16) { + printf("WARN: requested no. of VFs %d exceeds total of %d\n", + entry->num_vfs, tmp16); + } + + /* + * The code below implements the VF Discovery recomandations specified + * in PCIe base spec "9.2.1.2 VF Discovery", quoted below: + * + * VF Discovery + * + * The First VF Offset and VF Stride fields in the SR-IOV extended + * capability are 16-bit Routing ID offsets. These offsets are used to + * compute the Routing IDs for the VFs with the following restrictions: + * - The value in NumVFs in a PF (Section 9.3.3.7) may affect the + * values in First VF Offset (Section 9.3.3.9) and VF Stride + * (Section 9.3.3.10) of that PF. + * - The value in ARI Capable Hierarchy (Section 9.3.3.3.5) in the + * lowest-numbered PF of the Device (for example PF0) may affect + * the values in First VF Offset and VF Stride in all PFs of the + * Device. + * - NumVFs of a PF may only be changed when VF Enable + * (Section 9.3.3.3.1) of that PF is Clear. + * - ARI Capable Hierarchy (Section 9.3.3.3.5) may only be changed + * when VF Enable is Clear in all PFs of a Device. + */ + + /* Clear VF enable for all PFs */ + device_foreach_child(pf_dev, dev->parent) { + dm_pci_read_config16(pf_dev, sriov_pos + PCI_SRIOV_CTRL, + &tmp16); + tmp16 &= ~PCI_SRIOV_CTRL_VFE; + dm_pci_write_config16(pf_dev, sriov_pos + PCI_SRIOV_CTRL, + tmp16); + } + + /* Obtain a reference to PF0 device */ + if (dm_pci_bus_find_bdf(PCI_BDF(PCI_BUS(entry->bdf), + PCI_DEV(entry->bdf), 0), &pf_dev)) { + printf("WARN: failed to get PF0\n"); + } + + if (entry->noari) + goto skip_ari; + + /* Check that connected downstream port supports ARI Forwarding */ + pos = dm_pci_find_capability(dev->parent, PCI_CAP_ID_EXP); + dm_pci_read_config32(dev->parent, pos + PCI_EXP_DEVCAP2, &tmp32); + if (!(tmp32 & PCI_EXP_DEVCAP2_ARI)) + goto skip_ari; + + /* Check that PF supports Alternate Routing ID */ + if (!dm_pci_find_ext_capability(dev, PCI_EXT_CAP_ID_ARI)) + goto skip_ari; + + /* Set ARI Capable Hierarcy for PF0 */ + dm_pci_read_config16(pf_dev, sriov_pos + PCI_SRIOV_CTRL, &tmp16); + tmp16 |= PCI_SRIOV_CTRL_ARI; + dm_pci_write_config16(pf_dev, sriov_pos + PCI_SRIOV_CTRL, tmp16); + have_ari = true; + +skip_ari: + if (!have_ari) { + /* + * No ARI support or disabled so clear ARI Capable Hierarcy + * for PF0 + */ + dm_pci_read_config16(pf_dev, sriov_pos + PCI_SRIOV_CTRL, + &tmp16); + tmp16 &= ~PCI_SRIOV_CTRL_ARI; + dm_pci_write_config16(pf_dev, sriov_pos + PCI_SRIOV_CTRL, + tmp16); + } + + /* Set requested number of VFs */ + dm_pci_write_config16(dev, sriov_pos + PCI_SRIOV_NUM_VF, + entry->num_vfs); + + /* Read VF stride and offset with the configs just made */ + dm_pci_read_config16(dev, sriov_pos + PCI_SRIOV_VF_OFFSET, offset); + dm_pci_read_config16(dev, sriov_pos + PCI_SRIOV_VF_STRIDE, stride); + + if (have_ari) { + /* Reset to default ARI Capable Hierarcy bit for PF0 */ + dm_pci_read_config16(pf_dev, sriov_pos + PCI_SRIOV_CTRL, + &tmp16); + tmp16 &= ~PCI_SRIOV_CTRL_ARI; + dm_pci_write_config16(pf_dev, sriov_pos + PCI_SRIOV_CTRL, + tmp16); + } + /* Reset to default the number of VFs */ + dm_pci_write_config16(dev, sriov_pos + PCI_SRIOV_NUM_VF, 0); +} + +static int fdt_fixup_pci_vfs(void *blob, struct extra_iommu_entry *entry, + struct ls_pcie_rc *pcie_rc) +{ + struct udevice *dev, *bus; + u16 vf_offset, vf_stride; + int i, sriov_pos; + pci_dev_t bdf; + + if (dm_pci_bus_find_bdf(entry->bdf, &dev)) { + printf("ERROR: BDF %d.%d.%d not found\n", PCI_BUS(entry->bdf), + PCI_DEV(entry->bdf), PCI_FUNC(entry->bdf)); + return 0; + } + + sriov_pos = dm_pci_find_ext_capability(dev, PCI_EXT_CAP_ID_SRIOV); + if (!sriov_pos) { + printf("WARN: trying to set VFs on non-SRIOV dev\n"); + return 0; + } + + get_vf_offset_and_stride(dev, sriov_pos, entry, &vf_offset, &vf_stride); + + for (bus = dev; device_is_on_pci_bus(bus);) + bus = bus->parent; + + bdf = entry->bdf - PCI_BDF(bus->seq, 0, 0) + (vf_offset << 8); + + for (i = 0; i < entry->num_vfs; i++) { + if (fdt_fixup_pcie_device_ls(blob, bdf, pcie_rc) < 0) + return -1; + bdf += vf_stride << 8; + } + + printf("Added %d iommu VF mappings for PF %d.%d.%d\n", + entry->num_vfs, PCI_BUS(entry->bdf), + PCI_DEV(entry->bdf), PCI_FUNC(entry->bdf)); + + return 0; +} + static void fdt_fixup_pcie_ls(void *blob) { struct udevice *dev, *bus; struct ls_pcie_rc *pcie_rc; pci_dev_t bdf; + struct extra_iommu_entry *entries; + int i, cnt, nodeoffset; + /* Scan all known buses */ for (pci_find_first_device(&dev); @@ -236,6 +519,51 @@ static void fdt_fixup_pcie_ls(void *blob) if (fdt_fixup_pcie_device_ls(blob, bdf, pcie_rc) < 0) break; } + + if (!IS_ENABLED(CONFIG_PCI_IOMMU_EXTRA_MAPPINGS)) + goto skip; + + list_for_each_entry(pcie_rc, &ls_pcie_list, list) { + nodeoffset = fdt_pcie_get_nodeoffset(blob, pcie_rc); + if (nodeoffset < 0) { + printf("ERROR: couldn't find pci node\n"); + continue; + } + + entries = get_extra_iommu_ents(blob, nodeoffset, + pcie_rc->dbi_res.start, &cnt); + if (!entries) + continue; + + for (i = 0; i < cnt; i++) { + if (entries[i].action == EXTRA_IOMMU_ENTRY_HOTPLUG) { + bdf = entries[i].bdf; + printf("Added iommu map for hotplug %d.%d.%d\n", + PCI_BUS(bdf), PCI_DEV(bdf), + PCI_FUNC(bdf)); + if (fdt_fixup_pcie_device_ls(blob, bdf, + pcie_rc) < 0) { + free(entries); + return; + } + } else if (entries[i].action == EXTRA_IOMMU_ENTRY_VFS) { + if (fdt_fixup_pci_vfs(blob, &entries[i], + pcie_rc) < 0) { + free(entries); + return; + } + } else { + printf("Invalid action %d for BDF %d.%d.%d\n", + entries[i].action, + PCI_BUS(entries[i].bdf), + PCI_DEV(entries[i].bdf), + PCI_FUNC(entries[i].bdf)); + } + } + free(entries); + } + +skip: pcie_board_fix_fdt(blob); } #endif