From patchwork Thu Mar 16 08:10:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Manivannan Sadhasivam X-Patchwork-Id: 70633 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:604a:0:0:0:0:0 with SMTP id j10csp350884wrt; Thu, 16 Mar 2023 01:16:24 -0700 (PDT) X-Google-Smtp-Source: AK7set8qsVeA9ntH4qBRcTqc+a/oUkfzoZBnupDZ4yWYl+odhDun5IeV991crcbAxOHTg5N3AeQ4 X-Received: by 2002:aa7:8ec4:0:b0:625:ce06:e5a with SMTP id b4-20020aa78ec4000000b00625ce060e5amr2371347pfr.16.1678954584450; Thu, 16 Mar 2023 01:16:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678954584; cv=none; d=google.com; s=arc-20160816; b=vPVMIWqzWCOHLD/6WhIW8vRZvqx2q60QTxhlUaSjmyb3rw/xyqz7R6r4olH3KuEC2y H+XnuvaywVHunC/RodbjsLeAX6vpsaE81HPkgurIeldCyxKzptxjSdSxQy6uFOW4tg+q 6LsdIQNbQHwt5H+oDxT+jEboCoOL0K057+soGCA9Rtnl3Vv6mngDLjao/4lpevDsvNgQ PoSGkhdSnJGULHWnyz1d3JPw7ghUQYmZScwl727G776X2jcU/zU1Tv9nakmfr48xKszz zyfmxENgwE46+i2Md38pFavb/p3f8ODV8KzyaNfRx/cmSqtwmOQX1NhMcedeAaq5o/bI x+iQ== 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=vS8hfidRbkXx+WU7nlobVXwnuTS8kKT/thUC53f5Tfk=; b=TzeH4nGQEnjdCM7q54iwX67JPtuKUdGR66ADPf7uPkNp6YPtwXy+v4iZS/VFrrgf8n DY9OhXG9LeUsG76yQjW9a+8+tadCbam7q16Xc9TIViKKUvFSYhRJQucZ9FaTBYrqG2Br X/lkhywuhO/3SYyNADgzFmku6/IUiGlVPfzH9BVGPd428y3XtEMlBzpVtqqwQZua0fmT CCqZdbMdxNWOwsNqEsqxxjtAFyK/7GjGC+FRztfdguidwQdQwzszjmZJPPOPm2Z47vRi gJHbERAQkRRtkOrHutj6ej1jUb1r95NRmfOGOnNvUNO/NWN4tXAwKueUXJs2YjNpOmBR S7cA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Nnjn8PYm; 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 z15-20020aa7990f000000b005a8e1cc59bfsi7257343pff.295.2023.03.16.01.16.11; Thu, 16 Mar 2023 01:16:24 -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=Nnjn8PYm; 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 S230443AbjCPILr (ORCPT + 99 others); Thu, 16 Mar 2023 04:11:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57892 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230456AbjCPILm (ORCPT ); Thu, 16 Mar 2023 04:11:42 -0400 Received: from mail-pf1-x433.google.com (mail-pf1-x433.google.com [IPv6:2607:f8b0:4864:20::433]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AADFEB1B0B for ; Thu, 16 Mar 2023 01:11:36 -0700 (PDT) Received: by mail-pf1-x433.google.com with SMTP id c4so643761pfl.0 for ; Thu, 16 Mar 2023 01:11:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1678954296; 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=vS8hfidRbkXx+WU7nlobVXwnuTS8kKT/thUC53f5Tfk=; b=Nnjn8PYmWqQ++sIgye0d2wCU3iwsPG03PgdfrKKyKHByELD3UZf8s8f1ysJWQDyuVS M1x8JKxAyJHdPpAslaBfS4meLs8ekxASJxhX3+XEhqF/gUwIOjQT48wbMGIu1ZSZLXGL RbsHnz9Kife58jkPXM2UYlyyQ9yKfbuuuHWW2atRy8i5m6rjZtjlHEPqcFw8pwiT+UP4 LpFKQZL3p8NT2U2bgRpuumcU7RGiN93T4VjFSyEqzaxRlZ7YVu9xn3SZmH5p3p9IkDSu PiJakb5Dy9OU/+j/BefeJ8IHCqHOTlhB4aLV2b4wTD+vHzg+J7zBaQmMgBgIpaRtRSDo uvrQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678954296; 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=vS8hfidRbkXx+WU7nlobVXwnuTS8kKT/thUC53f5Tfk=; b=r31KqHWvm24fNTV3HCE0RZrMdcx0151W4Y28pcGJQ72e0kiN7wD/hjPGXyx0Z3rLkI fUn/y/9ZDcPfgYmdH9Vze90soI5psoteUF56R3UKWSwB0vT438D4MIXT8yPRo9tHgY7a 81rcrqi3pV/mH4OAoMjxXGExZh/RnueSTYyec0N4qI+fslrk88mDfwm2usyKTc1ZK5fS ZQEAvXjKzQf/KXjW404HSMGXja0YHTMHTY0HDVtPrQgCHC/yIHA4UBhvzQ+KosTJx1vL tVuU0hHIslaBp5XFOpA7LZZuePNoEkwfnV2Pkk3Hh3dstIzozE6rVNmE8QDMCTY7oFSz d3dg== X-Gm-Message-State: AO0yUKUIs1An3M2eCv8pkmRZ8IQTTSn6uZwJsNd0fMInw3O3Fl3Izzyx dkM8TMH/k0WW55NZE2hQrKwN X-Received: by 2002:a62:1b12:0:b0:626:444:bfa6 with SMTP id b18-20020a621b12000000b006260444bfa6mr125095pfb.26.1678954296213; Thu, 16 Mar 2023 01:11:36 -0700 (PDT) Received: from localhost.localdomain ([117.207.30.24]) by smtp.gmail.com with ESMTPSA id 13-20020aa7910d000000b005d9984a947bsm4804422pfh.139.2023.03.16.01.11.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Mar 2023 01:11:35 -0700 (PDT) From: Manivannan Sadhasivam To: andersson@kernel.org, lpieralisi@kernel.org, kw@linux.com, krzysztof.kozlowski+dt@linaro.org, robh@kernel.org Cc: konrad.dybcio@linaro.org, linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, quic_srichara@quicinc.com, Manivannan Sadhasivam , stable@vger.kernel.org Subject: [PATCH v5 01/19] PCI: qcom: Fix the incorrect register usage in v2.7.0 config Date: Thu, 16 Mar 2023 13:40:59 +0530 Message-Id: <20230316081117.14288-2-manivannan.sadhasivam@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230316081117.14288-1-manivannan.sadhasivam@linaro.org> References: <20230316081117.14288-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 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?1760511482248935442?= X-GMAIL-MSGID: =?utf-8?q?1760511482248935442?= Qcom PCIe IP version v2.7.0 and its derivatives don't contain the PCIE20_PARF_AXI_MSTR_WR_ADDR_HALT register. Instead, they have the new PCIE20_PARF_AXI_MSTR_WR_ADDR_HALT_V2 register. So fix the incorrect register usage which is modifying a different register. Also in this IP version, this register change doesn't depend on MSI being enabled. So remove that check also. Cc: # 5.6+ Fixes: ed8cc3b1fc84 ("PCI: qcom: Add support for SDM845 PCIe controller") Signed-off-by: Manivannan Sadhasivam --- drivers/pci/controller/dwc/pcie-qcom.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/pci/controller/dwc/pcie-qcom.c b/drivers/pci/controller/dwc/pcie-qcom.c index a232b04af048..89d748cc4b8a 100644 --- a/drivers/pci/controller/dwc/pcie-qcom.c +++ b/drivers/pci/controller/dwc/pcie-qcom.c @@ -1279,11 +1279,9 @@ static int qcom_pcie_init_2_7_0(struct qcom_pcie *pcie) val &= ~REQ_NOT_ENTR_L1; writel(val, pcie->parf + PCIE20_PARF_PM_CTRL); - if (IS_ENABLED(CONFIG_PCI_MSI)) { - val = readl(pcie->parf + PCIE20_PARF_AXI_MSTR_WR_ADDR_HALT); - val |= BIT(31); - writel(val, pcie->parf + PCIE20_PARF_AXI_MSTR_WR_ADDR_HALT); - } + val = readl(pcie->parf + PCIE20_PARF_AXI_MSTR_WR_ADDR_HALT_V2); + val |= BIT(31); + writel(val, pcie->parf + PCIE20_PARF_AXI_MSTR_WR_ADDR_HALT_V2); return 0; err_disable_clocks: