From patchwork Fri Oct 28 13:35:54 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Hovold X-Patchwork-Id: 12291 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp837014wru; Fri, 28 Oct 2022 06:39:40 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7WvF10Qfp87im1lnTZPhZPMzPW3rzhwd7muAGj8Ruyl1IqzppONQLYgMH2A+QTUz65IV7e X-Received: by 2002:a17:902:e812:b0:187:2ab:7d6f with SMTP id u18-20020a170902e81200b0018702ab7d6fmr655809plg.137.1666964380527; Fri, 28 Oct 2022 06:39:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666964380; cv=none; d=google.com; s=arc-20160816; b=XI7MWRxZJf7mMtMy9AJ/KhH4cW9ImEuGazKTG0MHCuqrKmG/Eg/zyrevFq4drAvIzh 39Ym+GsFzfpY/PYKg49Nxlf51BiViCVbGQwv/lfIJKE5s+yh4g3j9gq81+Yb0iW3+P8m 2xPGxvPQO/MjJiTghGOh30ZcQLWTCKKgB/lVOScdh9A83bXA1ejnfIFYY2uN3ztQqlrx qAhwzZBRMbLgoBFPClqibp8UYolrmetYos4E8B2506Zi/Q0hB8VysDdN2W7+TxrGfHpB z2NEdILvyq/LmXynQOM5uiJF+cnhawY857Tbk3/AX8Gdpx05VAqS33tJcIwQFXToxyrH Dp7A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=yaihhjhhAs15DOKk2Fwx/x3s/+QJ7XK1popHUyiMAe4=; b=kepjDI+IwqepuRKaGVhxvhmb5iwTof4Xgxa71fvpUTgIz/9HUhXQMxx8Nz4S3eHRdL Z6eqUyyaDextqXTfbC637jdb8bw2S6JzeY5HUXHckb+dhNq+4UfOgWKvMQxyyfUTWQdV I6APRkQNfEGSf/MWjdMRwqPA9CQu3cRpobbByfBwl+MOzIDbxWa8GQRiFY9CQCf1JvNs WyprlJPjRYEB3e3bazWYHbqENXvaEE6JbwjTv5zUEZIMdwuTNUS0kumfqj/X86tyE6kr oJeXPdpjU9h51W12RIbI6U4Bu8cOs8PSAa/StYb9TAnCc5AAoPv6K7ldB3SMlWSss9Jm acRQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=TiaWdPFE; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id n3-20020a170903110300b00176b7b8cf2esi6307994plh.586.2022.10.28.06.39.27; Fri, 28 Oct 2022 06:39:40 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=TiaWdPFE; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230458AbiJ1Nhp (ORCPT + 99 others); Fri, 28 Oct 2022 09:37:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41866 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230472AbiJ1Ngx (ORCPT ); Fri, 28 Oct 2022 09:36:53 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 994DC1D79B2; Fri, 28 Oct 2022 06:36:51 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 42B49B82A30; Fri, 28 Oct 2022 13:36:50 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D2B11C433C1; Fri, 28 Oct 2022 13:36:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1666964208; bh=kHWHx6aJI0QiHRqoX6LC3zrlO/UEm3YyvB3PCvEOuoI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TiaWdPFE0mD+v9D+PG1hQ8efNATegjr1QYQBhZwUtWqjm7nhuTReTDxUzGpvBet7s nv++7gmWAG0wRmtXdcCYIS8ti0tj4awoWg622BxWt3EpBWELRpE48nzXr47cSTM4Yo r6Y9neMTCbdjWHMEtBuU42CxLvClBV6i0pU5nS0cZX6T+M9Yw51qWwRyGfGhYI8k1i C2JUU2LjzbZUTbPavm+XdtFs48AJd6RNK7eiqoGIj0+IMQazRQ8910BG9Cy0V7z5ub ksrcbmzWa7wpFvPr+P/4DFrFgM8WopBbGUJnMpP4NWOoTfcFRhfEoYC0DArTGYOvX4 O0YdmhcdTZWbA== Received: from johan by xi.lan with local (Exim 4.94.2) (envelope-from ) id 1ooPXH-0004rA-DD; Fri, 28 Oct 2022 15:36:35 +0200 From: Johan Hovold To: Vinod Koul Cc: Andy Gross , Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , Dmitry Baryshkov , linux-arm-msm@vger.kernel.org, linux-phy@lists.infradead.org, linux-kernel@vger.kernel.org, Johan Hovold Subject: [PATCH v4 07/16] phy: qcom-qmp-pcie: clean up PHY lane init Date: Fri, 28 Oct 2022 15:35:54 +0200 Message-Id: <20221028133603.18470-8-johan+linaro@kernel.org> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20221028133603.18470-1-johan+linaro@kernel.org> References: <20221028133603.18470-1-johan+linaro@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747938842274591120?= X-GMAIL-MSGID: =?utf-8?q?1747938842274591120?= Clean up the PHY lane initialisation somewhat by adding further temporary variables and programming both tx and rx for the second lane after the first lane. Reviewed-by: Dmitry Baryshkov Signed-off-by: Johan Hovold --- drivers/phy/qualcomm/phy-qcom-qmp-pcie.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/drivers/phy/qualcomm/phy-qcom-qmp-pcie.c b/drivers/phy/qualcomm/phy-qcom-qmp-pcie.c index bd946438e3c3..dd7e72424fc0 100644 --- a/drivers/phy/qualcomm/phy-qcom-qmp-pcie.c +++ b/drivers/phy/qualcomm/phy-qcom-qmp-pcie.c @@ -1835,18 +1835,19 @@ static void qmp_pcie_lanes_init(struct qmp_pcie *qmp, const struct qmp_phy_cfg_t const struct qmp_phy_cfg *cfg = qmp->cfg; void __iomem *tx = qmp->tx; void __iomem *rx = qmp->rx; + void __iomem *tx2 = qmp->tx2; + void __iomem *rx2 = qmp->rx2; if (!tables) return; qmp_pcie_configure_lane(tx, tables->tx, tables->tx_num, 1); - - if (cfg->lanes >= 2) - qmp_pcie_configure_lane(qmp->tx2, tables->tx, tables->tx_num, 2); - qmp_pcie_configure_lane(rx, tables->rx, tables->rx_num, 1); - if (cfg->lanes >= 2) - qmp_pcie_configure_lane(qmp->rx2, tables->rx, tables->rx_num, 2); + + if (cfg->lanes >= 2) { + qmp_pcie_configure_lane(tx2, tables->tx, tables->tx_num, 2); + qmp_pcie_configure_lane(rx2, tables->rx, tables->rx_num, 2); + } } static void qmp_pcie_pcs_init(struct qmp_pcie *qmp, const struct qmp_phy_cfg_tables *tables)