From patchwork Tue May 23 08:59:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Herve Codina X-Patchwork-Id: 97917 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp1997187vqo; Tue, 23 May 2023 02:07:26 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6Bu/xKFuffhJnXzMQm+qPuzhc+m+9Jig+XuicEhQ6LJl51fABLdXTqdt+A48xOMY/Ru/cO X-Received: by 2002:a17:902:da8a:b0:1af:babd:7b84 with SMTP id j10-20020a170902da8a00b001afbabd7b84mr4385234plx.41.1684832846584; Tue, 23 May 2023 02:07:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684832846; cv=none; d=google.com; s=arc-20160816; b=rT0F/idG0PgFqRmSeCxTkdjjObv0+xkxJPZSA912TQ67rRoARuKajwQ/vR48kkdDk5 jo2Wuh3vrVXUY1u6YgIJCZfYCvjuQ0RQTpsmR4ZPkfpfTMLwz/nzkjds6qOnJV664Avk mGwKa7d/7X/s8ezoWXi+mrNNTQebC15LRG7x87jjmCN/dJcPA+tWvUOh8inkZYkDjvXe akhifYeHVrvRZD3IhMGFpzjAQCK3YQXA51fczhAn25w4TcpOpO1DqRrhnrtodJVDDSFu gifeggAUDBcbDcFbNNEl0QERFcaJ3mP5mf8yVKoeyyyBSonDBsVMkvF+NRYZr0CVW9V/ F56w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=EfY/8yJ+Azw862bqGkzmouL5hoaQtAS7JukLHLhERIU=; b=iGOnuAnnShDMdTH8j1IEUaWg7EJUBkqEm+UHFuwG+Fk5nZkoqVIBhK9XU4gfc2Us/9 J0E4lLbcmEhZOB3uRkekKOhNHH848ZcmRIxCuwik+d9Am8WWyxV9UVhbolS9KqcpdGhh mTRgsNy+Be4M8/GLFUJ4HesvBdm41owodNQFJuCfjhuRtf5wonM2z7QQyNvjx7Su9s0R qPWqgKnyohrce9qJPS2KUDZArxpCqFSMhz3btueeq/ToirPfiw56pAtSjAtH2JT0y9fP 1+CXbN54xezHNtEqIkrXo13iP2GB+SaAUBvKGzkyyx8ZSNa9ZsAG6h/NTslvfeMVc5Qs ZxGw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@bootlin.com header.s=gm1 header.b=XwdERH7E; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=bootlin.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id bi11-20020a170902bf0b00b001ae21cd0fafsi1062854plb.38.2023.05.23.02.07.14; Tue, 23 May 2023 02:07:26 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@bootlin.com header.s=gm1 header.b=XwdERH7E; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=bootlin.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236129AbjEWI7a (ORCPT + 99 others); Tue, 23 May 2023 04:59:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34260 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232991AbjEWI7X (ORCPT ); Tue, 23 May 2023 04:59:23 -0400 Received: from relay5-d.mail.gandi.net (relay5-d.mail.gandi.net [217.70.183.197]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9A94313E; Tue, 23 May 2023 01:59:11 -0700 (PDT) Received: (Authenticated sender: herve.codina@bootlin.com) by mail.gandi.net (Postfix) with ESMTPA id B3B311C000C; Tue, 23 May 2023 08:59:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1684832350; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=EfY/8yJ+Azw862bqGkzmouL5hoaQtAS7JukLHLhERIU=; b=XwdERH7EssnlbUs+m58TkAsn2oRyXQOf7VZcLrzW4lZWaJAvcIxV7ZfLvk84g7W/zOyWHt Y00z3DmLYmckKS8j+9aGAhxHRhgc8Rwvvj+34kaih0d+eTClL+Q4PalqvA2fLM58/hKNL7 Beta149CMiYDuaen0Hd76jS1cTjYF2JS4/NKuNoOXsLdR1UVyRl/LrFHyRsO2+L0Il/48g tLr5Vp7J3AUZWv9q0vwVFwqkivivIOHmMT1p9S1UXQA4uFC7E1zxMdo74i6PW/nnETe4sq KVPOP3JYPXFJH2xwpOjMb4BZEpVvxo3vAh8oHVvGmG647F8emBr3mW3qJB8ALg== From: Herve Codina To: Herve Codina , Qiang Zhao , Li Yang , Greg Kroah-Hartman , Jiri Slaby Cc: linuxppc-dev@lists.ozlabs.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-serial@vger.kernel.org, Mark Brown , Christophe Leroy , Thomas Petazzoni , kernel test robot Subject: [PATCH v2 1/2] soc: fsl: cpm1: Fix TSA and QMC dependencies in case of COMPILE_TEST Date: Tue, 23 May 2023 10:59:01 +0200 Message-Id: <20230523085902.75837-2-herve.codina@bootlin.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230523085902.75837-1-herve.codina@bootlin.com> References: <20230523085902.75837-1-herve.codina@bootlin.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1766675286713026378?= X-GMAIL-MSGID: =?utf-8?q?1766675286713026378?= In order to compile tsa.c and qmc.c, CONFIG_CPM must be set. Without this dependency, the linker fails with some missing symbols for COMPILE_TEST configurations that need QMC without enabling CPM. Signed-off-by: Herve Codina Reported-by: kernel test robot Link: https://lore.kernel.org/oe-kbuild-all/202305160221.9XgweObz-lkp@intel.com/ Acked-by: Randy Dunlap Tested-by: Randy Dunlap # build-tested --- drivers/soc/fsl/qe/Kconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/soc/fsl/qe/Kconfig b/drivers/soc/fsl/qe/Kconfig index 7268c2fbcbc1..e0d096607fef 100644 --- a/drivers/soc/fsl/qe/Kconfig +++ b/drivers/soc/fsl/qe/Kconfig @@ -36,7 +36,7 @@ config UCC config CPM_TSA tristate "CPM TSA support" depends on OF && HAS_IOMEM - depends on CPM1 || COMPILE_TEST + depends on CPM1 || (CPM && COMPILE_TEST) help Freescale CPM Time Slot Assigner (TSA) controller. @@ -47,7 +47,7 @@ config CPM_TSA config CPM_QMC tristate "CPM QMC support" depends on OF && HAS_IOMEM - depends on CPM1 || (FSL_SOC && COMPILE_TEST) + depends on CPM1 || (FSL_SOC && CPM && COMPILE_TEST) depends on CPM_TSA help Freescale CPM QUICC Multichannel Controller From patchwork Tue May 23 08:59:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Herve Codina X-Patchwork-Id: 97921 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp1998401vqo; Tue, 23 May 2023 02:10:12 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7TIzfmeJXZycu46uL2+DvAtRbq89TeHjG8sLODynhc79hyI5MQM6gu+Jn8L+XMigKN89D7 X-Received: by 2002:a05:6a00:1783:b0:644:d77:a2c5 with SMTP id s3-20020a056a00178300b006440d77a2c5mr20374871pfg.29.1684833012384; Tue, 23 May 2023 02:10:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684833012; cv=none; d=google.com; s=arc-20160816; b=QP4toDXM7PAolv/SzEWNPATm5T7H64g7Hy2uqioFiZPItSFLwrsN+OF6rh+OdIvxUn 66v5kc+T6EyCnKceBD9n3A5/TejoWIl1PbXfXKOMrjoSJOkVniSNlfB5xYuhW2Pt5tfG 60Np5pVuAz3l3gMKR5H0jZCqM9cl+vT//h1EY5NGwY4g0pIH99zjsKcv86/TUVFGRRqL KPf2M3gK4ReTVS5JFT9T6VqlV1//M5LE7BTpJf3WFg/aiOjSm3QZ8NInXCpzYYty9HhL Cfd22x4IVPAfmTzsqCO9KARsWERKuzuAg3LH1gxp4ydWNRixHzXKbdoOBjafFUPVqDvM 4Ljw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=hB0jH5VbqniXpY2XCqtCh3H0TPVZDlgFAeoWdY16lSQ=; b=MVGJqfhfNRxw97XLlHO/O0aMZoi3wDklqW/zew3r2ieYomnv1mP5n0B6SPSZHIcDcN 5oNqwjlOshhbxUe1klZBxnwj76t41k0TJrZQDAlPTzV2d0MuNEfppqmS1ov6Nzge7Dah lp2OmByabayEphTebi7WgoKmurlBniZai6pMVttJ3yfFM2SSne7hJXrxDWvgevn+UNxe ZXPpH3R702XR3w7FCIW89H0EHgeXhU01KqukLcWgsHryOXpQB+l1Fa3dRGWxP9CKbJto O53pueRgIs8wALMr6+K6WQVTsDwwJ/T9aIOdwehyPfVllVZpUoclUzNLy51Ru8jx5XMr iEtQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@bootlin.com header.s=gm1 header.b=Mw816vN8; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=bootlin.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id y1-20020a626401000000b0064729e5a04dsi6143053pfb.388.2023.05.23.02.09.59; Tue, 23 May 2023 02:10:12 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@bootlin.com header.s=gm1 header.b=Mw816vN8; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=bootlin.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236280AbjEWI7d (ORCPT + 99 others); Tue, 23 May 2023 04:59:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34286 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236142AbjEWI7Y (ORCPT ); Tue, 23 May 2023 04:59:24 -0400 Received: from relay5-d.mail.gandi.net (relay5-d.mail.gandi.net [IPv6:2001:4b98:dc4:8::225]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 03A5A132; Tue, 23 May 2023 01:59:13 -0700 (PDT) Received: (Authenticated sender: herve.codina@bootlin.com) by mail.gandi.net (Postfix) with ESMTPA id 2D8A01C000E; Tue, 23 May 2023 08:59:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1684832352; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=hB0jH5VbqniXpY2XCqtCh3H0TPVZDlgFAeoWdY16lSQ=; b=Mw816vN8TcnBrfqTuNPEggUvaZItZxQ1MeLicdYfseZoMBoorR4ORd/ARlEOpS1cgZp1hw 0sG3pZC4coWfmm8liekXRLcMPfdvp2TMA/Px2we9hfRSHDr1bghzhC/tn9NjJgE60PAy11 XMAh/2o5xVgsfDw5ZcTC0FbCxKiDoUKktLDfwLDr4x9e6XXUasE4dwVbtWz2lPF/TF9zPE v9NcBijXdx7na0lNRCsioVYyRD7MOF2zbK8ZKe9m0dm8Vj3A7/jfMU0puanLfbCB8TcGDp LjDauu5pX317pW/k6pO8A4dFBfq7Yi5004JBbTjdlXsWSvQ5wihHsNrzJIvv+Q== From: Herve Codina To: Herve Codina , Qiang Zhao , Li Yang , Greg Kroah-Hartman , Jiri Slaby Cc: linuxppc-dev@lists.ozlabs.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-serial@vger.kernel.org, Mark Brown , Christophe Leroy , Thomas Petazzoni , kernel test robot Subject: [PATCH v2 2/2] serial: cpm_uart: Fix a COMPILE_TEST dependency Date: Tue, 23 May 2023 10:59:02 +0200 Message-Id: <20230523085902.75837-3-herve.codina@bootlin.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230523085902.75837-1-herve.codina@bootlin.com> References: <20230523085902.75837-1-herve.codina@bootlin.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1766675460892757645?= X-GMAIL-MSGID: =?utf-8?q?1766675460892757645?= In a COMPILE_TEST configuration, the cpm_uart driver uses symbols from the cpm_uart_cpm2.c file. This file is compiled only when CONFIG_CPM2 is set. Without this dependency, the linker fails with some missing symbols for COMPILE_TEST configuration that needs SERIAL_CPM without enabling CPM2. This lead to: depends on CPM2 || CPM1 || (PPC32 && CPM2 && COMPILE_TEST) This dependency does not make sense anymore and can be simplified removing all the COMPILE_TEST part. Signed-off-by: Herve Codina Reported-by: kernel test robot Link: https://lore.kernel.org/oe-kbuild-all/202305160221.9XgweObz-lkp@intel.com/ Fixes: e3e7b13bffae ("serial: allow COMPILE_TEST for some drivers") --- drivers/tty/serial/Kconfig | 2 +- drivers/tty/serial/cpm_uart/cpm_uart.h | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/tty/serial/Kconfig b/drivers/tty/serial/Kconfig index 625358f44419..de092bc1289e 100644 --- a/drivers/tty/serial/Kconfig +++ b/drivers/tty/serial/Kconfig @@ -769,7 +769,7 @@ config SERIAL_PMACZILOG_CONSOLE config SERIAL_CPM tristate "CPM SCC/SMC serial port support" - depends on CPM2 || CPM1 || (PPC32 && COMPILE_TEST) + depends on CPM2 || CPM1 select SERIAL_CORE help This driver supports the SCC and SMC serial ports on Motorola diff --git a/drivers/tty/serial/cpm_uart/cpm_uart.h b/drivers/tty/serial/cpm_uart/cpm_uart.h index 0577618e78c0..46c03ed71c31 100644 --- a/drivers/tty/serial/cpm_uart/cpm_uart.h +++ b/drivers/tty/serial/cpm_uart/cpm_uart.h @@ -19,8 +19,6 @@ struct gpio_desc; #include "cpm_uart_cpm2.h" #elif defined(CONFIG_CPM1) #include "cpm_uart_cpm1.h" -#elif defined(CONFIG_COMPILE_TEST) -#include "cpm_uart_cpm2.h" #endif #define SERIAL_CPM_MAJOR 204