From patchwork Tue Feb 27 21:47:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Li X-Patchwork-Id: 13574454 Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on2048.outbound.protection.outlook.com [40.107.21.48]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 525E015098B; Tue, 27 Feb 2024 21:47:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.21.48 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709070469; cv=fail; b=LoGPYCnN5w9Q82Edu6OUzeYOWWh0QkRitNHvcu7WhxuKngk+mRSOM0h9qmtZ20tLIJF7lXK08/gZ0d27LuO7XWjEf3RGeZh1xEp2kgOifccb+GAW7Fpj1BB9EgEy5CNiTEqJZkqeqqgK3y86Q8+EfXqqPBD2OJLuZzQE1QHFvFc= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709070469; c=relaxed/simple; bh=jax7w3YeSKyiyCNa2W/Ldiw1ax01/mOleY5P8AfYqYU=; h=From:Date:Subject:Content-Type:Message-Id:References:In-Reply-To: To:Cc:MIME-Version; b=GaFYXeRNZnveUVWGvtU4VvKki75quUcYyZEUYN7co9gICyDkFZHGpjN/zCQMo4sgvQvvdFTaLGKMZX+ENa72YOGSMny3Zwt7qfFEjhz2Wib+vVkC6isYQbHAslUXxNLiGGbuUXK1dZZ6eC/YR3xtORxPIEHfMNzIEJB6hE+F7yA= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=nxp.com; spf=pass smtp.mailfrom=nxp.com; dkim=pass (1024-bit key) header.d=nxp.com header.i=@nxp.com header.b=FTaZuuG6; arc=fail smtp.client-ip=40.107.21.48 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=nxp.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=nxp.com header.i=@nxp.com header.b="FTaZuuG6" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=EVfeVMOwsPlalH0Y4uuzyuLztoH674GDafu7e1w+g3F806gZj6ZnZXkPIIrDptSViBtsNqCr+b0Jz+H2HHfkeRQ8mlynGG7pBijSOneTXoSZXDCs0EmrSQTGfCBGmUIBeSSNQOmKA7C650TYzchrRFgO7aRcOWSc4ZmgA9B8GXi2FA45rPlMG8m6P6HK3KVW/BZVQaHWdeuYzPnYDZ2GKNx0uKSijON7DKTTvBNFRw70M53/cDJOTd3Od0ALbBeY7oMf0fJgi/LXJhTBN6l8ThGj13xiH0fPKmZN7B7WA9Tz79oY9L8VpIsLUWGaFjutd3B2cOwCnG0EkJ2OfBrAMQ== 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=WDHFWrjCyoKXsLP6sV2GTSZH9KE24ao5w8wAVmSeCgo=; b=bsK7oMcGPEgk30Q8+DPYpxOX0pxSFjxuFjnd8g1HgvFlf5RSQttpfUFMaF09xCQjFkzBEm6m9ptPkD0tjkdtlZGQoQt033+tEvERgxKTxMCzzvvqJfBgaAb7crKTolvL2SoY5IMqcW7nIst7awCTL+/Np1FgwfqlgVhvi/0Q5n7xoiZGJVAxZ4SsWeMcGgZwJ6k7BFOXqTbOXPu6i6qCdpYtXZwSc2eQSrashoIPsSLWv1WeNEI1pi2L9qr1FqqCiKAxhSOlGHKarcTs2kZdKPZkz9c6ib4PLxpeF4hGw5RXDf/ciOaXUkiI/kNxAc2GGCWorS3Q9Fo+krDmZUV/Fg== 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=WDHFWrjCyoKXsLP6sV2GTSZH9KE24ao5w8wAVmSeCgo=; b=FTaZuuG6lmeyj/5huhCYGQCPwQjo5ovyS697D9Z4T7sTRAa+tDuHZFrziSl3elg/Lh8AClQNxAkSbw9I2GIMjfXNPtbku7YRRiFWBmaf+xUuYRg49O1BM2aGP8z5qm1p1f6hZ2GExAUuIRsw3p1CWYvryBHvC9fxCXfFAZAJz6w= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from PAXPR04MB9642.eurprd04.prod.outlook.com (2603:10a6:102:240::14) by VI1PR04MB7056.eurprd04.prod.outlook.com (2603:10a6:800:12c::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7316.36; Tue, 27 Feb 2024 21:47:43 +0000 Received: from PAXPR04MB9642.eurprd04.prod.outlook.com ([fe80::9af4:87e:d74:94aa]) by PAXPR04MB9642.eurprd04.prod.outlook.com ([fe80::9af4:87e:d74:94aa%7]) with mapi id 15.20.7316.035; Tue, 27 Feb 2024 21:47:42 +0000 From: Frank Li Date: Tue, 27 Feb 2024 16:47:09 -0500 Subject: [PATCH 2/6] PCI: imx6: Rename pci-imx6.c and PCI_IMX6 config Message-Id: <20240227-pci2_upstream-v1-2-b952f8333606@nxp.com> References: <20240227-pci2_upstream-v1-0-b952f8333606@nxp.com> In-Reply-To: <20240227-pci2_upstream-v1-0-b952f8333606@nxp.com> To: Richard Zhu , Lucas Stach , Lorenzo Pieralisi , =?utf-8?q?Krzysztof_Wilczy?= =?utf-8?q?=C5=84ski?= , Rob Herring , Bjorn Helgaas , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , NXP Linux Team , Philipp Zabel , Liam Girdwood , Mark Brown Cc: linux-pci@vger.kernel.org, imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, bpf@vger.kernel.org, Frank Li X-Mailer: b4 0.13-dev-c87ef X-Developer-Signature: v=1; a=ed25519-sha256; t=1709070448; l=2678; i=Frank.Li@nxp.com; s=20240130; h=from:subject:message-id; bh=jax7w3YeSKyiyCNa2W/Ldiw1ax01/mOleY5P8AfYqYU=; b=CHy2ODfXM0CDTDa81x8SaQEkbhra+ZQ6KXeSguPvo8k2lQH1HxPL6HoPrWTvOIJx6vaQ8TKw8 09DTverntT6BJA6WqowkR8y+3wSRrXoQ8o6XTShVG1B7V9Q1vEeHcvk X-Developer-Key: i=Frank.Li@nxp.com; a=ed25519; pk=I0L1sDUfPxpAkRvPKy7MdauTuSENRq+DnA+G4qcS94Q= X-ClientProxiedBy: BYAPR11CA0050.namprd11.prod.outlook.com (2603:10b6:a03:80::27) To PAXPR04MB9642.eurprd04.prod.outlook.com (2603:10a6:102:240::14) Precedence: bulk X-Mailing-List: linux-pci@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PAXPR04MB9642:EE_|VI1PR04MB7056:EE_ X-MS-Office365-Filtering-Correlation-Id: c536a716-2f4b-47ab-f048-08dc37ddb9c9 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Q1hxDHUqp23am1gocVijphtui+huWJWMfcRXaUUKfKHTi8bz2TtphSthEigTsNSHeZS5f71YDia5koq7F6R8VyXkzdXrLQ4XMJNSfRokThAKL32LuLdWAcCCau64dNwmI0ir697rkBJJLc1cs3okYQVRbn9cFvomRp1dN7JEybjfWA1SSevZFLJDkqpuxKAjI9b/JbRH0NgEPgQVRNSNu7S3/dTNf4aOaDa7qEnFAImPsCe9XtWB4S2FeI9ZfBpOUFcyPaSeBbDZ+apmcD0TMWv6+oW11Ber9iITQnSGB+Hz7DVpLH8MXRfzYm9Oc85WF73UN+nGmi9vCp5srPOL+HGTug0SEgryO0uPRUIgdx5C6HZfM/E4FPIrQ/XXwIS50QMui+sMj7rEp8EtqUTQV2aZttLRvsDobT5mqnWiS3bMuZ5ThI2/U/txnXUkABAmp39Hl+56442IEb0+6kVDbyqrJdQ8MfIjRuijBnP0ZZhtPgYjow8OmbHb8CAAW+P+bb7ljQUi7XO5ytGSCz61uKsuh9MPDcIYHUrBmR9Ob12GfuJGYOUYiXtU+L9YT/r23rzWUIkU3EdNbIwQGKNAYIOQKhZo/70C/KqJ4iDGXNk+jjCSxCzxUUosoMiJST50luXFKGODsvuniShZIrpbvjQi2+vrasEotR9tK4qBOvxowuWt8T/nlznVymd5nN8JlEqMTvSHT+cHV2TBGdTKlZpb6Y5ZBIUkv4sRgD4lG6Q= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PAXPR04MB9642.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(921011)(38350700005);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?Zgi547dEXsNwcKR1KTk7Zz46Rgvu?= =?utf-8?q?LNixfu0wXqjbbXKpRMGt+wp7gJfjEH6eoHGFA7mgVwZslHztvtj2g4ygqSGsjobKS?= =?utf-8?q?yrUfEhfL02WCLNSDB2SPwji20Qu6TyufQ4UfbG9MLQihuKLB9FM8GV65VN2+XBUO8?= =?utf-8?q?bmwIyngONxWebteHcKkMkOeyJslHaFrhuMmiuVjTABROrRvcT+Q9dBQ+NBeW0+vm0?= =?utf-8?q?RLfVeW8JKCvfkR4ju/pi5ZAPoHbuXkVFPhM3whgiLEVWk25vCkF1F98G5vr/5NNAF?= =?utf-8?q?rXBbUkW05Y48/0B2O7Fk/0ZmHDWXhJwQK+9wJogVdFK8Bn3RNQaIlP+hJPimHCBu8?= =?utf-8?q?iNGlaPNJj/tEU0M2A2NhZFlXAFgFalryi6bi+757IjFOBlzpjDR9H+zN9bp7afiqD?= =?utf-8?q?2+TkE+Yo9z3s/esh1D6UpyrZZCJvvwSoYbCK1dh2vV7rFbk6aYrFNy35OQHIEaxqL?= =?utf-8?q?cgvsNr7yj4koGyYe7PSj0ncXp/MLKyM67vpWOtMqV9BXA16rPRws1MOWjKyDD5oll?= =?utf-8?q?f8v7wuNAbk6RuISOVVviiAIl2EXIVX0oTgL4X9eRDnkOzE+TVdlEFHpL08GI+3hkn?= =?utf-8?q?OK22eE9V3aI1TW5zLImZG9yAhtdV7Jk2F3VcmBI9wAa4uEY49G9a10PT++8SpQJq3?= =?utf-8?q?c8tkf9ULCbc72Gvq/+5kRkJC3eMrxuYYTMyUjDmFa8oefAwvK3hzryypv1stkQ1bd?= =?utf-8?q?h2DUj+B0noxl/1izpGYZjaQh7jIKsZYckD7N0qsjT+u+tBtkFxaAkK4ufmQP6gaEY?= =?utf-8?q?G2bte+k/QuSwz72irYeBTtyNE6E7UfG3triykBoZQoJaT5Telg+ckmUKxZwrXFz4m?= =?utf-8?q?sKLzouLyeW3Ii9K2g2ix3UztrPcyFcmjpZmI66cNQ3eT2TzcPYtAOMrcRCinnRxpS?= =?utf-8?q?rdxFELVXGCgqD2EaeJDArkWCPYnFwu4/dpl/PX9klHMCDCod68iCCG/4sjNxxCyal?= =?utf-8?q?XPfWJEaaJEfAIpX4jW59tfjHSCSoZy0mWm43KZn/fPS9fqVlyH+1XEi7YnHDs2T3o?= =?utf-8?q?hy1X1JCwjcvICcs9Z8gDAWBrRWTunyQTh9Wa/6UNdRAKIZC5xEdU91KyBjgKJdV70?= =?utf-8?q?sGR/b4ah+cqLgNw/kCbqbMing8d2C9hEJBbN61x/QyNntqJhsZizROhvh3IzAyZZH?= =?utf-8?q?xD0x46NQIynaosn+Vt+l227Uv4wHKw98MGxKWNpi91daTII2B8XrcvzbNzK3JO5Nx?= =?utf-8?q?eaa8FkSuJcGUFWHCLPJjNntJNhzUckbE99Rfpc+vyiVgd5wGyMC6j8G6Z5y6axRgC?= =?utf-8?q?FBdWuDHB9uJq8XsHC6snaAOPXwnCA55R6xUwy0UbzJw9AGL6C8vYyvQ8A2Qr0K4BT?= =?utf-8?q?lbk7cszCZPWtyHRTTV4zXpAOsh6prt/Vp5acLNPrOf4dJzmfLU2fptVQ1PwS5hN1d?= =?utf-8?q?KPZTIVjJlbYNnGRSFjnLYB8ye7pshI5h4M9fYCwT1nDMhR28VTy4Bq/lwFsFZ75IW?= =?utf-8?q?pz/V66K5YqZdlX1efOJuCNnhVnfz0L45TcJ7Bz6o9+5vLGC0vRsOOp26tden2+gvM?= =?utf-8?q?OotMgyNVR/yO?= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: c536a716-2f4b-47ab-f048-08dc37ddb9c9 X-MS-Exchange-CrossTenant-AuthSource: PAXPR04MB9642.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Feb 2024 21:47:42.5202 (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: acf8WSXHnt8hf6ALopobdEkdtfCutiGNzgmNV0tvAoDCvN+tW8CtbMfbRkm21/2bAkQBsV5wmfpxWFeBDRVEkg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB7056 pci-imx6.c and PCI_IMX6 actuall for all i.MX chips (i.MX6x, i.MX7x, i.MX8x, i.MX9x). Remove '6' to avoid confuse. Signed-off-by: Frank Li --- drivers/pci/controller/dwc/Kconfig | 14 +++++++------- drivers/pci/controller/dwc/Makefile | 2 +- drivers/pci/controller/dwc/{pci-imx6.c => pci-imx.c} | 0 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/pci/controller/dwc/Kconfig b/drivers/pci/controller/dwc/Kconfig index 8afacc90c63b8..647ce302e5ebb 100644 --- a/drivers/pci/controller/dwc/Kconfig +++ b/drivers/pci/controller/dwc/Kconfig @@ -70,27 +70,27 @@ config PCIE_BT1 Enables support for the PCIe controller in the Baikal-T1 SoC to work in host mode. It's based on the Synopsys DWC PCIe v4.60a IP-core. -config PCI_IMX6 +config PCI_IMX bool -config PCI_IMX6_HOST - bool "Freescale i.MX6/7/8 PCIe controller (host mode)" +config PCI_IMX_HOST + bool "Freescale i.MX PCIe controller (host mode)" depends on ARCH_MXC || COMPILE_TEST depends on PCI_MSI select PCIE_DW_HOST - select PCI_IMX6 + select PCI_IMX help Enables support for the PCIe controller in the i.MX SoCs to work in Root Complex mode. The PCI controller on i.MX is based on DesignWare hardware and therefore the driver re-uses the DesignWare core functions to implement the driver. -config PCI_IMX6_EP - bool "Freescale i.MX6/7/8 PCIe controller (endpoint mode)" +config PCI_IMX_EP + bool "Freescale i.MX PCIe controller (endpoint mode)" depends on ARCH_MXC || COMPILE_TEST depends on PCI_ENDPOINT select PCIE_DW_EP - select PCI_IMX6 + select PCI_IMX help Enables support for the PCIe controller in the i.MX SoCs to work in endpoint mode. The PCI controller on i.MX is based diff --git a/drivers/pci/controller/dwc/Makefile b/drivers/pci/controller/dwc/Makefile index bac103faa5237..7084e615b2774 100644 --- a/drivers/pci/controller/dwc/Makefile +++ b/drivers/pci/controller/dwc/Makefile @@ -7,7 +7,7 @@ obj-$(CONFIG_PCIE_BT1) += pcie-bt1.o obj-$(CONFIG_PCI_DRA7XX) += pci-dra7xx.o obj-$(CONFIG_PCI_EXYNOS) += pci-exynos.o obj-$(CONFIG_PCIE_FU740) += pcie-fu740.o -obj-$(CONFIG_PCI_IMX6) += pci-imx6.o +obj-$(CONFIG_PCI_IMX) += pci-imx.o obj-$(CONFIG_PCIE_SPEAR13XX) += pcie-spear13xx.o obj-$(CONFIG_PCI_KEYSTONE) += pci-keystone.o obj-$(CONFIG_PCI_LAYERSCAPE) += pci-layerscape.o diff --git a/drivers/pci/controller/dwc/pci-imx6.c b/drivers/pci/controller/dwc/pci-imx.c similarity index 100% rename from drivers/pci/controller/dwc/pci-imx6.c rename to drivers/pci/controller/dwc/pci-imx.c