From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759437AbcDEPp7 (ORCPT ); Tue, 5 Apr 2016 11:45:59 -0400 Received: from p3plsmtps2ded02.prod.phx3.secureserver.net ([208.109.80.59]:33899 "EHLO p3plsmtps2ded02.prod.phx3.secureserver.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933309AbcDEPpN (ORCPT ); Tue, 5 Apr 2016 11:45:13 -0400 x-originating-ip: 72.167.245.219 From: "K. Y. Srinivasan" To: gregkh@linuxfoundation.org, linux-kernel@vger.kernel.org, devel@linuxdriverproject.org, olaf@aepfle.de, apw@canonical.com, vkuznets@redhat.com, jasowang@redhat.com Cc: Jake Oshins , "K. Y. Srinivasan" Subject: [PATCH 7/7] drivers:hv: Separate out frame buffer logic when picking MMIO range Date: Tue, 5 Apr 2016 10:22:56 -0700 Message-Id: <1459876976-15860-7-git-send-email-kys@microsoft.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1459876976-15860-1-git-send-email-kys@microsoft.com> References: <1459876777-15772-1-git-send-email-kys@microsoft.com> <1459876976-15860-1-git-send-email-kys@microsoft.com> X-CMAE-Envelope: MS4wfEVR/VU6iEUgpU08TBDXKLU51azLAy6PedDYdIaiWcaKlLe902cgUPkEqo4qWkK8zwKGsLV2R7EOcAAKXuO2NSE0nLSUMEWnMa4lB1qZtSKBoN0JWEEz l1Yv27St22Z29Kt/LALMikuNJniwdaQEfRDi1p+ynwLmmOQN7EPAG8uQ1GxwCRXGiTJyUwPbGQLZJ/I3iqJ3at8PMo0wYhxWo45DenUsNSfw/oPxD+1FA/Uu b0FwF6+RbTX18Q+c3tQY0I1VXmHYp9GTLgIkk6P09bsevJhagc+ceeU5AAT3qfuyfMS7Fir1GZPMMeU33nTR/yHqeRSQF0QF2EucfhS260AA03hfR1rV71pD 9EhM1wvIkHI8I16HU0eAKPLZoojSziZJ2aWA//D5h2iPL3CLnPLS3AyG5dLIMhp4jaghViE0myaTD60Ya853JFsU5Ics4g== Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Jake Oshins 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 Signed-off-by: K. Y. Srinivasan --- Greg, please apply this to the 4.6 tree. drivers/hv/vmbus_drv.c | 80 +++++++++++++++++++++--------------------------- 1 files 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); } } -- 1.7.4.1