From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.3 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 982D4C433E0 for ; Tue, 12 Jan 2021 18:27:34 +0000 (UTC) Received: from lists.ozlabs.org (lists.ozlabs.org [203.11.71.2]) (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 B78762311A for ; Tue, 12 Jan 2021 18:27:33 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B78762311A Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=csgroup.eu Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=linuxppc-dev-bounces+linuxppc-dev=archiver.kernel.org@lists.ozlabs.org Received: from bilbo.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 4DFfFH1jZMzDqvW for ; Wed, 13 Jan 2021 05:27:31 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=csgroup.eu (client-ip=93.17.236.30; helo=pegase1.c-s.fr; envelope-from=christophe.leroy@csgroup.eu; receiver=) Authentication-Results: lists.ozlabs.org; dmarc=none (p=none dis=none) header.from=csgroup.eu Received: from pegase1.c-s.fr (pegase1.c-s.fr [93.17.236.30]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4DFfC85Y9WzDqTy for ; Wed, 13 Jan 2021 05:25:38 +1100 (AEDT) Received: from localhost (mailhub1-int [192.168.12.234]) by localhost (Postfix) with ESMTP id 4DFfBz0Pnyz9tyLw for ; Tue, 12 Jan 2021 19:25:31 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at c-s.fr Received: from pegase1.c-s.fr ([192.168.12.234]) by localhost (pegase1.c-s.fr [192.168.12.234]) (amavisd-new, port 10024) with ESMTP id Fvqg_1vNs4ft for ; Tue, 12 Jan 2021 19:25:30 +0100 (CET) Received: from messagerie.si.c-s.fr (messagerie.si.c-s.fr [192.168.25.192]) by pegase1.c-s.fr (Postfix) with ESMTP id 4DFfBy66zmz9tyLb for ; Tue, 12 Jan 2021 19:25:30 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 4D9668B7D3 for ; Tue, 12 Jan 2021 19:25:32 +0100 (CET) X-Virus-Scanned: amavisd-new at c-s.fr Received: from messagerie.si.c-s.fr ([127.0.0.1]) by localhost (messagerie.si.c-s.fr [127.0.0.1]) (amavisd-new, port 10023) with ESMTP id LD4SopIqvY20 for ; Tue, 12 Jan 2021 19:25:32 +0100 (CET) Received: from [192.168.4.90] (unknown [192.168.4.90]) by messagerie.si.c-s.fr (Postfix) with ESMTP id F0ECF8B7CD for ; Tue, 12 Jan 2021 19:25:31 +0100 (CET) Subject: Re: [PATCH] tty: serial: cpm_uart: Add udbg support for enabling xmon From: Christophe Leroy To: linuxppc-dev@lists.ozlabs.org References: Message-ID: <6619e42e-38ca-8fa0-b154-8550b14c41d6@csgroup.eu> Date: Tue, 12 Jan 2021 19:25:25 +0100 User-Agent: Mozilla/5.0 (Windows NT 6.1; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.6.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: fr Content-Transfer-Encoding: 8bit X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: linuxppc-dev-bounces+linuxppc-dev=archiver.kernel.org@lists.ozlabs.org Sender: "Linuxppc-dev" Le 23/12/2020 à 10:38, Christophe Leroy a écrit : > In order to use xmon with powerpc 8xx, the serial driver > must provide udbg_putc() and udpb_getc(). > > Provide them via cpm_put_poll_char() and cpm_get_poll_char(). > > This requires CONFIG_CONSOLE_POLL. > > Signed-off-by: Christophe Leroy This patch has been merged in tty-next, it is visible in linux-next Christophe > --- > drivers/tty/serial/cpm_uart/cpm_uart_core.c | 40 ++++++++++++++++++++- > 1 file changed, 39 insertions(+), 1 deletion(-) > > diff --git a/drivers/tty/serial/cpm_uart/cpm_uart_core.c b/drivers/tty/serial/cpm_uart/cpm_uart_core.c > index ba14ec5b9bc4..2920b9b602b3 100644 > --- a/drivers/tty/serial/cpm_uart/cpm_uart_core.c > +++ b/drivers/tty/serial/cpm_uart/cpm_uart_core.c > @@ -1145,6 +1145,32 @@ static void cpm_put_poll_char(struct uart_port *port, > ch[0] = (char)c; > cpm_uart_early_write(pinfo, ch, 1, false); > } > + > +static struct uart_port *udbg_port; > + > +static void udbg_cpm_putc(char c) > +{ > + if (c == '\n') > + cpm_put_poll_char(udbg_port, '\r'); > + cpm_put_poll_char(udbg_port, c); > +} > + > +static int udbg_cpm_getc_poll(void) > +{ > + int c = cpm_get_poll_char(udbg_port); > + > + return c == NO_POLL_CHAR ? -1 : c; > +} > + > +static int udbg_cpm_getc(void) > +{ > + int c; > + > + while ((c = udbg_cpm_getc_poll()) == -1) > + cpu_relax(); > + return c; > +} > + > #endif /* CONFIG_CONSOLE_POLL */ > > static const struct uart_ops cpm_uart_pops = { > @@ -1251,7 +1277,10 @@ static int cpm_uart_init_port(struct device_node *np, > pinfo->gpios[i] = NULL; > > #ifdef CONFIG_PPC_EARLY_DEBUG_CPM > - udbg_putc = NULL; > +#ifdef CONFIG_CONSOLE_POLL > + if (!udbg_port) > +#endif > + udbg_putc = NULL; > #endif > > return cpm_uart_request_port(&pinfo->port); > @@ -1370,6 +1399,15 @@ static int __init cpm_uart_console_setup(struct console *co, char *options) > uart_set_options(port, co, baud, parity, bits, flow); > cpm_line_cr_cmd(pinfo, CPM_CR_RESTART_TX); > > +#ifdef CONFIG_CONSOLE_POLL > + if (!udbg_port) { > + udbg_port = &pinfo->port; > + udbg_putc = udbg_cpm_putc; > + udbg_getc = udbg_cpm_getc; > + udbg_getc_poll = udbg_cpm_getc_poll; > + } > +#endif > + > return 0; > } > >