From patchwork Mon Nov 18 08:32:29 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pankaj Bansal X-Patchwork-Id: 1196587 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=none (no SPF record) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=nxp.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="BgBcbQi/"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 47GhzF0lnvz9sQp for ; Mon, 18 Nov 2019 19:32:41 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id BBE50C21E08; Mon, 18 Nov 2019 08:32:35 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=SPF_HELO_PASS, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 6EF2FC21DA2; Mon, 18 Nov 2019 08:32:32 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 4537CC21DA2; Mon, 18 Nov 2019 08:32:31 +0000 (UTC) Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-eopbgr130041.outbound.protection.outlook.com [40.107.13.41]) by lists.denx.de (Postfix) with ESMTPS id CC260C21D56 for ; Mon, 18 Nov 2019 08:32:30 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Aq0DRkStaTCW4+yJUlizNcLp8blBldfDwP6Yr2jOCZJ+zhc241fFgMriPiwfzzHJsLcpvzeUs52MbYuVnuPjpEd5X1IJxzF9jrDl6jF9B+C6/OysquFicZftz3xlDIuHK6kDVHqebZ/HGX1fRXeAXl0kqemZtL53xF77+14WPeHK1vgH/NDmtD/8g/3u8cFK9I2pHafYK/s08FohmMFRuweoEC0bkDMOF2+mJjgGHMPJaAXQwFs+smZWr3RAdWI/tMsvRYoDvg63mkHpa5R7/D19LDDIOaN9hTIVsyXAP2DxpVxA5+6mX03U7wI9xOChOpT/akScrVc96CUpHFFlxQ== 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=SgmMQkVM3JmZ69bGkMIgkhYT605+1fKa43NC7Pi5luI=; b=O5gkh0kCclyPUYzIwWh2qfFSYEJsUIfObWhT8UMCDYO4PpN+S7vcwCKh/5nL79cXbJis8FFIOztGajSEQnFhrJOF5TZ4wuUTouJ/nXgX/Iw+Ch8lV+SEf5vE44WVLsEU/6dpYfRATcKVpcEmamxdLF6baSKI6iz72JlihdDXuN1jrrsBg3Z0roSnyTFxk0b8oY35glIiDQ362Pobb5uiJqXsr6q4W99hpSIupfN5Z0zXR9Kx8xw+KpX/mLsqWyFkmhYLnMhmQaJYKWPDDMLSdzmRChy4T3vUWWz2eNZBj5DllcRF2mKekOAs7Ml9BkeLHQ44o32D/rKD6BCzkIamZg== 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=SgmMQkVM3JmZ69bGkMIgkhYT605+1fKa43NC7Pi5luI=; b=BgBcbQi/tfGTD+yOQvR7PpZsOhTbULUmuzlVO7FfKqV2UTn+mYz32EyP5nagwYVayrN3zqrknFOGOsB/8b084lD39/OcDkikHu1IAQADTjQlayACyDrdjF6QY2mNVZ4k4OjMy8rCoe+RkenPTGzLY9PYXRu1SXtNhug2em5zQAg= Received: from VI1PR0401MB2496.eurprd04.prod.outlook.com (10.168.65.10) by VI1PR0401MB2558.eurprd04.prod.outlook.com (10.168.68.17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2451.22; Mon, 18 Nov 2019 08:32:29 +0000 Received: from VI1PR0401MB2496.eurprd04.prod.outlook.com ([fe80::711c:adf:94a6:28cd]) by VI1PR0401MB2496.eurprd04.prod.outlook.com ([fe80::711c:adf:94a6:28cd%11]) with mapi id 15.20.2451.029; Mon, 18 Nov 2019 08:32:29 +0000 From: Pankaj Bansal To: Priyanka Jain , Xiaowei Bao , "Z.q. Hou" Thread-Topic: [PATCH v2] armv8: layerscape: Manage PCIe EP compatible string via Kconfig Thread-Index: AQHVneq3DO14rqV14keZNM5lyVJayQ== Date: Mon, 18 Nov 2019 08:32:29 +0000 Message-ID: <20191118135406.9697-1-pankaj.bansal@nxp.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: MA1PR01CA0155.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00:71::25) To VI1PR0401MB2496.eurprd04.prod.outlook.com (2603:10a6:800:56::10) x-mailer: git-send-email 2.17.1 authentication-results: spf=none (sender IP is ) smtp.mailfrom=pankaj.bansal@nxp.com; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [92.120.1.69] x-ms-publictraffictype: Email x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: 1528e154-776e-4191-ed3e-08d76c01d969 x-ms-traffictypediagnostic: VI1PR0401MB2558:|VI1PR0401MB2558: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:1060; x-forefront-prvs: 0225B0D5BC x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(4636009)(396003)(346002)(366004)(136003)(39860400002)(376002)(199004)(189003)(4326008)(99286004)(6486002)(476003)(2906002)(44832011)(2616005)(256004)(8936002)(81166006)(81156014)(71190400001)(71200400001)(26005)(186003)(386003)(54906003)(110136005)(486006)(66556008)(66476007)(7736002)(305945005)(25786009)(66446008)(64756008)(86362001)(1076003)(14454004)(6306002)(66066001)(6436002)(6512007)(36756003)(52116002)(50226002)(8676002)(102836004)(6506007)(966005)(3846002)(316002)(6116002)(66946007)(478600001)(6636002)(5660300002); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR0401MB2558; H:VI1PR0401MB2496.eurprd04.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; received-spf: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: 59rZSm4zI6Qc24Mn84adlau1Z1Q0sNqAQxrJhkVbDXBhGzcaF8m2AFRlmO4w5lijLfG235PToX4WQd6WCHmY3zk6/Om+O9A7PARRfMGP4S+Oa4SXRWVj9Jni2FfjlmwgFGn/5Rj/k2+3hzVY5MLC2S1ogBtzsILW7yOvjuZD3+ODvkFQVSSzQ2JaSP/twpKbGp9Gq6+eUm/d4tYHKFJhk0kOBjmk51NlMyWrSaiZmEIuehin21bb96z04hr+tUMJ8k8Mank+AN1mW06OCRHG7G1ulKtF1oX9aVCvlk17LHjXkutM5QBb3l+DW/63VbMXSt1dJW4xbgDFIaerVgENBT8TAAt9gMMRyB401PBlqH2+cSMxZocQXvPwD/2+OHwTs0mtmoATYSPdQs5nYoj4cXzBlxiLdf4awVOqq8gvxOLKjiv8T4zo5mfPf0Jco0q9 MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1528e154-776e-4191-ed3e-08d76c01d969 X-MS-Exchange-CrossTenant-originalarrivaltime: 18 Nov 2019 08:32:29.6758 (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: AMMmiUPXp3XSxXikAh9q4LsnZuTEs/SqvHavqafL76DUQCSpkJu/fCGRIO150VAXYxnqPLRg4d4jnfVBS6bwyg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0401MB2558 Cc: "u-boot@lists.denx.de" Subject: [U-Boot] [PATCH v2] armv8: layerscape: Manage PCIe EP compatible string via Kconfig X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 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" The ep node device tree name is governed by these bindings: https://github.com/torvalds/linux/blob/master/Documentation/ devicetree/bindings/pci/layerscape-pci.txt#L24 As per above the ep compatible node contains platform name. Therefore, define the ep node compatible as CONFIG to find the pcie ep node in device tree during device tree fixup. Signed-off-by: Pankaj Bansal --- Notes: V2: - Modified the commit subject and body as per review comments arch/arm/cpu/armv8/fsl-layerscape/Kconfig | 9 +++++++++ drivers/pci/pcie_layerscape_fixup.c | 4 ++-- drivers/pci/pcie_layerscape_gen4_fixup.c | 2 +- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/arch/arm/cpu/armv8/fsl-layerscape/Kconfig b/arch/arm/cpu/armv8/fsl-layerscape/Kconfig index bc3758f607..f8e7519994 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/Kconfig +++ b/arch/arm/cpu/armv8/fsl-layerscape/Kconfig @@ -267,6 +267,15 @@ config FSL_PCIE_COMPAT This compatible is used to find pci controller node in Kernel DT to complete fixup. +config FSL_PCIE_EP_COMPAT + string "PCIe EP compatible of Kernel DT" + depends on PCIE_LAYERSCAPE || PCIE_LAYERSCAPE_GEN4 + default "fsl,lx2160a-pcie-ep" if ARCH_LX2160A + default "fsl,ls-pcie-ep" + help + This compatible is used to find pci controller ep node in Kernel DT + to complete fixup. + config HAS_FEATURE_GIC64K_ALIGN bool default y if ARCH_LS1043A diff --git a/drivers/pci/pcie_layerscape_fixup.c b/drivers/pci/pcie_layerscape_fixup.c index 089e031724..194010f310 100644 --- a/drivers/pci/pcie_layerscape_fixup.c +++ b/drivers/pci/pcie_layerscape_fixup.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0+ /* - * Copyright 2017 NXP + * Copyright 2017-2019 NXP * Copyright 2014-2015 Freescale Semiconductor, Inc. * Layerscape PCIe driver */ @@ -253,7 +253,7 @@ static void ft_pcie_ep_fix(void *blob, struct ls_pcie *pcie) { int off; - off = fdt_node_offset_by_compat_reg(blob, "fsl,ls-pcie-ep", + off = fdt_node_offset_by_compat_reg(blob, CONFIG_FSL_PCIE_EP_COMPAT, pcie->dbi_res.start); if (off < 0) return; diff --git a/drivers/pci/pcie_layerscape_gen4_fixup.c b/drivers/pci/pcie_layerscape_gen4_fixup.c index 1c9e5750bd..91e68eb84c 100644 --- a/drivers/pci/pcie_layerscape_gen4_fixup.c +++ b/drivers/pci/pcie_layerscape_gen4_fixup.c @@ -187,7 +187,7 @@ static void ft_pcie_ep_layerscape_gen4_fix(void *blob, struct ls_pcie_g4 *pcie) { int off; - off = fdt_node_offset_by_compat_reg(blob, "fsl,lx2160a-pcie-ep", + off = fdt_node_offset_by_compat_reg(blob, CONFIG_FSL_PCIE_EP_COMPAT, pcie->ccsr_res.start); if (off < 0) {