From patchwork Mon Feb 18 12:56:46 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yousong Zhou X-Patchwork-Id: 1043969 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=lists.openwrt.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="HpgjT+ML"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="DXtRL9af"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4433mS6rhFz9rxp for ; Mon, 18 Feb 2019 23:57:12 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Subject:MIME-Version:References: In-Reply-To:Message-Id:Date:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=Obq+RTA6oKvF2JV0xZ/caUyKANaxzOcZTTzMDnhWDi0=; b=HpgjT+ML+t1jzk qW3GLKz+pyf9hBeviaRneoakohb16BSXvqW9XAi1GRb62YqzeU8Ybm5pkkp4d2wBmtLKr36FcuMoM K6tzx5XHf4z/6dZsBNaH64dH4Q+xwvbiw6psR1v6ZRp9yG7+Xf0nAIR/j38FleKHTNe6wZ4wZg0Y3 fCKu43gYzdi99E10SeQjl8J86MqSJBYKBqhdwGOMQl18htyUgwBUxAfq+Jp7nztjCl9Nj/vkfAef6 1QdYVD9kQCf+F4O5jnwcembOKvhsj62tGyWbRcPd9U1bZeMekX1uw9Our4ONzN96wFL1WP3bgSb1t yfITacPauFj5LqqkMcWw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gviTq-0002SI-Qn; Mon, 18 Feb 2019 12:57:06 +0000 Received: from mail-pf1-x441.google.com ([2607:f8b0:4864:20::441]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gviTi-0002I7-2b for openwrt-devel@lists.openwrt.org; Mon, 18 Feb 2019 12:56:59 +0000 Received: by mail-pf1-x441.google.com with SMTP id c123so8547873pfb.0 for ; Mon, 18 Feb 2019 04:56:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=MnWolt9mvrDVnlzCtQCLXEJlgYJPe5FMbg8Z/Mqf94E=; b=DXtRL9affAg077rjFbbm5Yq31xA1kQ32jxjAR7wLD4Utknm8z57r93Yx9vH5fwqJjS mHYAAj0dHA/FIcYtb3QnErgjysv83HTBSGI4vqGroRtuhJh4rKouC3t0SifU3hWFq8+0 9TfdX1z1Hn2mE/89H1PKXSz/Y16uuPzXD9B8lKzmPJYC10t+HrQMIeGVwQUOtFBTk5ak LVypHwX+8BuvNp8Ae6BVdXQ16MlJB1DL+P7QuIQasNMoU8xZmC1zgGNpyqxUkSwTZJDm us89pGdAu1guBo3FhIPeR/qe4UmnKT3SymGEqmhJIpkJYv+gfq6iw2XOvloWF2PRHr6b QWGA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=MnWolt9mvrDVnlzCtQCLXEJlgYJPe5FMbg8Z/Mqf94E=; b=o+UmyqHElY+Ejym8Nx3NicLMklbtFfzVpu9UeXUKja8kxe+0MP+WAySYoi04dpTAkt uNGBdW1xQ/wI780BPt8AuuU60EHgN4/ZIZihwlZczaN40/JJnGen2MLoZVcO9w8DFvhm wUBsf0hIrMKyshRdDAKuZaiI8AkRS60VahNXnsOtJWf8J9Aopheru3uQfXrLi8N9QjyG e3akKJ7AEEEwe6NpxoCMMzyXON6ctMj9HMjrNJT+tLaR6fo6gmZ/slCqK8sGzRQe9BfS GmS5zDF76sJ0Xiye35DZ3El1Z1NzzSJKaERUQHY2VPQtlYZuQP/PtZFpy5X3eG5jheKa SyWA== X-Gm-Message-State: AHQUAubK+xfd37r9O8iUxq3nAMtT/Gz9YJWg83U+6Ti4rZq5V3sf/wc8 QunxYU3lJkTFgiTaesR2P8gEFmnX9xg= X-Google-Smtp-Source: AHgI3IbuU69elUQYFEqixqFu53ZxpgaKBINooQKWV68YlSN+NFK0d3zpve4ItZAvzXjeEr1zlqHMFA== X-Received: by 2002:a63:fa48:: with SMTP id g8mr18818793pgk.203.1550494617574; Mon, 18 Feb 2019 04:56:57 -0800 (PST) Received: from titan.localdomain.hq.cloud.yunionyun.com ([47.52.22.109]) by smtp.gmail.com with ESMTPSA id z185sm19620087pfb.17.2019.02.18.04.56.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 18 Feb 2019 04:56:56 -0800 (PST) From: Yousong Zhou To: f.fainelli@gmail.com Date: Mon, 18 Feb 2019 12:56:46 +0000 Message-Id: <20190218125646.1621-2-yszhou4tech@gmail.com> In-Reply-To: <20190218125646.1621-1-yszhou4tech@gmail.com> References: <20190218125646.1621-1-yszhou4tech@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190218_045658_113127_7E104CC1 X-CRM114-Status: GOOD ( 10.50 ) X-Spam-Score: 0.6 (/) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (0.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:441 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (yszhou4tech[at]gmail.com) -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain 0.8 UPPERCASE_50_75 message body is 50-75% uppercase Subject: [OpenWrt-Devel] [PATCH 2/2] armvirt: 32: enable CONFIG_ARM_LPAE X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Yousong Zhou , openwrt-devel@lists.openwrt.org Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org This is required for running armvirt_32 on QEMU 3.0 [1], otherwise the kernel will emit the following complaint and virtio-net-pci devices will fail to be initialized [ 1.124214] OF: PCI: host bridge /pcie@10000000 ranges: [ 1.125093] OF: PCI: IO 0x3eff0000..0x3effffff -> 0x00000000 [ 1.125942] OF: PCI: MEM 0x10000000..0x3efeffff -> 0x10000000 [ 1.126403] OF: PCI: MEM 0x8000000000..0xffffffffff -> 0x8000000000 [ 1.127748] pci-host-generic 4010000000.pcie: can't claim ECAM area [mem 0x10000000-0x1fffffff]: address conflict with /pcie@10000000 [mem 0x10000000-0x3efeffff] [ 1.129752] pci-host-generic: probe of 4010000000.pcie failed with error -16 Running QEMU with "-M virt,highmem=off" is an option, but "highmem" was only introduced as a default on flag since QEMU 2.5.0 and QEMU will fail and quit on encounter of unknown flags [1] Armv7 guest fails to boot with qemu-3.0.0-1, https://bugzilla.redhat.com/show_bug.cgi?id=1633328#c5 Signed-off-by: Yousong Zhou --- target/linux/armvirt/32/config-default | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/target/linux/armvirt/32/config-default b/target/linux/armvirt/32/config-default index cdac5ffe56..a31488749c 100644 --- a/target/linux/armvirt/32/config-default +++ b/target/linux/armvirt/32/config-default @@ -1,4 +1,5 @@ CONFIG_ALIGNMENT_TRAP=y +# CONFIG_ARCH_AXXIA is not set CONFIG_ARCH_HAS_DEBUG_VIRTUAL=y CONFIG_ARCH_HAS_SET_MEMORY=y CONFIG_ARCH_HAS_STRICT_KERNEL_RWX=y @@ -12,6 +13,7 @@ CONFIG_ARCH_MULTI_V7=y CONFIG_ARCH_NR_GPIO=0 CONFIG_ARCH_OPTIONAL_KERNEL_RWX=y CONFIG_ARCH_OPTIONAL_KERNEL_RWX_DEFAULT=y +CONFIG_ARCH_PHYS_ADDR_T_64BIT=y # CONFIG_ARCH_SELECT_MEMORY_MODEL is not set # CONFIG_ARCH_SPARSEMEM_DEFAULT is not set CONFIG_ARCH_SUPPORTS_UPROBES=y @@ -26,7 +28,7 @@ CONFIG_ARM_HAS_SG_CHAIN=y CONFIG_ARM_HEAVY_MB=y CONFIG_ARM_L1_CACHE_SHIFT=6 CONFIG_ARM_L1_CACHE_SHIFT_6=y -# CONFIG_ARM_LPAE is not set +CONFIG_ARM_LPAE=y CONFIG_ARM_PATCH_IDIV=y CONFIG_ARM_PATCH_PHYS_VIRT=y CONFIG_ARM_PSCI=y @@ -63,15 +65,19 @@ CONFIG_GENERIC_CPU_AUTOPROBE=y CONFIG_GENERIC_IRQ_EFFECTIVE_AFF_MASK=y # CONFIG_GRO_CELLS is not set CONFIG_HARDEN_BRANCH_PREDICTOR=y +CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y CONFIG_HAVE_ARM_ARCH_TIMER=y CONFIG_HAVE_DYNAMIC_FTRACE_WITH_REGS=y CONFIG_HAVE_EBPF_JIT=y +CONFIG_HAVE_GENERIC_GUP=y CONFIG_HAVE_IDE=y CONFIG_HAVE_MOD_ARCH_SPECIFIC=y CONFIG_HAVE_OPROFILE=y CONFIG_HAVE_OPTPROBES=y CONFIG_HAVE_PROC_CPU=y +CONFIG_HAVE_RCU_TABLE_FREE=y CONFIG_HAVE_SMP=y +# CONFIG_HUGETLBFS is not set CONFIG_HZ_FIXED=0 CONFIG_HZ_PERIODIC=y # CONFIG_MDIO_BUS is not set @@ -86,7 +92,8 @@ CONFIG_OUTER_CACHE=y CONFIG_OUTER_CACHE_SYNC=y CONFIG_PAGE_OFFSET=0xC0000000 CONFIG_PERF_USE_VMALLOC=y -CONFIG_PGTABLE_LEVELS=2 +CONFIG_PGTABLE_LEVELS=3 +CONFIG_PHYS_ADDR_T_64BIT=y # CONFIG_PL310_ERRATA_588369 is not set # CONFIG_PL310_ERRATA_727915 is not set # CONFIG_PL310_ERRATA_753970 is not set @@ -98,6 +105,7 @@ CONFIG_SG_POOL=y CONFIG_SMP_ON_UP=y CONFIG_SWP_EMULATE=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y +CONFIG_SYS_SUPPORTS_HUGETLBFS=y # CONFIG_THUMB2_KERNEL is not set CONFIG_TIMER_OF=y CONFIG_TIMER_PROBE=y