From patchwork Tue Jul 12 12:04:46 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: 1655356 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=hd+3GaaM; 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 4Lhzwm0MLxz9sB4 for ; Tue, 12 Jul 2022 22:05:44 +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 1oBEdy-0004QS-MU; Tue, 12 Jul 2022 12:05:34 +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 1oBEdT-0003d6-Fx for kernel-team@lists.ubuntu.com; Tue, 12 Jul 2022 12:05:03 +0000 Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) (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 406F03F4D0 for ; Tue, 12 Jul 2022 12:05:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1657627502; bh=/rIQlglhHhAjzlScHdGDYatA/sI6fLFNekW6ZM98gL0=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=hd+3GaaMk6x8ahcgZ1+Zcr5TLWdmS9MOrUpBlwsjNNZvktaSKmeKJ4mOwObmWCu7A qHxOSpXSsN2BlL8Dj2J2MJlwxk4vT2bOzPmuRLBMuJg8+TFpt/s2cjo+A7K9ug91ko mP28/GFYFbgg4TTffV3+zt6bzmTqqEqWcGxX3mbOojlpoXNy2YgCSEyR/o+5ICxjTo MjXDjKZVbghxxHJ7q+YBeagCBaDzD5Ut31sYOs+0JUD7/FmlQczzduVeXdet+5i0bF Hscp/+t0ODrmJsAKVO6HTGKuvkE7J0AqCty6yofWX6nl+lwrGvbOBfRja+w6P2pvjR +tXUGvBJ7BJBg== Received: by mail-wr1-f70.google.com with SMTP id l5-20020adfa385000000b0021db73f5818so132626wrb.20 for ; Tue, 12 Jul 2022 05:05:02 -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=/rIQlglhHhAjzlScHdGDYatA/sI6fLFNekW6ZM98gL0=; b=dFsoDjNB8opkA+wflp0rA0WYHUCeZoiDg6TFd//ZLm0Q0iFvpi2V6xeHUIaB3ypvtU wVJFp+HVILZYpkTBlfrtKCPJ89Wsl4WmKRvk2cQAwVvUHIithwZ8xX/O3+F0PN89H6le /jAm0I7G0xctSC1mRt8Zu3pUiS3DSKzwXweIP51ziNc6JqJidRJwdHmUwBJJee887a3Y EMyF6YP3i1YH5Kxdpk63oG+YgSm8z6qqCq3QhNTLzFQtAZgwbYsEHKbmlAtSjlrGhI9d Nxqukldoo70xPVy2FPkr8xHqSqsscuAo/RqtbBmppNRjc651550cDHuEfLRUYLTQHN0t TUUw== X-Gm-Message-State: AJIora+mdVVTJYo+BEpQ84XhqHHsRspukB08vZ8U46vLhi81uRBHlHBZ UoyuwBY0Rem6N2qSbDR0R+AFRc26utha3/JwdAAJbTa7tdcQ5pnStGJKTu+JBTG1iKMT4UXxrhE UPrGmq4NT4GRj5NRh/BEp2lRWRi5IYnqqJeKwYqewOA== X-Received: by 2002:a05:600c:4306:b0:3a2:e9e0:3626 with SMTP id p6-20020a05600c430600b003a2e9e03626mr3375764wme.175.1657627501327; Tue, 12 Jul 2022 05:05:01 -0700 (PDT) X-Google-Smtp-Source: AGRyM1u9B2x9r2eZ/8g5k9bW8cXS+puZqpNdQtj1RQ6N/s+bZl8Gvg/V+DhXIK/9dfpT0JAR/uSkrw== X-Received: by 2002:a05:600c:4306:b0:3a2:e9e0:3626 with SMTP id p6-20020a05600c430600b003a2e9e03626mr3375723wme.175.1657627500899; Tue, 12 Jul 2022 05:05:00 -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.05.00 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Jul 2022 05:05:00 -0700 (PDT) From: Emil Renner Berthing To: kernel-team@lists.ubuntu.com Subject: [SRU][K][PATCH 15/16] UBUNTU: [Config] Set CONFIG_MHI_WWAN_CTRL=m on riscv64 Date: Tue, 12 Jul 2022 14:04:46 +0200 Message-Id: <20220712120447.355124-16-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 0e156a243542..4b2f6c759bd6 100644 --- a/debian.master/config/amd64/config.common.amd64 +++ b/debian.master/config/amd64/config.common.amd64 @@ -376,7 +376,6 @@ CONFIG_MFD_WL1273_CORE=m CONFIG_MFD_WM8994=m CONFIG_MHI_BUS=m CONFIG_MHI_BUS_EP=m -CONFIG_MHI_WWAN_CTRL=m CONFIG_MII=m CONFIG_MINIX_FS=m CONFIG_MINIX_SUBPARTITION=y diff --git a/debian.master/config/annotations b/debian.master/config/annotations index 7a04ae19385d..a8b5aefd863d 100644 --- a/debian.master/config/annotations +++ b/debian.master/config/annotations @@ -6932,7 +6932,7 @@ CONFIG_WILINK_PLATFORM_DATA policy<{'amd64': 'y', 'arm64': ' # Menu: Device Drivers >> Network device support >> Wireless WAN >> WWAN Driver Core CONFIG_WWAN policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 'riscv64': 'm', 's390x': 'n'}> CONFIG_WWAN_HWSIM policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'm', 's390x': '-'}> -CONFIG_MHI_WWAN_CTRL policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'n'}> +CONFIG_MHI_WWAN_CTRL policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'm'}> CONFIG_MHI_WWAN_MBIM policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'm'}> CONFIG_RPMSG_WWAN_CTRL policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'm'}> CONFIG_IOSM policy<{'amd64': 'm'}> diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64 index 72270e7d398c..5bf633fab2b7 100644 --- a/debian.master/config/arm64/config.common.arm64 +++ b/debian.master/config/arm64/config.common.arm64 @@ -392,7 +392,6 @@ CONFIG_MFD_WL1273_CORE=m CONFIG_MFD_WM8994=m CONFIG_MHI_BUS=m CONFIG_MHI_BUS_EP=m -CONFIG_MHI_WWAN_CTRL=m CONFIG_MII=y CONFIG_MINIX_FS=m CONFIG_MINIX_SUBPARTITION=y diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf index 26d3b1d3ecec..fc5d43b61bcd 100644 --- a/debian.master/config/armhf/config.common.armhf +++ b/debian.master/config/armhf/config.common.armhf @@ -378,7 +378,6 @@ CONFIG_MFD_WL1273_CORE=m CONFIG_MFD_WM8994=m CONFIG_MHI_BUS=m CONFIG_MHI_BUS_EP=m -CONFIG_MHI_WWAN_CTRL=m CONFIG_MII=y CONFIG_MINIX_FS=m CONFIG_MINIX_SUBPARTITION=y diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index ddce83712bd0..c4bcc26f688c 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -6401,6 +6401,7 @@ CONFIG_MFD_WM8998=y # CONFIG_MHI_BUS_DEBUG is not set CONFIG_MHI_BUS_PCI_GENERIC=m CONFIG_MHI_NET=m +CONFIG_MHI_WWAN_CTRL=m CONFIG_MHI_WWAN_MBIM=m CONFIG_MHP_MEMMAP_ON_MEMORY=y CONFIG_MICREL_KS8995MA=m diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el index d2c0e9de2396..7f82d024b307 100644 --- a/debian.master/config/ppc64el/config.common.ppc64el +++ b/debian.master/config/ppc64el/config.common.ppc64el @@ -382,7 +382,6 @@ CONFIG_MFD_WL1273_CORE=m CONFIG_MFD_WM8994=m CONFIG_MHI_BUS=m CONFIG_MHI_BUS_EP=m -CONFIG_MHI_WWAN_CTRL=m CONFIG_MII=m CONFIG_MINIX_FS=m CONFIG_MINIX_SUBPARTITION=y diff --git a/debian.master/config/riscv64/config.common.riscv64 b/debian.master/config/riscv64/config.common.riscv64 index 4b4a9150e59c..b0c8c7e586ce 100644 --- a/debian.master/config/riscv64/config.common.riscv64 +++ b/debian.master/config/riscv64/config.common.riscv64 @@ -375,7 +375,6 @@ CONFIG_MFD_WL1273_CORE=m CONFIG_MFD_WM8994=m CONFIG_MHI_BUS=m CONFIG_MHI_BUS_EP=m -# CONFIG_MHI_WWAN_CTRL is not set CONFIG_MII=m CONFIG_MINIX_FS=m CONFIG_MINIX_SUBPARTITION=y