From patchwork Mon Dec 21 08:47:06 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xiaogang.Chen" X-Patchwork-Id: 346598 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.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT 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 D053BC433DB for ; Mon, 21 Dec 2020 08:48:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9230A22C7E for ; Mon, 21 Dec 2020 08:48:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726848AbgLUIsN (ORCPT ); Mon, 21 Dec 2020 03:48:13 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47272 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726100AbgLUIsN (ORCPT ); Mon, 21 Dec 2020 03:48:13 -0500 Received: from mail-oi1-x22f.google.com (mail-oi1-x22f.google.com [IPv6:2607:f8b0:4864:20::22f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 467AAC061248 for ; Mon, 21 Dec 2020 00:47:33 -0800 (PST) Received: by mail-oi1-x22f.google.com with SMTP id 9so10604173oiq.3 for ; Mon, 21 Dec 2020 00:47:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=auzb+IbQH96MeFrxoC0H6UvH3kmzyCZ5vmcXQO/iNac=; b=cLtDWp+Tg4tqVzR6qaDR7kb8m4B1OZ20RQIOimKiTi1BZPIvijx5vvMA06eLguVWYG 2htFwkWvrf1ZOzkisiQfXUjrYk8Hqk3vMhcvaO3B5Is4HegTHZdrd4KfMVTzID7iRTtZ 7T0KDTB7t/CYcjW3Usq7tqecaMsu4fM1/Xip8rtcbjSd4pttdOvfGSMLE0VWvtmeN0n3 ZE6t+qMqWzTkgcKSjKHh1DeRL5qS0hNOKVH6NzRRbhY30AviO/Qq75xtnX555WZpjNZf zp/kLnu3dm4AFv2X6E64t8oTu7X6VqGaiPnjBqfKtdUaRMV37CfmuO1gMJzGFg0tYeCM 7aTA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=auzb+IbQH96MeFrxoC0H6UvH3kmzyCZ5vmcXQO/iNac=; b=IlfjG9u2PwhaZizwsTg8QRg5VqlcRLDxaORH6tpGL6koCrMdlAfWh1PXQdnL/PIviX 86k4ooidrdJLCxincC37PWtxEVCqNKkG40EcIaoyifQ3noBv2qBnWVT4UbrJ1ieYpc/n GRc30rDUlMEFIfXHIMub3RNcyaZ56ty/en+3VYAJMEvd2Fy48Juh3l+lyDVxx0JRgMBP d3HlYmnYDaQZw0MtpGCvlLccbMRhvQy3EK0TNOGnkQm4KCyvqofXqzTh1EMZKF/FBE6O OFNGNoLAIl4Z2TqTCmnh70/1iz1ZXFWGRDuGmrqONW4CJDniw0zMz5g0zZjfyl4U6vSq ZsGQ== X-Gm-Message-State: AOAM531sSa1s6tr+Z4FGynxUERvjsWCCHqOunyW+hvchZuFEc4QXAfgi /DO6R9HMt1RgRBnQ2YVyzwo= X-Google-Smtp-Source: ABdhPJzMdEsiyIoJtP0qZFb+5SgZQzVWslWgAOijm9RD2IfjJjlPcWvV9Ay87zx/3XD7l0vGLmT3zw== X-Received: by 2002:a54:4785:: with SMTP id o5mr10361276oic.139.1608540452777; Mon, 21 Dec 2020 00:47:32 -0800 (PST) Received: from XChen-BuildServer.amd.com ([165.204.77.1]) by smtp.gmail.com with ESMTPSA id i24sm3611270oot.42.2020.12.21.00.47.32 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 21 Dec 2020 00:47:32 -0800 (PST) From: "Xiaogang.Chen" X-Google-Original-From: "Xiaogang.Chen" To: xiaogang.chen@amd.com Cc: Michal Simek , stable , Greg Kroah-Hartman Subject: [PATCH v1 01/14] Revert "serial: uartps: Fix error path when alloc failed" Date: Mon, 21 Dec 2020 02:47:06 -0600 Message-Id: <1608540439-28772-2-git-send-email-xiaogang.chen@amd.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1608540439-28772-1-git-send-email-xiaogang.chen@amd.com> References: <1608540439-28772-1-git-send-email-xiaogang.chen@amd.com> Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Michal Simek commit b6fd2dbbd649b89a3998528994665ded1e3fbf7f upstream. This reverts commit 32cf21ac4edd6c0d5b9614368a83bcdc68acb031. As Johan says, this driver needs a lot more work and these changes are only going in the wrong direction: https://lkml.kernel.org/r/20190523091839.GC568@localhost Reported-by: Johan Hovold Signed-off-by: Michal Simek Cc: stable Link: https://lore.kernel.org/r/46cd7f039db847c08baa6508edd7854f7c8ff80f.1585905873.git.michal.simek@xilinx.com Signed-off-by: Greg Kroah-Hartman --- drivers/tty/serial/xilinx_uartps.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/tty/serial/xilinx_uartps.c b/drivers/tty/serial/xilinx_uartps.c index d8910c5..f9297ee 100644 --- a/drivers/tty/serial/xilinx_uartps.c +++ b/drivers/tty/serial/xilinx_uartps.c @@ -1554,10 +1554,8 @@ static int cdns_uart_probe(struct platform_device *pdev) #ifdef CONFIG_SERIAL_XILINX_PS_UART_CONSOLE cdns_uart_console = devm_kzalloc(&pdev->dev, sizeof(*cdns_uart_console), GFP_KERNEL); - if (!cdns_uart_console) { - rc = -ENOMEM; - goto err_out_id; - } + if (!cdns_uart_console) + return -ENOMEM; strncpy(cdns_uart_console->name, CDNS_UART_TTY_NAME, sizeof(cdns_uart_console->name)); From patchwork Mon Dec 21 08:47:08 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xiaogang.Chen" X-Patchwork-Id: 346596 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.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT 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 061DEC433E6 for ; Mon, 21 Dec 2020 08:48:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C2BFE22CA1 for ; Mon, 21 Dec 2020 08:48:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727093AbgLUIsP (ORCPT ); Mon, 21 Dec 2020 03:48:15 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47278 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726100AbgLUIsO (ORCPT ); Mon, 21 Dec 2020 03:48:14 -0500 Received: from mail-ot1-x32f.google.com (mail-ot1-x32f.google.com [IPv6:2607:f8b0:4864:20::32f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A9ED1C0611C5 for ; Mon, 21 Dec 2020 00:47:34 -0800 (PST) Received: by mail-ot1-x32f.google.com with SMTP id a109so8238092otc.1 for ; Mon, 21 Dec 2020 00:47:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=jfEy6OA7Jpnp8cSsusvCd4sjnDQSeNnNzB3FZXduis8=; b=BQuPQn1zKXlLW+WGq78h3CvAeOpll+co+8Me5JZF23tKdKWeGgzZ5wneqgsolrqkQ7 h8h+9Rgz8IBOAqXfFUDrI/sJXVjM5c7y8QLl+5QJIhBTtQ/d+zuA1BCp2sCODklSIYIX LRe140SnDLso7N5Bki84ZhBjsLiS/pA63dke3Xgplsf28ZYhmavwl1k9uIAn+GdVp1jp IlhRYozdLUMya9xkO6sKdWpPfVeMhcbJb8XVHXPThns8+pjmEQu3fjAgPZFfhRARyUea wqXLgobaSSfUTc3dj20sarLMX0jkSE0ldNrA65hQSBKi+q+Q8YctibxCHi9/VhQSmsxB 0U6w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=jfEy6OA7Jpnp8cSsusvCd4sjnDQSeNnNzB3FZXduis8=; b=N0wKOqoYGbwKVBP0pY27VimTFDKe40NTrG03XVf22HhQWiMUdv7zyaHRD93Macm4DZ zqD+WukzH/KMkPh2ZLYkBeAEHNRykgEtcn+HZIYXb/E8rk2ubcRPweef03a0UgRUfsiQ Ay4EpqOL/vDXox4xA5NdvRp177u8BZe4sO4jsd3ElZY1zPZX1piOxGPCATc6X75Y2KCz 6S/n4jHBCsw7cNeU+Guq2I6X4Vy+lfLHS29S1szEsTo9i8M8JLfaLAcVN/XgHoofDKHD JQ8EySQkxfyulY1+aclR2FbhceO824awknln4gWvGCRx/le5JpsowAkn5Pl595JbrDvg l9TQ== X-Gm-Message-State: AOAM53251fY49nTWQsVBJJfl5vza1WpITwCk1ZLrZROdgtgLoNnSFL0m 6h9pSKvlr8MaGaGVpZlKX2datg2e5SE8eeeL X-Google-Smtp-Source: ABdhPJxNrgPeIkgBRAGYoikYvFFRnylLm5HcPxEmzJQyU/aUxcTcnEpf7TI3ohvf+V3Qyr9Qfp+84w== X-Received: by 2002:a05:6830:1349:: with SMTP id r9mr11391643otq.256.1608540454138; Mon, 21 Dec 2020 00:47:34 -0800 (PST) Received: from XChen-BuildServer.amd.com ([165.204.77.1]) by smtp.gmail.com with ESMTPSA id i24sm3611270oot.42.2020.12.21.00.47.33 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 21 Dec 2020 00:47:33 -0800 (PST) From: "Xiaogang.Chen" X-Google-Original-From: "Xiaogang.Chen" To: xiaogang.chen@amd.com Cc: Michal Simek , stable , Greg Kroah-Hartman Subject: [PATCH v1 03/14] Revert "serial: uartps: Change uart ID port allocation" Date: Mon, 21 Dec 2020 02:47:08 -0600 Message-Id: <1608540439-28772-4-git-send-email-xiaogang.chen@amd.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1608540439-28772-1-git-send-email-xiaogang.chen@amd.com> References: <1608540439-28772-1-git-send-email-xiaogang.chen@amd.com> Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Michal Simek commit 72d68197281e2ad313960504d10b0c41ff87fd55 upstream. This reverts commit ae1cca3fa3478be92948dbbcd722390272032ade. With setting up NR_PORTS to 16 to be able to use serial2 and higher aliases and don't loose functionality which was intended by these changes. As Johan says, this driver needs a lot more work and these changes are only going in the wrong direction: https://lkml.kernel.org/r/20190523091839.GC568@localhost Reported-by: Johan Hovold Signed-off-by: Michal Simek Cc: stable Link: https://lore.kernel.org/r/a94931b65ce0089f76fb1fe6b446a08731bff754.1585905873.git.michal.simek@xilinx.com Signed-off-by: Greg Kroah-Hartman --- drivers/tty/serial/xilinx_uartps.c | 111 +++++-------------------------------- 1 file changed, 13 insertions(+), 98 deletions(-) diff --git a/drivers/tty/serial/xilinx_uartps.c b/drivers/tty/serial/xilinx_uartps.c index d1d889d..3b497f3 100644 --- a/drivers/tty/serial/xilinx_uartps.c +++ b/drivers/tty/serial/xilinx_uartps.c @@ -27,6 +27,7 @@ #define CDNS_UART_TTY_NAME "ttyPS" #define CDNS_UART_NAME "xuartps" #define CDNS_UART_MAJOR 0 /* use dynamic node allocation */ +#define CDNS_UART_NR_PORTS 16 #define CDNS_UART_FIFO_SIZE 64 /* FIFO size */ #define CDNS_UART_REGISTER_SPACE 0x1000 #define TX_TIMEOUT 500000 @@ -1415,90 +1416,6 @@ static const struct of_device_id cdns_uart_of_match[] = { }; MODULE_DEVICE_TABLE(of, cdns_uart_of_match); -/* - * Maximum number of instances without alias IDs but if there is alias - * which target "< MAX_UART_INSTANCES" range this ID can't be used. - */ -#define MAX_UART_INSTANCES 32 - -/* Stores static aliases list */ -static DECLARE_BITMAP(alias_bitmap, MAX_UART_INSTANCES); -static int alias_bitmap_initialized; - -/* Stores actual bitmap of allocated IDs with alias IDs together */ -static DECLARE_BITMAP(bitmap, MAX_UART_INSTANCES); -/* Protect bitmap operations to have unique IDs */ -static DEFINE_MUTEX(bitmap_lock); - -static int cdns_get_id(struct platform_device *pdev) -{ - int id, ret; - - mutex_lock(&bitmap_lock); - - /* Alias list is stable that's why get alias bitmap only once */ - if (!alias_bitmap_initialized) { - ret = of_alias_get_alias_list(cdns_uart_of_match, "serial", - alias_bitmap, MAX_UART_INSTANCES); - if (ret && ret != -EOVERFLOW) { - mutex_unlock(&bitmap_lock); - return ret; - } - - alias_bitmap_initialized++; - } - - /* Make sure that alias ID is not taken by instance without alias */ - bitmap_or(bitmap, bitmap, alias_bitmap, MAX_UART_INSTANCES); - - dev_dbg(&pdev->dev, "Alias bitmap: %*pb\n", - MAX_UART_INSTANCES, bitmap); - - /* Look for a serialN alias */ - id = of_alias_get_id(pdev->dev.of_node, "serial"); - if (id < 0) { - dev_warn(&pdev->dev, - "No serial alias passed. Using the first free id\n"); - - /* - * Start with id 0 and check if there is no serial0 alias - * which points to device which is compatible with this driver. - * If alias exists then try next free position. - */ - id = 0; - - for (;;) { - dev_info(&pdev->dev, "Checking id %d\n", id); - id = find_next_zero_bit(bitmap, MAX_UART_INSTANCES, id); - - /* No free empty instance */ - if (id == MAX_UART_INSTANCES) { - dev_err(&pdev->dev, "No free ID\n"); - mutex_unlock(&bitmap_lock); - return -EINVAL; - } - - dev_dbg(&pdev->dev, "The empty id is %d\n", id); - /* Check if ID is empty */ - if (!test_and_set_bit(id, bitmap)) { - /* Break the loop if bit is taken */ - dev_dbg(&pdev->dev, - "Selected ID %d allocation passed\n", - id); - break; - } - dev_dbg(&pdev->dev, - "Selected ID %d allocation failed\n", id); - /* if taking bit fails then try next one */ - id++; - } - } - - mutex_unlock(&bitmap_lock); - - return id; -} - /** * cdns_uart_probe - Platform driver probe * @pdev: Pointer to the platform device structure @@ -1532,17 +1449,21 @@ static int cdns_uart_probe(struct platform_device *pdev) if (!cdns_uart_uart_driver) return -ENOMEM; - cdns_uart_data->id = cdns_get_id(pdev); + /* Look for a serialN alias */ + cdns_uart_data->id = of_alias_get_id(pdev->dev.of_node, "serial"); if (cdns_uart_data->id < 0) - return cdns_uart_data->id; + cdns_uart_data->id = 0; + + if (cdns_uart_data->id >= CDNS_UART_NR_PORTS) { + dev_err(&pdev->dev, "Cannot get uart_port structure\n"); + return -ENODEV; + } /* There is a need to use unique driver name */ driver_name = devm_kasprintf(&pdev->dev, GFP_KERNEL, "%s%d", CDNS_UART_NAME, cdns_uart_data->id); - if (!driver_name) { - rc = -ENOMEM; - goto err_out_id; - } + if (!driver_name) + return -ENOMEM; cdns_uart_uart_driver->owner = THIS_MODULE; cdns_uart_uart_driver->driver_name = driver_name; @@ -1571,7 +1492,7 @@ static int cdns_uart_probe(struct platform_device *pdev) rc = uart_register_driver(cdns_uart_uart_driver); if (rc < 0) { dev_err(&pdev->dev, "Failed to register driver\n"); - goto err_out_id; + return rc; } cdns_uart_data->cdns_uart_driver = cdns_uart_uart_driver; @@ -1722,10 +1643,7 @@ static int cdns_uart_probe(struct platform_device *pdev) clk_disable_unprepare(cdns_uart_data->pclk); err_out_unregister_driver: uart_unregister_driver(cdns_uart_data->cdns_uart_driver); -err_out_id: - mutex_lock(&bitmap_lock); - clear_bit(cdns_uart_data->id, bitmap); - mutex_unlock(&bitmap_lock); + return rc; } @@ -1748,9 +1666,6 @@ static int cdns_uart_remove(struct platform_device *pdev) #endif rc = uart_remove_one_port(cdns_uart_data->cdns_uart_driver, port); port->mapbase = 0; - mutex_lock(&bitmap_lock); - clear_bit(cdns_uart_data->id, bitmap); - mutex_unlock(&bitmap_lock); clk_disable_unprepare(cdns_uart_data->uartclk); clk_disable_unprepare(cdns_uart_data->pclk); pm_runtime_disable(&pdev->dev); From patchwork Mon Dec 21 08:47:10 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xiaogang.Chen" X-Patchwork-Id: 346597 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.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT 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 238E9C43381 for ; Mon, 21 Dec 2020 08:48:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id EC6E522C9C for ; Mon, 21 Dec 2020 08:48:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727206AbgLUIsR (ORCPT ); Mon, 21 Dec 2020 03:48:17 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47288 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726100AbgLUIsQ (ORCPT ); Mon, 21 Dec 2020 03:48:16 -0500 Received: from mail-ot1-x32b.google.com (mail-ot1-x32b.google.com [IPv6:2607:f8b0:4864:20::32b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 147E1C0611CB for ; Mon, 21 Dec 2020 00:47:36 -0800 (PST) Received: by mail-ot1-x32b.google.com with SMTP id d8so8218712otq.6 for ; Mon, 21 Dec 2020 00:47:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=JG8SIoKNNK7D2be1BMI076Sef2xNS4jk9wzXH8T6m48=; b=eNefK2PTjrZbUpgJAxXcfllArOX4/aNDRxl+9xF8GgsMa95UQE4FlbQnAR5anS6bhc NvT2X9rQ3oYTdr5/PdRCZZkm8RKtSEo7ksSOBZUWY+8QOy0e1ZePkBWbysADqkjWtmvp EbcsoMUNZHRGVX91hEHH0xs4WlW5/H7ILbwqqZ8vHG57UO7yKvT1rO5Qm+bmCk6tPBzL gEJnz3EFwmKdvJNWaJ4iAcI0MNZPGPREeh6XoKkioq2caFsx7BTV6nd41C8mjiE8HBXL 3Y72E502r6kwCJamMBQaIhtiaddz7euonk8pThYqPG16Z1xIS+Feen+Fk4l6dWjjIPut bAkg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=JG8SIoKNNK7D2be1BMI076Sef2xNS4jk9wzXH8T6m48=; b=YVaUsK2Ud2IquOOJSCyHnh9q4eq4JL+kNTwJE60HapcKs4EUBSLekri/39SsHLeiF5 nOFas4RQ+JL2I/9/mMwyyJoGQB3M8d6nl0OFX/9MuBdgkgbRXnHKghLrpC2HyCj5R5wW W9X6grGLgwXijNbshDQr2ByYeyt0A3psxPrRZTpPV1FZ8vqhdewBbtvWgWLAUqeGNxCv 0WR3hTOHjd0g3dpaWKTc+G6o5QXI1GZS5GUV5xd9UASDMM4pCiaafzdM8/uliL7Xi2uS 2hTEpM+nGKadKudwL+wIFuH6MGxZnij4vadOXrKSvDUM/7pjtnIFPhzJE6aAzmPuzY6t PECg== X-Gm-Message-State: AOAM531qsnabyt6SkwqXKRuujhS6Ar0Sk0uNTjDdCzcTcbypwtYYPbLs sNTPg920nrVR8UdSSOgOe5w= X-Google-Smtp-Source: ABdhPJwmPVeth6IQdVR3uWQ9RqxAdEJBYySFZzgDnbRZtLzLz2NBSVcVD0AeBwqHmxFq0QiMSobG0g== X-Received: by 2002:a9d:38e:: with SMTP id f14mr11324387otf.201.1608540455525; Mon, 21 Dec 2020 00:47:35 -0800 (PST) Received: from XChen-BuildServer.amd.com ([165.204.77.1]) by smtp.gmail.com with ESMTPSA id i24sm3611270oot.42.2020.12.21.00.47.34 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 21 Dec 2020 00:47:35 -0800 (PST) From: "Xiaogang.Chen" X-Google-Original-From: "Xiaogang.Chen" To: xiaogang.chen@amd.com Cc: Michal Simek , stable , Greg Kroah-Hartman Subject: [PATCH v1 05/14] Revert "serial: uartps: Register own uart console and driver structures" Date: Mon, 21 Dec 2020 02:47:10 -0600 Message-Id: <1608540439-28772-6-git-send-email-xiaogang.chen@amd.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1608540439-28772-1-git-send-email-xiaogang.chen@amd.com> References: <1608540439-28772-1-git-send-email-xiaogang.chen@amd.com> Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Michal Simek commit 18cc7ac8a28e28cd005c2475f52576cfe10cabfb upstream. This reverts commit 024ca329bfb9a948f76eaff3243e21b7e70182f2. As Johan says, this driver needs a lot more work and these changes are only going in the wrong direction: https://lkml.kernel.org/r/20190523091839.GC568@localhost Reported-by: Johan Hovold Signed-off-by: Michal Simek Cc: stable Link: https://lore.kernel.org/r/1ee35667e36a8efddee381df5fe495ad65f4d15c.1585905873.git.michal.simek@xilinx.com Signed-off-by: Greg Kroah-Hartman --- drivers/tty/serial/xilinx_uartps.c | 95 ++++++++++++++++---------------------- 1 file changed, 40 insertions(+), 55 deletions(-) diff --git a/drivers/tty/serial/xilinx_uartps.c b/drivers/tty/serial/xilinx_uartps.c index e7b8cb9..7a9b360 100644 --- a/drivers/tty/serial/xilinx_uartps.c +++ b/drivers/tty/serial/xilinx_uartps.c @@ -27,6 +27,7 @@ #define CDNS_UART_TTY_NAME "ttyPS" #define CDNS_UART_NAME "xuartps" #define CDNS_UART_MAJOR 0 /* use dynamic node allocation */ +#define CDNS_UART_MINOR 0 /* works best with devtmpfs */ #define CDNS_UART_NR_PORTS 16 #define CDNS_UART_FIFO_SIZE 64 /* FIFO size */ #define CDNS_UART_REGISTER_SPACE 0x1000 @@ -1144,6 +1145,8 @@ static const struct uart_ops cdns_uart_ops = { #endif }; +static struct uart_driver cdns_uart_uart_driver; + #ifdef CONFIG_SERIAL_XILINX_PS_UART_CONSOLE /** * cdns_uart_console_putchar - write the character to the FIFO buffer @@ -1283,6 +1286,16 @@ static int cdns_uart_console_setup(struct console *co, char *options) return uart_set_options(port, co, baud, parity, bits, flow); } + +static struct console cdns_uart_console = { + .name = CDNS_UART_TTY_NAME, + .write = cdns_uart_console_write, + .device = uart_console_device, + .setup = cdns_uart_console_setup, + .flags = CON_PRINTBUFFER, + .index = -1, /* Specified on the cmdline (e.g. console=ttyPS ) */ + .data = &cdns_uart_uart_driver, +}; #endif /* CONFIG_SERIAL_XILINX_PS_UART_CONSOLE */ #ifdef CONFIG_PM_SLEEP @@ -1414,6 +1427,9 @@ static const struct of_device_id cdns_uart_of_match[] = { }; MODULE_DEVICE_TABLE(of, cdns_uart_of_match); +/* Temporary variable for storing number of instances */ +static int instances; + /** * cdns_uart_probe - Platform driver probe * @pdev: Pointer to the platform device structure @@ -1427,11 +1443,6 @@ static int cdns_uart_probe(struct platform_device *pdev) struct resource *res; struct cdns_uart *cdns_uart_data; const struct of_device_id *match; - struct uart_driver *cdns_uart_uart_driver; - char *driver_name; -#ifdef CONFIG_SERIAL_XILINX_PS_UART_CONSOLE - struct console *cdns_uart_console; -#endif cdns_uart_data = devm_kzalloc(&pdev->dev, sizeof(*cdns_uart_data), GFP_KERNEL); @@ -1441,12 +1452,6 @@ static int cdns_uart_probe(struct platform_device *pdev) if (!port) return -ENOMEM; - cdns_uart_uart_driver = devm_kzalloc(&pdev->dev, - sizeof(*cdns_uart_uart_driver), - GFP_KERNEL); - if (!cdns_uart_uart_driver) - return -ENOMEM; - /* Look for a serialN alias */ id = of_alias_get_id(pdev->dev.of_node, "serial"); if (id < 0) @@ -1457,50 +1462,25 @@ static int cdns_uart_probe(struct platform_device *pdev) return -ENODEV; } - /* There is a need to use unique driver name */ - driver_name = devm_kasprintf(&pdev->dev, GFP_KERNEL, "%s%d", - CDNS_UART_NAME, id); - if (!driver_name) - return -ENOMEM; - - cdns_uart_uart_driver->owner = THIS_MODULE; - cdns_uart_uart_driver->driver_name = driver_name; - cdns_uart_uart_driver->dev_name = CDNS_UART_TTY_NAME; - cdns_uart_uart_driver->major = CDNS_UART_MAJOR; - cdns_uart_uart_driver->minor = id; - cdns_uart_uart_driver->nr = 1; - + if (!cdns_uart_uart_driver.state) { + cdns_uart_uart_driver.owner = THIS_MODULE; + cdns_uart_uart_driver.driver_name = CDNS_UART_NAME; + cdns_uart_uart_driver.dev_name = CDNS_UART_TTY_NAME; + cdns_uart_uart_driver.major = CDNS_UART_MAJOR; + cdns_uart_uart_driver.minor = CDNS_UART_MINOR; + cdns_uart_uart_driver.nr = CDNS_UART_NR_PORTS; #ifdef CONFIG_SERIAL_XILINX_PS_UART_CONSOLE - cdns_uart_console = devm_kzalloc(&pdev->dev, sizeof(*cdns_uart_console), - GFP_KERNEL); - if (!cdns_uart_console) - return -ENOMEM; - - strncpy(cdns_uart_console->name, CDNS_UART_TTY_NAME, - sizeof(cdns_uart_console->name)); - cdns_uart_console->index = id; - cdns_uart_console->write = cdns_uart_console_write; - cdns_uart_console->device = uart_console_device; - cdns_uart_console->setup = cdns_uart_console_setup; - cdns_uart_console->flags = CON_PRINTBUFFER; - cdns_uart_console->data = cdns_uart_uart_driver; - cdns_uart_uart_driver->cons = cdns_uart_console; + cdns_uart_uart_driver.cons = &cdns_uart_console; #endif - rc = uart_register_driver(cdns_uart_uart_driver); - if (rc < 0) { - dev_err(&pdev->dev, "Failed to register driver\n"); - return rc; + rc = uart_register_driver(&cdns_uart_uart_driver); + if (rc < 0) { + dev_err(&pdev->dev, "Failed to register driver\n"); + return rc; + } } - cdns_uart_data->cdns_uart_driver = cdns_uart_uart_driver; - - /* - * Setting up proper name_base needs to be done after uart - * registration because tty_driver structure is not filled. - * name_base is 0 by default. - */ - cdns_uart_uart_driver->tty_driver->name_base = id; + cdns_uart_data->cdns_uart_driver = &cdns_uart_uart_driver; match = of_match_node(cdns_uart_of_match, pdev->dev.of_node); if (match && match->data) { @@ -1578,6 +1558,7 @@ static int cdns_uart_probe(struct platform_device *pdev) port->ops = &cdns_uart_ops; port->fifosize = CDNS_UART_FIFO_SIZE; port->has_sysrq = IS_ENABLED(CONFIG_SERIAL_XILINX_PS_UART_CONSOLE); + port->line = id; /* * Register the port. @@ -1609,7 +1590,7 @@ static int cdns_uart_probe(struct platform_device *pdev) console_port = port; #endif - rc = uart_add_one_port(cdns_uart_uart_driver, port); + rc = uart_add_one_port(&cdns_uart_uart_driver, port); if (rc) { dev_err(&pdev->dev, "uart_add_one_port() failed; err=%i\n", rc); @@ -1619,12 +1600,15 @@ static int cdns_uart_probe(struct platform_device *pdev) #ifdef CONFIG_SERIAL_XILINX_PS_UART_CONSOLE /* This is not port which is used for console that's why clean it up */ if (console_port == port && - !(cdns_uart_uart_driver->cons->flags & CON_ENABLED)) + !(cdns_uart_uart_driver.cons->flags & CON_ENABLED)) console_port = NULL; #endif cdns_uart_data->cts_override = of_property_read_bool(pdev->dev.of_node, "cts-override"); + + instances++; + return 0; err_out_pm_disable: @@ -1640,8 +1624,8 @@ static int cdns_uart_probe(struct platform_device *pdev) err_out_clk_dis_pclk: clk_disable_unprepare(cdns_uart_data->pclk); err_out_unregister_driver: - uart_unregister_driver(cdns_uart_data->cdns_uart_driver); - + if (!instances) + uart_unregister_driver(cdns_uart_data->cdns_uart_driver); return rc; } @@ -1676,7 +1660,8 @@ static int cdns_uart_remove(struct platform_device *pdev) console_port = NULL; #endif - uart_unregister_driver(cdns_uart_data->cdns_uart_driver); + if (!--instances) + uart_unregister_driver(cdns_uart_data->cdns_uart_driver); return rc; }