From nobody Tue May 7 22:09:52 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; 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 ARC-Seal: i=1; a=rsa-sha256; t=1594391121; cv=none; d=zohomail.com; s=zohoarc; b=CQNWpwsYIt8LN6/5yY/mUZNZVGeRHIIj1u0nL4T/uBbnIXHd6T2x3YTzR+D71Jevi9IKege1Y+Yt3+dVL4KkgQkvyK6gn6lmZtmfcBMqtzVdSy8Dyf+Xst/l/XfHh1l6xc4yZCi+YD9XRqNdHOjz1HgeOJ9xP17tEMkFKn5GZLE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594391121; h=Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=jUzkedHsg6D6gv3hDJRl3NK0NZ+430eO5ciOTcU3wgU=; b=Ryo3Frpz9PCpHjAFrjtWom08aQqiAtU7qdjZsIxnpGPoEYHYb7YrTZG7hGEn1xKawtXSe5ksuIYNfweUt4f6RW6K0PKrTkR80VYE78zxMtszmI6w3w2TZEbIkLpGJk6LI4peIz7lcizAttEuWDMoO4n9yq8yB75K5kPCYTQiZB0= ARC-Authentication-Results: i=1; mx.zohomail.com; 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 Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1594391121333946.51888652327; Fri, 10 Jul 2020 07:25:21 -0700 (PDT) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jttxD-0005TA-Iy; Fri, 10 Jul 2020 14:24:43 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jttxB-0005T5-Np for xen-devel@lists.xenproject.org; Fri, 10 Jul 2020 14:24:41 +0000 Received: from mx2.suse.de (unknown [195.135.220.15]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 16a8d742-c2b9-11ea-bca7-bc764e2007e4; Fri, 10 Jul 2020 14:24:39 +0000 (UTC) Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id 34ECEAC9F; Fri, 10 Jul 2020 14:24:39 +0000 (UTC) X-Inumbo-ID: 16a8d742-c2b9-11ea-bca7-bc764e2007e4 X-Virus-Scanned: by amavisd-new at test-mx.suse.de From: Juergen Gross To: xen-devel@lists.xenproject.org, linux-fbdev@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, linux-efi@vger.kernel.org Subject: [PATCH v2] efi: avoid error message when booting under Xen Date: Fri, 10 Jul 2020 16:22:53 +0200 Message-Id: <20200710142253.28070-1-jgross@suse.com> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Juergen Gross , Peter Jones , Ard Biesheuvel , Bartlomiej Zolnierkiewicz Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" Content-Type: text/plain; charset="utf-8" efifb_probe() will issue an error message in case the kernel is booted as Xen dom0 from UEFI as EFI_MEMMAP won't be set in this case. Avoid that message by calling efi_mem_desc_lookup() only if EFI_MEMMAP is set. Fixes: 38ac0287b7f4 ("fbdev/efifb: Honour UEFI memory map attributes when m= apping the FB") Signed-off-by: Juergen Gross Acked-by: Ard Biesheuvel Acked-by: Bartlomiej Zolnierkiewicz --- drivers/video/fbdev/efifb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/video/fbdev/efifb.c b/drivers/video/fbdev/efifb.c index 65491ae74808..e57c00824965 100644 --- a/drivers/video/fbdev/efifb.c +++ b/drivers/video/fbdev/efifb.c @@ -453,7 +453,7 @@ static int efifb_probe(struct platform_device *dev) info->apertures->ranges[0].base =3D efifb_fix.smem_start; info->apertures->ranges[0].size =3D size_remap; =20 - if (efi_enabled(EFI_BOOT) && + if (efi_enabled(EFI_MEMMAP) && !efi_mem_desc_lookup(efifb_fix.smem_start, &md)) { if ((efifb_fix.smem_start + efifb_fix.smem_len) > (md.phys_addr + (md.num_pages << EFI_PAGE_SHIFT))) { --=20 2.26.2