From patchwork Wed Aug 26 07:19:16 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Stanley X-Patchwork-Id: 11737537 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id E83EB913 for ; Wed, 26 Aug 2020 07:19:51 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C10632071E for ; Wed, 26 Aug 2020 07:19:51 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="jYtTqmdB"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="OXa+dODJ" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C10632071E Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=jms.id.au Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject: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=cjw9x032D791++PtOVPnAWsdzlML7JybaXAMtigVjHM=; b=jYtTqmdBscZChWH6lspe25hKTT UQWiUystN7UsZPeGPOtuzjQtas45ixt49uBnEHbflqMcnNcYsyx8GgZuklDjJILpva5dXJC4zzMLN v8Bh5wyogi29SOKkEFR069AqB5FrWllSlxpgTm4Zz8rEEDRWTJPQnFjpJEUSZOxHZInRXuYrxFh0i CdB4VyCkHrmwOfofwId+kvU3eF09NOHTx2yqLMNUge+zF1aLBHuYe7LNz/vXRyu9vJ5WzGUVRkVZe e0YXLR9LbpQiGV8pdWKD3rlpzEVaVc23U8vA6LignoeTEJcsetNBf+5oNoCV3+CZlrZE/qXyyzY1l GbXZmzjA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kApif-0007ns-7N; Wed, 26 Aug 2020 07:19:41 +0000 Received: from mail-pg1-x543.google.com ([2607:f8b0:4864:20::543]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kApic-0007lw-47; Wed, 26 Aug 2020 07:19:39 +0000 Received: by mail-pg1-x543.google.com with SMTP id g33so605581pgb.4; Wed, 26 Aug 2020 00:19:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=qWLQ09H4pd8WgMgtgz12mw5W3VvW3dhG530iJhOXSE0=; b=OXa+dODJtUqYwtqpQ7ayh7hD2+7v70th2/273W1+fTk2MmqVr26N7l3YZK+gVNeD/0 VJQGWHjYBPCccKWZ5YVAYwN/9y4ZFAyd6xLhPT4v16Qzl8uLtYEwJYFtwS+IV2T+uYRT o696chC8iVjFQ0LJSsUiv6kscF9IHSXTtAA+LZaM69XQXkCOHKmEW0qVuTAVoGDTw8rI sKBmyMC1a5Rt7wlCJz+Qs7XI8L/DKlv4IH8jFR3MVib6BMPkEUCTjfEyquqWtlz1cbbZ Ja4CpU7sVeu/8jGj2Wbeme+jeEiCa6g/jBznhIWVa5JLTjmtiBQR2a5mNhXgh2O5GvYc AUBQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :mime-version:content-transfer-encoding; bh=qWLQ09H4pd8WgMgtgz12mw5W3VvW3dhG530iJhOXSE0=; b=bgqv0Kj02SRvhkvGHtXxrDlM0HAMzcJuLhOlMvkrSxV8zPw0dHSuY/rCoAZoOfqLRC hF6tCAt9ZHrVZvYg/zAMU4T30Pv8fGFpvS3LNvteBh5cgI1ss16El69iBXhUrx9PikfQ 12VaQzp1YCGY3xz6yBZ+iqqSNAnNBnWsB7g1aZNzb2zmhJruSVe+65j19VAH/x+ccQe7 We5gr6+r+ILtdbyj+r2Gkn6jc1/fDtWvi23cug3CBgVs6HddR9MJZdvf6QlmltR6kvaJ 0eLEPcll8Xp3eixdyQD2aUpmc8pWnj60rupFlpw84uj5qEMpCG4hxaQeqw6zUfeP1foq AqPA== X-Gm-Message-State: AOAM533kX/pwpHLdDylmkeAx+iTq4DxIbOLSO2vwOv531rR3bziCPNqT g04KGTG/WGKDhlHiZAJB5fU= X-Google-Smtp-Source: ABdhPJzu+RfzmpakKaJ6ICWRJIIn4iAY6rm05Qjiy2cIfh8eZg7ri+t6ytJ/DqHxJh9T+iOIaATKGQ== X-Received: by 2002:a62:1c86:: with SMTP id c128mr11084787pfc.78.1598426374880; Wed, 26 Aug 2020 00:19:34 -0700 (PDT) Received: from localhost.localdomain ([45.124.203.19]) by smtp.gmail.com with ESMTPSA id mw8sm1125465pjb.47.2020.08.26.00.19.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Aug 2020 00:19:33 -0700 (PDT) From: Joel Stanley To: Andrew Jeffery , Arnd Bergmann , Mauro Carvalho Chehab Subject: [PATCH] ARM: config: aspeed: Fix selection of media drivers Date: Wed, 26 Aug 2020 16:49:16 +0930 Message-Id: <20200826071916.3081953-1-joel@jms.id.au> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200826_031938_185556_4D9A1621 X-CRM114-Status: GOOD ( 14.97 ) X-Spam-Score: 0.4 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (0.4 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:543 listed in] [list.dnswl.org] 0.2 HEADER_FROM_DIFFERENT_DOMAINS From and EnvelopeFrom 2nd level mail domains are different 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [joel.stan[at]gmail.com] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.2 FREEMAIL_FORGED_FROMDOMAIN 2nd level domains in From and EnvelopeFrom freemail headers are different X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Alexandre Belloni , linux-aspeed@lists.ozlabs.org, Tony Lindgren , Thierry Reding , Florian Fainelli , Jonathan Hunter , Ludovic Desroches , NXP Linux Team , linux-mips@vger.kernel.org, James Hartley , Ray Jui , Sascha Hauer , linux-rpi-kernel@lists.infradead.org, linux-tegra@vger.kernel.org, linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Thomas Bogendoerfer , Scott Branden , linux-kernel@vger.kernel.org, stable@vger.kernel.org, Pengutronix Kernel Team , Shawn Guo , =?utf-8?q?C=C3=A9dric_Le_Goater?= Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org In the 5.7 merge window the media kconfig was restructued. For most platforms these changes set CONFIG_MEDIA_SUPPORT_FILTER=y which keeps unwanted drivers disabled. The exception is if a config sets EMBEDDED or EXPERT (see b0cd4fb27665). In that case the filter is set to =n, causing a bunch of DVB tuner drivers (MEDIA_TUNER_*) to be accidentally enabled. This was noticed as it blew out the build time for the Aspeed defconfigs. Enabling the filter means the Aspeed config also needs to set CONFIG_MEDIA_PLATFORM_SUPPORT=y in order to have the CONFIG_VIDEO_ASPEED driver enabled. Fixes: 06b93644f4d1 ("media: Kconfig: add an option to filter in/out platform drivers") Fixes: b0cd4fb27665 ("media: Kconfig: on !EMBEDDED && !EXPERT, enable driver filtering") Cc: stable@vger.kernel.org CC: Mauro Carvalho Chehab Signed-off-by: Joel Stanley --- Another solution would be to revert b0cd4fb27665 ("media: Kconfig: on !EMBEDDED && !EXPERT, enable driver filtering"). I assume this was done to be helpful, but in practice it has enabled the TUNER drivers (and others) for the following configs that didn't have them before: $ git grep -lE "(CONFIG_EXPERT|CONFIG_EMBEDDED)" arch/*/configs/ | xargs grep -l MEDIA_SUPPORT arch/arm/configs/aspeed_g4_defconfig arch/arm/configs/aspeed_g5_defconfig arch/arm/configs/at91_dt_defconfig arch/arm/configs/bcm2835_defconfig arch/arm/configs/davinci_all_defconfig arch/arm/configs/ezx_defconfig arch/arm/configs/imote2_defconfig arch/arm/configs/imx_v4_v5_defconfig arch/arm/configs/imx_v6_v7_defconfig arch/arm/configs/milbeaut_m10v_defconfig arch/arm/configs/multi_v7_defconfig arch/arm/configs/omap2plus_defconfig arch/arm/configs/pxa_defconfig arch/arm/configs/qcom_defconfig arch/arm/configs/sama5_defconfig arch/arm/configs/tegra_defconfig arch/mips/configs/ci20_defconfig arch/mips/configs/lemote2f_defconfig arch/mips/configs/loongson3_defconfig arch/mips/configs/pistachio_defconfig I've cc'd the maintainers of these defconfigs so they are aware. --- arch/arm/configs/aspeed_g4_defconfig | 3 ++- arch/arm/configs/aspeed_g5_defconfig | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/arch/arm/configs/aspeed_g4_defconfig b/arch/arm/configs/aspeed_g4_defconfig index 303f75a3baec..58d293b63581 100644 --- a/arch/arm/configs/aspeed_g4_defconfig +++ b/arch/arm/configs/aspeed_g4_defconfig @@ -160,7 +160,8 @@ CONFIG_SENSORS_TMP421=y CONFIG_SENSORS_W83773G=y CONFIG_WATCHDOG_SYSFS=y CONFIG_MEDIA_SUPPORT=y -CONFIG_MEDIA_CAMERA_SUPPORT=y +CONFIG_MEDIA_SUPPORT_FILTER=y +CONFIG_MEDIA_PLATFORM_SUPPORT=y CONFIG_V4L_PLATFORM_DRIVERS=y CONFIG_VIDEO_ASPEED=y CONFIG_DRM=y diff --git a/arch/arm/configs/aspeed_g5_defconfig b/arch/arm/configs/aspeed_g5_defconfig index b0d056d49abe..cc2449ed6e6d 100644 --- a/arch/arm/configs/aspeed_g5_defconfig +++ b/arch/arm/configs/aspeed_g5_defconfig @@ -175,7 +175,8 @@ CONFIG_SENSORS_TMP421=y CONFIG_SENSORS_W83773G=y CONFIG_WATCHDOG_SYSFS=y CONFIG_MEDIA_SUPPORT=y -CONFIG_MEDIA_CAMERA_SUPPORT=y +CONFIG_MEDIA_SUPPORT_FILTER=y +CONFIG_MEDIA_PLATFORM_SUPPORT=y CONFIG_V4L_PLATFORM_DRIVERS=y CONFIG_VIDEO_ASPEED=y CONFIG_DRM=y