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 B3856EB64DC for ; Sun, 2 Jul 2023 01:04:10 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 6B5798615A; Sun, 2 Jul 2023 03:04:08 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=denx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1688259848; bh=kZvjHMNsdfhQqGA6b/Atq62w/cdUxyLfnvwhrldEBZA=; h=From:To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From; b=sweRqd6BGWSFBJ6Cd0UFejBEhIeRI/DUpXlVwuEEHPxBeQEhxUcBny33aS7x1JknY wWJjTRiSnCpq/3NoHdMkVu2sPBFb2FggqaSjN2et94gXN82KYiBqVqIA5e4VFW7e4p ErXoMLmln8M1ndejd7+Qz3IvWLH/Xtrowz82ymuudDgfMG91JqZZkq5kWGowjm/7dB e6q4tBhBST5tKHmpRu73yt2b7ZSjzu44DlGzy01fWW9ievRhy9/m91hnwW6xfFHpc7 yj/8r2S5yiDEv0g1XwIw0Q7odtlnNAc2rGTP7vmUrYBHWrWvfk/xoEpZnI2uUKfbOS 05WTiYL1o5Sjg== Received: from tr.lan (ip-86-49-120-218.bb.vodafone.cz [86.49.120.218]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: marex@denx.de) by phobos.denx.de (Postfix) with ESMTPSA id 1D0DD86114; Sun, 2 Jul 2023 03:04:06 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1688259846; bh=kZvjHMNsdfhQqGA6b/Atq62w/cdUxyLfnvwhrldEBZA=; h=From:To:Cc:Subject:Date:From; b=pU4rw4eH4cbL2Xg9nJ5g1Jzl/nPTK1KqTfZZQfNg1AG2reUmoH2oAofsTo68fxzg6 /tn/X+V1fKBMpbbeGIy4TNymNyAqwxzW9L/ohoW/jjhEY5VL1Wy0PQXUAgHkuFvN6P ir+FLrH2Ou2HGREGUjFdv7QSajaTJgnIFv3TD5jl7HK9vQwfTZUKp+ZMm/uaQ2pmAo Iw6bMdlatOsJYUXf9zBLukzpv+M//IRevA3oO2mrpq0b+etT/sxC3m5t9oRairkilE 1tbbQGk1lwaebBVUaOnZjRNfCCgc0TC8FGr3A6my/QTtYWr6HSjWN+pfuXyshQ2ZGb A8IKQGl0bBUvw== From: Marek Vasut To: u-boot@lists.denx.de Cc: trini@konsulko.com, Marek Vasut , Peng Fan , "NXP i.MX U-Boot Team" , Fabio Estevam , Heiko Schocher , Heinrich Schuchardt , Rasmus Villemoes , Simon Glass , Stefano Babic , Ye Li Subject: [PATCH v2] ARM: imx: romapi: Fix signed integer bitwise ops misuse Date: Sun, 2 Jul 2023 03:03:51 +0200 Message-Id: <20230702010351.451794-1-marex@denx.de> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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.8 at phobos.denx.de X-Virus-Status: Clean Bitwise operations on signed integers are not defined, replace them with per-call checks. Reviewed-by: Peng Fan Signed-off-by: Marek Vasut --- Cc: "NXP i.MX U-Boot Team" Cc: Fabio Estevam Cc: Heiko Schocher Cc: Heinrich Schuchardt Cc: Rasmus Villemoes Cc: Simon Glass Cc: Stefano Babic Cc: Tom Rini Cc: Ye Li --- V2: - s@then@them@ - Add RB from Peng --- arch/arm/mach-imx/spl_imx_romapi.c | 32 ++++++++++++++++++++---------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/arch/arm/mach-imx/spl_imx_romapi.c b/arch/arm/mach-imx/spl_imx_romapi.c index 9164045115f..4af41699678 100644 --- a/arch/arm/mach-imx/spl_imx_romapi.c +++ b/arch/arm/mach-imx/spl_imx_romapi.c @@ -76,13 +76,16 @@ static int spl_romapi_load_image_seekable(struct spl_image_info *spl_image, u32 image_offset; ret = rom_api_query_boot_infor(QUERY_IVT_OFF, &offset); - ret |= rom_api_query_boot_infor(QUERY_PAGE_SZ, &pagesize); - ret |= rom_api_query_boot_infor(QUERY_IMG_OFF, &image_offset); + if (ret != ROM_API_OKAY) + goto err; - if (ret != ROM_API_OKAY) { - puts("ROMAPI: Failure query boot infor pagesize/offset\n"); - return -1; - } + ret = rom_api_query_boot_infor(QUERY_PAGE_SZ, &pagesize); + if (ret != ROM_API_OKAY) + goto err; + + ret = rom_api_query_boot_infor(QUERY_IMG_OFF, &image_offset); + if (ret != ROM_API_OKAY) + goto err; header = (struct legacy_img_hdr *)(CONFIG_SPL_IMX_ROMAPI_LOADADDR); @@ -124,6 +127,10 @@ static int spl_romapi_load_image_seekable(struct spl_image_info *spl_image, } return 0; + +err: + puts("ROMAPI: Failure query boot infor pagesize/offset\n"); + return -1; } static ulong spl_ram_load_read(struct spl_load_info *load, ulong sector, @@ -344,12 +351,12 @@ int board_return_to_bootrom(struct spl_image_info *spl_image, u32 boot, bstage; ret = rom_api_query_boot_infor(QUERY_BT_DEV, &boot); - ret |= rom_api_query_boot_infor(QUERY_BT_STAGE, &bstage); + if (ret != ROM_API_OKAY) + goto err; - if (ret != ROM_API_OKAY) { - puts("ROMAPI: failure at query_boot_info\n"); - return -1; - } + ret = rom_api_query_boot_infor(QUERY_BT_STAGE, &bstage); + if (ret != ROM_API_OKAY) + goto err; printf("Boot Stage: "); @@ -374,4 +381,7 @@ int board_return_to_bootrom(struct spl_image_info *spl_image, return spl_romapi_load_image_stream(spl_image, bootdev); return spl_romapi_load_image_seekable(spl_image, bootdev, boot); +err: + puts("ROMAPI: failure at query_boot_info\n"); + return -1; } -- 2.40.1