From patchwork Mon Apr 25 20:06:55 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matt Fleming X-Patchwork-Id: 66613 Delivered-To: patch@linaro.org Received: by 10.140.93.198 with SMTP id d64csp1233288qge; Mon, 25 Apr 2016 13:08:33 -0700 (PDT) X-Received: by 10.66.194.230 with SMTP id hz6mr51745775pac.132.1461614913294; Mon, 25 Apr 2016 13:08:33 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 72si3194971pfs.107.2016.04.25.13.08.33; Mon, 25 Apr 2016 13:08:33 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@codeblueprint-co-uk.20150623.gappssmtp.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S964801AbcDYUIM (ORCPT + 29 others); Mon, 25 Apr 2016 16:08:12 -0400 Received: from mail-wm0-f46.google.com ([74.125.82.46]:35502 "EHLO mail-wm0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933503AbcDYUID (ORCPT ); Mon, 25 Apr 2016 16:08:03 -0400 Received: by mail-wm0-f46.google.com with SMTP id e201so98088956wme.0 for ; Mon, 25 Apr 2016 13:08:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=codeblueprint-co-uk.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=RViGp4x20FlZRxgrHvlUikcA2bwQCRq/XvAsU4TLo0Q=; b=g0NZnRV5WDisn1GVVP7kczP6ZpKg90DBmg0QeZDSQI/4XT1twZCXZSF5KSJI+ru0Qo nFi1LvOrb8Ij/OVkamPUt0t34e6Q5jhsGRMcOqXbOmyYhhKjQA7wDbNuiFcdw7+SyBu0 qUQffDXmGCLvyvtFXgFgSzhPD4uhODW1ajMC2j5PYycTvZA07ZHZEF8tmnjbloRh1CDu wQ2gN5jyC3yC4jLBAbXLL7o1cxSrzEHpWOjvZxJMD2QqwhvTJSOCXBWKIr+VzosGiA+v LCAt6sVADPIGdOd4Ze3biyfUVMF43eP/c9WD1HomC7F5JO9jTt4hM1XawpB4UKNG2jQ3 OBQw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=RViGp4x20FlZRxgrHvlUikcA2bwQCRq/XvAsU4TLo0Q=; b=RSzDo9rSnViq8XgzReXU7HxZ+LRi7cspextkI1mmCn0b8TSVSw5p9USdlivWOzX0al ebITtKIxKUlLUvh+5T79XYQmPu1XO+5gKyNCjGIQv+bAOpsMhKKcNlMkpjkuRTN0Skvz 3eSlzV4tfkpF/ChCbbHDDkSANnCkJi0AMyHMlQaPZOPr94SxYlf1vO/3x22MWqNV1/ew XS7hDke95Tzm5Jo89oqlcuFJPs3LkX+FyYuxSplOnqW40tKuMEtQkXzC9oWyQAAsMNW2 urWrpXokee9DsvRbthzNzjdbvRWVw+vOcF+4w33JAWGvj/3+PGeQoPOqqkXRA3Tdkn9W MT6A== X-Gm-Message-State: AOPr4FVSKNpBFgTeduOA4V8hDQNWV2WKcv7IvngpCH5Aa0irRMkZNE9+KRTkmJaJwq7irg== X-Received: by 10.194.175.70 with SMTP id by6mr13261306wjc.19.1461614882444; Mon, 25 Apr 2016 13:08:02 -0700 (PDT) Received: from localhost (bcdc58e5.skybroadband.com. [188.220.88.229]) by smtp.gmail.com with ESMTPSA id ju3sm19204578wjb.11.2016.04.25.13.08.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 25 Apr 2016 13:08:00 -0700 (PDT) From: Matt Fleming To: Ingo Molnar , Thomas Gleixner , "H . Peter Anvin" Cc: Ard Biesheuvel , linux-kernel@vger.kernel.org, linux-efi@vger.kernel.org, Matt Fleming , David Herrmann , Mark Rutland , Peter Jones , Will Deacon Subject: [PATCH 23/40] efi/arm*: Wire up struct screen_info to efi-framebuffer platform device Date: Mon, 25 Apr 2016 21:06:55 +0100 Message-Id: <1461614832-17633-24-git-send-email-matt@codeblueprint.co.uk> X-Mailer: git-send-email 2.7.3 In-Reply-To: <1461614832-17633-1-git-send-email-matt@codeblueprint.co.uk> References: <1461614832-17633-1-git-send-email-matt@codeblueprint.co.uk> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Ard Biesheuvel This adds code to the ARM and arm64 EFI init routines to expose a platform device of type 'efi-framebuffer' if struct screen_info has been populated appropriately from the GOP protocol by the stub. Since the framebuffer may potentially be located in system RAM, make sure that the region is reserved and marked MEMBLOCK_NOMAP. Signed-off-by: Ard Biesheuvel Cc: Mark Rutland Cc: Will Deacon Cc: David Herrmann Cc: Peter Jones Signed-off-by: Matt Fleming --- drivers/firmware/efi/arm-init.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) -- 2.7.3 diff --git a/drivers/firmware/efi/arm-init.c b/drivers/firmware/efi/arm-init.c index ac95dd8b119f..7a3318dd4319 100644 --- a/drivers/firmware/efi/arm-init.c +++ b/drivers/firmware/efi/arm-init.c @@ -19,6 +19,7 @@ #include #include #include +#include #include #include @@ -78,6 +79,10 @@ static void __init init_screen_info(void) screen_info.orig_video_cols = 80; screen_info.orig_video_lines = 25; } + + if (screen_info.orig_video_isVGA == VIDEO_TYPE_EFI && + memblock_is_map_memory(screen_info.lfb_base)) + memblock_mark_nomap(screen_info.lfb_base, screen_info.lfb_size); } static int __init uefi_init(void) @@ -256,3 +261,16 @@ void __init efi_init(void) init_screen_info(); } + +static int __init register_gop_device(void) +{ + void *pd; + + if (screen_info.orig_video_isVGA != VIDEO_TYPE_EFI) + return 0; + + pd = platform_device_register_data(NULL, "efi-framebuffer", 0, + &screen_info, sizeof(screen_info)); + return PTR_ERR_OR_ZERO(pd); +} +subsys_initcall(register_gop_device);