From patchwork Tue Feb 6 19:56:54 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 127092 Delivered-To: patch@linaro.org Received: by 10.46.124.24 with SMTP id x24csp3231019ljc; Tue, 6 Feb 2018 11:59:24 -0800 (PST) X-Google-Smtp-Source: AH8x225Puot6CB3RmtNBDu8JGmn76OyZf+JmicIMyAsUM8iwMTzL5Jh+Oe4WZPXvc2VYCry+Lstu X-Received: by 10.36.69.78 with SMTP id y75mr5113550ita.9.1517947164321; Tue, 06 Feb 2018 11:59:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1517947164; cv=none; d=google.com; s=arc-20160816; b=FNfJZz7+v5RYpQvk87kuQufPQFvvAZrVaKdKBU62f2Dp8/VVr8abq3Wy0x0DOJAWqm 3s8SeKY/HxqHpRbgh70UyaXdId3V+w0q376jrqqtEwD5GmBzvk5II2lvIfqJRqVFBh0l Om71iejAasiP+ycXo+oURkeTUBMOpDBxMXOkzDU8MIwvbmsIL/w54Qol+jzZdcHjBpUA FcwUB8nDsPPY5c5f3eE/k7LH5WdsWkX1U9CODjbAyslChrFYb6nOLlC9XfVDg5bJujMH wd9nxQxRXWgoLjv27eOBbgATMG5XGxnxiiRQGTmNIbqI9RWk3FASbwYdcXRFFj62AIBl PsFA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-unsubscribe:list-id :precedence:subject:cc:references:in-reply-to:message-id:date:to :from:arc-authentication-results; bh=a9CfSShNNAhPIxq2U6W5D00Pc3jFPBm7KDFMGkeEwQQ=; b=NBvNWTy29kI6kMIIjQDf1Ensd5aPJbrpePOJ/m4+E6JZfD1kpykWD99JYIhRBQEtDb tfqaOiJaI5t0yVJGkm0sPos6skpX9B5g8J38KslyyI19MTbzM+lUBWo3wDH6IRrfjwXU I80KnMvBRMQyC0fypS/zILnboKTZiBF7chgammAMbSHmGx/VdPyjL/gvN9GodTAAIFes kfq/0oh9KTpY1cggalHPHNZiJdtAIkgcTz8K/r2YwX+T13XPu63Q/U2N8HqKlCPlnJ5u fnzC1kVkj18MZuuUacuauYRQNugOu7ZtiAwcWRs6Jj79S5jZImSR6Hn3vRyZo55MAZ5x rjUQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of xen-devel-bounces@lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Return-Path: Received: from lists.xenproject.org (lists.xenproject.org. [192.237.175.120]) by mx.google.com with ESMTPS id z3si7091134iof.273.2018.02.06.11.59.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 06 Feb 2018 11:59:24 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of xen-devel-bounces@lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of xen-devel-bounces@lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ej9Mf-0001IY-H3; Tue, 06 Feb 2018 19:57:13 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ej9Md-0001IA-Ve for xen-devel@lists.xen.org; Tue, 06 Feb 2018 19:57:11 +0000 X-Inumbo-ID: 059afa81-0b78-11e8-b9b1-635ca7ef6cff Received: from foss.arm.com (unknown [217.140.101.70]) by us1-amaz-eas1.inumbo.com (Halon) with ESMTP id 059afa81-0b78-11e8-b9b1-635ca7ef6cff; Tue, 06 Feb 2018 19:57:55 +0000 (UTC) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id D2A891596; Tue, 6 Feb 2018 11:57:05 -0800 (PST) Received: from e108454-lin.cambridge.arm.com (e108454-lin.cambridge.arm.com [10.1.206.53]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id A02843F25C; Tue, 6 Feb 2018 11:57:04 -0800 (PST) From: Julien Grall To: xen-devel@lists.xen.org Date: Tue, 6 Feb 2018 19:56:54 +0000 Message-Id: <20180206195655.7097-2-julien.grall@arm.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180206195655.7097-1-julien.grall@arm.com> References: <20180206195655.7097-1-julien.grall@arm.com> Cc: andre.przywara@arm.com, Julien Grall , sstabellini@kernel.org, ian.jackson@eu.citrix.com, mjaggi@caviumnetworks.com Subject: [Xen-devel] [PATCH 1/2] xen/arm: Extend the number of memory banks supported X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" When booting using Grub on Thunder-X, the number of memory available is greater than 64. Bump the number to 128, so we can take advantage of all the memory. Signed-off-by: Julien Grall --- Note that I wasn't able to boot without this patch, because EFI stub is printing an error when the number of region exceed 64. This will result to fragment in bit more the memory (sounds like print allocate memory) and will fail to get the memory on retry. --- xen/include/asm-arm/setup.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/include/asm-arm/setup.h b/xen/include/asm-arm/setup.h index 7ff2c34dab..0cc3330807 100644 --- a/xen/include/asm-arm/setup.h +++ b/xen/include/asm-arm/setup.h @@ -6,7 +6,7 @@ #define MIN_FDT_ALIGN 8 #define MAX_FDT_SIZE SZ_2M -#define NR_MEM_BANKS 64 +#define NR_MEM_BANKS 128 #define MAX_MODULES 5 /* Current maximum useful modules */ From patchwork Tue Feb 6 19:56:55 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 127093 Delivered-To: patch@linaro.org Received: by 10.46.124.24 with SMTP id x24csp3231053ljc; Tue, 6 Feb 2018 11:59:28 -0800 (PST) X-Google-Smtp-Source: AH8x224fM3WZ9kmw1ZJDlPJG11UmQHjHD5IuNe+jR/mmDFKqmiZU07pKkT1P/fsuAGL1Qq5IDdpk X-Received: by 10.107.40.143 with SMTP id o137mr4450687ioo.72.1517947167940; Tue, 06 Feb 2018 11:59:27 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1517947167; cv=none; d=google.com; s=arc-20160816; b=n6tGVPXbsC3BxvhO6e5/NN63asC1C1+zuJ7IqHZY7dj1ednqJ3z9l2H5b6QNjb5PHj 2uIOdx1CwTXT7JoC8ts9j4cCCIQNuf+xUiNiQwWYHu/W63mCXPGAkeSxUDHZA2enUjHc typXyQ5Tiv177xmE5E/CK0DBtYBGEICPFXtBXcmQusbVUdKeIVNx3sCRdc9Hzctt2OcG H99CadGRUu0GzKKou6yn+fQK7Xup3AeHarO1tzljdxyX6Prquyot/zZOLD3MNffjTDxF j2432Xzf1UeF2ieaNR+ldyISrGpy9UIH4fuxV1WPFuUHQ+UYQ9JY0AOr9VBEEIQYCDjF rJVQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-unsubscribe:list-id :precedence:subject:cc:references:in-reply-to:message-id:date:to :from:arc-authentication-results; bh=WBt9mKIDdKmkEicJjT8MQsRd3wem1C2ZyCwRJFa4GmY=; b=JUD+oQCA+AN77NtqnT7s+nAsENUMUSPJN2lcJ4EaHoaAgpQOQ3Q/gxtNg8ESg3Sglr LjHxVO/2J22KbHR/A7mZnf60qKLLx/BTrDieasxP2HNFhWstmbbizS7y1JoduLiIdCOw +lje/7UxMKcM2DbXhyJZYsEhjPa99hn1lAjLLAtbrotmkbaO8IuQsIIqJILD6spzeklO ziuZPmy56LsDsD9yztPlUsf9/RRLc8xVfdWJ5jQP0TlyqxBW9y31muJw2YYrcwDIEFyW jjBnJtsqI33pjLnnN0ePCgDdNmfskLuKOphPuph6sKhMFb7p3poNt72mv76jvaMgTaWx KNwA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of xen-devel-bounces@lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Return-Path: Received: from lists.xenproject.org (lists.xenproject.org. [192.237.175.120]) by mx.google.com with ESMTPS id t124si185603itf.146.2018.02.06.11.59.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 06 Feb 2018 11:59:27 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of xen-devel-bounces@lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of xen-devel-bounces@lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ej9Mh-0001J6-Nk; Tue, 06 Feb 2018 19:57:15 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ej9Mf-0001IC-Vu for xen-devel@lists.xen.org; Tue, 06 Feb 2018 19:57:14 +0000 X-Inumbo-ID: 06789bb6-0b78-11e8-b9b1-635ca7ef6cff Received: from foss.arm.com (unknown [217.140.101.70]) by us1-amaz-eas1.inumbo.com (Halon) with ESMTP id 06789bb6-0b78-11e8-b9b1-635ca7ef6cff; Tue, 06 Feb 2018 19:57:56 +0000 (UTC) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 4FFC280D; Tue, 6 Feb 2018 11:57:07 -0800 (PST) Received: from e108454-lin.cambridge.arm.com (e108454-lin.cambridge.arm.com [10.1.206.53]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 1D45C3F25C; Tue, 6 Feb 2018 11:57:05 -0800 (PST) From: Julien Grall To: xen-devel@lists.xen.org Date: Tue, 6 Feb 2018 19:56:55 +0000 Message-Id: <20180206195655.7097-3-julien.grall@arm.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180206195655.7097-1-julien.grall@arm.com> References: <20180206195655.7097-1-julien.grall@arm.com> Cc: andre.przywara@arm.com, Julien Grall , sstabellini@kernel.org, ian.jackson@eu.citrix.com, mjaggi@caviumnetworks.com Subject: [Xen-devel] [PATCH 2/2] xen/arm: Blacklist SMMU on Thunder-X X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" Xen does not yet support Cavium SMMU because it requires some workaround. For the time being, blacklist them. Signed-off-by: Julien Grall --- xen/arch/arm/platforms/Makefile | 1 + xen/arch/arm/platforms/thunderx.c | 39 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+) create mode 100644 xen/arch/arm/platforms/thunderx.c diff --git a/xen/arch/arm/platforms/Makefile b/xen/arch/arm/platforms/Makefile index 53a47e48d2..80e555cc14 100644 --- a/xen/arch/arm/platforms/Makefile +++ b/xen/arch/arm/platforms/Makefile @@ -6,5 +6,6 @@ obj-$(CONFIG_ARM_32) += omap5.o obj-$(CONFIG_ARM_32) += rcar2.o obj-$(CONFIG_ARM_64) += seattle.o obj-y += sunxi.o +obj-$(CONFIG_ARM_64) += thunderx.o obj-$(CONFIG_ARM_64) += xgene-storm.o obj-$(CONFIG_ARM_64) += xilinx-zynqmp.o diff --git a/xen/arch/arm/platforms/thunderx.c b/xen/arch/arm/platforms/thunderx.c new file mode 100644 index 0000000000..f5d7044296 --- /dev/null +++ b/xen/arch/arm/platforms/thunderx.c @@ -0,0 +1,39 @@ +/* + * xen/arch/arm/platforms/thunderx.c + * + * Cavium Thunder-X specific settings + * + * Copyright (c) 2018 ARM Ltd. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; under version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; If not, see . + */ + +#include + +static const char * const thunderx_dt_compat[] __initconst = +{ + "cavium,thunder-88x", + NULL +}; + +static const struct dt_device_match thunderx_blacklist_dev[] __initconst = +{ + /* Cavium has its own SMMU which is not yet supported. */ + DT_MATCH_COMPATIBLE("cavium,smmu-v2"), + { /* sentinel */ }, +}; + +PLATFORM_START(thunderx, "THUNDERX") + .compatible = thunderx_dt_compat, + .blacklist_dev = thunderx_blacklist_dev, +PLATFORM_END