From patchwork Wed Feb 14 15:30:44 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 128366 Delivered-To: patch@linaro.org Received: by 10.46.124.24 with SMTP id x24csp733447ljc; Wed, 14 Feb 2018 07:33:29 -0800 (PST) X-Google-Smtp-Source: AH8x224t5322OK6olnMsnfJ4yWs4BuyMK9UCmitccgBd/0+VBWFFgQG/kRh9Nv8ChCoKrhJfwdxq X-Received: by 10.107.149.1 with SMTP id x1mr6212871iod.80.1518622409658; Wed, 14 Feb 2018 07:33:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1518622409; cv=none; d=google.com; s=arc-20160816; b=T0EoJTv9Kf7BLznqtGtt/3mDKXL2ZNQZbD4a/9G9V3orVPfYTthn4/lrdOJS7QssUT uL2walNk6JmJ3yXURwyi5TFs7hvdhu3msvpMHPpRC70hWUHg5zxq7Pi5gfocPuzV0aa5 z4DTkaMfTDuvlYxEVcb/FnkGs+z2fR5sZ1csh3ZvLsAgzQFAmXGJfulsgYyZarF6zykP 1/IBvjqiMGor3HnwbioL78KG6uiyyQu41N9unrBBqXYNK0TWuf/AtVmZyv+s2AVc26sR DXBHKHycLLB8hv09Hsy5ayR548A3sNiDKbyuThEUSC9hWZIPQ8vKxh6phCHwrWe/s+Wq BWsg== 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=RMzjPqs/sD9avymULzWFTJufI+kMIZmifnwJAMQ2SE2B8Pwhrui+A5qnac5xQpvk4y fZM7VSJ70Rg1R1IQMzi1u1PXz8y0H6rs4gRVYbtIgyf8A4xLSLnckDNkIv+5hzyE7fWx VO7rPxSj2DM5JlgN+w1QBq1Zu+GAZtBxHjc+1k9EU3pPJ+f1v3ItP/93PKrTLw/SVWHD 5nCDOSVDcjA3tZ8lX83S2TLhmEufwQ/bKAGQ9PFjCWdttOJTJ7n1rrSROHHjJn3qIEIo DXnIUJHjnH2s5iZtxHiehPbPNSynZCM3i69NVNjmnXrfFbR2L8QeqcVkxDtgTHXFQ2CE 45Vg== 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 e81si79526ioa.323.2018.02.14.07.33.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Feb 2018 07:33:29 -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 1elz1S-0002Kj-KD; Wed, 14 Feb 2018 15:31:02 +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 1elz1Q-0002KG-NP for xen-devel@lists.xen.org; Wed, 14 Feb 2018 15:31:00 +0000 X-Inumbo-ID: 37e5f884-119c-11e8-b9b1-635ca7ef6cff Received: from foss.arm.com (unknown [217.140.101.70]) by us1-amaz-eas1.inumbo.com (Halon) with ESMTP id 37e5f884-119c-11e8-b9b1-635ca7ef6cff; Wed, 14 Feb 2018 15:32:08 +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 1433A15BF; Wed, 14 Feb 2018 07:30:54 -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 D5B9D3F53D; Wed, 14 Feb 2018 07:30:52 -0800 (PST) From: Julien Grall To: xen-devel@lists.xen.org Date: Wed, 14 Feb 2018 15:30:44 +0000 Message-Id: <20180214153045.10558-2-julien.grall@arm.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180214153045.10558-1-julien.grall@arm.com> References: <20180214153045.10558-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 v2 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 Reviewed-by: Stefano Stabellini --- 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 Wed Feb 14 15:30:45 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 128367 Delivered-To: patch@linaro.org Received: by 10.46.124.24 with SMTP id x24csp733456ljc; Wed, 14 Feb 2018 07:33:30 -0800 (PST) X-Google-Smtp-Source: AH8x225BmIqwM6lFhC5N7jBV9w2jeEh6dfuocxw85RbZMN1iH+eBui2w1LAexMCd+IJQ8H7eHfpj X-Received: by 10.107.15.8 with SMTP id x8mr6228904ioi.38.1518622410123; Wed, 14 Feb 2018 07:33:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1518622410; cv=none; d=google.com; s=arc-20160816; b=yFd+Fh6CiEl6Tg/WmvBTkYcJeTnKqv9CcFqzpNYyYgLfHDkH7I1AYHSNASmH54xE0C +rKmN8C+Jt1YA0C1NQTj6N6S2uVbtn+kIOur27l4cy+nUYKWJh39UVCsJJnoCuuXBzA4 WIc+eP+qqVCDf8id2Ft7j3atoi3EepYZT4DU+gGeoMFGOKeYwubXNoIXmv/nqcz+xvvA /MGsP7wJI5Clpq3NmqgZzAmrirWkDPnpqkU+Z9VPCIy9Y8oTUrD9iXBJwooV8r6AH6m/ HWpyMnWqq32SdfIuuvIhwk6rrRBn+02qSKJLLuLuaxMlKTv/HqGeYEZlNb0slXgMNCHe Bk4g== 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=e301iKNhC44FD8U4hdHj20pdwPEt+OjPUDiCNnUsUEM=; b=LcsuE8wR8muVAv/2BqmM5hSdrJfKtLFg8fzYq6zMQSakvUHvRmnYpMKXMYcVRz5w9p iKATvj9T7IgG8UTVUiiosKuyVfSgHge4h0cGXwM9BtJactj2WoDzMhs9A0q652ZCMY5T 111qEIcucZwvUCRb4GQdfAqqDwzB1/QKQW/yctR9VS9+gidslN6kCVkK1je4eEmfJaXt 5j+4y+TECgYjew3ajR9jCfhlxOYV9AWmNmdzvZ4+PnTbiB3eJ6phGBrJ1Cgc0vMpy7Ib /+seHGNcJn/XznGVyz49cHnqgwW4He6pm0Uvvobdvg5aPFAFAH7+Ea7FZXmRI4gEiI0d Sd3Q== 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 k37si1306739ioi.153.2018.02.14.07.33.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Feb 2018 07:33:30 -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 1elz1S-0002Ku-QW; Wed, 14 Feb 2018 15:31:02 +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 1elz1R-0002KI-DC for xen-devel@lists.xen.org; Wed, 14 Feb 2018 15:31:01 +0000 X-Inumbo-ID: 38c332c8-119c-11e8-b9b1-635ca7ef6cff Received: from foss.arm.com (unknown [217.140.101.70]) by us1-amaz-eas1.inumbo.com (Halon) with ESMTP id 38c332c8-119c-11e8-b9b1-635ca7ef6cff; Wed, 14 Feb 2018 15:32:10 +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 8573E1435; Wed, 14 Feb 2018 07:30:55 -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 528BA3F53D; Wed, 14 Feb 2018 07:30:54 -0800 (PST) From: Julien Grall To: xen-devel@lists.xen.org Date: Wed, 14 Feb 2018 15:30:45 +0000 Message-Id: <20180214153045.10558-3-julien.grall@arm.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180214153045.10558-1-julien.grall@arm.com> References: <20180214153045.10558-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 v2 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 Acked-by: Stefano Stabellini --- Changes in v2: - Fix compatible string --- 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..9b32a29c6b --- /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-88xx", + 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