From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 886A9C433F5 for ; Sat, 1 Jan 2022 17:14:25 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 7408381277; Sat, 1 Jan 2022 18:14:22 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (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 (2048-bit key; unprotected) header.d=windriver.com header.i=@windriver.com header.b="SHv8ru6O"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 856EB82FB5; Sat, 1 Jan 2022 18:14:20 +0100 (CET) Received: from mx0a-0064b401.pphosted.com (mx0a-0064b401.pphosted.com [205.220.166.238]) (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 DC61082F3E for ; Sat, 1 Jan 2022 18:14:16 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=windriver.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=prvs=800048d64d=ovidiu.panait@windriver.com Received: from pps.filterd (m0250810.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.16.1.2/8.16.1.2) with ESMTP id 201HEAAn018804; Sat, 1 Jan 2022 09:14:10 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=windriver.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=PPS06212021; bh=aQJ94tKxmt2EBppZZma0LWNEfww+ZTByVJ1ZUtnjs+0=; b=SHv8ru6OMkL5bT4VDjR/+rPfiNEe3BMi5tc/ckwvOXx8xHjBcajma3zUskeb5ZZy0v2+ r1BYPAwli1G2/YfMorOwcigpMuOihA5xNBJ2lzz9HggD0MtKBGaZTtFqzF2HZ/odnrO7 p8I/NIUjXcurGCMC6NHNKXYC962M1vWHCEusLYRkxlHKv/fWsU0xtLzgB9cUg7Y2n1U7 itkW4d6qZi058ChmheFM32xV4E1PO9VmQM8xKNk37je1qUJTFvFb6K9oov8UxU8aPLS1 6jZDICJ2iDN1GL5+9Dfz+tkxlA2xPvyDz/IqC2aqpGmsAQI69gR+eDeFstCHSgS4r2v/ tw== Received: from nam04-mw2-obe.outbound.protection.outlook.com (mail-mw2nam08lp2172.outbound.protection.outlook.com [104.47.73.172]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 3dak4705gk-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Sat, 01 Jan 2022 09:14:10 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ff0XVlOfl8srF7/sb1qysRZtezj4jkMTuST7BLn/vEMq21rQqOUmKnc74hV/tQCUmuCz/VYZLsh38x2BeReIV6ViddmBfALNVrTeTXdiGThd4Dup1IZA05QK33T1EIj3OsEml3FWPIEPuB1uOH0KCJloDv+l635ggoIp/VnRjgqaphHrJeV6uVMR0f/2IdJ/wFsgBo3qZL36MJV6E59xFIC6MZkmVXs5izYkW8LuYHQmnq7Z8BIRJM8n1pU1zqKMCOYXnA5WWTUSY2bJTf9pdidS9vjWB5FmujMyzbb9jw3UYgLo3yJajV11zkOQApIvSzb+4BcZrqjiKI/IrItPJQ== 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=aQJ94tKxmt2EBppZZma0LWNEfww+ZTByVJ1ZUtnjs+0=; b=T+uF7PkEkm8UOf/MddtXawJHtsaLzPsGqi+bBL9MQSUOIKBm+Y+dpCbT9gueMKUo+FLWohO4oYWa5Z15qU1fwRygWC0mxrh5Q+JYV1udLrp3lZwAXUhR/+Xtsrjb5xPYJr+VPQ8S7cRdKwWsu8n7K+j6iBZEInJQ4t8IVJOUyNp70+PLQj0nVBrlzEYCGMCDjvhZ64LajPfrAAKcllJIm/dKIpQV1Ku+XR/GvHNJETA1Is/W3d997xg546Q8UaPht/8wMrahpprBlGGnxVsLy2eOnuC3Uf/km4bDu/nK7XO3uHuPZn43zkv8QzHJIIZy+sh9Usv/t4NPWZ1XCztDHA== 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 Received: from DM4PR11MB5327.namprd11.prod.outlook.com (2603:10b6:5:392::22) by DM5PR1101MB2284.namprd11.prod.outlook.com (2603:10b6:4:58::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4823.19; Sat, 1 Jan 2022 17:14:06 +0000 Received: from DM4PR11MB5327.namprd11.prod.outlook.com ([fe80::7d5a:c35:1ddb:11f3]) by DM4PR11MB5327.namprd11.prod.outlook.com ([fe80::7d5a:c35:1ddb:11f3%8]) with mapi id 15.20.4844.015; Sat, 1 Jan 2022 17:14:06 +0000 From: Ovidiu Panait To: u-boot@lists.denx.de Cc: Ovidiu Panait , Simon Glass , Bin Meng , Tim Harvey , Zong Li Subject: [PATCH v2 3/7] common: board_r: drop initr_kgdb wrapper Date: Sat, 1 Jan 2022 19:13:27 +0200 Message-Id: <20220101171332.2676936-3-ovidiu.panait@windriver.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220101171332.2676936-1-ovidiu.panait@windriver.com> References: <20220101171332.2676936-1-ovidiu.panait@windriver.com> Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: VI1PR0801CA0071.eurprd08.prod.outlook.com (2603:10a6:800:7d::15) To DM4PR11MB5327.namprd11.prod.outlook.com (2603:10b6:5:392::22) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: bead5869-ff97-454f-1858-08d9cd4a1dcd X-MS-TrafficTypeDiagnostic: DM5PR1101MB2284:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:6108; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: BEhWvSjmQhMGBXrtrgfoe1dQO2UHeNeX3gYfgT7S7FOs6g4ze7T0XSMG9XACPVGlal2kO6HF2X0+FU9jp4hQ/9UBf/eF1PN+Ld2pPcpheog7731TPy8zl0DvF0gn7K7oGmuAJ8AmQPkG4hPgWXc36jnFxz3Qn5v5EeJhKU9arlIVdej+KIvboDj5lDHNq/WujbEFo54Y1I3kxtkQRqTY8w2bYNQ3MuKHRx5Ib+3i+HFjyFT6Ory6Xhu6YHwnrzDi3ZF/+zGDCnBNGzR5rlj+eKU5+q+r8kn0pQNoeKGtz+GEiwQofOIXmfDXDhQbCPwyRXtX0sainOofhGbdwnEyHZ6RFCMe2QsXflgXBL4Q+8zo14dJ6SiKVFZXm4pxP07bWk5Wrq7CVKZzOhPAzfrzTwm9nMk3lHZcl/mkgR6unSjdvP42JvBoWB46sjeReAx/uRYYIOa7raaLD3WaWdHCkFnuSs3lBgjHDpXXV6u4auXX6TDbTq0jIx+gxaZ7at9OHaoiv/joKxzN5ek3F8Ww7+raVOOGUy4ymZWGdP+9zogPSYsaMhalVGlJVYCQNzuc05AByeC5VNYgFB0W7bkN1jeXE01lLm9ekmi7soHAt+9s3Jzr0rSG4wuC6K2l3Nn36u7Uru0Vqslhnw5EmuOBEyvK4WzVqpp12n9U2mhPMcoFRjqKPfeJGnVw1rv3RfUBEh8jlEFu/69ojT509eEmxw== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DM4PR11MB5327.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(366004)(66946007)(6506007)(44832011)(66476007)(66556008)(316002)(6666004)(8676002)(38100700002)(4326008)(54906003)(5660300002)(6486002)(508600001)(38350700002)(52116002)(1076003)(2906002)(8936002)(36756003)(186003)(2616005)(6512007)(86362001)(26005)(6916009)(83380400001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?hSFLQXNu4D14QjHtwjPlyMiZPOOgCf3u2ATyQtpTI6Qcfx5J4WhDpQ+GW4nV?= =?us-ascii?Q?kXQCWmVHxgO+mUhwNR1Pnu8MZH+NNvcYd4M3JI0D2UbBmwuTSmzz4G+qX/uD?= =?us-ascii?Q?zpfx96OfCOOA2j3AUXL7OxeIDybGJ3XKw2ja9JZnlBMP/upOdmh0UJhZxyhF?= =?us-ascii?Q?7yz9DqFpH5fdbajxJGz9TJM7KZKNK7eDNDB+dajDWaK5oVMb7dSfQrkjUoyo?= =?us-ascii?Q?hZGVuFc9G7VBP08zh7AenV3Jn+AJWkPqrMz1IlHcs5vvUWAHSA0XDN5ERNxK?= =?us-ascii?Q?u0Ttr1XHXhtOoqoi6xDhwN54lurC0KPcfbM0fgWXR3CNe6jZVB7xPw/EDwKs?= =?us-ascii?Q?BySwsNfx06QDUhb8kvhO8pqrqjVLo6a0al9x3FEYCMwwLSnQJVmeXN1wWLQA?= =?us-ascii?Q?FhZfGIYC95bwbOx8X5NeQpyyH3jOJ8jjj97oamWeEkFVLqfDE4gRNfVq/YPg?= =?us-ascii?Q?JWLzMqmO7bXVeiCuTjeTdLgctiDh9kD87W6vRTfhbPZUuIanHgK50Tq2iGpG?= =?us-ascii?Q?ngXfMxSnXF49nMXpbjw6dsA9SqFwoNPweHK9Yxpv2O7T70Ubzau6bnABYGYr?= =?us-ascii?Q?85IxxUQsqdZTQYzkjKQeSna2bQ9GNLwum9vHO3io1PjYF8sehkG9V4BJj9CX?= =?us-ascii?Q?KWdE5JDy8W0HxZ9qTGklmUpLhvxPiw2legpV6X2qiKH39N4Cw+PzVn7ompPK?= =?us-ascii?Q?eWVkVDv/VBjy7s0Dt11saCvsaFmuRl9yC5TlNt8CSbxx0xv3aZ/pLMGrw/zz?= =?us-ascii?Q?WtrsGaN+xqY/lhL2eCiw1zZ++S/jmfWaeAYBvlQnelkz5oLrpUKZWCUhn4Lz?= =?us-ascii?Q?TA1VGOFsYMb6NTK/N19nzxt5zikrz+I4g4CngoqA7ESKuF7mCjibDChmvdnB?= =?us-ascii?Q?XXWd42WV3pjkwEXTAl0M+HxrPH77/SPD7ILgUYPCaP6E/hEielj9xI5pCHee?= =?us-ascii?Q?Zkvt9GFOKMMpjyjBXMwgYX2zJR1IfLobK8Tx3nGEqhMmIfyJEv16i+/KftI+?= =?us-ascii?Q?61kbOUauG2iLK1sYxqmdTojO57zgL0BlaJGSHOap1zA2wEpoUAwz9UKl/58m?= =?us-ascii?Q?w5HVqJmhDYh9lW51Y51SE5ES5eOGelYJq+SvNY1cm+P9C6mZX1sCyLlI5IF4?= =?us-ascii?Q?KHvSGEYEmpnBK+hSP1G8lg7Bd+bqmS7yUolq/0PruZaXFyi6LsoHCt6ldJ2i?= =?us-ascii?Q?p7gfdWpl7s+6Ir882a/Pl/4G8ZTmqFRJMLLIhiazpBd5af8mzwBjlj/6k/g3?= =?us-ascii?Q?0+M09priibUg3gB465wiOXgku1WGB1KKJOpeXR76kjlbVglx7kNzvY5uEiPK?= =?us-ascii?Q?+aG/pnC1z2DEMw3qQmKdZa4Tn6OwNfSUmvg8gqRDFwkI2q06VPdQlSx3oPvK?= =?us-ascii?Q?fU4h47tDq2jfuhjUqUNsH2IixZEM/4Q84hmsUNbMHa4aVMKvQQYPEl2swUSH?= =?us-ascii?Q?wRmhQj6nsHpvloviTKk5cX98waGoM/I8EjlzJAcdWByJK3HlZBhe70O0+G5s?= =?us-ascii?Q?IZoJDPP1HJezfziim7FwBcXYx0IXaib56nibmsUBWeJQ5S0tAvx/TIXm1cul?= =?us-ascii?Q?d0K6mdeSZMHkqYKf2WMxsa7p9MAaYAX1reL6ndA20KiGqSAaPO8NBFZTivvn?= =?us-ascii?Q?OleI5bteRn5qU/mQGGueHYyYFJSJjSI1HqH/BUo5SGmXUHJMu65ozMuc5QWb?= =?us-ascii?Q?RpVBZA=3D=3D?= X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: bead5869-ff97-454f-1858-08d9cd4a1dcd X-MS-Exchange-CrossTenant-AuthSource: DM4PR11MB5327.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Jan 2022 17:14:06.2752 (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: vxfB17lu8U6PsJVFdrLpJaHSCMHT7YsFAzniP/l4TrkvqsgNI6gYEOFXXqibnCgO4YU+vacPoCzWPJJeucamje0YXTcElhNSb2uKc7K++1w= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR1101MB2284 X-Proofpoint-ORIG-GUID: eV0II8P-AU44Bw32oFkedP0j_qPfSmg- X-Proofpoint-GUID: eV0II8P-AU44Bw32oFkedP0j_qPfSmg- X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.790,Hydra:6.0.425,FMLib:17.11.62.513 definitions=2022-01-01_02,2022-01-01_01,2021-12-02_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 bulkscore=0 spamscore=0 adultscore=0 malwarescore=0 phishscore=0 mlxscore=0 clxscore=1011 impostorscore=0 mlxlogscore=581 priorityscore=1501 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2110150000 definitions=main-2201010054 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.38 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.103.2 at phobos.denx.de X-Virus-Status: Clean Add a return value to kgdb_init and use it directly in the post-relocation init sequence, rather than using a wrapper stub. Also, move the "KGDB" print message inside kgdb_init(). Reviewed-by: Simon Glass Signed-off-by: Ovidiu Panait --- Changes in v2: - drop extern and add function comment common/board_r.c | 11 +---------- common/kgdb.c | 7 +++++-- include/kgdb.h | 11 ++++++++++- 3 files changed, 16 insertions(+), 13 deletions(-) diff --git a/common/board_r.c b/common/board_r.c index cc0e6fa92e..5905921caa 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -498,15 +498,6 @@ static int initr_ethaddr(void) } #endif /* CONFIG_CMD_NET */ -#ifdef CONFIG_CMD_KGDB -static int initr_kgdb(void) -{ - puts("KGDB: "); - kgdb_init(); - return 0; -} -#endif - #if defined(CONFIG_LED_STATUS) static int initr_status_led(void) { @@ -745,7 +736,7 @@ static init_fnc_t init_sequence_r[] = { #endif INIT_FUNC_WATCHDOG_RESET #ifdef CONFIG_CMD_KGDB - initr_kgdb, + kgdb_init, #endif interrupt_init, #if defined(CONFIG_MICROBLAZE) || defined(CONFIG_M68K) diff --git a/common/kgdb.c b/common/kgdb.c index 4493a15919..29b09fcfe5 100644 --- a/common/kgdb.c +++ b/common/kgdb.c @@ -527,15 +527,18 @@ handle_exception (struct pt_regs *regs) * kgdb_init must be called *after* the * monitor is relocated into ram */ -void -kgdb_init(void) +int kgdb_init(void) { + puts("KGDB: "); + kgdb_serial_init(); debugger_exception_handler = handle_exception; initialized = 1; putDebugStr("kgdb ready\n"); puts("ready\n"); + + return 0; } void diff --git a/include/kgdb.h b/include/kgdb.h index 616ce4451f..bdba347a7f 100644 --- a/include/kgdb.h +++ b/include/kgdb.h @@ -39,7 +39,16 @@ typedef kgdb_data; /* these functions are provided by the generic kgdb support */ -extern void kgdb_init(void); +/** + * kgdb_init() + * + * Perform initializations to allow debugging U-Boot with gdb over a serial + * link. It is called during the generic board init sequence. + * + * Return: 0 if OK + */ +int kgdb_init(void); + extern void kgdb_error(int); extern int kgdb_output_string(const char *, unsigned int); extern void breakpoint(void); -- 2.25.1