From patchwork Sat May 6 07:31:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Manivannan Sadhasivam X-Patchwork-Id: 90703 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp915851vqo; Sat, 6 May 2023 00:59:11 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4qkNQlXcInqxjO9LFAevQ+Rv1j1GRgIaTKa9/jHmetdpcQzvlKRSnW7F5vzj/YVnGka8Xz X-Received: by 2002:a05:6a20:7d8c:b0:ef:e240:b552 with SMTP id v12-20020a056a207d8c00b000efe240b552mr5118710pzj.46.1683359950836; Sat, 06 May 2023 00:59:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1683359950; cv=none; d=google.com; s=arc-20160816; b=G6+gpu1GZc3nbDihe+UQygy1de8dNPN5eipaZr2Dxze52rArEa72Q1sZe8n6zloYaU Yp80fJm1wIe7MJfK8eA1mKnjPLzPMFiy2rjp6rWncRtIqDXNVzR6o2ZdFwzZZygd0IPR vM/DHzz6uM/WoTgbJB/zZxrtykKOc6H7294ge/XKSQpmszXuDYstvO/rnPSHgWE+oc5T FZaqvrReuRevjrMjSGlkw4grKwNq8HPhSjD18Yb3GcYlmGrSTWWd9DiefKPyn5u0Cc7L Wo33LKTEPI01q8Pux/lJBU/uoJmAvD5pQe7puKHbyZ+J7csyVnZGcjQTy/PHCIAkGaeb 1gdg== 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=G3aahhSvjykatbGenbflTiOGlibAhrS0dhFMwQB0VPM=; b=gJ0EyqaC0mwIRgvNuu97KOAZMTbvYyj3Gt2PtuevV5v+4MHMldXnTjjLHRX7y2gixn GW0xNtSpX/6eVB38CbdplMwUX6pCVRUBOWaJ+0GTy+GwVKEGzogWKecEgprbiWlPSXIQ wPq9F/5scK7f6cRdiF5UO2hawZ38Zv14M0V8z0LbH5gCQ0aYqau62GICx8CTskQPO0jR U2NxG1emij1/QM4vy9abOItdhBeyLf/VTn4AOjE8pFYEQJw4HuJWPfJdIPfo3Ti0Nj96 cOm2NirEMq6T5h2upDEj9J6vJW41SKJ7d+VezKsYNriaSlOvqPFTCuQ+sJuElsPiM0jp FmxA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=GxFQNpd0; 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=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id b12-20020a621b0c000000b006361df3aa86si3703394pfb.88.2023.05.06.00.58.58; Sat, 06 May 2023 00:59:10 -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=@linaro.org header.s=google header.b=GxFQNpd0; 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=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230229AbjEFHc4 (ORCPT + 99 others); Sat, 6 May 2023 03:32:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38392 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231421AbjEFHcc (ORCPT ); Sat, 6 May 2023 03:32:32 -0400 Received: from mail-pf1-x436.google.com (mail-pf1-x436.google.com [IPv6:2607:f8b0:4864:20::436]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3C09C11D84 for ; Sat, 6 May 2023 00:32:11 -0700 (PDT) Received: by mail-pf1-x436.google.com with SMTP id d2e1a72fcca58-64395e2a715so2570719b3a.3 for ; Sat, 06 May 2023 00:32:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1683358330; x=1685950330; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=G3aahhSvjykatbGenbflTiOGlibAhrS0dhFMwQB0VPM=; b=GxFQNpd05mDxAV0i9GMQOPTCgxqwLMZ+QK9AefNdLXF80KB5OghCE1RYK8vTXDPyCp sGqP0LDArubwzy0Gckf1gK+GiBxNS8vEBCtH7RYc5AmehMi8rNgDenMeXoTq8JvdjFFG QBfenFguebk02IJEAZCHHTm+SXLWdCEW8p08L+UiwTEX8Zh2sokw4If8lDoXFSfvID/g hN1DL/+mSc4aaxa+fSejtOXfuvx0IsZKDJZfOltyUJEXsh0haxlU763Vi1ZJQ+dS0bNV 33JwolC7NdfzL5C6txOwkPBirgHiY5WJ++cxAP8jpTIJpx8/pnVHsqtRV7DfjK9Gas06 MPLA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683358330; x=1685950330; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=G3aahhSvjykatbGenbflTiOGlibAhrS0dhFMwQB0VPM=; b=U+NE3NBrSweYB7NlgGh3xKjC21GKUTLmfS856GL2ORy6GuhupwGOncNx1KgwUUZBi0 XxDGSNCwQKfhtN8YyM0BsMrYgrrRayN/ND0kFuMrhiBykt0KlVruuK7m1qibeGyW41eT tA+Q/YkixXP/CkR3uHI23REYolBnDf1d/+c2sZyhSBZVrhV1TPTnsgAOfATtoPotUW5j bK9FFe6KY9KGyYhUI+k+n9E85xCWP9BdUkdHblwJlwgOBrFdDce2zC/9q5gl+M7oYRfe GpUNlGkPnH5lachjCs6QH4lc2rz/p1TzrUI9tbU0m/IX2NNgH7cHgpeLb/DaAaUNdhMO UPZA== X-Gm-Message-State: AC+VfDzX5weLukgPHomD+IrSx+NrpFTMeN4KIEuuvvYas/v7jp3q4Vjt 9ZkZTLsoJXtrVqFFDrm48QDh X-Received: by 2002:a05:6a20:394d:b0:f2:5b9f:fe61 with SMTP id r13-20020a056a20394d00b000f25b9ffe61mr5361935pzg.34.1683358330410; Sat, 06 May 2023 00:32:10 -0700 (PDT) Received: from localhost.localdomain ([120.138.12.87]) by smtp.gmail.com with ESMTPSA id z16-20020aa785d0000000b0062a56e51fd7sm2627373pfn.188.2023.05.06.00.32.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 06 May 2023 00:32:10 -0700 (PDT) From: Manivannan Sadhasivam To: lpieralisi@kernel.org, kw@linux.com, bhelgaas@google.com Cc: robh@kernel.org, andersson@kernel.org, konrad.dybcio@linaro.org, linux-pci@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, steev@kali.org, quic_srichara@quicinc.com, Manivannan Sadhasivam Subject: [PATCH 6/8] PCI: qcom: Use post init sequence of IP v2.3.2 for v2.4.0 Date: Sat, 6 May 2023 13:01:37 +0530 Message-Id: <20230506073139.8789-7-manivannan.sadhasivam@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230506073139.8789-1-manivannan.sadhasivam@linaro.org> References: <20230506073139.8789-1-manivannan.sadhasivam@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=unavailable 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?1765130843456580129?= X-GMAIL-MSGID: =?utf-8?q?1765130843456580129?= The post init sequence of IP v2.4.0 is same as v2.3.2. So let's reuse the v2.3.2 sequence which now also disables hotplug capability of the controller as it is not at all supported on any SoCs making use of this IP. Signed-off-by: Manivannan Sadhasivam Reviewed-by: Dmitry Baryshkov --- drivers/pci/controller/dwc/pcie-qcom.c | 30 +------------------------- 1 file changed, 1 insertion(+), 29 deletions(-) diff --git a/drivers/pci/controller/dwc/pcie-qcom.c b/drivers/pci/controller/dwc/pcie-qcom.c index 33353be396ec..0c5e825c6360 100644 --- a/drivers/pci/controller/dwc/pcie-qcom.c +++ b/drivers/pci/controller/dwc/pcie-qcom.c @@ -697,34 +697,6 @@ static int qcom_pcie_init_2_4_0(struct qcom_pcie *pcie) return 0; } -static int qcom_pcie_post_init_2_4_0(struct qcom_pcie *pcie) -{ - u32 val; - - /* enable PCIe clocks and resets */ - val = readl(pcie->parf + PARF_PHY_CTRL); - val &= ~PHY_TEST_PWR_DOWN; - writel(val, pcie->parf + PARF_PHY_CTRL); - - /* change DBI base address */ - writel(0, pcie->parf + PARF_DBI_BASE_ADDR); - - /* MAC PHY_POWERDOWN MUX DISABLE */ - val = readl(pcie->parf + PARF_SYS_CTRL); - val &= ~MAC_PHY_POWERDOWN_IN_P2_D_MUX_EN; - writel(val, pcie->parf + PARF_SYS_CTRL); - - val = readl(pcie->parf + PARF_MHI_CLOCK_RESET_CTRL); - val |= BYPASS; - writel(val, pcie->parf + PARF_MHI_CLOCK_RESET_CTRL); - - val = readl(pcie->parf + PARF_AXI_MSTR_WR_ADDR_HALT_V2); - val |= EN; - writel(val, pcie->parf + PARF_AXI_MSTR_WR_ADDR_HALT_V2); - - return 0; -} - static int qcom_pcie_get_resources_2_3_3(struct qcom_pcie *pcie) { struct qcom_pcie_resources_2_3_3 *res = &pcie->res.v2_3_3; @@ -1280,7 +1252,7 @@ static const struct qcom_pcie_ops ops_2_3_2 = { static const struct qcom_pcie_ops ops_2_4_0 = { .get_resources = qcom_pcie_get_resources_2_4_0, .init = qcom_pcie_init_2_4_0, - .post_init = qcom_pcie_post_init_2_4_0, + .post_init = qcom_pcie_post_init_2_3_2, .deinit = qcom_pcie_deinit_2_4_0, .ltssm_enable = qcom_pcie_2_3_2_ltssm_enable, };