From patchwork Sat Jul 15 20:57:53 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baptiste Jonglez X-Patchwork-Id: 788981 X-Patchwork-Delegate: nbd@openwrt.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.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 3x923r4YP2z9s75 for ; Sun, 16 Jul 2017 06:59:20 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="tLe8ZAun"; dkim-atps=neutral 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:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Subject:Message-Id: Date:To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=ZwCd9tdXJ+sTHYAUNM0Um1IfDk+6/v+55ufd6vDBP+M=; b=tLe8ZAunkwgCyc rxpATNqh9DMGkWmpHBkIfaIwMXSy/ExjBhwEgWMF7OethbmK5oThCvTflJo4nwp/hOkHA+DXLZivf RvJ7ZdShgG+tLMmJdIJy3962P4SKNAFtAalXF5egOFogTLIgpcdgaLLWsGw+nQhhrNIlVeToYKBon SmeoRgHlYfFZopDXUxNlIiwW9THa3VzZfsfry77UamKdIckie3z2cmrie2n74npBrjF+4eeKnvXks oApol6lDS/jIn9JIspI0+pkDkiLw+y0oualdEQjo7S9z09Auf6OQILvnPmM3S7IJTDyhUVdXHRYh0 IAt+dQ7u+XApa2DxWXlQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1dWU9Q-0005Sl-5v; Sat, 15 Jul 2017 20:58:56 +0000 Received: from degre.six.polyno.me ([2a03:7220:8081:1a00::1] helo=mejis.polyno.me) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dWU9L-0005QS-Sv for lede-dev@lists.infradead.org; Sat, 15 Jul 2017 20:58:54 +0000 Received: from [172.23.184.98] (helo=tuxmachine.polynome.dn42) by mejis.polyno.me with esmtp (Exim 4.80) (envelope-from ) id 1dWU8u-0002KM-Cl; Sat, 15 Jul 2017 22:58:24 +0200 From: Baptiste Jonglez To: lede-dev@lists.infradead.org Date: Sat, 15 Jul 2017 22:57:53 +0200 Message-Id: <20170715205756.14334-1-baptiste@bitsofnetworks.org> X-Mailer: git-send-email 2.13.3 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170715_135852_170578_7A634AA1 X-CRM114-Status: UNSURE ( 5.43 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-1.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Subject: [LEDE-DEV] [PATCH lede-17.01 1/4] x86/generic: use HIGHMEM64G instead of HIGHMEM4G to fix PAE and Xen X-BeenThere: lede-dev@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jo-Philipp Wich , Baptiste Jonglez , Daniel Golle MIME-Version: 1.0 Sender: "Lede-dev" Errors-To: lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org From: Baptiste Jonglez This is a backport of 641a65fd062987a456216cc4fa91ff2910528261 in master. This change re-enables PAE for the 32-bit x86 subtarget, which is interesting in its own right but also necessary for Xen support. Commit af1d1ebd ("x86: enable 4G high memory support for generic (32bit) subtarget") inadvertently disabled both PAE and Xen support. Fixes: FS#908 Cc: Daniel Golle Cc: Jo-Philipp Wich Signed-off-by: Baptiste Jonglez --- target/linux/x86/generic/config-default | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/target/linux/x86/generic/config-default b/target/linux/x86/generic/config-default index 1a14c270bc..c4ca4fd396 100644 --- a/target/linux/x86/generic/config-default +++ b/target/linux/x86/generic/config-default @@ -42,6 +42,7 @@ CONFIG_AGP_INTEL=y # CONFIG_AGP_SWORKS is not set # CONFIG_AGP_VIA is not set # CONFIG_APM is not set +CONFIG_ARCH_DMA_ADDR_T_64BIT=y CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y CONFIG_ARCH_MIGHT_HAVE_ACPI_PDC=y CONFIG_ARCH_PHYS_ADDR_T_64BIT=y @@ -165,7 +166,8 @@ CONFIG_HDMI=y CONFIG_HIBERNATE_CALLBACKS=y CONFIG_HID=y CONFIG_HID_BATTERY_STRENGTH=y -# CONFIG_HIGHMEM64G is not set +# CONFIG_HIGHMEM4G is not set +CONFIG_HIGHMEM64G=y CONFIG_HOTPLUG_CPU=y CONFIG_HPET=y CONFIG_HPET_MMAP=y @@ -267,6 +269,7 @@ CONFIG_PATA_VIA=y CONFIG_PCIEAER=y CONFIG_PCIEPORTBUS=y CONFIG_PCIE_PME=y +CONFIG_PCI_BUS_ADDR_T_64BIT=y CONFIG_PCI_MMCONFIG=y CONFIG_PCI_XEN=y # CONFIG_PCWATCHDOG is not set