From patchwork Tue Nov 8 10:46:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juerg Haefliger X-Patchwork-Id: 1701224 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=oB6eoln1; dkim-atps=neutral Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4N64Xt5SGQz1yqS for ; Tue, 8 Nov 2022 21:46:53 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1osM7q-00046u-HG; Tue, 08 Nov 2022 10:46:38 +0000 Received: from smtp-relay-internal-0.internal ([10.131.114.225] helo=smtp-relay-internal-0.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1osM7p-00046L-EM for kernel-team@lists.ubuntu.com; Tue, 08 Nov 2022 10:46:37 +0000 Received: from mail-ej1-f72.google.com (mail-ej1-f72.google.com [209.85.218.72]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id 215A6423E9 for ; Tue, 8 Nov 2022 10:46:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1667904397; bh=SPLammQPfGmd+FnjTELTZH5RGmfxEgnn1abM0Uy/fzI=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=oB6eoln1ldAYstgIKLXJtidUjILWCLZGjJ1Tr8K04rMmBKpFGDAea+PNQitY8qfgu 5J7/C6YfnF/a4yaqTGodNvOM4cMGuPbIszOh6+HIrAFIsFBhn8ZeACvq9Ou1nrynfI PZ+It3PYL2TzPPT+zml/gyhqHkU6f9tXGDVpKyhZk+nKNedgavt/oIHN2BDbrZFCpW UM6+6ZOD2+WDKxgTJ1RS9NiDVKRWw/Z65CWMzu1s8uasT43fhNX6tAImEdPUivt2TT pkZBpsVzr8vZpcE8YMTlhI8Wnpiqi673davayX39BRl83CJDZHXmX8rB/4VDK9zdma G1krOW2qo6YiA== Received: by mail-ej1-f72.google.com with SMTP id qf25-20020a1709077f1900b0078c02a23da3so8137448ejc.0 for ; Tue, 08 Nov 2022 02:46:37 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=SPLammQPfGmd+FnjTELTZH5RGmfxEgnn1abM0Uy/fzI=; b=uIaYZOb49OBCuAhPTdTG5Xj3bX3S57cCFKVZVCV8Up+BXcYUoxGwigIPbmGgOc8/R8 CFGSpbcW8FUQESPvD7iirKBrb/2PhwSO3P+noPaMmc8Fz6DcIdKMjh0PmpYKBPKQ5Meu srLox7jTedsAti+Ww38VLV+4t+WatGpWchyuOiCF7bANE4GpVQ+3HBrQ1E9mM2Tfv622 bHOdV898oEjdMxocR64SlEmCvQOH/Hzv4FQBodWcMtV1QneHuvcuix/AyXw6UYkmSzDe f9/RiW2p/EdHpta8+7MZGogd5pzn+PKhX1QARBpsxmL+++rVKGQoSEzYx6cTdDY5T/QQ eWbQ== X-Gm-Message-State: ACrzQf0M6mpIJ7z7BQnz8MTCIZqI94s8Z5pYbQZQLK9tfU//lPEiDuY2 T3vYXYgngmcXDOz7GbEU5SZoRt2gdYd0c7AIJRpSP5LbachAro/nMd4emtK7P/b3qP6a1xgHW+B AuqbTwKy1kEXHDeKY5nGx0M0iddaIeXiefH+2P4uz7w== X-Received: by 2002:a17:906:8475:b0:7ad:c04:d3cf with SMTP id hx21-20020a170906847500b007ad0c04d3cfmr50682938ejc.463.1667904396865; Tue, 08 Nov 2022 02:46:36 -0800 (PST) X-Google-Smtp-Source: AMsMyM6V1Q7zfFNuXRRRuGK7o46QpVbRe7Au/JMbCuVR4dpHBc+S1oJR0IMReFvO0qWS81RhhbZJ0g== X-Received: by 2002:a17:906:8475:b0:7ad:c04:d3cf with SMTP id hx21-20020a170906847500b007ad0c04d3cfmr50682927ejc.463.1667904396669; Tue, 08 Nov 2022 02:46:36 -0800 (PST) Received: from localhost.localdomain ([194.191.244.86]) by smtp.gmail.com with ESMTPSA id kv15-20020a17090778cf00b007adf125cde4sm4609012ejc.13.2022.11.08.02.46.36 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Nov 2022 02:46:36 -0800 (PST) From: Juerg Haefliger To: kernel-team@lists.ubuntu.com Subject: [SRU][K/raspi][PATCH 1/3] drivers: dwc_otg: stop GCC from patching FIQ functions Date: Tue, 8 Nov 2022 11:46:30 +0100 Message-Id: <20221108104632.12140-2-juerg.haefliger@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221108104632.12140-1-juerg.haefliger@canonical.com> References: <20221108104632.12140-1-juerg.haefliger@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Jonathan Bell BugLink: https://bugs.launchpad.net/bugs/1995853 Configuring GCC to use task stack protector canaries means it will insert calls to check functions in FIQ code. This is bad, as a) the FIQ's stack is banked and b) the failure invokes __stack_chk_fail which eventually tries to call printk(). Printing to the console inside the FIQ is generally fatal. Add CFLAGS to stop this happening in FIQ code. Also catch one function where notrace wasn't specified. Signed-off-by: Jonathan Bell (cherry picked from commit 1a62e5b2363d26320b01d8377ea13dc24a6f32d1 rpi-5.19.y) Signed-off-by: Juerg Haefliger --- drivers/usb/host/dwc_otg/Makefile | 1 + drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/usb/host/dwc_otg/Makefile b/drivers/usb/host/dwc_otg/Makefile index 7ea65a6bcdb7..8cbe3e684f26 100644 --- a/drivers/usb/host/dwc_otg/Makefile +++ b/drivers/usb/host/dwc_otg/Makefile @@ -28,6 +28,7 @@ ccflags-y += -DDWC_LINUX ccflags-y += $(CFI) ccflags-y += $(BUS_INTERFACE) #ccflags-y += -DDWC_DEV_SRPCAP +CFLAGS_dwc_otg_fiq_fsm.o += -fno-stack-protector obj-$(CONFIG_USB_DWCOTG) += dwc_otg.o diff --git a/drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.c b/drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.c index f644acbce748..67e277804b2e 100644 --- a/drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.c +++ b/drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.c @@ -142,7 +142,7 @@ inline void fiq_fsm_spin_unlock(fiq_lock_t *lock) { } * fiq_fsm_restart_channel() - Poke channel enable bit for a split transaction * @channel: channel to re-enable */ -static void fiq_fsm_restart_channel(struct fiq_state *st, int n, int force) +static void notrace fiq_fsm_restart_channel(struct fiq_state *st, int n, int force) { hcchar_data_t hcchar = { .d32 = FIQ_READ(st->dwc_regs_base + HC_START + (HC_OFFSET * n) + HCCHAR) }; From patchwork Tue Nov 8 10:46:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juerg Haefliger X-Patchwork-Id: 1701226 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=NLjKREWe; dkim-atps=neutral Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4N64Xv0Jhzz23mG for ; Tue, 8 Nov 2022 21:46:53 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1osM7s-00048g-Mb; Tue, 08 Nov 2022 10:46:40 +0000 Received: from smtp-relay-internal-1.internal ([10.131.114.114] helo=smtp-relay-internal-1.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1osM7q-000473-Su for kernel-team@lists.ubuntu.com; Tue, 08 Nov 2022 10:46:38 +0000 Received: from mail-ed1-f69.google.com (mail-ed1-f69.google.com [209.85.208.69]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id 8C60C412C7 for ; Tue, 8 Nov 2022 10:46:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1667904398; bh=1OAkxds0NLWF2XAxz19eFkvvqwuADA/5kyULV6UwyMw=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=NLjKREWeVW1nzwzRsc0fVNnKVE+jnWscXLbpQlsd6B+x25Ns0omuUwOXw6XyEGqWQ uUOdPGqVXJUpOrRFnaYrreJkWf8pDvvmxscthj7aMTbbyVNntrVTAKpwv0uI6ncXk7 sUrSgccLiUSH+/scOBWN+w+v/1Et46Z9O7Dd7Ta8lBruAUeiQbOGWwlJnEiZuOkqrk lbrZ56zlfdaD4eIc5odzFyVbExCwhT2g23YDUGEcPnw/Ef7ROqGqK2rpKYmhKXzcI3 bQB2EsWn1JYQJ0Jr5GRlbWjqiNqHt9T6tHlWTYL9FE8wPBjCql0JkpVysTrtCCuZMF Gq5Pbc2EIlqiA== Received: by mail-ed1-f69.google.com with SMTP id w17-20020a056402269100b00461e28a75ccso10228418edd.8 for ; Tue, 08 Nov 2022 02:46:38 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=1OAkxds0NLWF2XAxz19eFkvvqwuADA/5kyULV6UwyMw=; b=Ldl+pHhs5GmlRT9aiDOF59YY46rrIhjmVDKWbTEf6QAJQj7KbmO+BX5BRqL6M67J3l FlpOJYzhhR+AiSFp+R7Xpba3dUsQzMJbVWyBcjS1/nBskXUw8e1j9Wb10Ul/UI6BrXqO 2yXpanBv5oxKx+07v6oGndkW884NDhKZkzL93zn644v6IQ7jK13nCsUhjCU+zQjPw1Yc D72OG69KxPaxjUF5d2a80mY8WI3Ho/qvaK8ti0ee/F+PTr/HYX9bR62y90QbgPF/fOg8 cUv+EKhNkbJqDOAedMQcTv9nmFx3XoxJhZ44rcFpvLdBGQDDnpjBdr4bwPC3AIEJCq2P bYrg== X-Gm-Message-State: ACrzQf2MjvlocrHFiYbi2w/HcElWI659n4zN5nBamVq9zX4jXUc//1P1 Mq2zpkPPOWh86Qc42pmKeoeeq+cUs8elYBCyu1Qhq+iZZdlUgb24VzCsTkeqADvBPt4V8T5t6kn B+YSTGS43XMTMYwkbwQ0QOFrkoD7T5iq/rhd6k4IAAw== X-Received: by 2002:a17:906:846a:b0:7ad:84cd:f2a9 with SMTP id hx10-20020a170906846a00b007ad84cdf2a9mr51163008ejc.244.1667904397607; Tue, 08 Nov 2022 02:46:37 -0800 (PST) X-Google-Smtp-Source: AMsMyM4M51Eh2P7jqeevbqcNJNWr1vZcZjM/A30QWkuBZfFu/l8cti5mRjwURYrORReGPXP87gpLCg== X-Received: by 2002:a17:906:846a:b0:7ad:84cd:f2a9 with SMTP id hx10-20020a170906846a00b007ad84cdf2a9mr51162993ejc.244.1667904397366; Tue, 08 Nov 2022 02:46:37 -0800 (PST) Received: from localhost.localdomain ([194.191.244.86]) by smtp.gmail.com with ESMTPSA id kv15-20020a17090778cf00b007adf125cde4sm4609012ejc.13.2022.11.08.02.46.36 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Nov 2022 02:46:37 -0800 (PST) From: Juerg Haefliger To: kernel-team@lists.ubuntu.com Subject: [SRU][K/raspi][PATCH 2/3] UBUNTU: Revert "UBUNTU: [Packaging] raspi: Use gcc-11 for armhf" Date: Tue, 8 Nov 2022 11:46:31 +0100 Message-Id: <20221108104632.12140-3-juerg.haefliger@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221108104632.12140-1-juerg.haefliger@canonical.com> References: <20221108104632.12140-1-juerg.haefliger@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" BugLink: https://bugs.launchpad.net/bugs/1995853 This reverts commit 3d15b0e601a672a7f915cf15f071ef59fd4e9090. Signed-off-by: Juerg Haefliger --- debian/rules.d/0-common-vars.mk | 9 ++------- debian/scripts/misc/kernelconfig | 9 +-------- 2 files changed, 3 insertions(+), 15 deletions(-) diff --git a/debian/rules.d/0-common-vars.mk b/debian/rules.d/0-common-vars.mk index f7a0bdc41a22..1d8f8b85772f 100644 --- a/debian/rules.d/0-common-vars.mk +++ b/debian/rules.d/0-common-vars.mk @@ -119,13 +119,8 @@ CROSS_COMPILE ?= $(DEB_HOST_GNU_TYPE)- # If a given kernel wants to change this, they can do so via their own # $(DEBIAN)/rules.d/hooks.mk and $(DEBIAN)/rules.d/$(arch).mk files # -# FIXME (juergh): Use gcc-11 for armhf -ifeq ($(arch),armhf) -export gcc := gcc-11 -else -export gcc := gcc-12 -endif -GCC_BUILD_DEPENDS=\ gcc-12 [arm64], gcc-11 [armhf], gcc-12-aarch64-linux-gnu [arm64] , gcc-11-arm-linux-gnueabihf [armhf] , +export gcc?=gcc-12 +GCC_BUILD_DEPENDS=\ $(gcc), $(gcc)-aarch64-linux-gnu [arm64] , $(gcc)-arm-linux-gnueabihf [armhf] , $(gcc)-powerpc64le-linux-gnu [ppc64el] , $(gcc)-riscv64-linux-gnu [riscv64] , $(gcc)-s390x-linux-gnu [s390x] , $(gcc)-x86-64-linux-gnu [amd64] , abidir := $(CURDIR)/$(DEBIAN)/__abi.current/$(arch) prev_abidir := $(CURDIR)/$(DEBIAN)/abi/$(arch) diff --git a/debian/scripts/misc/kernelconfig b/debian/scripts/misc/kernelconfig index 2db4b719db6d..44c1b79d9765 100755 --- a/debian/scripts/misc/kernelconfig +++ b/debian/scripts/misc/kernelconfig @@ -67,13 +67,6 @@ for arch in $archs; do # Determine cross toolchain to use for Kconfig compiler tests cross_compile="$(dpkg-architecture -qDEB_HOST_GNU_TYPE -a$arch 2>/dev/null)-" - # FIXME (juergh): Use gcc-11 for armhf - if [ "${kernarch}" = "arm" ] ; then - gcc=gcc-11 - else - gcc=gcc-12 - fi - # Environment variables for 'make *config'. We omit CROSS_COMPILE # for i386 since it is no longer supported after 19.04, however # we maintain the configs for hwe. @@ -83,7 +76,7 @@ for arch in $archs; do if [ "$compiler_path" != '' ]; then env="$env CROSS_COMPILE=$cross_compile CC=$compiler_path" else - echo "WARNING: ${cross_compile}${gcc} not installed" + echo "WARNING: ${cross_compile}gcc not installed" modify_config= warning_partial="$warning_partial $arch" fi From patchwork Tue Nov 8 10:46:32 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juerg Haefliger X-Patchwork-Id: 1701225 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=IgwzNXZY; dkim-atps=neutral Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4N64Xv0MB4z23mJ for ; Tue, 8 Nov 2022 21:46:53 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1osM7u-000492-St; Tue, 08 Nov 2022 10:46:42 +0000 Received: from smtp-relay-internal-0.internal ([10.131.114.225] helo=smtp-relay-internal-0.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1osM7r-00047J-8d for kernel-team@lists.ubuntu.com; Tue, 08 Nov 2022 10:46:39 +0000 Received: from mail-ed1-f72.google.com (mail-ed1-f72.google.com [209.85.208.72]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id 149D6423EF for ; Tue, 8 Nov 2022 10:46:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1667904399; bh=BV6vkb2RfB5LVL0+f6tiljrvULquVmfSeoeVWcryFUk=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=IgwzNXZYWhhXB1SncYOqjtAgIK4z7HEXVBacakT4Wbk2OWu5GywwEhZhG8Y73fzq1 xJwfmw1Q+OifAkV7W4NHSVz7JHfZaQXPZLjmiPJv1bQNQbOiFIszs5uATX2kDepeSV 5NxXol+gEinCiOhlF1GlYQeAGzegLezm/9efnp769Vsbsgr1ibMvBVtYqUn+HxvwEf /Ggjy6HBRw2ToJi2mHJI3n8hSFXiK4aNCi6zYtBcv7NS8ZF/VdnmEwb52ZyEPGXeqN tviJEV/vGaKKYSVE5DBfE6EdgeKKxqViQtW4hdECZNPW0ty49xAKkdUsi2B2/+2qO5 1mYNL0DwdFmJQ== Received: by mail-ed1-f72.google.com with SMTP id q13-20020a056402518d00b00462b0599644so10471616edd.20 for ; Tue, 08 Nov 2022 02:46:39 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=BV6vkb2RfB5LVL0+f6tiljrvULquVmfSeoeVWcryFUk=; b=BsocEP9Mmf+ePrqTXHZcsBQas5CWa0ennFH7OdZVikMF4JgUnAvR6qvph55yfXp0qU TZ/embmD/TeCJ5KaRo3qIbAR7hmBlQeONnG11Vc4JTF/zSiChoXFvgE6vLOgPRO+xQ1u R2O+GATapeYLbk2GcG0F8/mnlDk9kNoEW3JYbBLwZ6GUViVbd3BHr7jUlu9JQQN4wB0c tWV/xBJXsdZ730IXkRDcvfYok5DrOLhWS/rqSk+TCJtIDQnYoXtBMVVXTDcyNkkJ65er YC6qeUrNKq96yseJdpmjlfzJndaVoVbhii/ZlNC1qNVyz6x8YhzmyV+XejKBIJl/NoS+ ppZA== X-Gm-Message-State: ACrzQf2rzuSbiUG8K8lfcPliAdxkqOU5pWJswe5i88e3vbCUYV/pSQe3 eJt5rD+rK33IVtrnddQZPywlFKT8MFUS6nshMigrGcremwbdaeDHEvCWkzxDnQ/wAfh2jfpt+kn GGe60J2eDsEqtLWVLXM1PJ2A1f7A+aeybEAIH4grIrA== X-Received: by 2002:a17:906:c151:b0:78d:cdbc:9fb7 with SMTP id dp17-20020a170906c15100b0078dcdbc9fb7mr50969875ejc.688.1667904398789; Tue, 08 Nov 2022 02:46:38 -0800 (PST) X-Google-Smtp-Source: AMsMyM6uxMmkIl/JY0CHSjGtaDmz2wFdRW+mVAFftlZAj2xbH0PPXZawyZM8gajeU8IMSvKFzVSXYw== X-Received: by 2002:a17:906:c151:b0:78d:cdbc:9fb7 with SMTP id dp17-20020a170906c15100b0078dcdbc9fb7mr50969848ejc.688.1667904398216; Tue, 08 Nov 2022 02:46:38 -0800 (PST) Received: from localhost.localdomain ([194.191.244.86]) by smtp.gmail.com with ESMTPSA id kv15-20020a17090778cf00b007adf125cde4sm4609012ejc.13.2022.11.08.02.46.37 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Nov 2022 02:46:37 -0800 (PST) From: Juerg Haefliger To: kernel-team@lists.ubuntu.com Subject: [SRU][K/raspi][PATCH 3/3] UBUNTU: [Config] raspi: updateconfigs for gcc-12 for armhf Date: Tue, 8 Nov 2022 11:46:32 +0100 Message-Id: <20221108104632.12140-4-juerg.haefliger@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221108104632.12140-1-juerg.haefliger@canonical.com> References: <20221108104632.12140-1-juerg.haefliger@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" BugLink: https://bugs.launchpad.net/bugs/1995853 Signed-off-by: Juerg Haefliger --- debian.raspi/config/arm64/config.common.arm64 | 1 - debian.raspi/config/armhf/config.common.armhf | 3 +-- debian.raspi/config/config.common.ubuntu | 2 ++ 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/debian.raspi/config/arm64/config.common.arm64 b/debian.raspi/config/arm64/config.common.arm64 index d7a53849e123..181771d19ed8 100644 --- a/debian.raspi/config/arm64/config.common.arm64 +++ b/debian.raspi/config/arm64/config.common.arm64 @@ -6,7 +6,6 @@ CONFIG_ARCH_MMAP_RND_BITS_MAX=33 CONFIG_ARCH_MMAP_RND_BITS_MIN=18 CONFIG_CC_VERSION_TEXT="aarch64-linux-gnu-gcc-12 (Ubuntu 12.2.0-3ubuntu1) 12.2.0" CONFIG_EFI_ARMSTUB_DTB_LOADER=y -CONFIG_GCC_VERSION=120200 # CONFIG_I2C_EMEV2 is not set CONFIG_IOMMU_IOVA=y CONFIG_IRQ_BYPASS_MANAGER=y diff --git a/debian.raspi/config/armhf/config.common.armhf b/debian.raspi/config/armhf/config.common.armhf index df34eb896ad5..003803d14c2f 100644 --- a/debian.raspi/config/armhf/config.common.armhf +++ b/debian.raspi/config/armhf/config.common.armhf @@ -3,9 +3,8 @@ # CONFIG_ARCH_MMAP_RND_BITS=8 CONFIG_ARCH_MMAP_RND_BITS_MIN=8 -CONFIG_CC_VERSION_TEXT="arm-linux-gnueabihf-gcc-11 (Ubuntu 11.3.0-6ubuntu1) 11.3.0" +CONFIG_CC_VERSION_TEXT="arm-linux-gnueabihf-gcc-12 (Ubuntu 12.2.0-3ubuntu1) 12.2.0" # CONFIG_EFI_ARMSTUB_DTB_LOADER is not set -CONFIG_GCC_VERSION=110300 CONFIG_I2C_EMEV2=m CONFIG_IOMMU_IOVA=m CONFIG_IRQ_BYPASS_MANAGER=m diff --git a/debian.raspi/config/config.common.ubuntu b/debian.raspi/config/config.common.ubuntu index 01964bebd973..b775af10c904 100644 --- a/debian.raspi/config/config.common.ubuntu +++ b/debian.raspi/config/config.common.ubuntu @@ -1216,6 +1216,7 @@ CONFIG_CC_HAS_WORKING_NOSANITIZE_ADDRESS=y CONFIG_CC_HAS_ZERO_CALL_USED_REGS=y CONFIG_CC_HAVE_SHADOW_CALL_STACK=y CONFIG_CC_HAVE_STACKPROTECTOR_SYSREG=y +CONFIG_CC_HAVE_STACKPROTECTOR_TLS=y CONFIG_CC_IMPLICIT_FALLTHROUGH="-Wimplicit-fallthrough=5" CONFIG_CC_IS_GCC=y CONFIG_CC_NO_ARRAY_BOUNDS=y @@ -2844,6 +2845,7 @@ CONFIG_GAMEPORT_NS558=m CONFIG_GARP=m CONFIG_GCC12_NO_ARRAY_BOUNDS=y CONFIG_GCC_SUPPORTS_DYNAMIC_FTRACE_WITH_REGS=y +CONFIG_GCC_VERSION=120200 # CONFIG_GCOV_KERNEL is not set CONFIG_GDB_SCRIPTS=y # CONFIG_GEMINI_ETHERNET is not set