From patchwork Thu Mar 24 14:44:23 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shannon Zhao X-Patchwork-Id: 64373 Delivered-To: patch@linaro.org Received: by 10.112.199.169 with SMTP id jl9csp697222lbc; Thu, 24 Mar 2016 07:47:58 -0700 (PDT) X-Received: by 10.67.5.133 with SMTP id cm5mr13350517pad.133.1458830856804; Thu, 24 Mar 2016 07:47:36 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id kv12si2484027pab.194.2016.03.24.07.47.36; Thu, 24 Mar 2016 07:47:36 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751383AbcCXOr0 (ORCPT + 29 others); Thu, 24 Mar 2016 10:47:26 -0400 Received: from mail-pa0-f46.google.com ([209.85.220.46]:33405 "EHLO mail-pa0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752041AbcCXOqk (ORCPT ); Thu, 24 Mar 2016 10:46:40 -0400 Received: by mail-pa0-f46.google.com with SMTP id fl4so23824707pad.0 for ; Thu, 24 Mar 2016 07:46:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=tCWlkexA7GUWfSWmxd1rquAV1xKc2xJliarlVakTg94=; b=GnCCUCwf6/oEO/eXa0cjHmdwBzUoVkK6WcIk4jxFDoKu0PCzWZdKGpaYcZjFOKbLQa qp0NBJZL/WKaK17yV23Ldd9qrpi1lIQ/uQAqVjYZPx0ZrRqFF6laRSGj0XnZD5TC+1Ay UY7eo2kBI/gy4QqEO2/PVD18FCuB85JBATXxc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=tCWlkexA7GUWfSWmxd1rquAV1xKc2xJliarlVakTg94=; b=fnBxJ5S7eJ++Zp57FFfk0P2mMZaJY8BXU5LPgTJvwwSCdfUv8PbjHLQsOE/14RkDAD kQEez8VYIcZsGraJ+txI8FWZlrdGtkZuESshzt4Jx1t2eujo7cjeio727FJA8QfgCcRn 3ljeBBu0NqpFp0PZPNr5Dg2KvE/Xl/rHVTYYPmlYERQQQ3MytPAgeqXvq07wmG+OMbxW FTE14NxoEk2ZP+4jnZ6GHDZZ0pmcxWABeJq5AwTxPYsGLyxQ2k88VEaQ4GbRjVKPu5Jg Gv8Cmj/S1xoLP7jRK2vDwEVYVNrTwC9Swpr2Ds8D+vyGlud0zH0w/5fIqyh5pGqvv2EB qYEw== X-Gm-Message-State: AD7BkJIwb/kGFRv/aVJKJiwccr1f+6uGB7hLaQS2O54FrtmMyh+ieA0908azmQWCpYDYrQIR X-Received: by 10.66.255.39 with SMTP id an7mr13433707pad.2.1458830799107; Thu, 24 Mar 2016 07:46:39 -0700 (PDT) Received: from localhost.localdomain ([104.238.45.135]) by smtp.gmail.com with ESMTPSA id lq10sm10780673pab.36.2016.03.24.07.46.31 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 24 Mar 2016 07:46:37 -0700 (PDT) From: Shannon Zhao To: linux-arm-kernel@lists.infradead.org, stefano.stabellini@citrix.com, david.vrabel@citrix.com Cc: devicetree@vger.kernel.org, linux-efi@vger.kernel.org, linux-kernel@vger.kernel.org, catalin.marinas@arm.com, will.deacon@arm.com, julien.grall@arm.com, peter.huangpeng@huawei.com, xen-devel@lists.xen.org, zhaoshenglong@huawei.com, shannon.zhao@linaro.org Subject: [PATCH v7 04/17] arm/xen: Use xen_xlate_map_ballooned_pages to setup grant table Date: Thu, 24 Mar 2016 22:44:23 +0800 Message-Id: <1458830676-27075-5-git-send-email-shannon.zhao@linaro.org> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1458830676-27075-1-git-send-email-shannon.zhao@linaro.org> References: <1458830676-27075-1-git-send-email-shannon.zhao@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Use xen_xlate_map_ballooned_pages to setup grant table. Then it doesn't rely on DT or ACPI to pass the start address and size of grant table. Signed-off-by: Shannon Zhao Acked-by: Stefano Stabellini --- arch/arm/xen/enlighten.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) -- 2.1.4 diff --git a/arch/arm/xen/enlighten.c b/arch/arm/xen/enlighten.c index 75cd734..d94f726 100644 --- a/arch/arm/xen/enlighten.c +++ b/arch/arm/xen/enlighten.c @@ -282,18 +282,10 @@ static int __init xen_guest_init(void) { struct xen_add_to_physmap xatp; struct shared_info *shared_info_page = NULL; - struct resource res; - phys_addr_t grant_frames; if (!xen_domain()) return 0; - if (of_address_to_resource(xen_node, GRANT_TABLE_PHYSADDR, &res)) { - pr_err("Xen grant table base address not found\n"); - return -ENODEV; - } - grant_frames = res.start; - xen_events_irq = irq_of_parse_and_map(xen_node, 0); if (!xen_events_irq) { pr_err("Xen event channel interrupt not found\n"); @@ -328,7 +320,10 @@ static int __init xen_guest_init(void) if (xen_vcpu_info == NULL) return -ENOMEM; - if (gnttab_setup_auto_xlat_frames(grant_frames)) { + xen_auto_xlat_grant_frames.count = gnttab_max_grant_frames(); + if (xen_xlate_map_ballooned_pages(&xen_auto_xlat_grant_frames.pfn, + &xen_auto_xlat_grant_frames.vaddr, + xen_auto_xlat_grant_frames.count)) { free_percpu(xen_vcpu_info); return -ENOMEM; }