From patchwork Tue Aug 23 19:10:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Anderson X-Patchwork-Id: 1669437 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.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: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=seco.com header.i=@seco.com header.a=rsa-sha256 header.s=selector1 header.b=sFo4bvlw; 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 ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4MBzNM5D7Tz1ygP for ; Wed, 24 Aug 2022 05:11:13 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 2F5D6845E0; Tue, 23 Aug 2022 21:11:05 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=seco.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=seco.com header.i=@seco.com header.b="sFo4bvlw"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 5B5A5844E3; Tue, 23 Aug 2022 21:11:04 +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=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.2 Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-eopbgr130082.outbound.protection.outlook.com [40.107.13.82]) (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 E9FEA847F2 for ; Tue, 23 Aug 2022 21:10:59 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=seco.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sean.anderson@seco.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=V3aQUtyt/EetFj0OxxDllBD0pO7+KRzQiFEezwNjqn7nhQWmHkyqIWXOAGXrOMZvwbIaaHoM6HlBui4qXbFJgHkFmz4Q+m4E8P4y1TycQ3uhOF7xHmwbLo+JOrBwhn11BiMrrLD/UmX0scT0CWg7/WEkdoNolQW/g3eHL9hqp/PDNNvfnoL/RBfoygZ83e9zUSU/zAnfec3JGq26aLMlpMnc7XfgeoUsxTtgAOBh4aqGLIOrJUjb8n4UfAA92saNczWSKZl5caPTOAFtIKipIjSDNDlk/bdNxEQ0nxHId/iRRAdi7v1HyYCUVV8S7OA9qs2W8V9eHvHGjP2fyl1tQQ== 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=1WniQuDeUixXo8s644brZng5QSoG5NAh4Tm7SoJaV3o=; b=ShKxF/ieBD9pHu+TDrD7VXmz8iyT0sikDSZmQSVOyBlbDyfBaMhaVlaLDZ1gM+hbigVsNZvNSJngvluSDcm3zHv6p0kQjTYglzDB1WCpT42AJFVx2vF3ACXZBBwJFKKu5kAMbUdU4smBZO7oiRAcJ+rxxcKwoRNUteJzz6iUnTcLungmemMnUB41KcPlkL3eEZDeR0WzCVeHlIkl4HD85tdjnoGMQ6UqgxZT9ZbS7KE4FVdj9e9mckaeZOjCDCQ5YJlQvCuNns5jML86JKsSNXfCu0uizIkjfNJP18ABSORaoAreILWCRmBWkXl+RqiYAZzhP6azH42gQwZi6+vGsQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=seco.com; dmarc=pass action=none header.from=seco.com; dkim=pass header.d=seco.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=seco.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=1WniQuDeUixXo8s644brZng5QSoG5NAh4Tm7SoJaV3o=; b=sFo4bvlwicqaTnIRmowHxEpGL6nER7dPPp1oMyn7z3kOjJWb/PH5fj/2Etk9rQq1F4aRbgTYcT0KxEzdQLPg6Y2hcUGWQ4rEJrOH8/cSYJhf/+uhUwM86fkJtSJOvF3U+6+5YsNjoyLhg/AuYM2LetXW90Ctcat3VioTdukEPutkL9w2QTILMVa3iQZxUcc7CzT0u2eaEQYCgW5xCuJnM4y+XWtQ6UzgvLlpqKYUIHBmvOqlRhIVf8laoDWiJWlLmR6tp3nwYJVWqYl4OFHhK77KlajFIduCLl8TiYGlfgrPFYnowIeBZUuxGnqII5wyA00jnnptAIySknqz8ANtwQ== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=seco.com; Received: from DB7PR03MB4972.eurprd03.prod.outlook.com (2603:10a6:10:7d::22) by DB3PR0302MB3340.eurprd03.prod.outlook.com (2603:10a6:8:a::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5546.24; Tue, 23 Aug 2022 19:10:58 +0000 Received: from DB7PR03MB4972.eurprd03.prod.outlook.com ([fe80::ecaa:a5a9:f0d5:27a2]) by DB7PR03MB4972.eurprd03.prod.outlook.com ([fe80::ecaa:a5a9:f0d5:27a2%4]) with mapi id 15.20.5504.019; Tue, 23 Aug 2022 19:10:57 +0000 From: Sean Anderson To: Tom Rini , u-boot@lists.denx.de Cc: hs@denx.de, Sean Anderson Subject: [PATCH] post: memory: Fix format strings Date: Tue, 23 Aug 2022 15:10:39 -0400 Message-Id: <20220823191040.2983454-1-sean.anderson@seco.com> X-Mailer: git-send-email 2.35.1.1320.gc452695387.dirty X-ClientProxiedBy: MN2PR06CA0030.namprd06.prod.outlook.com (2603:10b6:208:23d::35) To DB7PR03MB4972.eurprd03.prod.outlook.com (2603:10a6:10:7d::22) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 37deb5be-61a7-46b2-4a1f-08da853b35aa X-MS-TrafficTypeDiagnostic: DB3PR0302MB3340:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: QMeVcsDnXcc0hE2pna/2nUnXCzmjWv9LcXLk2cENk8KmGxUKiE+o3PN4HuiY1OWRPTPf0ndTPZt53weno9xbdrxfraERQLFTI+zvEqGqdfEphroEW42C5fNBl9zNbFIwzHKiG9hTAOa4//MtmdYiwUKWMCJ9Fa/Lhn63jFS/Ksu4h22qU5BJCSc/z9UTJQhOOxzLnHtY/rAYnFrRphQgWAklKsaLUOOBhlJuVKT3m+02D8MhbX3EkVISo5rOLIygz8aaGfs7d2SjncKpG8Mp6ALLVRcZ6LpFc9C9r5Rv/fPCXJgfy035s9dFlue/QyxXYTXaA67JA0IWbwUgdwBD37xzfoblzJkCiRHs7MnfuJ7OOc8aok4HHn68xA+pXyBxqvBYBDEv7DP1Tvyw1gjVryOeExYcULTyiy/50wW8NarPOTIY/EiqbMVQRtogQ5ZDv1gNiY2/Yl08HRNKI6lkKvXk2wtOc/muNOfw/SnlhhnKw1jLhLYeASuRK1JrSZh2A9UV4hFbRIldwaO5UWh9244mp6Iaoh0XChmGpLArWnJMFWBL4eT810K2q0xdjgadx2OQ18XjQ3g3CQOULqu31Rws1z2aDsFyXFEBPf3xPqgMVkBk2eNNFMU7VyxWes2OeKA26ppkm50+B75T8drox7x3nrwG024SV2VXZgMdOlJQKaXdufKqo/QVf2ikGjFRkPpJ7z6e5L5elwW2i0MMr3xUgLqib6hdUqGTRiqrp7Kyx+AlH97+HRAe5UQpJ4T0KcRooEH2xOF5F6mjVhw/jQ== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DB7PR03MB4972.eurprd03.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230016)(396003)(376002)(346002)(136003)(39840400004)(366004)(44832011)(41300700001)(2616005)(1076003)(8936002)(186003)(26005)(4326008)(5660300002)(6512007)(52116002)(8676002)(6486002)(107886003)(6666004)(2906002)(66556008)(38350700002)(478600001)(66946007)(66476007)(6506007)(86362001)(38100700002)(36756003)(316002)(83380400001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ORvdY5Mo58gQxAfAsTZkxHY0PwPvV/JWVC1EUcNOCq1qIqPc5x1AEDFcfR27Rc2HyPQ9ggKer3s7h1Ob2iBVJ1x8DSd3PIU538rwj68UtOhW1VrLg7ZjLoyTNd0csbHKgkVIPwXTY6z3e+/mCQAJMq5PRaupXiFLqBxRqfM7dWA8VedjDlvYkTDlf3N1Fq35I3wTiuGlF3cZ9a6p2l+7aa6yv82iUcGcUqQx5oFQMXVkheUk6UpjdEfx7kzsScF5J++skkJH5QkI47hGUNCCskrMi7GQZX8gOLVMgO29TZ3Koaas+z2sDRiCrROs1AjNojlnkwe/0hvEdkjNUeTP5ECX08W3DWu4yLDReMlLvHnBWyuNlVR/8p+Von54wtTbj0TDjuGNIgDgrKcIrDY/PPEP+pPswUcBgbBIad9jcl5dsv3mCg1FzasVwAbnkxzl0jQY6NAqiYPXbOVNs66SaxanqMCrGoQ0LkRb3nOi/hqrg+hEZQCAYrE7ElHTn+RynBWS585LDxlTShzLWjsmybz+4+fHd/CDoJMaTf6J10t1oydAVq5SFbx/dqEmz+tO+mDttACWnIKw5/zugF28U1HgaHgnQE1w2V34WAychSFuTeXJyoVvAc3oOr9cXqj7xHWXCy78eeSSy3fY940OL1DsKb+h050vF7kh4Op9TxKFi1IK8EiwWXJI2Q2QQYsWz2oHLebbwsqR7caVe3Lu/G6hj/uEzCTeauyzudaP8xPQ4gSt8wooXQeeJTAyRhAIrQ7PGCq8U3zM8DKxes/YoP/5fQC37tOdwnETTemS0tk7P3CSnYw/uVoRVV5GaX1nrRId2a81J5jgvA6S+PAcJCQd40aJ6mCrGSrtw5UyXQAifMboQFv+bUJiXeQw5mse4gCdMGNkTAJrPYBeh5Hy1Kiux9Hv6AO51Of6Qwxc4xoWkvm2jd6eybQKBrr6C0SGfVaH/jxlxU64A5y3bu4ePDxKIOmiCbCx8jNonV3ZeLdFom1EFanrV25BzblE5jEMkJ0dTxjUaMAacxbpBQ1n8MTlyAzFunSH6ik6en9kk9ETZuALPh5hwD8jl80w8mmfW11+wUpmdtOjcdeur7IkJaHLx7OxKrs+dinejnR6CmVU6d0RjIMyFCoEa7bDJH3vOF7qssRvjc1rc/Pyd01Ako/T8A5Sp4E2ZwX48wZKq2xxP8y90InhcA0EDX743Ux60wD0owkM0gOxE2JC7oHC6HSeBvpif320JFnx/AyVcIuF8e96NC/DnZmMjSWAiEPXe+giorFgxQINO3NG6YUyOeHDQV2yamcFFEYfcdg+MbcUodtm5QPkQUX0k6H+RVqS9vfDAhK98UT4h9/TeX0HUGK3+1KZ+beTmtBxvuExNzx1JDJYCL0Zv1SZgZHmXHUm2mzRlkLmpELP7l8ArLgJuGdKcUloV1ASZpOFiiaJlgpoCNbGf5hzfXtce0WWHXHW0ShHIfGQ58YLRuPrs9abwz9MCqis+YWySeM4KiHCtaskfcDVyaBGhylVt19l3R7CywFL3UH4ntM4sCw5Cxh8qt//LoD8ADMdgxNKq+TbzseKbP86Nq3L7USghKg4ApNgZEOgvco41gmv+FbWIE5ggA== X-OriginatorOrg: seco.com X-MS-Exchange-CrossTenant-Network-Message-Id: 37deb5be-61a7-46b2-4a1f-08da853b35aa X-MS-Exchange-CrossTenant-AuthSource: DB7PR03MB4972.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Aug 2022 19:10:57.8451 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: bebe97c3-6438-442e-ade3-ff17aa50e733 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: bZPuP9gusOkBDpDrTczZcXBHPqsS5PgNAPIw1xygWW4mPeorJqcu0n9TB9LBKcpXAIcCDgv4p+TuUvYrh6O3qw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB3PR0302MB3340 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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.6 at phobos.denx.de X-Virus-Status: Clean This fixes numerous cases of format strings not matching their arguments. Also keep the format strings on one line for easier grepping. Signed-off-by: Sean Anderson Reviewed-by: Simon Glass --- post/drivers/memory.c | 30 ++++++++++++------------------ 1 file changed, 12 insertions(+), 18 deletions(-) diff --git a/post/drivers/memory.c b/post/drivers/memory.c index 281989da6fa..4fb9355d603 100644 --- a/post/drivers/memory.c +++ b/post/drivers/memory.c @@ -228,9 +228,8 @@ static int memory_post_dataline(unsigned long long * pmem) hi = (temp64>>32) & 0xffffffff; lo = temp64 & 0xffffffff; - post_log("Memory (data line) error at %08x, " - "wrote %08x%08x, read %08x%08x !\n", - pmem, pathi, patlo, hi, lo); + post_log("Memory (data line) error at %p, wrote %08x%08x, read %08x%08x !\n", + pmem, pathi, patlo, hi, lo); ret = -1; } } @@ -259,9 +258,8 @@ static int memory_post_addrline(ulong *testaddr, ulong *base, ulong size) } #endif if(readback == *testaddr) { - post_log("Memory (address line) error at %08x<->%08x, " - "XOR value %08x !\n", - testaddr, target, xor); + post_log("Memory (address line) error at %p<->%p, XOR value %08lx !\n", + testaddr, target, xor); ret = -1; } } @@ -287,9 +285,8 @@ static int memory_post_test1(unsigned long start, for (i = 0; i < size / sizeof (ulong) && !ret; i++) { readback = mem[i]; if (readback != val) { - post_log("Memory error at %08x, " - "wrote %08x, read %08x !\n", - mem + i, val, readback); + post_log("Memory error at %p, wrote %08lx, read %08lx !\n", + mem + i, val, readback); ret = -1; break; @@ -317,9 +314,8 @@ static int memory_post_test2(unsigned long start, unsigned long size) for (i = 0; i < size / sizeof (ulong) && !ret; i++) { readback = mem[i]; if (readback != (1 << (i % 32))) { - post_log("Memory error at %08x, " - "wrote %08x, read %08x !\n", - mem + i, 1 << (i % 32), readback); + post_log("Memory error at %p, wrote %08lx, read %08lx !\n", + mem + i, 1UL << (i % 32), readback); ret = -1; break; @@ -347,9 +343,8 @@ static int memory_post_test3(unsigned long start, unsigned long size) for (i = 0; i < size / sizeof (ulong) && !ret; i++) { readback = mem[i]; if (readback != i) { - post_log("Memory error at %08x, " - "wrote %08x, read %08x !\n", - mem + i, i, readback); + post_log("Memory error at %p, wrote %08lx, read %08lx !\n", + mem + i, i, readback); ret = -1; break; @@ -377,9 +372,8 @@ static int memory_post_test4(unsigned long start, unsigned long size) for (i = 0; i < size / sizeof (ulong) && !ret; i++) { readback = mem[i]; if (readback != ~i) { - post_log("Memory error at %08x, " - "wrote %08x, read %08x !\n", - mem + i, ~i, readback); + post_log("Memory error at %p, wrote %08lx, read %08lx !\n", + mem + i, ~i, readback); ret = -1; break;