From patchwork Wed Aug 12 05:48:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Satya Priya X-Patchwork-Id: 258146 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=-13.0 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, 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 DF504C433DF for ; Wed, 12 Aug 2020 05:49:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C6D4D20768 for ; Wed, 12 Aug 2020 05:49:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726642AbgHLFtY (ORCPT ); Wed, 12 Aug 2020 01:49:24 -0400 Received: from alexa-out.qualcomm.com ([129.46.98.28]:60702 "EHLO alexa-out.qualcomm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726430AbgHLFtY (ORCPT ); Wed, 12 Aug 2020 01:49:24 -0400 Received: from ironmsg-lv-alpha.qualcomm.com ([10.47.202.13]) by alexa-out.qualcomm.com with ESMTP; 11 Aug 2020 22:49:23 -0700 Received: from ironmsg02-blr.qualcomm.com ([10.86.208.131]) by ironmsg-lv-alpha.qualcomm.com with ESMTP/TLS/AES256-SHA; 11 Aug 2020 22:49:21 -0700 Received: from c-skakit-linux.ap.qualcomm.com (HELO c-skakit-linux.qualcomm.com) ([10.242.51.242]) by ironmsg02-blr.qualcomm.com with ESMTP; 12 Aug 2020 11:19:04 +0530 Received: by c-skakit-linux.qualcomm.com (Postfix, from userid 2344709) id 59E2E43FA; Wed, 12 Aug 2020 11:19:03 +0530 (IST) From: satya priya To: Greg Kroah-Hartman Cc: swboyd@chromium.org, mgautam@codeaurora.org, linux-arm-msm@vger.kernel.org, linux-serial@vger.kernel.org, akashast@codeaurora.org, rojay@codeaurora.org, msavaliy@qti.qualcomm.com, satya priya Subject: [PATCH] tty: serial: qcom_geni_serial: Remove the UART frequency table Date: Wed, 12 Aug 2020 11:18:48 +0530 Message-Id: <1597211328-23500-1-git-send-email-skakit@codeaurora.org> X-Mailer: git-send-email 2.7.4 Sender: linux-serial-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-serial@vger.kernel.org Use clk_round_rate() API to find a frequency that will work with the requested baud rate. With this we can avoid updating the table each time we add a new frquency to the table. We can just call clk_round_rate() and make sure it is evenly divisible by the requested rate and then it will be the same as before. Signed-off-by: satya priya --- drivers/tty/serial/qcom_geni_serial.c | 32 +++++++++----------------------- 1 file changed, 9 insertions(+), 23 deletions(-) diff --git a/drivers/tty/serial/qcom_geni_serial.c b/drivers/tty/serial/qcom_geni_serial.c index 3aa29d2..312daa24 100644 --- a/drivers/tty/serial/qcom_geni_serial.c +++ b/drivers/tty/serial/qcom_geni_serial.c @@ -149,12 +149,6 @@ static unsigned int qcom_geni_serial_tx_empty(struct uart_port *port); static void qcom_geni_serial_stop_rx(struct uart_port *uport); static void qcom_geni_serial_handle_rx(struct uart_port *uport, bool drop); -static const unsigned long root_freq[] = {7372800, 14745600, 19200000, 29491200, - 32000000, 48000000, 51200000, 64000000, - 80000000, 96000000, 100000000, - 102400000, 112000000, 120000000, - 128000000}; - #define to_dev_port(ptr, member) \ container_of(ptr, struct qcom_geni_serial_port, member) @@ -941,30 +935,22 @@ static int qcom_geni_serial_startup(struct uart_port *uport) return 0; } -static unsigned long get_clk_cfg(unsigned long clk_freq) -{ - int i; - - for (i = 0; i < ARRAY_SIZE(root_freq); i++) { - if (!(root_freq[i] % clk_freq)) - return root_freq[i]; - } - return 0; -} - -static unsigned long get_clk_div_rate(unsigned int baud, - unsigned int sampling_rate, unsigned int *clk_div) +static unsigned long get_clk_div_rate(const struct geni_se *se, + unsigned int baud, unsigned int sampling_rate, + unsigned int *clk_div) { unsigned long ser_clk; unsigned long desired_clk; + long actual_clk; desired_clk = baud * sampling_rate; - ser_clk = get_clk_cfg(desired_clk); - if (!ser_clk) { + actual_clk = clk_round_rate(se->clk, desired_clk); + if (actual_clk % desired_clk != 0) { pr_err("%s: Can't find matching DFS entry for baud %d\n", __func__, baud); - return ser_clk; + return 0; } + ser_clk = actual_clk; *clk_div = ser_clk / desired_clk; return ser_clk; @@ -998,7 +984,7 @@ static void qcom_geni_serial_set_termios(struct uart_port *uport, if (GENI_SE_VERSION_MAJOR(ver) >= 2 && GENI_SE_VERSION_MINOR(ver) >= 5) sampling_rate /= 2; - clk_rate = get_clk_div_rate(baud, sampling_rate, &clk_div); + clk_rate = get_clk_div_rate(&port->se, baud, sampling_rate, &clk_div); if (!clk_rate) goto out_restart_rx;