From patchwork Wed Mar 30 23:48:47 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jake Oshins X-Patchwork-Id: 603669 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 3qb22D3YGnz9sDH for ; Thu, 31 Mar 2016 09:12:36 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753266AbcC3WMI (ORCPT ); Wed, 30 Mar 2016 18:12:08 -0400 Received: from p3plsmtps2ded02.prod.phx3.secureserver.net ([208.109.80.59]:54989 "EHLO p3plsmtps2ded02.prod.phx3.secureserver.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753155AbcC3WMH (ORCPT ); Wed, 30 Mar 2016 18:12:07 -0400 Received: from linuxonhyperv.com ([72.167.245.219]) by : HOSTING RELAY : with SMTP id lOITanuSSzRgvlOITarXM1; Wed, 30 Mar 2016 15:09:06 -0700 x-originating-ip: 72.167.245.219 Received: by linuxonhyperv.com (Postfix, from userid 520) id 69DFB190304; Wed, 30 Mar 2016 16:49:30 -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 v2 7/7] drivers:hv: Separate out frame buffer logic when picking MMIO range Date: Wed, 30 Mar 2016 16:48:47 -0700 Message-Id: <1459381727-25039-8-git-send-email-jakeo@microsoft.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1459381727-25039-1-git-send-email-jakeo@microsoft.com> References: <1459381727-25039-1-git-send-email-jakeo@microsoft.com> X-CMAE-Envelope: MS4wfOmRVqFkVeMpmJrfcpLJb5h3slqyt+LrAyBW/r7An9GdDIrAGqJoAzP5vtv/NRv++AGO8gf9LOwxckNnJGlYsI5lh9PuprTj4TLcD4ZuAyWzYX8Q1J2v zdFmCjo4GqAPHU4PmAT1qB9CxznoL2OZ1j36vPD7moFipLL4sh8cJjMqvJIzJfKSqTSuFHGs5fHzCV2URloEANe83nBQwK8tSZ++788Janyt9mlzk1HFsxNG smh2nPtytCXDKspDb8U149xkAKQ+H3+9uRe/m22E91H33nPCU1GFDB8ehHi0v/fBaaX0nUpMKUwJa7Z6w1BA6H9szdGssEqeIasn/u7QvzZEpx2sUMZM6OFb INqVtq1xyRZX2Goxy7u9WOFQkVojWW0Q6My3idFLTw2tfxJeQOgKkLUPm03mOh+Vfn0BVxKc3wZwr8y57oROTgDANt5gSa8nLT/8/x4rrpJkRtFlMYkXzb/Z ialCOYYZrCVjSYRhdmqvpVRwP2JsVy3irsFocJUUqT+M6+2MvAYzxdrD8RU= 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 | 79 ++++++++++++++++++++++---------------------------- 1 file changed, 34 insertions(+), 45 deletions(-) -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/hv/vmbus_drv.c b/drivers/hv/vmbus_drv.c index f8fa7b8..ec6fa42 100644 --- a/drivers/hv/vmbus_drv.c +++ b/drivers/hv/vmbus_drv.c @@ -1162,64 +1162,53 @@ 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) { + + 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); } }