From patchwork Wed Apr 6 01:18:22 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jake Oshins X-Patchwork-Id: 606790 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3qfll669S3z9t3t for ; Wed, 6 Apr 2016 09:42:26 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760508AbcDEXlB (ORCPT ); Tue, 5 Apr 2016 19:41:01 -0400 Received: from p3plsmtps2ded02.prod.phx3.secureserver.net ([208.109.80.59]:52011 "EHLO p3plsmtps2ded02.prod.phx3.secureserver.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760504AbcDEXlA (ORCPT ); Tue, 5 Apr 2016 19:41:00 -0400 Received: from linuxonhyperv.com ([72.167.245.219]) by : HOSTING RELAY : with SMTP id naXnaa9RBzRgvnaXnaGoM8; Tue, 05 Apr 2016 16:37:59 -0700 x-originating-ip: 72.167.245.219 Received: by linuxonhyperv.com (Postfix, from userid 520) id 35A2B190331; Tue, 5 Apr 2016 18:18:47 -0700 (PDT) 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, helgaas@kernel.org Cc: Jake Oshins Subject: [PATCH v5 6/6] drivers:hv: Separate out frame buffer logic when picking MMIO range Date: Tue, 5 Apr 2016 18:18:22 -0700 Message-Id: <1459905502-20798-7-git-send-email-jakeo@microsoft.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1459905502-20798-1-git-send-email-jakeo@microsoft.com> References: <1459905502-20798-1-git-send-email-jakeo@microsoft.com> X-CMAE-Envelope: MS4wfNm1tbaDqKKfE0vVUOqCbqs2dDC6OuS1g9otdjE90d5TJA2qs3z0tKqJ3vNuCu7PUJZ/Jd5UALMtRe4TyYfpuuBQHRTvxWVxlPopPrHbbetvQvXaHyHU Ny5AhLJGyfr1LmROCbBmB4MJH95t8g7xcuTeB4RRoIlSG1Uv++jWTsF/MaQ0Rw+6N6MDQbYEzkiCj4FPXAdx2ub5QdzdM+5PtbXReuTLz5sR+dFf1/QRciIp 7a8YHLpx0TQalNsW2iLjZNJXKIUMMxR8G4cqDgysePAM1RzGs41jFyBXRjt+oqyKzYZ8O03ixFz5eNtIl0Efdl95oxeeLcv9wC6OR1wsAdOPtDzgUsUffX0h MAZwdXjTYbqGbDPaLDlqGek8cB72Jw5uXxvywdvxZDdK+IhkjrfcbNVhIX7vMtnHgGMjCmP9RP6pZacAUwNUgg6ItBKpX1aFp0xhd0einFUrSFTd2HhuYB1R JfKtWkrYpfPXN05GfE8dDdTMrbJgOdMmo7jN+seAVhMfEK/LFnulyKCKU3EDGQUSGfs/8QaV5r/nNU+G Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org Simplify the logic that picks MMIO ranges by pulling out the logic related to trying to lay frame buffer claim on top of where the firmware placed the frame buffer. Signed-off-by: Jake Oshins --- drivers/hv/vmbus_drv.c | 80 ++++++++++++++++++++++---------------------------- 1 file changed, 35 insertions(+), 45 deletions(-) diff --git a/drivers/hv/vmbus_drv.c b/drivers/hv/vmbus_drv.c index eaa5c3b..a29a6c0 100644 --- a/drivers/hv/vmbus_drv.c +++ b/drivers/hv/vmbus_drv.c @@ -1162,64 +1162,54 @@ int vmbus_allocate_mmio(struct resource **new, struct hv_device *device_obj, bool fb_overlap_ok) { struct resource *iter, *shadow; - resource_size_t range_min, range_max, start, local_min, local_max; + resource_size_t range_min, range_max, start; const char *dev_n = dev_name(&device_obj->device); - u32 fb_end = screen_info.lfb_base + (screen_info.lfb_size << 1); - int i, retval; + int retval; retval = -ENXIO; down(&hyperv_mmio_lock); + /* + * If overlaps with frame buffers are allowed, then first attempt to + * make the allocation from within the reserved region. Because it + * is already reserved, no shadow allocation is necessary. + */ + if (fb_overlap_ok && fb_mmio && !(min > fb_mmio->end) && + !(max < fb_mmio->start)) { + + range_min = fb_mmio->start; + range_max = fb_mmio->end; + start = (range_min + align - 1) & ~(align - 1); + for (; start + size - 1 <= range_max; start += align) { + *new = request_mem_region_exclusive(start, size, dev_n); + if (*new) { + retval = 0; + goto exit; + } + } + } + for (iter = hyperv_mmio; iter; iter = iter->sibling) { if ((iter->start >= max) || (iter->end <= min)) continue; range_min = iter->start; range_max = iter->end; - - /* If this range overlaps the frame buffer, split it into - two tries. */ - for (i = 0; i < 2; i++) { - local_min = range_min; - local_max = range_max; - if (fb_overlap_ok || (range_min >= fb_end) || - (range_max <= screen_info.lfb_base)) { - i++; - } else { - if ((range_min <= screen_info.lfb_base) && - (range_max >= screen_info.lfb_base)) { - /* - * The frame buffer is in this window, - * so trim this into the part that - * preceeds the frame buffer. - */ - local_max = screen_info.lfb_base - 1; - range_min = fb_end; - } else { - range_min = fb_end; - continue; - } + start = (range_min + align - 1) & ~(align - 1); + for (; start + size - 1 <= range_max; start += align) { + shadow = __request_region(iter, start, size, NULL, + IORESOURCE_BUSY); + if (!shadow) + continue; + + *new = request_mem_region_exclusive(start, size, dev_n); + if (*new) { + shadow->name = (char *)*new; + retval = 0; + goto exit; } - start = (local_min + align - 1) & ~(align - 1); - for (; start + size - 1 <= local_max; start += align) { - shadow = __request_region(iter, start, - size, - NULL, - IORESOURCE_BUSY); - if (!shadow) - continue; - - *new = request_mem_region_exclusive(start, size, - dev_n); - if (*new) { - shadow->name = (char *)*new; - retval = 0; - goto exit; - } - - __release_region(iter, start, size); - } + __release_region(iter, start, size); } }