From patchwork Fri Jul 14 13:02:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Hovold X-Patchwork-Id: 703523 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D1346C001DD for ; Fri, 14 Jul 2023 13:04:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235611AbjGNNEF (ORCPT ); Fri, 14 Jul 2023 09:04:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57266 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234881AbjGNNEF (ORCPT ); Fri, 14 Jul 2023 09:04:05 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4BC9830CB; Fri, 14 Jul 2023 06:04:04 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id C6D1761D10; Fri, 14 Jul 2023 13:04:03 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1D3D8C433C9; Fri, 14 Jul 2023 13:04:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1689339843; bh=n56OIv7wYjOjFumwVnFoUoyIEuQPLS8u1Ruo4hGD9LM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=msQVqeY3TLfufw2NEY7pyhHzHiNIT0Id16NVjLACYwvWqZmWT1RDrkTYmPDZO3Lor bUBU6jNWB22Abm6zcLaDc70I9ctjUK2SuRL5SWhN+sFocbufLvscgmSwwo/jf5EwLB +x3lqLDYWL/vUlmUPzPu9+TT+z18qo4Hx/onwHzYeWcMsHJ2aEtZStsHNLFGIU6kQv x2eebLwVadZPlv7UWK1dJL3ZMO2UrNf6upiYM1YLlT5FoE/NxWn2fH2OlR47tXH9ej 0jrz4giBo+6fi30wM58uvHE5P0kQLUP1Jp1unLiyTi8baaXUCr75dZJ3MX/gdDexhb 8vTVjixyYBIww== Received: from johan by xi.lan with local (Exim 4.96) (envelope-from ) id 1qKISq-0003nk-21; Fri, 14 Jul 2023 15:04:04 +0200 From: Johan Hovold To: Greg Kroah-Hartman Cc: Andy Gross , Bjorn Andersson , Konrad Dybcio , Jiri Slaby , linux-arm-msm@vger.kernel.org, linux-serial@vger.kernel.org, linux-kernel@vger.kernel.org, Johan Hovold , stable@vger.kernel.org, Rajendra Nayak , Matthias Kaehlcke Subject: [PATCH 1/2] serial: qcom-geni: fix opp vote on shutdown Date: Fri, 14 Jul 2023 15:02:13 +0200 Message-ID: <20230714130214.14552-2-johan+linaro@kernel.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230714130214.14552-1-johan+linaro@kernel.org> References: <20230714130214.14552-1-johan+linaro@kernel.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-serial@vger.kernel.org The operating-performance-point vote needs to be dropped when shutting down the port to avoid wasting power by keeping resources like power domains in an unnecessarily high performance state (e.g. when a UART connected Bluetooth controller is not in use). Fixes: a5819b548af0 ("tty: serial: qcom_geni_serial: Use OPP API to set clk/perf state") Cc: stable@vger.kernel.org # 5.9 Cc: Rajendra Nayak Cc: Matthias Kaehlcke Signed-off-by: Johan Hovold --- drivers/tty/serial/qcom_geni_serial.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/tty/serial/qcom_geni_serial.c b/drivers/tty/serial/qcom_geni_serial.c index b825b05e6137..8be896dbaa88 100644 --- a/drivers/tty/serial/qcom_geni_serial.c +++ b/drivers/tty/serial/qcom_geni_serial.c @@ -126,6 +126,7 @@ struct qcom_geni_serial_port { dma_addr_t rx_dma_addr; bool setup; unsigned int baud; + unsigned long clk_rate; void *rx_buf; u32 loopback; bool brk; @@ -1249,6 +1250,7 @@ static void qcom_geni_serial_set_termios(struct uart_port *uport, baud * sampling_rate, clk_rate, clk_div); uport->uartclk = clk_rate; + port->clk_rate = clk_rate; dev_pm_opp_set_rate(uport->dev, clk_rate); ser_clk_cfg = SER_CLK_EN; ser_clk_cfg |= clk_div << CLK_DIV_SHFT; @@ -1513,10 +1515,13 @@ static void qcom_geni_serial_pm(struct uart_port *uport, if (new_state == UART_PM_STATE_ON && old_state == UART_PM_STATE_OFF) { geni_icc_enable(&port->se); + if (port->clk_rate) + dev_pm_opp_set_rate(uport->dev, port->clk_rate); geni_se_resources_on(&port->se); } else if (new_state == UART_PM_STATE_OFF && old_state == UART_PM_STATE_ON) { geni_se_resources_off(&port->se); + dev_pm_opp_set_rate(uport->dev, 0); geni_icc_disable(&port->se); } } From patchwork Fri Jul 14 13:02:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Hovold X-Patchwork-Id: 703136 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 973FCEB64DA for ; Fri, 14 Jul 2023 13:04:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235176AbjGNNEF (ORCPT ); Fri, 14 Jul 2023 09:04:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57264 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229704AbjGNNEE (ORCPT ); Fri, 14 Jul 2023 09:04:04 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 308AD30CA; Fri, 14 Jul 2023 06:04:04 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id BE8D461D11; Fri, 14 Jul 2023 13:04:03 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1A416C433C8; Fri, 14 Jul 2023 13:04:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1689339843; bh=BknjWnKCtvrJ0CaxUt4ptagyWk8YX48GKd/9fEAJ7JU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GYn5D6G2rlXhkg6EtehiBiofi0CHsC3R3ZgqqiiObvyMK+L+JI/s1boBPYZmHn5Hx LXGAj95v2RxQn2xRcKnC2RS+Y6z3pflHw9IcNMnCOnWpr3Fx5S16lzCf7T1rpeQaJY fJ98o5wIjf3mG2lTj07BkfJdPIrRyIYEACeiTIQbBDVGYeuKlC/9JeG8A3O1/dRJmT StpVxBG+wYK48dB5GpLgJO4T+ch2wnKZUl5omXqD9LpZTII4DSkvDhvpd/tOzy2qPu UBDiMlQSRoMhXRNBSvvFs8rh7viw82a8JxhwE/+6qohzGYh9io19FJGs/xRsRPxHdR SDX35RDG13Ucg== Received: from johan by xi.lan with local (Exim 4.96) (envelope-from ) id 1qKISq-0003nm-2J; Fri, 14 Jul 2023 15:04:04 +0200 From: Johan Hovold To: Greg Kroah-Hartman Cc: Andy Gross , Bjorn Andersson , Konrad Dybcio , Jiri Slaby , linux-arm-msm@vger.kernel.org, linux-serial@vger.kernel.org, linux-kernel@vger.kernel.org, Johan Hovold Subject: [PATCH 2/2] serial: qcom-geni: clean up clock-rate debug printk Date: Fri, 14 Jul 2023 15:02:14 +0200 Message-ID: <20230714130214.14552-3-johan+linaro@kernel.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230714130214.14552-1-johan+linaro@kernel.org> References: <20230714130214.14552-1-johan+linaro@kernel.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-serial@vger.kernel.org Make the clock-rate debug printk more readable by using an equal sign instead of a dash as separator between names and values and adding some spaces: qcom_geni_serial 988000.serial: desired_rate = 1843200, clk_rate = 7372800, clk_div = 4 Signed-off-by: Johan Hovold Reviewed-by: Konrad Dybcio --- drivers/tty/serial/qcom_geni_serial.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/tty/serial/qcom_geni_serial.c b/drivers/tty/serial/qcom_geni_serial.c index 8be896dbaa88..753ac68d03a6 100644 --- a/drivers/tty/serial/qcom_geni_serial.c +++ b/drivers/tty/serial/qcom_geni_serial.c @@ -1246,7 +1246,7 @@ static void qcom_geni_serial_set_termios(struct uart_port *uport, goto out_restart_rx; } - dev_dbg(port->se.dev, "desired_rate-%u, clk_rate-%lu, clk_div-%u\n", + dev_dbg(port->se.dev, "desired_rate = %u, clk_rate = %lu, clk_div = %u\n", baud * sampling_rate, clk_rate, clk_div); uport->uartclk = clk_rate;