From nobody Fri Nov 22 04:24:00 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=reject dis=none) header.from=citrix.com ARC-Seal: i=1; a=rsa-sha256; t=1727967522; cv=none; d=zohomail.com; s=zohoarc; b=VsR0A1FmQv5qll5kg2uAH/ohP9rzsVxf0Yl6Vu4JV+KYEYWoVH/js7CzI+0of/baGUK0YSdk1TYUxA6pd7l0o8NGsayjIzjXkAfsUlX8fP9JnR6tEfefDm6QIXDAjUloP/++PtSWmuE6lsS6X1Q9pxKlOvOPpeumYWPtBgTzZJk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1727967522; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=JGsl96EbJi//MexkeYAYAOH4FIDs3vyRmf07tQpcP8o=; b=KlYYOnunMxjHJJTeMcKZYnqAxcTaSgCNLyWa7PysyIrn6JJ0kk7CnS2b2a4CINHM3xfEyFcrVEGmmbAyfClVXD4TsLvdpJeTHCOktKU8dqeSjX6jVyARu8uKftcGjqi4sN2cThfsYZmQNxQV6CR+3FKa9S/SsqtwDiaDBbuxcvQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1727967522594256.06218975978254; Thu, 3 Oct 2024 07:58:42 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.809559.1221947 (Exim 4.92) (envelope-from ) id 1swNHW-0000Or-9W; Thu, 03 Oct 2024 14:58:18 +0000 Received: by outflank-mailman (output) from mailman id 809559.1221947; Thu, 03 Oct 2024 14:58:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1swNHW-0000Ok-6s; Thu, 03 Oct 2024 14:58:18 +0000 Received: by outflank-mailman (input) for mailman id 809559; Thu, 03 Oct 2024 14:58:16 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1swNHU-0000Ob-FA for xen-devel@lists.xenproject.org; Thu, 03 Oct 2024 14:58:16 +0000 Received: from mail-ed1-x52d.google.com (mail-ed1-x52d.google.com [2a00:1450:4864:20::52d]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id ea58d975-8197-11ef-a0ba-8be0dac302b0; Thu, 03 Oct 2024 16:58:14 +0200 (CEST) Received: by mail-ed1-x52d.google.com with SMTP id 4fb4d7f45d1cf-5c8844f0ccaso1383144a12.0 for ; Thu, 03 Oct 2024 07:58:14 -0700 (PDT) Received: from andrewcoop.eng.citrite.net ([185.25.67.249]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a99102859casm94462866b.47.2024.10.03.07.58.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Oct 2024 07:58:12 -0700 (PDT) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: ea58d975-8197-11ef-a0ba-8be0dac302b0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1727967493; x=1728572293; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=JGsl96EbJi//MexkeYAYAOH4FIDs3vyRmf07tQpcP8o=; b=QgqalzLmx+kSEMaq4JaJz5zA39TqecoTtI1XvCNABQoY+vUqBe0XZ430qjF0h0Mpb2 lYPGvfWVJq4MeGWCYA9JOfW85T5SlW+VhjInAuQ6e1/f0KO74QURbmyAbzV38rYOFsOj poRF1yEtAU2NlMO8p4uC/ZWKVflOMtIIr9pAs= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1727967493; x=1728572293; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=JGsl96EbJi//MexkeYAYAOH4FIDs3vyRmf07tQpcP8o=; b=mReVhFkvWbvo6EUHY3UAofF44/80OOnmemp9Bz/1xHKRdjWoqd9z9179MEXPUoiZYG SSxHBiPVRRnjDSr/Ivcy81AVQIpjpzIRofm+AndGj0Oez7a6sfVgeauTnnfNiPjxNcoO +5sidh/stZFzFEYzTw6ezzdVHjdqjFv9w3HQSe88+5VzEMJW+kXA884ygEhasv31+/6n G2b4PUVU8RqpCE6JCU+uvgvKDD02+yMSV7tPnfE218dHqesqGfDoHZSh7gQyw3gAYJcD Dc9fW7cLJk9EoK2eh6iPBthQ9iwA1tJdJKl6Cx9rZLdQDL71z7I3MgnHiN3X+V70EfTV O5Hw== X-Gm-Message-State: AOJu0YwyjyaZgSXNtZEVmWF3fxwOi2qo3QAv2mr9yi5qRwKMzlkD+kUl CinnhkeWCTw1yRsu4GyEdvYT6TaZuyQfxtu0JbJXXncyDiEn8vfRuVGdvn+H2VgMZl0hGuR5JS+ XsJ4= X-Google-Smtp-Source: AGHT+IGUL/HZNccId+soyn3Qd3Ghz0NZo0SrhW0cj1SSeugN+ZN9/nQqP5oFTEuPOYgQ5optixsdCQ== X-Received: by 2002:a17:907:8015:b0:a99:9e9:a401 with SMTP id a640c23a62f3a-a9909e9a892mr265023766b.19.1727967493407; Thu, 03 Oct 2024 07:58:13 -0700 (PDT) From: Andrew Cooper To: Xen-devel Cc: Andrew Cooper , Jan Beulich , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= , =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= , "Daniel P . Smith" , Frediano Ziglio Subject: [PATCH] x86/boot: Don't use INC to set defaults Date: Thu, 3 Oct 2024 15:58:10 +0100 Message-Id: <20241003145810.2217075-1-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.39.5 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @citrix.com) X-ZM-MESSAGEID: 1727967524826116600 __efi64_mb2_start() makes some bold assumptions about the efi_platform and skip_realmode booleans. Set them to 1 explicitly, which is more robust. Make the comment a little more consice. No practical change. Signed-off-by: Andrew Cooper Acked-by: Roger Pau Monn=C3=A9 Reviewed-by: Frediano Ziglio --- CC: Jan Beulich CC: Roger Pau Monn=C3=A9 CC: Marek Marczykowski-G=C3=B3recki CC: Daniel P. Smith CC: Frediano Ziglio --- xen/arch/x86/boot/head.S | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/xen/arch/x86/boot/head.S b/xen/arch/x86/boot/head.S index d1856d8012c9..af776c201a15 100644 --- a/xen/arch/x86/boot/head.S +++ b/xen/arch/x86/boot/head.S @@ -279,14 +279,12 @@ __efi64_mb2_start: pop %rbx pop %rax =20 - /* We are on EFI platform and EFI boot services are available. */ - incb efi_platform(%rip) - /* - * Disable real mode and other legacy stuff which should not - * be run on EFI platforms. + * efi_multiboot2_prelude() is happy that we're on EFI platform. = Skip + * the BIOS initialisation path. */ - incb skip_realmode(%rip) + movb $1, efi_platform(%rip) + movb $1, skip_realmode(%rip) =20 /* Jump to trampoline_setup after switching CPU to x86_32 mode. */ lea trampoline_setup(%rip),%r15 base-commit: eb21ce14d709ef0c0030d0625028a4868c81126f --=20 2.39.5