From patchwork Wed Jan 16 20:22:32 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 155755 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp1096933jaa; Wed, 16 Jan 2019 12:23:10 -0800 (PST) X-Google-Smtp-Source: ALg8bN4SMkZc8trolT4MfVZ3LZ5SdO1dncqq44PMRw9XYbqHTXYGaD1bHEDCDYD9umW9mIQ3Qe9p X-Received: by 2002:a17:902:4523:: with SMTP id m32mr11673093pld.53.1547670190525; Wed, 16 Jan 2019 12:23:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1547670190; cv=none; d=google.com; s=arc-20160816; b=z0ncyb8N4bYcDtNdM7FYAJ7MhhZBkt8+gWJtglGx2g9y74hKaZHfik3fhckIdP3vKQ 2+Ccc+VeXM4kmEymQwfSGWLIa1Z/r12RStlJg2HCwC7wVnreHAazn5vJo1PFT87FdXkJ zkK1OzGsOSBGlKlYU8J4eiRDNONN9r0D4gfRQdY5zMuKXi+pAjtsuNHBwAJ1jl0A9gWg ZlUM+pb6Xs9rB5/8C7+STG7pd0XMM7TTWWBLqtBW1DNyPfcmABmXugZBOarcKJ4fEH+B XVL2EVA0JtwF6+C8G0MGmlvHLzkwLTzhUaW7o/boBMCNnv96+R3Fn7skKjl6LcOpB0ki 7Osw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to; bh=Uh5pexYuDFa4hZC/IlYCsFa/9tRiA5q9PcI2BEHU9J0=; b=ZYgymhsgp3mbP+aSD5BxdIH1FvVUOdgdrY4pn9kkZpvPqwH3vfbyaivm+tmDofqxPz /LsPhAbm9TaqjECXSMRD3FA68jrJY6pWriZyOMyvB9dCOyYP5bmw7LGz5ZSJI2uDS2ZX 4dUnVepbbIqF38CdByH15KxFHMNSk6pviykdEDRm31gC2VBYrDbnuJL0BYG3+JKPXLxh 7/fBQasL2jn+Hk2fWU+lXBXJnj4YlZB73O9xZXWheg1Rru8m/ZTavyYhmtjKnaMsxKzC tK22DBgVnzQb8fkxXuZ0sOyHlwn3sFTxWsTn1p6TTQpx3HRlJaMRNmb0NLksKzR+W76z 9CZA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b="Tbn/qES3"; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from ml01.01.org (ml01.01.org. [198.145.21.10]) by mx.google.com with ESMTPS id h5si7059313pgg.230.2019.01.16.12.23.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 16 Jan 2019 12:23:10 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) client-ip=198.145.21.10; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b="Tbn/qES3"; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id B62FC211B81AB; Wed, 16 Jan 2019 12:22:55 -0800 (PST) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2a00:1450:4864:20::341; helo=mail-wm1-x341.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-wm1-x341.google.com (mail-wm1-x341.google.com [IPv6:2a00:1450:4864:20::341]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 9BF97211B81AB for ; Wed, 16 Jan 2019 12:22:54 -0800 (PST) Received: by mail-wm1-x341.google.com with SMTP id f188so3417023wmf.5 for ; Wed, 16 Jan 2019 12:22:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=xYvAK108fpARZFq4UbDWU58ZBt2yeCKfLKt/exnNwwE=; b=Tbn/qES3FhGaDAs1jdY8I5RXBaU+dGZQYWK5QI9XelAtKBIRI4fXmTn7fkCERupGfn OzGKENugmDFczl+bid0a+cdA5Jc68DN2u6p5A0oLbOY4w8kcmu28Hyf9QkQSxv5Ix149 GjSywLzDwUyCAxDAg3KDkNdYvRNZO0dd3Vfwo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=xYvAK108fpARZFq4UbDWU58ZBt2yeCKfLKt/exnNwwE=; b=D9CF0SUZl+dPi8GZBcBoNjh//KfK+pLfO9aYo+O7knzZWfZUw/zq46smY6swIRCRtv U6AGUW4uzS9yU7Tt/mn/Am4qyc8O8Li/dhU4XC6KyuOYR5KToeorxkGEhjX00duloOk6 xb9WedzXh8pmb1FZHBuAs4qmwPrvJK/ETY8ibRPIr72IDrHGsAsdQz2UC1pG87aOy2V8 Ey2jfnJsb86VJPjSycyWU1eMVfQDd0mf0HtGvu7D0NW3Qc3NBS6Q4tURLn3zztdUE3Wj eXRq0pUzD16krmIdpezpvqgAADBbUjPsM3XjkvGZxWZ36SwiAHD7rDwu5mppmtb6AJ10 XVnw== X-Gm-Message-State: AJcUukfJtx0mPWUDXcYeKwNjxT0apvga/V3Tk2v3zSXPlPid+ZiTSN6Y VfuMrNANwZ9Qx0VwX5uOTz1XZipNvvNNkw== X-Received: by 2002:a1c:dc86:: with SMTP id t128mr9438957wmg.42.1547670172867; Wed, 16 Jan 2019 12:22:52 -0800 (PST) Received: from dogfood.home ([2a01:cb1d:112:6f00:28df:207d:542c:1451]) by smtp.gmail.com with ESMTPSA id p139sm70901316wmd.31.2019.01.16.12.22.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 16 Jan 2019 12:22:51 -0800 (PST) From: Ard Biesheuvel To: edk2-devel@lists.01.org Date: Wed, 16 Jan 2019 21:22:32 +0100 Message-Id: <20190116202236.6977-8-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190116202236.6977-1-ard.biesheuvel@linaro.org> References: <20190116202236.6977-1-ard.biesheuvel@linaro.org> Subject: [edk2] [PATCH v2 07/11] StandaloneMmPkg/StandaloneMmCoreEntryPoint: remove bogus ASSERT_EFI_ERROR()s X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jiewen Yao MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" ASSERT_EFI_ERROR (x) is a shorthand for ASSERT(!EFI_ERROR(x)), and so it should only be used with EFI_STATUS type expressions. So drop two instances that operate on other types, since neither looks particularly useful. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ard Biesheuvel Reviewed-by: Supreeth Venkatesh --- StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/AArch64/StandaloneMmCoreEntryPoint.c | 2 -- 1 file changed, 2 deletions(-) -- 2.17.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel diff --git a/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/AArch64/StandaloneMmCoreEntryPoint.c b/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/AArch64/StandaloneMmCoreEntryPoint.c index 05ed6c8dd0b5..5cca532456fd 100644 --- a/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/AArch64/StandaloneMmCoreEntryPoint.c +++ b/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/AArch64/StandaloneMmCoreEntryPoint.c @@ -295,7 +295,6 @@ _ModuleEntryPoint ( // ProcessModuleEntryPointList (HobStart); - ASSERT_EFI_ERROR (CpuDriverEntryPoint); DEBUG ((DEBUG_INFO, "Shared Cpu Driver EP 0x%lx\n", (UINT64) CpuDriverEntryPoint)); finish: @@ -303,5 +302,4 @@ finish: InitMmFoundationSvcArgs.Arg0 = ARM_SVC_ID_SP_EVENT_COMPLETE_AARCH64; InitMmFoundationSvcArgs.Arg1 = Status; DelegatedEventLoop (&InitMmFoundationSvcArgs); - ASSERT_EFI_ERROR (0); }