From patchwork Fri Feb 21 08:56:43 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffman X-Patchwork-Id: 3695111 Return-Path: X-Original-To: patchwork-linux-fbdev@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id C420C9F382 for ; Fri, 21 Feb 2014 08:58:14 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id F27762017D for ; Fri, 21 Feb 2014 08:58:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2754820179 for ; Fri, 21 Feb 2014 08:58:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754336AbaBUI5I (ORCPT ); Fri, 21 Feb 2014 03:57:08 -0500 Received: from mx1.redhat.com ([209.132.183.28]:49111 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753603AbaBUI5H (ORCPT ); Fri, 21 Feb 2014 03:57:07 -0500 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s1L8v3Ru017544 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 21 Feb 2014 03:57:04 -0500 Received: from nilsson.home.kraxel.org (vpn1-7-129.ams2.redhat.com [10.36.7.129]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id s1L8v2jT023111; Fri, 21 Feb 2014 03:57:03 -0500 Received: by nilsson.home.kraxel.org (Postfix, from userid 500) id 7D1CB80620; Fri, 21 Feb 2014 09:57:02 +0100 (CET) From: Gerd Hoffmann To: linux-fbdev@vger.kernel.org Cc: linux-kernel@vger.kernel.org, gregkh@linuxfoundation.org, kys@microsoft.com, haiyangz@microsoft.com, jasowang@redhat.com, Gerd Hoffmann , devel@linuxdriverproject.org (open list:Hyper-V CORE AND...) Subject: [PATCH 3/4] vmbus: use resource for hyperv mmio region Date: Fri, 21 Feb 2014 09:56:43 +0100 Message-Id: <1392973004-28215-4-git-send-email-kraxel@redhat.com> In-Reply-To: <1392973004-28215-1-git-send-email-kraxel@redhat.com> References: <1392973004-28215-1-git-send-email-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 Sender: linux-fbdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fbdev@vger.kernel.org X-Spam-Status: No, score=-7.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Use a resource for the hyperv mmio region instead of start/size variables. Register the region properly so it shows up in /proc/iomem. Signed-off-by: Gerd Hoffmann --- drivers/hv/vmbus_drv.c | 16 ++++++++++------ include/linux/hyperv.h | 3 +-- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/drivers/hv/vmbus_drv.c b/drivers/hv/vmbus_drv.c index 2352ae48..a14f603 100644 --- a/drivers/hv/vmbus_drv.c +++ b/drivers/hv/vmbus_drv.c @@ -43,10 +43,12 @@ static struct acpi_device *hv_acpi_dev; static struct tasklet_struct msg_dpc; static struct completion probe_event; static int irq; -u64 hyperv_mmio_start; -EXPORT_SYMBOL_GPL(hyperv_mmio_start); -u64 hyperv_mmio_size; -EXPORT_SYMBOL_GPL(hyperv_mmio_size); + +struct resource hyperv_mmio = { + .name = "hyperv mmio", + .flags = IORESOURCE_MEM, +}; +EXPORT_SYMBOL_GPL(hyperv_mmio); static int vmbus_exists(void) { @@ -902,8 +904,8 @@ static acpi_status vmbus_walk_resources(struct acpi_resource *res, void *ctx) break; case ACPI_RESOURCE_TYPE_ADDRESS64: - hyperv_mmio_start = res->data.address64.minimum; - hyperv_mmio_size = res->data.address64.address_length; + hyperv_mmio.start = res->data.address64.minimum; + hyperv_mmio.end = res->data.address64.maximum; break; } @@ -933,6 +935,8 @@ static int vmbus_acpi_add(struct acpi_device *device) if (ACPI_FAILURE(result)) goto acpi_walk_err; + if (hyperv_mmio.start && hyperv_mmio.end) + request_resource(&iomem_resource, &hyperv_mmio); } ret_val = 0; diff --git a/include/linux/hyperv.h b/include/linux/hyperv.h index be3028f..c93e342 100644 --- a/include/linux/hyperv.h +++ b/include/linux/hyperv.h @@ -1459,8 +1459,7 @@ int hv_vss_init(struct hv_util_service *); void hv_vss_deinit(void); void hv_vss_onchannelcallback(void *); -extern u64 hyperv_mmio_start; -extern u64 hyperv_mmio_size; +extern struct resource hyperv_mmio; /* * Negotiated version with the Host.