From patchwork Thu Apr 26 14:08:18 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Simek X-Patchwork-Id: 10366031 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 1BC1460225 for ; Thu, 26 Apr 2018 14:11:19 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0AFAA29102 for ; Thu, 26 Apr 2018 14:11:19 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id F27F329112; Thu, 26 Apr 2018 14:11:18 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 5141E29102 for ; Thu, 26 Apr 2018 14:11:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To: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:List-Owner; bh=rtRZEaSsZzz7xf9oO6rbJyRFLoFxbP7UVBbsdpJzEMQ=; b=afyj39xLaz0TmthfKU9CXYMQQ4 JfXU8V22pgGat06bs3FADATnYzyNtHtCGK7oWtS2YWdTP/mghV+oyOvijILw2ZN3mfWA4B0MXRICO tIBZ9ewkXeBmqio1CqYVEC6/KIs18wNL1hTRvxXUoJ80b7H2aM1M3yzUFBHB+HpL/zTVDK8mk+sqj Y4uIgblFbdGdNrJ9dZ2qYos53P+iy6K75TlKHWwOTfwohzvMoaJe1DWMXHSk6xeuhjBddpkgh98tm ow/L6mimOlJdusAIoeeciYRIlSQPm3DBS00YHjLmf2539Ow7HhetpGUkG8CmsnaBR+uZXm5MWV0GV 94qhQ1EA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fBhc3-0006Ff-JV; Thu, 26 Apr 2018 14:11:07 +0000 Received: from mail-wm0-x241.google.com ([2a00:1450:400c:c09::241]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fBhZg-0003qc-0j for linux-arm-kernel@lists.infradead.org; Thu, 26 Apr 2018 14:08:46 +0000 Received: by mail-wm0-x241.google.com with SMTP id b21so13601565wme.4 for ; Thu, 26 Apr 2018 07:08:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monstr-eu.20150623.gappssmtp.com; s=20150623; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=FAOFcpp/B6D2Q8Bu4CRlqm5bO2dL8QbsLNrCJB37dUY=; b=zhqRMjjOfU2nvb8t0MR24qEW/hMp1jXBz6cXAb3gj3KzK5wWERPLEF9CePy40c8VU/ t2sTV0moNXWdxDiCV7qVv6c2F4JiAI5LHvSDVM2kpzozJ4CuzIJFkSqzaeU6sukALgrF 9x9ZEVp37sh9rTIvnzVo4R8h34BuZ+5ZGttyDGzQ6K+lXphw/82uOrZQ0oQsTGIaGJip hO1Ckf915OexVhl/GsPpOrMCWL+cl0voSxlUwJGqAQ2x+l0xFw6H02bpoc+917/pA7Fi nvr4Cg6kB6rmkvjUTyWgoCptz9xdJ8USnKUTV0tVfDTJRVRgMO2dHDS1f6nTJWMYmh59 My9A== 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 :in-reply-to:references:in-reply-to:references; bh=FAOFcpp/B6D2Q8Bu4CRlqm5bO2dL8QbsLNrCJB37dUY=; b=dBB5PlmG1Vc2nF2KrfO7ApeRe2YhCou28U1+NH0r9yx3f/PClXDqSrQmXqwsv/tW+Z 0eHhwo4E68ZBGHi0e5DntwvvMkhy8F4/nML+dRK50Y+0PwK1utWI8Iel1K6Usz4EH2ov e9Rs/KGFWTmIovmvI5lBJTnggk+uxUAEzpKEFsjqOhmA5Z2oQyAqUTEKTfH36geiZ5NZ sKKM+vtKF5NncAV2NDc5IkcfOzjtPjuvaIfjluEuOyHaf49kItkG7F9JPNHbUOWUjO0C rV3wviKdiak5vBfhMALyKsv5VHMSpP3yJX081PvJtWk0RLVyaN40GnJv9eJX1opKjvlo ZIuw== X-Gm-Message-State: ALQs6tAOgM/V3JarjtTUSV7a8OjacWiYhixlQ6apg38X6qtxbGpUsFr5 HCHO0qlzVuEcJT6Z16/L8AyHVg== X-Google-Smtp-Source: AIpwx48OVMAhrCpZRRIKzbcbPojmnomd8oS5PMQNHxNISnh4rbxzCuNGOPJaTp6auOxO+d7jGzX+xw== X-Received: by 10.28.111.136 with SMTP id c8mr17482572wmi.9.1524751708379; Thu, 26 Apr 2018 07:08:28 -0700 (PDT) Received: from localhost (nat-35.starnet.cz. [178.255.168.35]) by smtp.gmail.com with ESMTPSA id 19-v6sm4087271wrz.7.2018.04.26.07.08.27 (version=TLS1_2 cipher=AES128-SHA bits=128/128); Thu, 26 Apr 2018 07:08:27 -0700 (PDT) From: Michal Simek To: linux-kernel@vger.kernel.org, monstr@monstr.eu, gnomes@lxorguk.ukuu.org.uk, Alexander Graf Subject: [RFC PATCH 2/3] serial: uartps: Move register to probe based on run time detection Date: Thu, 26 Apr 2018 16:08:18 +0200 Message-Id: <7dc0d444ddfae465a80e509af6ceb6be5b42881a.1524751696.git.michal.simek@xilinx.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: References: In-Reply-To: References: X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180426_070840_094746_8106238B X-CRM114-Status: GOOD ( 16.73 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Greg Kroah-Hartman , linux-arm-kernel@lists.infradead.org, linux-serial@vger.kernel.org, Jiri Slaby MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Find out the highest serial alias and allocate that amount of structures/minor numbers to be able to handle all of them. Origin setting that there are two prealocated CDNS_UART_NR_PORTS is kept there. Signed-off-by: Michal Simek --- Discussed here: https://patchwork.kernel.org/patch/9738445/ The same solution is done in pl011 driver. --- drivers/tty/serial/xilinx_uartps.c | 32 ++++++++++++++++-------------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/drivers/tty/serial/xilinx_uartps.c b/drivers/tty/serial/xilinx_uartps.c index 0fc9de20843c..ffb5b66a05b5 100644 --- a/drivers/tty/serial/xilinx_uartps.c +++ b/drivers/tty/serial/xilinx_uartps.c @@ -1432,6 +1432,22 @@ static int cdns_uart_probe(struct platform_device *pdev) struct cdns_uart *cdns_uart_data; const struct of_device_id *match; + if (!cdns_uart_uart_driver.state) { + rc = of_alias_get_highest_id("serial"); + if (rc >= CDNS_UART_NR_PORTS) { + /* serial2 means 3 ports that's why rc(2) + 1 here */ + rc += 1; + /* Rewrite default setup which is using 2 ports */ + cdns_uart_uart_driver.nr = 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 = devm_kzalloc(&pdev->dev, sizeof(*cdns_uart_data), GFP_KERNEL); if (!cdns_uart_data) @@ -1622,28 +1638,14 @@ static struct platform_driver cdns_uart_platform_driver = { static int __init cdns_uart_init(void) { - int retval = 0; - - /* Register the cdns_uart driver with the serial core */ - retval = uart_register_driver(&cdns_uart_uart_driver); - if (retval) - return retval; - /* Register the platform driver */ - retval = platform_driver_register(&cdns_uart_platform_driver); - if (retval) - uart_unregister_driver(&cdns_uart_uart_driver); - - return retval; + return platform_driver_register(&cdns_uart_platform_driver); } static void __exit cdns_uart_exit(void) { /* Unregister the platform driver */ platform_driver_unregister(&cdns_uart_platform_driver); - - /* Unregister the cdns_uart driver */ - uart_unregister_driver(&cdns_uart_uart_driver); } arch_initcall(cdns_uart_init);