From mboxrd@z Thu Jan 1 00:00:00 1970 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2B6E8C433EF for ; Mon, 10 Jan 2022 09:57:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243522AbiAJJ4u (ORCPT ); Mon, 10 Jan 2022 04:56:50 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:58446 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243454AbiAJJ4d (ORCPT ); Mon, 10 Jan 2022 04:56:33 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1641808592; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=wJr2+TRe6SBb1BM5UDY1ejbky83MU/0sD3dvYedx6MA=; b=J4ZOZtmCIds8/MwCUrWz/SS2nQNAVJ5EeyzV5uefZMGGOa6nEnmxSdx/2ed2b+3Ve2ZoFI qbSn1IrqtEtqURijjBDdZSpf4hOw5wjit6pAN0ZxpNkdz/3/a67bx99MnduDj5rSdk2nrC rU1EALk8oYxYKasYPAbPU15Q8OPsyac= Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-532-rezVg43GNGGyvTyUrMvwJw-1; Mon, 10 Jan 2022 04:56:31 -0500 X-MC-Unique: rezVg43GNGGyvTyUrMvwJw-1 Received: by mail-wr1-f69.google.com with SMTP id v18-20020a5d5912000000b001815910d2c0so4003856wrd.1 for ; Mon, 10 Jan 2022 01:56:31 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=wJr2+TRe6SBb1BM5UDY1ejbky83MU/0sD3dvYedx6MA=; b=weqh8O9QE2/GyhGw6tpyn39YsTiTxRXdDjEKXfMg4NLCNfqK+duvCQV0AZyUbjG8Nl ZlravLa4N9kiDUZ5CIMC4rYSWYkIiuJj4iLYVYEsnf0uUn9FVuifQwpH4YwvaTFW7ZCt sbjznJOBa2mChinQWnvfke402vl1afXGxeQbeLR9zCxd6KQyZLBDsgXUjSpRNeVwZPE5 8LbcrIhayB556K3IJk/ymCCuO5weGRAT72SJ/+BpugxhvkZRqM3pEmIYNAac7PtyFW8y 2dhUrTJiUnGV/UIqiIU9TJ/+2xTFAJIOrQaFWnZdoi/zabJeriL9DVwUZhlXrbfmctyR IrjA== X-Gm-Message-State: AOAM531GZSW1m6wbw+/FFQ1bvGrtmJX72MVErFRYY1p5sbkprMN7W+M8 yYZAawmQPlj8CoXGsWqEqKCYBdeArvuLIk1Il1xpF56exV1R3hyxQx6FE1yuX2iMg2idSOH/QFt scuPOluVNavQweQiMuLJFua0GohR79U2R6pnwfZBJjJI+i+3ZPwjU8QEylC7mO4zZ5epz9iitUn s= X-Received: by 2002:a05:6000:11c9:: with SMTP id i9mr6134117wrx.544.1641808590225; Mon, 10 Jan 2022 01:56:30 -0800 (PST) X-Google-Smtp-Source: ABdhPJzvF1fUNv4N+g4L82v97FbltLNWdtemC8wnOpy3eswOBvCDx6S9Wvq2C8LmHTKllcM2hylVhA== X-Received: by 2002:a05:6000:11c9:: with SMTP id i9mr6134090wrx.544.1641808589966; Mon, 10 Jan 2022 01:56:29 -0800 (PST) Received: from minerva.home ([92.176.231.205]) by smtp.gmail.com with ESMTPSA id b13sm6315167wrf.64.2022.01.10.01.56.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Jan 2022 01:56:29 -0800 (PST) From: Javier Martinez Canillas To: linux-kernel@vger.kernel.org Cc: Kris Karas , Peter Robinson , Geert Uytterhoeven , Javier Martinez Canillas , stable@vger.kernel.org, Borislav Petkov , Daniel Vetter , Greg Kroah-Hartman , Thomas Zimmermann , dri-devel@lists.freedesktop.org, linux-fbdev@vger.kernel.org Subject: [PATCH v2 2/2] video: vga16fb: Only probe for EGA and VGA 16 color graphic cards Date: Mon, 10 Jan 2022 10:56:25 +0100 Message-Id: <20220110095625.278836-3-javierm@redhat.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20220110095625.278836-1-javierm@redhat.com> References: <20220110095625.278836-1-javierm@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The vga16fb framebuffer driver only supports Enhanced Graphics Adapter (EGA) and Video Graphics Array (VGA) 16 color graphic cards. But it doesn't check if the adapter is one of those or if a VGA16 mode is used. This means that the driver will be probed even if a VESA BIOS Extensions (VBE) or Graphics Output Protocol (GOP) interface is used. This issue has been present for a long time but it was only exposed by commit d391c5827107 ("drivers/firmware: move x86 Generic System Framebuffers support") since the platform device registration to match the {vesa,efi}fb drivers is done later as a consequence of that change. All non-x86 architectures though treat orig_video_isVGA as a boolean so only do the supported video mode check for x86 and not for other arches. Link: https://bugzilla.kernel.org/show_bug.cgi?id=215001 Fixes: d391c5827107 ("drivers/firmware: move x86 Generic System Framebuffers support") Reported-by: Kris Karas Cc: # 5.15.x Signed-off-by: Javier Martinez Canillas Tested-by: Kris Karas --- Changes in v2: - Only check the suppported video mode for x86 (Geert Uytterhoeven). drivers/video/fbdev/vga16fb.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/drivers/video/fbdev/vga16fb.c b/drivers/video/fbdev/vga16fb.c index 8c464409eb99..d21f68f3ee44 100644 --- a/drivers/video/fbdev/vga16fb.c +++ b/drivers/video/fbdev/vga16fb.c @@ -184,6 +184,25 @@ static inline void setindex(int index) vga_io_w(VGA_GFX_I, index); } +/* Check if the video mode is supported by the driver */ +static inline int check_mode_supported(void) +{ + /* non-x86 architectures treat orig_video_isVGA as a boolean flag */ +#if defined(CONFIG_X86) + /* only EGA and VGA in 16 color graphic mode are supported */ + if (screen_info.orig_video_isVGA != VIDEO_TYPE_EGAC && + screen_info.orig_video_isVGA != VIDEO_TYPE_VGAC) + return -ENODEV; + + if (screen_info.orig_video_mode != 0x0D && /* 320x200/4 (EGA) */ + screen_info.orig_video_mode != 0x0E && /* 640x200/4 (EGA) */ + screen_info.orig_video_mode != 0x10 && /* 640x350/4 (EGA) */ + screen_info.orig_video_mode != 0x12) /* 640x480/4 (VGA) */ + return -ENODEV; +#endif + return 0; +} + static void vga16fb_pan_var(struct fb_info *info, struct fb_var_screeninfo *var) { @@ -1427,6 +1446,11 @@ static int __init vga16fb_init(void) vga16fb_setup(option); #endif + + ret = check_mode_supported(); + if (ret) + return ret; + ret = platform_driver_register(&vga16fb_driver); if (!ret) { -- 2.33.1