From patchwork Sat Dec 4 19:57:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sam Protsenko X-Patchwork-Id: 12694785 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 9398AC433EF for ; Sat, 4 Dec 2021 20:00:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=5E8aiLLJwIkFAeDYCRSNYbIU4ed2pfcotg6H420cdQg=; b=40I9x/Pm1c1H+/ mtSddNFL/m3LD+9+SNl86FQgPwkdsG/0s5xjVEj4DQeCztWKWMM8VkKFSV7nVXZjJXCURtSIn0ZY3 h3uvTDEskzvj2uIuQzpCWkwnvl56OZVnICPbRittWeTQ8TW/N6i2gatJPGZ5BlZ7mteowWHLG6LIb 61trVeGSu6fA0/Bt2gdzlpGrAob6dP683MnCXyvWEhLnIQdLE7GY8XMiREm8A7846Yqz+hgpMN9k+ SIbcnL+Ak+MPQVnpOzK5jY41utqWVL7s6LZBWYcAI4eD0fHvHPpAf9NHU9AtT1iXK9qiRyuNdJu9x FoyT/yya936xGzWBarqA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mtbBW-000i7s-NS; Sat, 04 Dec 2021 19:59:02 +0000 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mtbAe-000hsR-1d for linux-arm-kernel@lists.infradead.org; Sat, 04 Dec 2021 19:58:09 +0000 Received: by mail-wm1-x32f.google.com with SMTP id o29so5069436wms.2 for ; Sat, 04 Dec 2021 11:58:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=dtgprRzraDdcWxVzWCqJEx+6e+lMCp/8Fk0v9/xYiTg=; b=LC73kSjhtPfz1OAuQXDdwMpUY1J/PGiz6g7v9Yn8K5ebl8fgyQI5Xw+ulIAJj8h+sY KuUIX9tYC9xQOjhmrUhwBUJJv2sPU2dowEKjeE0aqDLAygjCkJHf6CbnUabPkEem3iTm 3Xy/KfoJYSVoLZqVXWZdSbhl1zXwuFFy+gaKEcPhqKoQbrn+2B+35ePDvAqvjeXRnk3y VjHpa3Y/UQPEpzaubQVfSFMcpPgkYkV8ImqjB7WN59Or2PKzXFob1l8ooHecMtGeg11C 7fHGR2JL093dUwpOv5X919XLZbsitbQtkV1wU8ZKxCd0AJ5Vb4OO361uoKa/ISmfnHDU EyuA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=dtgprRzraDdcWxVzWCqJEx+6e+lMCp/8Fk0v9/xYiTg=; b=NbR+beefuwUUtHZp+SaYBoIdPV1eyhu/j0/KeKOLMfLHRXPy68ZHnLtgrJT8ZadetT FUU3oR/m7s9VcWTiWh02S/29x/YtElkJQt1MliFJrlyzZ4T5jiHtajMeLU/EPtcfaZHt MN7wcsFCHbeuYgeT84ape2PRIiIPuOO4fIlug6LZH9cil8wc0r13z82tWV88aw9+4wpm OkB3YXVxgPpP+e96kgmlQhmTJ1J90IOR4WvXg55uAqVh/m4eSzN94BkVj4kTUJS7K0zD vzif/NWZLGvLNZpw80qVQDPB2MJvTnIBp1YPcmCS82S0BDWIbO4kFcsSUkgG6HemLl4S cw7w== X-Gm-Message-State: AOAM533jZ5un/cUVqv2bYYYTrlsrJyRqQP22oN+bIGUo3anaaOIG34Tc 6XKoJ+X16pcWio7j65L33NQGAQ== X-Google-Smtp-Source: ABdhPJzEdB3USItEVjCahP2N6o5ouxcRcAxJwvA99/oPl67wQu6iR7rjcLKXwLDrLg1BLX7vAWevXQ== X-Received: by 2002:a7b:c257:: with SMTP id b23mr25474214wmj.67.1638647886901; Sat, 04 Dec 2021 11:58:06 -0800 (PST) Received: from localhost ([31.134.121.151]) by smtp.gmail.com with ESMTPSA id b197sm6281503wmb.24.2021.12.04.11.58.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 04 Dec 2021 11:58:06 -0800 (PST) From: Sam Protsenko To: Krzysztof Kozlowski , Rob Herring , Greg Kroah-Hartman Cc: Jaewon Kim , Chanho Park , David Virag , Youngmin Nam , devicetree@vger.kernel.org, linux-serial@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-samsung-soc@vger.kernel.org Subject: [PATCH v3 5/5] tty: serial: samsung: Fix console registration from module Date: Sat, 4 Dec 2021 21:57:57 +0200 Message-Id: <20211204195757.8600-6-semen.protsenko@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211204195757.8600-1-semen.protsenko@linaro.org> References: <20211204195757.8600-1-semen.protsenko@linaro.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211204_115808_109413_ACD29E97 X-CRM114-Status: GOOD ( 16.08 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On modern Exynos SoCs (like Exynos850) the UART can be implemented as a part of USI IP-core. In such case, USI driver is used to initialize USI registers, and it also calls of_platform_populate() to instantiate all sub-nodes (e.g. serial node) of USI node. When serial driver is built-in, but USI driver is a module, and CONFIG_SERIAL_SAMSUNG_CONSOLE is enabled, next call chain will happen when loading USI module from user space: usi_init v usi_probe v of_platform_populate v s3c24xx_serial_probe v uart_add_one_port v uart_configure_port v register_console v try_enable_new_console v s3c24xx_serial_console_setup But because the serial driver is built-in, and s3c24xx_serial_console_setup() is marked with __init keyword, that symbol will discarded and long gone by that time already, causing failed paging request. That happens during the next config combination: EXYNOS_USI=m SERIAL_SAMSUNG=y SERIAL_SAMSUNG_CONSOLE=y That config should be completely possible, so rather than limiting SERIAL_SAMSUNG choice to "m" only when USI=m, remove __init keyword for all affected functions. Signed-off-by: Sam Protsenko Reviewed-by: Krzysztof Kozlowski --- Changes in v3: - (none) Changes in v2: - This patch is added in v2 drivers/tty/serial/samsung_tty.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/tty/serial/samsung_tty.c b/drivers/tty/serial/samsung_tty.c index 61ccb359620a..d002a4e48ed9 100644 --- a/drivers/tty/serial/samsung_tty.c +++ b/drivers/tty/serial/samsung_tty.c @@ -2500,7 +2500,8 @@ s3c24xx_serial_console_write(struct console *co, const char *s, uart_console_write(cons_uart, s, count, s3c24xx_serial_console_putchar); } -static void __init +/* Shouldn't be __init, as it can be instantiated from other module */ +static void s3c24xx_serial_get_options(struct uart_port *port, int *baud, int *parity, int *bits) { @@ -2563,7 +2564,8 @@ s3c24xx_serial_get_options(struct uart_port *port, int *baud, } } -static int __init +/* Shouldn't be __init, as it can be instantiated from other module */ +static int s3c24xx_serial_console_setup(struct console *co, char *options) { struct uart_port *port;