From patchwork Tue Jul 12 12:04:32 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Emil Renner Berthing X-Patchwork-Id: 1655343 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.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=plcC59ic; dkim-atps=neutral Authentication-Results: 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=) Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4Lhzw60MCZz9sFk for ; Tue, 12 Jul 2022 22:05:08 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1oBEdK-0003UT-Um; Tue, 12 Jul 2022 12:04:54 +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 1oBEdH-0003Qy-PF for kernel-team@lists.ubuntu.com; Tue, 12 Jul 2022 12:04:51 +0000 Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.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-1.canonical.com (Postfix) with ESMTPS id F0ED43F4D0 for ; Tue, 12 Jul 2022 12:04:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1657627490; bh=l5uxkq5sMp5o0mqstsGRhSNIEGap+EYUvdpdnXyPGJw=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=plcC59icsRik5UnDFHHCvaMduvpZL557UNSJNbGy+pALMCFz53XZrTZUb+haiuuDL E8OMIsv3mvU1rEeFhYznouvFlFS05JWW757rvPOr1TeU8ECm3lAPB/pHGNkia6qcHr 5cFCU35FYZNWU1N/jTOOq71TUfeDJI4ornE9z5NmTD+F124j5hAwnoxvyD49HHt7dz duSRr55Bsx9kU8cYwpyNUq7SA5UACsUyot1gPZBxIOysdqmFkK08ix0Za750CyzlYR nsrsD1zL7RDGbN4otGjw+ZvwG9x6Z2rWxmWj+Nkfdg3tVINgtte80G6r6yCJ9/K705 jXD0BaWOeLXjQ== Received: by mail-wm1-f72.google.com with SMTP id i184-20020a1c3bc1000000b003a026f48333so4048498wma.4 for ; Tue, 12 Jul 2022 05:04:50 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=l5uxkq5sMp5o0mqstsGRhSNIEGap+EYUvdpdnXyPGJw=; b=cq/LfxdVhqyX5tgziGGNzdzpmR6BB1DZTBECkwXPQaOPbN1qHjH8L+BZV/fYvLNvNn pdm0VxzpdDGh+diNebds7zeFZiiNg2G5eqU89U2DjLG2W1Qn/kiJOefMraB5bf8d2bLT av1OcMOnxyGoZyPc5n5FGtK3sRdsdV7DSW7IXHqpHKxBlX/35VR3vSDzCG6/BCGP6wvM iJrv1kPLF9QvT7VLFV3xPF/85g8nyQzyEOee49y9rlpg1hya0deo3+ZLGK6jcmYhiQh8 8qLnNrg/Nj3+iGLW1P3ETZGzZaePJVkiC5O9qsr5f/d2UfAGljMNAWxQoHAFUGyE3a6a 4WOw== X-Gm-Message-State: AJIora9aVtMnyMpCu+aeK/FYa6wHaxfWVHnDr7a46XSAENvRctbVGc8S mz6P+cfI1Ezj+BXeUD+9uuY1vsytsXq2YD6VG9IFzF0i1j2FlUlMgLphjyhdRV8IqFPKIhsN1tB tgjMFW+l/Z9/K3kClOUUMIbQMdgxn605BaMmGhHPPlw== X-Received: by 2002:adf:e30c:0:b0:21d:666f:f7bf with SMTP id b12-20020adfe30c000000b0021d666ff7bfmr20903542wrj.120.1657627489916; Tue, 12 Jul 2022 05:04:49 -0700 (PDT) X-Google-Smtp-Source: AGRyM1v5kSrglK1lQGjyrEClSsQwTBk2xc6UcJvisPGCgMPfArihO0NGEn9ghaUdF4vToxptPCRpWQ== X-Received: by 2002:adf:e30c:0:b0:21d:666f:f7bf with SMTP id b12-20020adfe30c000000b0021d666ff7bfmr20903512wrj.120.1657627489554; Tue, 12 Jul 2022 05:04:49 -0700 (PDT) Received: from stitch.. (80.71.140.73.ipv4.parknet.dk. [80.71.140.73]) by smtp.gmail.com with ESMTPSA id i15-20020adfefcf000000b0021d82a6095bsm7992246wrp.95.2022.07.12.05.04.49 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Jul 2022 05:04:49 -0700 (PDT) From: Emil Renner Berthing To: kernel-team@lists.ubuntu.com Subject: [SRU][K][PATCH 01/16] UBUNTU: [Config] Disable CONFIG_CXL_MEM_RAW_COMMANDS on riscv64 Date: Tue, 12 Jul 2022 14:04:32 +0200 Message-Id: <20220712120447.355124-2-emil.renner.berthing@canonical.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220712120447.355124-1-emil.renner.berthing@canonical.com> References: <20220712120447.355124-1-emil.renner.berthing@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/1981437 This option was not annotated in the linux-riscv tree, so let's align it with the other architectures. Signed-off-by: Emil Renner Berthing --- debian.master/config/amd64/config.common.amd64 | 1 - debian.master/config/annotations | 2 +- debian.master/config/arm64/config.common.arm64 | 1 - debian.master/config/armhf/config.common.armhf | 1 - debian.master/config/config.common.ubuntu | 1 + debian.master/config/ppc64el/config.common.ppc64el | 1 - debian.master/config/riscv64/config.common.riscv64 | 1 - 7 files changed, 2 insertions(+), 6 deletions(-) diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64 index 73abfdd0a295..c3fd7a196871 100644 --- a/debian.master/config/amd64/config.common.amd64 +++ b/debian.master/config/amd64/config.common.amd64 @@ -83,7 +83,6 @@ CONFIG_CRYPTO_LIB_POLY1305_RSIZE=11 CONFIG_CRYPTO_SM3_GENERIC=m CONFIG_CRYPTO_SM4_GENERIC=m CONFIG_CXL_BUS=m -# CONFIG_CXL_MEM_RAW_COMMANDS is not set CONFIG_DEBUG_INFO_BTF=y CONFIG_DECNET=m CONFIG_DEFAULT_MMAP_MIN_ADDR=65536 diff --git a/debian.master/config/annotations b/debian.master/config/annotations index 00683d2efa9e..f2d8dacaa3bd 100644 --- a/debian.master/config/annotations +++ b/debian.master/config/annotations @@ -696,7 +696,7 @@ CONFIG_MHI_BUS_PCI_GENERIC policy<{'amd64': 'm', 'arm64': ' # Menu: Device Drivers >> CXL (Compute Express Link) Devices Support CONFIG_CXL_BUS policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'm', 's390x': 'n'}> CONFIG_CXL_MEM policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'm'}> -CONFIG_CXL_MEM_RAW_COMMANDS policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'ppc64el': 'n', 'riscv64': 'y', 's390x': '-'}> +CONFIG_CXL_MEM_RAW_COMMANDS policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'ppc64el': 'n', 'riscv64': 'n', 's390x': '-'}> CONFIG_CXL_ACPI policy<{'amd64': 'm', 'arm64': 'm'}> CONFIG_CXL_PMEM policy<{'amd64': 'm', 'arm64': 'm', 'armhf-generic-lpae': 'm', 'ppc64el': 'm', 'riscv64': 'm'}> diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64 index ae43a5b2e7c4..e03083af3dc3 100644 --- a/debian.master/config/arm64/config.common.arm64 +++ b/debian.master/config/arm64/config.common.arm64 @@ -89,7 +89,6 @@ CONFIG_CRYPTO_LIB_POLY1305_RSIZE=9 CONFIG_CRYPTO_SM3_GENERIC=m CONFIG_CRYPTO_SM4_GENERIC=m CONFIG_CXL_BUS=m -# CONFIG_CXL_MEM_RAW_COMMANDS is not set CONFIG_DEBUG_INFO_BTF=y CONFIG_DECNET=m CONFIG_DEFAULT_MMAP_MIN_ADDR=32768 diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf index be6fe67009b8..6a146143fc34 100644 --- a/debian.master/config/armhf/config.common.armhf +++ b/debian.master/config/armhf/config.common.armhf @@ -81,7 +81,6 @@ CONFIG_CRYPTO_LIB_POLY1305_RSIZE=9 CONFIG_CRYPTO_SM3_GENERIC=m CONFIG_CRYPTO_SM4_GENERIC=m CONFIG_CXL_BUS=m -# CONFIG_CXL_MEM_RAW_COMMANDS is not set # CONFIG_DEBUG_INFO_BTF is not set CONFIG_DECNET=m CONFIG_DEFAULT_MMAP_MIN_ADDR=32768 diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index ff7b6fa6d27d..ab2ad1f3bc4b 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -2635,6 +2635,7 @@ CONFIG_CXLFLASH=m CONFIG_CXL_ACPI=m CONFIG_CXL_BASE=y CONFIG_CXL_MEM=m +# CONFIG_CXL_MEM_RAW_COMMANDS is not set CONFIG_CXL_PCI=m CONFIG_CXL_PMEM=m CONFIG_CXL_PORT=m diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el index cc98a0a6930a..eb4b93eb7026 100644 --- a/debian.master/config/ppc64el/config.common.ppc64el +++ b/debian.master/config/ppc64el/config.common.ppc64el @@ -83,7 +83,6 @@ CONFIG_CRYPTO_LIB_POLY1305_RSIZE=1 CONFIG_CRYPTO_SM3_GENERIC=m CONFIG_CRYPTO_SM4_GENERIC=m CONFIG_CXL_BUS=m -# CONFIG_CXL_MEM_RAW_COMMANDS is not set CONFIG_DEBUG_INFO_BTF=y CONFIG_DECNET=m CONFIG_DEFAULT_MMAP_MIN_ADDR=65536 diff --git a/debian.master/config/riscv64/config.common.riscv64 b/debian.master/config/riscv64/config.common.riscv64 index 8ed1cff72616..261dbb049839 100644 --- a/debian.master/config/riscv64/config.common.riscv64 +++ b/debian.master/config/riscv64/config.common.riscv64 @@ -79,7 +79,6 @@ CONFIG_CRYPTO_LIB_POLY1305_RSIZE=1 CONFIG_CRYPTO_SM3_GENERIC=m CONFIG_CRYPTO_SM4_GENERIC=m CONFIG_CXL_BUS=m -CONFIG_CXL_MEM_RAW_COMMANDS=y CONFIG_DEBUG_INFO_BTF=y CONFIG_DECNET=m CONFIG_DEFAULT_MMAP_MIN_ADDR=65536