From patchwork Mon Nov 23 13:16:42 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ovidiu Panait X-Patchwork-Id: 1404790 X-Patchwork-Delegate: trini@ti.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=none (p=none dis=none) header.from=windriver.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=windriversystems.onmicrosoft.com header.i=@windriversystems.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-windriversystems-onmicrosoft-com header.b=IPhdopYL; 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 4CfnwS0wrvzB3yQ for ; Tue, 24 Nov 2020 00:25:59 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 65FB2825C8; Mon, 23 Nov 2020 14:20:23 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=windriver.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=windriversystems.onmicrosoft.com header.i=@windriversystems.onmicrosoft.com header.b="IPhdopYL"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id C5EC6825D0; Mon, 23 Nov 2020 14:18:42 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.3 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,KHOP_HELO_FCRDNS,MSGID_FROM_MTA_HEADER, T_SPF_HELO_TEMPERROR,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.2 Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on20603.outbound.protection.outlook.com [IPv6:2a01:111:f400:7eaa::603]) (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 F0FF0825C8 for ; Mon, 23 Nov 2020 14:18:13 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=windriver.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=Ovidiu.Panait@windriver.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WwR8qewil4fhO7qqBEbwJNnR5LdSeX42CdG0fSHIwdZG+oJl81X7BCtNy8xb8qomggQwuL4K4hcwCJsxcuFQN81WjL/eQyHrF9T0FnxJxwVVf1Ywt53bLOR/l2+wyi2Z5fm3St7H0aP3qglxuyUETPVC0KJ2C3DGg8VGZlPjKy65aS6W3E23dbKhyLYYm+k9nVIwEKWj4x8XCZ0pW7pRo9nRDWwwNoTh31Cs5EZhNzhdpRlFlHhQ7j8PNVOyYcSA60/0cTcYpJSZ06BNU84ILBnpsjjP6C14Zy4gVkPyVBNzueWk956iokH6VeC00/1JKdIy7646lk110cMzEtJgKg== 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=WCvbzSQqWnUtNhdgdCoPspi5h414FO9/2VdYDANfklw=; b=E973GTCEbQbwDjgYSFBNN1ukqHzNAaeXsDOHaGW+kQ84d7vsz7lOcr+cqouVz2WfDWKZ0eI+pitv0udAN5Y2BpAcLmJfqQYLJM4FDciV30PyGdJ2gfuttsp7IMFJbgYCu6X7nqpm+zV0ba8idAHchJtr1xbx9x6Qb2BUfcJVi1s0J0GY2CltCpHDeUiZ/lkL3CTrr/PYcYjbk2K/hIW06pFWDVXylaZWhP8yf7XIkVIdLgufnhFDISK/gEJ5ZDXWhOE25p1znnDW2e06uC7JvgFWlxrEv6aGv0iIS3mmBiJcc5BtY7ilNyskFnvRg/0br7EdTz1F8Mdb+5cvb/c7hw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=windriver.com; dmarc=pass action=none header.from=windriver.com; dkim=pass header.d=windriver.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=windriversystems.onmicrosoft.com; s=selector2-windriversystems-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=WCvbzSQqWnUtNhdgdCoPspi5h414FO9/2VdYDANfklw=; b=IPhdopYL2ByxblK9lyoeJ8Z0Ab/BrxEhVH8XC3XmMTo3GF/M0TeZcyUtPJVna059DOpdOdE/YA1FFbWaaSa8KeJVLeCZqmFk/6VOMYbNefIB0fDo+75l5xAI6z7VjX08nIEUT3BROWj7N9UYNy5dKBWO2Bjxfz/8/4fuwHFPUA8= Authentication-Results: lists.denx.de; dkim=none (message not signed) header.d=none;lists.denx.de; dmarc=none action=none header.from=windriver.com; Received: from BL0PR11MB3201.namprd11.prod.outlook.com (2603:10b6:208:6b::21) by MN2PR11MB4336.namprd11.prod.outlook.com (2603:10b6:208:18c::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3589.20; Mon, 23 Nov 2020 13:17:55 +0000 Received: from BL0PR11MB3201.namprd11.prod.outlook.com ([fe80::650a:e5b9:d7:6cc0]) by BL0PR11MB3201.namprd11.prod.outlook.com ([fe80::650a:e5b9:d7:6cc0%5]) with mapi id 15.20.3589.025; Mon, 23 Nov 2020 13:17:55 +0000 From: Ovidiu Panait To: u-boot@lists.denx.de Cc: sjg@chromium.org Subject: [PATCH v3 09/18] common: board_r: Drop initr_pci_ep wrapper Date: Mon, 23 Nov 2020 15:16:42 +0200 Message-Id: <20201123131651.33032-10-ovidiu.panait@windriver.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201123131651.33032-1-ovidiu.panait@windriver.com> References: <20201123131651.33032-1-ovidiu.panait@windriver.com> X-Originating-IP: [46.97.150.20] X-ClientProxiedBy: VI1PR09CA0089.eurprd09.prod.outlook.com (2603:10a6:802:29::33) To BL0PR11MB3201.namprd11.prod.outlook.com (2603:10b6:208:6b::21) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from otp-linux01.wrs.com (46.97.150.20) by VI1PR09CA0089.eurprd09.prod.outlook.com (2603:10a6:802:29::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3589.20 via Frontend Transport; Mon, 23 Nov 2020 13:17:54 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 1bc95b82-e592-4c71-440f-08d88fb23052 X-MS-TrafficTypeDiagnostic: MN2PR11MB4336: 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: oNjmKhyIEMdrV8IeWl8lAXQ1nY7wec+Jgk2dac1pPje88LJ4kx7P/lVzsb71+erV+s4Qy+eWcoTMGtdlhb+Gj6n6Y5Vg0f+hLvbI9X6vVNcabFFcZd1zDkGjvJvuzQJg0JCNpn9kXOge8CJ9jW+1VnyrUUCO2d9nKoKSEN/h/h/jZttU/lsPV1NBs+nTIj0fxbM9EJVQ2UatDN5zqLJMMsKKDqobPl4+VKL3kv/yaXBecZmxLxqoMqywfhFFX6RxZijHMG/DMy8zxhN/PxmON70nVzOZo3xFTc+27PHn3q1oKuF8QDZu4zvGfUYuz66+7weaX9s2/nhtThZzJxX7NQ== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:BL0PR11MB3201.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(346002)(136003)(366004)(396003)(39840400004)(376002)(6512007)(4326008)(16526019)(478600001)(52116002)(186003)(5660300002)(316002)(8676002)(6486002)(6666004)(83380400001)(6916009)(36756003)(66946007)(86362001)(44832011)(2906002)(26005)(2616005)(8936002)(66476007)(66556008)(1076003)(956004)(6506007); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: uASNWFNkoChJ7dyvcWl2nuvyZ4YwK1iX/xaYI80H940n94aN7VAaKJk5D84iDcBvBrGbS6KVOHCVgMAReUGXBgVq6ELH5pPqxCnALVmsFind+ZU86Rj0R8DCdB68uxQnfjj3FWJzKl9alySCVtsF4erNGl/FY61vLIWg1dQmx3DTBSNCWbi/yd1Dn+DFLf7qeN9TuuS5CfzAlFp3Mwftd20jfikXl5X7zAXLKkzla4YEEHK+NONEJQLSWLo+xbl0ajT80QZ6v1z2hJuvkBpeQV/DmmTSHl+puQbeMkBRItzpzpSjQe301HcRzPpKgO4UNeWprEwfCY5WohZF7YEyGdwzrTVaro3GquWpZ063kSVILO23F3aAhYagwSBKHd581rKsBy5JnxJdKUKXRTW9KLkSsL7LNvVzyngkHstq/Go+5N7nRfUmwBXlWvBg1C45orzKK66uJxS3yNzgsKQq5LXeeCa1bLW10ipkf8GpVJczfxrKEvmxQuOyWVrC3E7dNIELMGMol+88hjsxusbOYXXOFsuchKO/EQOdpUZQV+oU5DqakDYKMQN3hgOMS1Lv+V1xRQ9jYZMWU4+34eRxmV6NG3apMRQidJHUg1E41RA5UqkktbMaTA6eFD9elTOO/r6raw+KDnFz9YNpryGE3VEU2cNbcaHvB0iDFRqaPOyx3qdTCcK+fm7M0s6p4ojhZ5d7bXubPUKzPNDCe+9xI4hZCx8y1ZbmbNle8iYiXTQ2cZmg23oBRtNxMM+54yyea0KQcans5tCgAOKEAE4Mso5fPEvXZoDQkDLuF9QWyjngN53T24mKtWRNl/YZ3RjnzRcDNIlawDJ7sXj+3961/APfnsumMhlLsS/lw/ZqNHQeEddLji3nNSWn1WBy6kJnecBbGEvxzWRE9JB48PKg9w== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1bc95b82-e592-4c71-440f-08d88fb23052 X-MS-Exchange-CrossTenant-AuthSource: BL0PR11MB3201.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Nov 2020 13:17:55.3132 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 8ddb2873-a1ad-4a18-ae4e-4644631433be X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: C8nXFqFPkdBsf5UHiBby1V6/ItGcPjXjCl1vqGelL8Jctjo2iO3ddTYcCBZTF9J1MqTyVXgL0rTZyMrZmGTnKoCCs544hLsO+siejvBqUHo= X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR11MB4336 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 Add a return value to pci_ep_init and use it directly in the post-relocation init sequence, rather than using a wrapper stub. Signed-off-by: Ovidiu Panait Reviewed-by: Simon Glass --- v3 updates: - add reviewed-by tag v2 updates: - add function comment common/board_r.c | 11 +---------- drivers/pci_endpoint/pci_ep-uclass.c | 4 +++- include/init.h | 10 +++++++++- 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/common/board_r.c b/common/board_r.c index 7a06627ba9..d86ff0cb5e 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -214,15 +214,6 @@ static int initr_unlock_ram_in_cache(void) } #endif -#ifdef CONFIG_PCI_ENDPOINT -static int initr_pci_ep(void) -{ - pci_ep_init(); - - return 0; -} -#endif - #ifdef CONFIG_PCI static int initr_pci(void) { @@ -836,7 +827,7 @@ static init_fnc_t init_sequence_r[] = { initr_bbmii, #endif #ifdef CONFIG_PCI_ENDPOINT - initr_pci_ep, + pci_ep_init, #endif #ifdef CONFIG_CMD_NET INIT_FUNC_WATCHDOG_RESET diff --git a/drivers/pci_endpoint/pci_ep-uclass.c b/drivers/pci_endpoint/pci_ep-uclass.c index 38a5f08376..aa89701de8 100644 --- a/drivers/pci_endpoint/pci_ep-uclass.c +++ b/drivers/pci_endpoint/pci_ep-uclass.c @@ -210,7 +210,7 @@ UCLASS_DRIVER(pci_ep) = { .flags = DM_UC_FLAG_SEQ_ALIAS, }; -void pci_ep_init(void) +int pci_ep_init(void) { struct udevice *dev; @@ -219,4 +219,6 @@ void pci_ep_init(void) uclass_next_device_check(&dev)) { ; } + + return 0; } diff --git a/include/init.h b/include/init.h index 7cdc47cff1..c6c5f34b55 100644 --- a/include/init.h +++ b/include/init.h @@ -177,6 +177,15 @@ int setup_bdinfo(void); */ int cpu_secondary_init_r(void); +/** + * pci_ep_init() - Initialize pci endpoint devices + * + * It is called during the generic post-relocation init sequence. + * + * Return: 0 if OK + */ +int pci_ep_init(void); + /** * init_cache_f_r() - Turn on the cache in preparation for relocation * @@ -249,7 +258,6 @@ int set_cpu_clk_info(void); int update_flash_size(int flash_size); int arch_early_init_r(void); void pci_init(void); -void pci_ep_init(void); int misc_init_r(void); #if defined(CONFIG_VID) int init_func_vid(void);