Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755708AbcDAXKj (ORCPT ); Fri, 1 Apr 2016 19:10:39 -0400 Received: from p3plsmtps2ded01.prod.phx3.secureserver.net ([208.109.80.58]:53353 "EHLO p3plsmtps2ded01.prod.phx3.secureserver.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755621AbcDAXKh (ORCPT ); Fri, 1 Apr 2016 19:10:37 -0400 x-originating-ip: 72.167.245.219 From: Jake Oshins To: linux-pci@vger.kernel.org, gregkh@linuxfoundation.org, kys@microsoft.com, linux-kernel@vger.kernel.org, devel@linuxdriverproject.org, olaf@aepfle.de, apw@canonical.com, vkuznets@redhat.com, haiyangz@microsoft.com, haddenh@microsoft.com Cc: Jake Oshins Subject: [PATCH v4 6/7] drivers:hv: Record MMIO range in use by frame buffer Date: Fri, 1 Apr 2016 17:47:46 -0700 Message-Id: <1459558067-1725-7-git-send-email-jakeo@microsoft.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1459558067-1725-1-git-send-email-jakeo@microsoft.com> References: <1459558067-1725-1-git-send-email-jakeo@microsoft.com> X-CMAE-Envelope: MS4wfEv2m1yZXEsN74baBJef6D6hoW8NVZWzxGRH6+s6h9KQReLwZJDKFJ+7sf57tARbTctzGVnNuC9mzmwl51a1y+Lip6OtyPmpUeTKExN/j57FxYqNwNnS xBIqquMOc5hOYWbvP6IQLVOEjOb3pCDAaYbBQHBmer3pKmnwZUrqu6SdrXRGrN2eiUdv+90kKOXAaM3pv4Q5n365AllmtGDIFy/X+6cgET4N1vx2f9xtfqW7 fHV0So3VRtM7Oa4xo4klUB8yVXvaavZpUBH5Tk5N3FmfoFAYwMV6sHkMhH8xGRV6r6aKo/t9mWB6Vg+P1nF2e1jOs2kJS6t196FzMVxb8a/3Cwg+kUqkl1nd D9I2zZGhfXJI/wrfch4QMYnXA6VnSijT8Itty9PayURjzvuPqfI6nAoxSZ98KquAFFCt0Yk2KyBuGuf56GXzW6zgfZUjyu9/OW91RLSMfAvLMHQJ65K6Dfn9 vOHCOrriiCmiu5WZ2GcQyRsx1Otg70vWfo6Hn1dsq523ahdA/sppV6AXIUE= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2652 Lines: 91 Later in the boot sequence, we need to figure out which memory ranges can be given out to various paravirtual drivers. The hyperv_fb driver should, ideally, be placed right on top of the frame buffer, without some other device getting plopped on top of this range in the meantime. Recording this now allows that to be guaranteed. Signed-off-by: Jake Oshins --- drivers/hv/vmbus_drv.c | 37 ++++++++++++++++++++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) diff --git a/drivers/hv/vmbus_drv.c b/drivers/hv/vmbus_drv.c index dfc6149..eaa5c3b 100644 --- a/drivers/hv/vmbus_drv.c +++ b/drivers/hv/vmbus_drv.c @@ -41,6 +41,7 @@ #include #include #include +#include #include "hyperv_vmbus.h" static struct acpi_device *hv_acpi_dev; @@ -101,6 +102,8 @@ static struct notifier_block hyperv_panic_block = { .notifier_call = hyperv_panic_event, }; +static const char *fb_mmio_name = "fb_range"; +static struct resource *fb_mmio; struct resource *hyperv_mmio; DEFINE_SEMAPHORE(hyperv_mmio_lock); @@ -1091,6 +1094,12 @@ static int vmbus_acpi_remove(struct acpi_device *device) struct resource *next_res; if (hyperv_mmio) { + if (fb_mmio) { + __release_region(hyperv_mmio, fb_mmio->start, + resource_size(fb_mmio)); + fb_mmio = NULL; + } + for (cur_res = hyperv_mmio; cur_res; cur_res = next_res) { next_res = cur_res->sibling; kfree(cur_res); @@ -1100,6 +1109,30 @@ static int vmbus_acpi_remove(struct acpi_device *device) return 0; } +static void vmbus_reserve_fb(void) +{ + int size; + /* + * Make a claim for the frame buffer in the resource tree under the + * first node, which will be the one below 4GB. The length seems to + * be underreported, particularly in a Generation 1 VM. So start out + * reserving a larger area and make it smaller until it succeeds. + */ + + if (screen_info.lfb_base) { + if (efi_enabled(EFI_BOOT)) + size = max_t(__u32, screen_info.lfb_size, 0x800000); + else + size = max_t(__u32, screen_info.lfb_size, 0x4000000); + + for (; !fb_mmio && (size >= 0x100000); size >>= 1) { + fb_mmio = __request_region(hyperv_mmio, + screen_info.lfb_base, size, + fb_mmio_name, 0); + } + } +} + /** * vmbus_allocate_mmio() - Pick a memory-mapped I/O range. * @new: If successful, supplied a pointer to the @@ -1261,8 +1294,10 @@ static int vmbus_acpi_add(struct acpi_device *device) if (ACPI_FAILURE(result)) continue; - if (hyperv_mmio) + if (hyperv_mmio) { + vmbus_reserve_fb(); break; + } } ret_val = 0; -- 1.9.1