From patchwork Fri Apr 1 23:11:32 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jake Oshins X-Patchwork-Id: 605040 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 3qcF5j66gbz9sdg for ; Sat, 2 Apr 2016 08:34:49 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755307AbcDAVed (ORCPT ); Fri, 1 Apr 2016 17:34:33 -0400 Received: from p3plsmtps2ded03.prod.phx3.secureserver.net ([208.109.80.60]:43456 "EHLO p3plsmtps2ded03.prod.phx3.secureserver.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755127AbcDAVea (ORCPT ); Fri, 1 Apr 2016 17:34:30 -0400 Received: from linuxonhyperv.com ([72.167.245.219]) by : HOSTING RELAY : with SMTP id m6fBaXXDZetyNm6fBanJ0v; Fri, 01 Apr 2016 14:31:29 -0700 x-originating-ip: 72.167.245.219 Received: by linuxonhyperv.com (Postfix, from userid 520) id 443F5190331; Fri, 1 Apr 2016 16:12:01 -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 Cc: Jake Oshins Subject: [PATCH v3 7/7] drivers:hv: Separate out frame buffer logic when picking MMIO range Date: Fri, 1 Apr 2016 16:11:32 -0700 Message-Id: <1459552292-1297-8-git-send-email-jakeo@microsoft.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1459552292-1297-1-git-send-email-jakeo@microsoft.com> References: <1459552292-1297-1-git-send-email-jakeo@microsoft.com> X-CMAE-Envelope: MS4wfF+CnhdAXsgmlKPARq0kU7z9mIhPCO2fULywa//te/dXaOEJE/GcuzviOpYOzODCzAY7DAl2397Q8jReZUgnHcQJgWYC9eeVxqe2REkl1WJttnSvIqjc crND4azhKAdhFnz8hJwScYWWe8cMSiK22pK5ulluJ/9XFAy9sc3Ahox68yYGXgk+0vWFcwIXabDORsH4Qv44M+MYvftf3zWFbGrkifA5+2zBvqRvvVknrx9y yvhNjqIEjwDNGWGNP+WAxvBupvHz+GbT0Tfgk2maeBY1DhGwFntkNS9kV7ZCOkUzGS6yIODb7hkX1c+mThCxUctrUXi4yMEYRZdQpsLMOx1scbYNoKsdXEMU wOL0bF2MlGx4CoTvPwYTdlac+pQcstCIuenM+3V+SnZIsXzIroZdKyzdLD400l38xJjVVfneIF9PV2azHgCtrVnUcPLn8QbrQGKxlB5Yf9Zzd7p4R6lcrKQ8 uM85mN+CsaivpynCoBZ8zY9whGZFdWJFia5L+eft+TeQfj1pdOaF3EIkl60= 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 df59bfb..bd6d064 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); } }