From patchwork Tue Jun 9 17:23:40 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Peter_M=C3=BCller?= X-Patchwork-Id: 3173 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 49hH6p64kRz3yQx for ; Tue, 9 Jun 2020 17:24:34 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 49hH6m2B9sz1Vv; Tue, 9 Jun 2020 17:24:32 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 49hH6m05sYz2xpb; Tue, 9 Jun 2020 17:24:32 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 49hH6k5Fvpz2xFj for ; Tue, 9 Jun 2020 17:24:30 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 49hH6j4Ld1zNj for ; Tue, 9 Jun 2020 17:24:29 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1591723470; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wdavoaI5AZyp5VmXO4q9n9s+Oz8FNsdFCdbFI8JQcug=; b=KYgWcYlG5eygexCOJaRNOhCuParZCQnb+MZBx/eqpNDIWZN4qGfk2FmfG8tyS9c0e9PzoA PFOCrGg3adq5j9Dw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1591723470; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wdavoaI5AZyp5VmXO4q9n9s+Oz8FNsdFCdbFI8JQcug=; b=B0FYBEVWJ1I/nBPeXsStzKr+c9HbUX2DYVS8fbePa527PmoEPc7NgT836j0gYiJw55hZpB VnPmTpODnOQK/QQ0AyS2C0Jfl6LP62yY8yQm991CzJoBoJ5Oda35MFJ9PBe+iG3xSdSvu6 u5YJNYBggXCZRGFXdF7F2vyA07vxYYvn50alnN9sWfAR/ZvmJoF5yHvh4zevDXl5suZoPA P8rhKk335VDGqLhkcrfB519C/QjEGz4xu5lwLnvgWOo/pUfhIl76lchlwnQXf7cZKFPEc0 pba2GTWkyXMRsx7YnMZZlRka2U0ZEaJQz/hCI3mEdMjk6y2a3Az0Th1YUG3+vw== To: development@lists.ipfire.org From: =?utf-8?q?Peter_M=C3=BCller?= Subject: [PATCH] kernel: enable CONFIG_RETPOLINE on aarch64 and armv5tel Message-ID: <5074b6b4-3a7e-4c31-7b47-39a3c6f4241c@ipfire.org> Date: Tue, 9 Jun 2020 17:23:40 +0000 MIME-Version: 1.0 Content-Language: en-US Authentication-Results: mail01.ipfire.org; auth=pass smtp.mailfrom=peter.mueller@ipfire.org X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" Since there seems to be no consistent position for that directive, the current approach is rather messy as it attempts to insert it near CONFIG_SMP (found and enabled across all architectures). When in Rome... Fixes: #12374 Cc: Arne Fitzenreiter Signed-off-by: Peter Müller --- config/kernel/kernel.config.aarch64-ipfire | 1 + config/kernel/kernel.config.armv5tel-ipfire-multi | 1 + 2 files changed, 2 insertions(+) diff --git a/config/kernel/kernel.config.aarch64-ipfire b/config/kernel/kernel.config.aarch64-ipfire index e0f2f6df8..8301c51bf 100644 --- a/config/kernel/kernel.config.aarch64-ipfire +++ b/config/kernel/kernel.config.aarch64-ipfire @@ -28,6 +28,7 @@ CONFIG_ARCH_DMA_ADDR_T_64BIT=y CONFIG_NEED_DMA_MAP_STATE=y CONFIG_NEED_SG_DMA_LENGTH=y CONFIG_SMP=y +CONFIG_RETPOLINE=y CONFIG_SWIOTLB=y CONFIG_IOMMU_HELPER=y CONFIG_KERNEL_MODE_NEON=y diff --git a/config/kernel/kernel.config.armv5tel-ipfire-multi b/config/kernel/kernel.config.armv5tel-ipfire-multi index 15183300f..1aca28d01 100644 --- a/config/kernel/kernel.config.armv5tel-ipfire-multi +++ b/config/kernel/kernel.config.armv5tel-ipfire-multi @@ -762,6 +762,7 @@ CONFIG_PCI_HOST_GENERIC=y CONFIG_HAVE_SMP=y CONFIG_SMP=y CONFIG_SMP_ON_UP=y +CONFIG_RETPOLINE=y CONFIG_ARM_CPU_TOPOLOGY=y CONFIG_SCHED_MC=y CONFIG_SCHED_SMT=y