From patchwork Sat May 6 07:31:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Manivannan Sadhasivam X-Patchwork-Id: 90688 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp907843vqo; Sat, 6 May 2023 00:33:08 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7zCHETiPYe38gFbwteGAzMweRzZCJIXbW6y41hMvFl772CUvzkG4Qtzce82wxtFbALwOqd X-Received: by 2002:a17:902:ea8b:b0:1a0:50bd:31a8 with SMTP id x11-20020a170902ea8b00b001a050bd31a8mr3771826plb.26.1683358388705; Sat, 06 May 2023 00:33:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1683358388; cv=none; d=google.com; s=arc-20160816; b=G2Xej2HlhmGiySAN6jHNOTlSpgLXkhDbQG6LRbwz2cc5WsXrD4jfN+5dfOmGHyDVqj Rl9nOlbWfBOzS1ea1Lz5vRQMysE/72CGAvU7QOqbFAc2uaSVENsU9j0ghBY9i9NNcy1n g36HxddsBoDlhn6kCkNtvWYrlO+fOcfxl4lQqFuTX3j6NJdAefgqyN/JuxT7zy+It/cI fpwdoPb2sCnMgMAnSNg9TdaflOouTngMwIxatJJ/ka37pHSl91Ksi9krVtLnr5fTxPMm 3SJf3rdLGEOf5BJks3D7F2JgdctVWmMvXtEGC9QlQcaeRfvVNrUUMGYVs2XcUCdhputI 0rfQ== 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=Hact0AkOI0DQGjwOBLvh9UZ6v/o0AVZ+jUuWAd19+iA=; b=jFeV66Y9l2bg08z0+8da1yG95kRvMYdzY0Xp5gdJqniw/U2jpefb5XBDe2LtpvNDiY nM83Zn6YCaPDlC4ZHp3oTv9BoRaBItDPbhKCjz/0h96TKBHEqjtgz33E07VZY43Ea3jJ lKhIDn5RyRzaxQkLQePiT0zY1UEVoqPiawvqHwklc2GOKdHBJZD8vqdNzkLPKhSY+7dX uzJRTUa53If6NjeNXL3Vk8mHMefcU1eY+iZqHPFifX7cTeJor/Zisb9jV2WNKejkaIn/ k9CeTNhG//QRGcB11IplG3A6eEIsYrUKi93COQkInBy9rwXiLCLYmaxAtN707QXtQxnL xVQQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=wJ4krpkC; 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 jf12-20020a170903268c00b001a21fd27407si3284529plb.469.2023.05.06.00.32.53; Sat, 06 May 2023 00:33:08 -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=wJ4krpkC; 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 S230383AbjEFHcE (ORCPT + 99 others); Sat, 6 May 2023 03:32:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37616 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229906AbjEFHbz (ORCPT ); Sat, 6 May 2023 03:31:55 -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 BBDCF5FFC for ; Sat, 6 May 2023 00:31:52 -0700 (PDT) Received: by mail-pf1-x433.google.com with SMTP id d2e1a72fcca58-643912bca6fso2122261b3a.0 for ; Sat, 06 May 2023 00:31:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1683358312; x=1685950312; 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=Hact0AkOI0DQGjwOBLvh9UZ6v/o0AVZ+jUuWAd19+iA=; b=wJ4krpkCp5ZCptdV4UrMvJ+qeZN41nNkdJIsci6UVWSmEmJx9CvJ3GNjm7F7MfzO8a yoWYEh6WGORd50He6SvmmvtM9EJ1iRFZwUAgNRvRU95AV0yGyefdM6oDltaqs3w7+Km5 nF+0xdPTR69pMUyECu7ParKjkA6FdqfkIyvKujvTWa9ElWNliRYW8mg3RfXvZs60l0O5 ekle4syynvnWw3Ask8JJciKu5Xp7HOwHInTXSL0wmYlBjT8Bb6T+EqvyhwRMLr4IiG82 OgBPYLO0mJTLglkAnPsLdcIQxfeOZv7jW8JlLhNco6BrIWncAoqTBUweQ2LsBhonrWwH OI5w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683358312; x=1685950312; 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=Hact0AkOI0DQGjwOBLvh9UZ6v/o0AVZ+jUuWAd19+iA=; b=gmoTRYnJyEPJdUhrGpQ7HZqVrQ7l5Q0PMiruCkqzjoLoBbst/C+RX8RmtISsmcKWBa drepT3iWf+6aDHtEG8V8lPyR3PXEU99ByzVRFaqwimLWg1Rk2ViNzyRMddtiKGVcoJsr opAAqdLphB5JuKZksPj/sCFvhTfmw/HREhsetOQN1ZmhHd0h7CtcWnpoLsEsMtb+qlA/ IZpX/+RlSE9/pG2o8zTSJ5QyaG8MVljB+fiDaYsvv1YH1ZxptHPhNAHcWkuUpmaYOO/5 KrKlVhsc392hYllktgi4vtl2SKO6Jhw3tz55qTTwh2GEn2u2nZGMAAtbFv4UqRoBtZJp mtCQ== X-Gm-Message-State: AC+VfDyrtw1aW2gzRlWqNIDeSRaYh6bZCs1cZtiiI2XtVIq6QljvkLZm 0JIZRA89bDnJRSRuKCgyASBR X-Received: by 2002:a05:6a00:179b:b0:63b:62d1:d868 with SMTP id s27-20020a056a00179b00b0063b62d1d868mr6139777pfg.8.1683358312233; Sat, 06 May 2023 00:31:52 -0700 (PDT) Received: from localhost.localdomain ([120.138.12.87]) by smtp.gmail.com with ESMTPSA id z16-20020aa785d0000000b0062a56e51fd7sm2627373pfn.188.2023.05.06.00.31.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 06 May 2023 00:31:51 -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 1/8] PCI: qcom: Use DWC helpers for modifying the read-only DBI registers Date: Sat, 6 May 2023 13:01:32 +0530 Message-Id: <20230506073139.8789-2-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?1765129205799412632?= X-GMAIL-MSGID: =?utf-8?q?1765129205799412632?= DWC core already exposes dw_pcie_dbi_ro_wr_{en/dis} helper APIs for enabling and disabling the write access to read only DBI registers. So let's use them instead of doing it manually. Also, the existing code doesn't disable the write access when it's done. This is also fixed now. Fixes: 5d76117f070d ("PCI: qcom: Add support for IPQ8074 PCIe controller") Signed-off-by: Manivannan Sadhasivam Reviewed-by: Dmitry Baryshkov Reviewed-by: Dmitry Baryshkov --- drivers/pci/controller/dwc/pcie-qcom.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/pci/controller/dwc/pcie-qcom.c b/drivers/pci/controller/dwc/pcie-qcom.c index 4ab30892f6ef..01795ee7ce45 100644 --- a/drivers/pci/controller/dwc/pcie-qcom.c +++ b/drivers/pci/controller/dwc/pcie-qcom.c @@ -61,7 +61,6 @@ /* DBI registers */ #define AXI_MSTR_RESP_COMP_CTRL0 0x818 #define AXI_MSTR_RESP_COMP_CTRL1 0x81c -#define MISC_CONTROL_1_REG 0x8bc /* MHI registers */ #define PARF_DEBUG_CNT_PM_LINKST_IN_L2 0xc04 @@ -132,9 +131,6 @@ /* AXI_MSTR_RESP_COMP_CTRL1 register fields */ #define CFG_BRIDGE_SB_INIT BIT(0) -/* MISC_CONTROL_1_REG register fields */ -#define DBI_RO_WR_EN 1 - /* PCI_EXP_SLTCAP register fields */ #define PCIE_CAP_SLOT_POWER_LIMIT_VAL FIELD_PREP(PCI_EXP_SLTCAP_SPLV, 250) #define PCIE_CAP_SLOT_POWER_LIMIT_SCALE FIELD_PREP(PCI_EXP_SLTCAP_SPLS, 1) @@ -826,7 +822,9 @@ static int qcom_pcie_post_init_2_3_3(struct qcom_pcie *pcie) writel(0, pcie->parf + PARF_Q2A_FLUSH); writel(PCI_COMMAND_MASTER, pci->dbi_base + PCI_COMMAND); - writel(DBI_RO_WR_EN, pci->dbi_base + MISC_CONTROL_1_REG); + + dw_pcie_dbi_ro_wr_en(pci); + writel(PCIE_CAP_SLOT_VAL, pci->dbi_base + offset + PCI_EXP_SLTCAP); val = readl(pci->dbi_base + offset + PCI_EXP_LNKCAP); @@ -836,6 +834,8 @@ static int qcom_pcie_post_init_2_3_3(struct qcom_pcie *pcie) writel(PCI_EXP_DEVCTL2_COMP_TMOUT_DIS, pci->dbi_base + offset + PCI_EXP_DEVCTL2); + dw_pcie_dbi_ro_wr_dis(pci); + return 0; } From patchwork Sat May 6 07:31:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Manivannan Sadhasivam X-Patchwork-Id: 90689 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp907862vqo; Sat, 6 May 2023 00:33:13 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ46Udqt2UGqrPBbTrMvUoc8RQn1JcDkaPMzivfB2k9E7PGh0Al3prIdVpiQun0o+6diK/A6 X-Received: by 2002:a17:902:c412:b0:1ab:25a6:a54b with SMTP id k18-20020a170902c41200b001ab25a6a54bmr5099133plk.4.1683358392797; Sat, 06 May 2023 00:33:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1683358392; cv=none; d=google.com; s=arc-20160816; b=afN+JW97fdkXNveX4KUV5jXC1/Tgq1o5lLfbp6Rqfh4AF7WmLTijwp1EkjgPnZ69/I DBbBXxoHZ/KjNBIF9LG7xLGiRJ3chcCP/8vBTkWryP+/jGDuiTZFRPOqSWZEmNA2JnVu U313pOM+KEIWCtJb+pEc4/D0H3edhdDfdQeEA2EVP/BpYA2hBS8W+YVs/6+823BIVPE/ 5HDV8EPZXvQVkyUWDLwFOSvHRVd7SRKmG8q8ukHNI6XiiD526SFaW+7U0W6mDFOMJZaq s4AxI4GGgDiXCbRg++bAirCGgIZfU0aer1oSMwhoeX1evbolDeFI4b+fWSG7ZS5uERMm Me+Q== 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=DMSlOb87FN5avnZVZsaz4/X3lkPSsnKywRngv2+jGMo=; b=G9502en7oRh08KGkOUyX8Vl6InzecKaLaC9BW+SJ+UCLj5LKsWCc1RVCZIv9KZNzoo JsEsQz/5ULY+aAHWvcAoKu4ku1ZwlUhDEPuHVss3RPxHfZIooujNibs7MCdIaK/UMUZ6 7QBogV/FQCbkdouzr2MZ0/vuU8BCi2RDmaqJyYsbbOeeGeWtWMI3vH/lYCquI3d7VuiI KcHPrLYAksboz1S/ONkef264SgYdtmjwM1Hj4TA+mo0d/YOwlQA+tKNIjOVO84FHoYkj qWLrO4ZBp6NDVTpHUd3wgU90MnuWX6/1c0qRJjXXJZGwwBAeBhOQ13GM7rTVF/9iK3LB 10vg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=IqOL4+Lh; 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 i17-20020a17090332d100b001a989e412bbsi2215109plr.514.2023.05.06.00.32.56; Sat, 06 May 2023 00:33:12 -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=IqOL4+Lh; 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 S230405AbjEFHcH (ORCPT + 99 others); Sat, 6 May 2023 03:32:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37670 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230209AbjEFHb5 (ORCPT ); Sat, 6 May 2023 03:31:57 -0400 Received: from mail-pf1-x429.google.com (mail-pf1-x429.google.com [IPv6:2607:f8b0:4864:20::429]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6C737AD0A for ; Sat, 6 May 2023 00:31:56 -0700 (PDT) Received: by mail-pf1-x429.google.com with SMTP id d2e1a72fcca58-643995a47f7so2455330b3a.1 for ; Sat, 06 May 2023 00:31:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1683358316; x=1685950316; 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=DMSlOb87FN5avnZVZsaz4/X3lkPSsnKywRngv2+jGMo=; b=IqOL4+Lh/a97EkERAXTgr7jujAWGzCQz0IsxYCGxnLDPs7bvD06IyTDppzQ3FtiPHP zvviPIGyG8KOIVzO/L75hGSk23gAPKURAvWnp3ifjSIaK416CkdWV4WEwB+MVCZlFyaY wIc3WX12RTKSKFBhkki9mQXczsUa34OgL2dsTsIUeGgGHCk4gwDIgm+fciAsXcizuS/M 9J68zAnzHCqOqL0/Kd/x/p720kpbpVj2YvD6BTpVlS9Ok920YzIcmqbTLhyTojIvfJT/ zGE2yT0Nqq4XGVazSquKuCLamnF27oPDv2IpDBl7KG+0Wwe72mmHM4BOOtu73OWOQM4A 2qjA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683358316; x=1685950316; 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=DMSlOb87FN5avnZVZsaz4/X3lkPSsnKywRngv2+jGMo=; b=G6l8Cu1MPjQj20tc9LgoCG16YVQzUhB++pcsBq5l8BToNRJ25cMVy96Ly6kUtGQLrK dePyw3D0rn7AYsnFdn0kn/REVjXO2w7A6RkoEkj4sVyCOwYDZJdCLKLGdA9ZuyFVZb4B QVwJWUJbs0Q0FxF74r80YaT1Z44iN9qBocr2c1zHWP3L9UvbY1OcuwKvLjCuz+DCRvUv 3MWFBGWx5qgAfzhZd+luYLe5xrS12xK+fVDIfb/VfFnAzekTmFo9n//m3tSfi95GhzaE WbZRwPwD+pRAsfh0d4pptprj5CFzqzQoqrwx0c4aKK0hoBWlfkVin368oqPU9cunRDlO AeNw== X-Gm-Message-State: AC+VfDyUzYeXWvQ1dCTF1FwA9BVopPFdL23uPLvFnJPtliCaDspgeJ6O QAWi4jP/xrwaAwNdtC1swKgq X-Received: by 2002:a05:6a00:849:b0:643:980:65b with SMTP id q9-20020a056a00084900b006430980065bmr5241008pfk.2.1683358315860; Sat, 06 May 2023 00:31:55 -0700 (PDT) Received: from localhost.localdomain ([120.138.12.87]) by smtp.gmail.com with ESMTPSA id z16-20020aa785d0000000b0062a56e51fd7sm2627373pfn.188.2023.05.06.00.31.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 06 May 2023 00:31:55 -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 2/8] PCI: qcom: Disable write access to read only registers for IP v2.9.0 Date: Sat, 6 May 2023 13:01:33 +0530 Message-Id: <20230506073139.8789-3-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=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?1765129209915428262?= X-GMAIL-MSGID: =?utf-8?q?1765129209915428262?= In the post init sequence of v2.9.0, write access to read only registers are not disabled after updating the registers. Fix it by disabling the access after register update. Fixes: 0cf7c2efe8ac ("PCI: qcom: Add IPQ60xx support") Signed-off-by: Manivannan Sadhasivam Reviewed-by: Dmitry Baryshkov Reviewed-by: Dmitry Baryshkov --- drivers/pci/controller/dwc/pcie-qcom.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/pci/controller/dwc/pcie-qcom.c b/drivers/pci/controller/dwc/pcie-qcom.c index 01795ee7ce45..391a45d1e70a 100644 --- a/drivers/pci/controller/dwc/pcie-qcom.c +++ b/drivers/pci/controller/dwc/pcie-qcom.c @@ -1136,6 +1136,7 @@ static int qcom_pcie_post_init_2_9_0(struct qcom_pcie *pcie) writel(0, pcie->parf + PARF_Q2A_FLUSH); dw_pcie_dbi_ro_wr_en(pci); + writel(PCIE_CAP_SLOT_VAL, pci->dbi_base + offset + PCI_EXP_SLTCAP); val = readl(pci->dbi_base + offset + PCI_EXP_LNKCAP); @@ -1145,6 +1146,8 @@ static int qcom_pcie_post_init_2_9_0(struct qcom_pcie *pcie) writel(PCI_EXP_DEVCTL2_COMP_TMOUT_DIS, pci->dbi_base + offset + PCI_EXP_DEVCTL2); + dw_pcie_dbi_ro_wr_dis(pci); + for (i = 0; i < 256; i++) writel(0, pcie->parf + PARF_BDF_TO_SID_TABLE_N + (4 * i)); From patchwork Sat May 6 07:31:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Manivannan Sadhasivam X-Patchwork-Id: 90693 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp909539vqo; Sat, 6 May 2023 00:38:47 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7pDgTtVBR6uywiUKRFyXEkdqvJ+JUnU9DI4BJoHUkUfuXQHqMnRqobxVxkb5YzsP8LRga0 X-Received: by 2002:a17:90b:4f89:b0:24d:f816:7952 with SMTP id qe9-20020a17090b4f8900b0024df8167952mr3959802pjb.5.1683358727371; Sat, 06 May 2023 00:38:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1683358727; cv=none; d=google.com; s=arc-20160816; b=e+eKd75XcSNhZLx58L3zPXFx5qTN3dYmJ8Oc955w3BuNkDm6JBcAF3Udg/dm2T2wuO LlY37MfgDBpnQnaypul4PJ0N5PbdSpQXZ6OqORTIc8cM1guvGaJG2U85rwJOrgGF5HOA 9OotYXEqTsLzbbCioZK5/TT3IpBt6Nx/lDqQ/lt8wctbnyeJr2lGuIlsMPZQgyjSFuO3 My7u21R2sGHashyBj6OcgQ819Z8gMIdGFa0l+V99jVhsDaAFZkHjRK47OTu+dNrNUimh IwueOSS3ZPwfG5vRxhvjuv+q82VyNLFUYKUXESYL72/q5C2PePD/3fBn6C6ELn7VDBPs pXYw== 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=gnprX8nF58MbC+8jk2bB2WSCWcm3GNiHBCtxvPm30dM=; b=HJen2PhlgXYHEpYAiW8GGCknQpl1RJN88TeWuL4b573nR8E8fcA3I1k4KP0UelTtmm G5tdyAq7irn47gJ1TBZajfTdonYEiMswdj/KJDrfDpBpdTJKjooU1IM4Hxyzk/AbqVqb qdqzCgDGBPp3UbbqdMAJQ6qmcgmMfQbK8qVu+YKnE3UVY+5ClVqElxzGhZFlng2Xiee1 Z4/kf5LBjHMgm1QVN7a3r29iMZKg+2tTzOXN/3lEgaRwDr6ALHE3M2BT6UOsneRGmVGL bQRPteg/VW3ANALj2pX+koynuOGr+Ou3ZxVfK5GSXuBoSGLqV2HsEr+PuAzt/mNe/SI4 8tZQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=IEPLhW3V; 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 ds6-20020a17090b08c600b00232f57260c1si7953234pjb.1.2023.05.06.00.38.34; Sat, 06 May 2023 00:38:47 -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=IEPLhW3V; 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 S231281AbjEFHcQ (ORCPT + 99 others); Sat, 6 May 2023 03:32:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38094 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229942AbjEFHcH (ORCPT ); Sat, 6 May 2023 03:32:07 -0400 Received: from mail-pf1-x432.google.com (mail-pf1-x432.google.com [IPv6:2607:f8b0:4864:20::432]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0B3751163D for ; Sat, 6 May 2023 00:32:00 -0700 (PDT) Received: by mail-pf1-x432.google.com with SMTP id d2e1a72fcca58-6439f186366so1096269b3a.2 for ; Sat, 06 May 2023 00:32:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1683358319; x=1685950319; 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=gnprX8nF58MbC+8jk2bB2WSCWcm3GNiHBCtxvPm30dM=; b=IEPLhW3VjIQfoKFoGZMwj/5mHPFXFTkjY7vlMGmonbbPkTlEr7EHa294tNa/LOpUqr pmk7r1njQJX+hZRxDuvFkiUqzHGKuHFBGTLrIWZar5Y2x99dd4LPAX549Pk9AqIao9jO ElBb3tmmEOgCGjY35nqnHgq6QOiCGRyf0ZSctdPfrSTWw2FyoZ5x2n9aDgY+0795eYC8 AFHCPWTVc3cITjYxELTXD7CLzyL4AUksfaiEyytWqTGnYPPuoqhX/KKoB9uZW/zcNCaH Jdx/ztme3QMugbBBKg76PrOq9WuO9XjJuqL5YRcNGlD3UXniPpSI9EvDos+dZFpn+iwO ZqJQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683358319; x=1685950319; 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=gnprX8nF58MbC+8jk2bB2WSCWcm3GNiHBCtxvPm30dM=; b=A30IFMK6RdmCrs/1ha7cSmELzGDNknnFZ4JH6NjwVbbSdyxCBTck0Q0qpCPq0Z91+F l8DcUwIUTrUZNPFT+HJ0spT7Eu+ZhWG0KvwqlyZptHSSNT5W6E7Y9+cx4NADTc0qsmND +gZo0/p6rRw/pVTe1EfXhcJ+K4UgsmnOUFsWANvJtNxRhb//8JZ2b3hc/LI49w6z1Vd9 HSrulAcTA5ZmO8Y4TxgQWETPg0fAngBZzoxiFS+uKoSmuToRaNtSnT0XbPYFkgJVSImq BG/RQOOTS6zzwXI9KqLPd1HTI3mZ8BiGFZcSLaZdS/aCtKQyVWBEaFL41CdyrteF9Srw UqNQ== X-Gm-Message-State: AC+VfDz3CjywbiDrV28o3wqiNEgQv2glWpX98zrRoHAY2sLNnP6Ao3cy KxRQVWonfqtYI76FvmqxOdl+ X-Received: by 2002:a05:6a00:24cf:b0:63d:3411:f9e3 with SMTP id d15-20020a056a0024cf00b0063d3411f9e3mr5929321pfv.19.1683358319465; Sat, 06 May 2023 00:31:59 -0700 (PDT) Received: from localhost.localdomain ([120.138.12.87]) by smtp.gmail.com with ESMTPSA id z16-20020aa785d0000000b0062a56e51fd7sm2627373pfn.188.2023.05.06.00.31.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 06 May 2023 00:31:59 -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 3/8] PCI: qcom: Do not advertise hotplug capability for IPs v2.7.0 and v1.9.0 Date: Sat, 6 May 2023 13:01:34 +0530 Message-Id: <20230506073139.8789-4-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?1765129561186717628?= X-GMAIL-MSGID: =?utf-8?q?1765129561186717628?= SoCs making use of Qcom PCIe controller IPs v2.7.0 and v1.9.0 do not support hotplug functionality. But the hotplug capability bit is set by default in the hardware. This causes the kernel PCI core to register hotplug service for the controller and send hotplug commands to it. But those commands will timeout generating messages as below during boot and suspend/resume. [ 5.782159] pcieport 0001:00:00.0: pciehp: Timeout on hotplug command 0x03c0 (issued 2020 msec ago) [ 5.810161] pcieport 0001:00:00.0: pciehp: Timeout on hotplug command 0x03c0 (issued 2048 msec ago) [ 7.838162] pcieport 0001:00:00.0: pciehp: Timeout on hotplug command 0x07c0 (issued 2020 msec ago) [ 7.870159] pcieport 0001:00:00.0: pciehp: Timeout on hotplug command 0x07c0 (issued 2052 msec ago) This not only spams the console output but also induces a delay of a couple of seconds. To fix this issue, let's clear the HPC bit in PCI_EXP_SLTCAP register as a part of the post init sequence to not advertise the hotplug capability for the controller. Signed-off-by: Manivannan Sadhasivam Reviewed-by: Dmitry Baryshkov Reviewed-by: Dmitry Baryshkov --- drivers/pci/controller/dwc/pcie-qcom.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/drivers/pci/controller/dwc/pcie-qcom.c b/drivers/pci/controller/dwc/pcie-qcom.c index 391a45d1e70a..00246726c21d 100644 --- a/drivers/pci/controller/dwc/pcie-qcom.c +++ b/drivers/pci/controller/dwc/pcie-qcom.c @@ -966,6 +966,23 @@ static int qcom_pcie_init_2_7_0(struct qcom_pcie *pcie) return ret; } +static int qcom_pcie_post_init_2_7_0(struct qcom_pcie *pcie) +{ + struct dw_pcie *pci = pcie->pci; + u16 offset = dw_pcie_find_capability(pci, PCI_CAP_ID_EXP); + u32 val; + + dw_pcie_dbi_ro_wr_en(pci); + + val = readl(pci->dbi_base + offset + PCI_EXP_SLTCAP); + val &= ~PCI_EXP_SLTCAP_HPC; + writel(val, pci->dbi_base + offset + PCI_EXP_SLTCAP); + + dw_pcie_dbi_ro_wr_dis(pci); + + return 0; +} + static void qcom_pcie_deinit_2_7_0(struct qcom_pcie *pcie) { struct qcom_pcie_resources_2_7_0 *res = &pcie->res.v2_7_0; @@ -1272,6 +1289,7 @@ static const struct qcom_pcie_ops ops_2_3_3 = { static const struct qcom_pcie_ops ops_2_7_0 = { .get_resources = qcom_pcie_get_resources_2_7_0, .init = qcom_pcie_init_2_7_0, + .post_init = qcom_pcie_post_init_2_7_0, .deinit = qcom_pcie_deinit_2_7_0, .ltssm_enable = qcom_pcie_2_3_2_ltssm_enable, }; @@ -1280,6 +1298,7 @@ static const struct qcom_pcie_ops ops_2_7_0 = { static const struct qcom_pcie_ops ops_1_9_0 = { .get_resources = qcom_pcie_get_resources_2_7_0, .init = qcom_pcie_init_2_7_0, + .post_init = qcom_pcie_post_init_2_7_0, .deinit = qcom_pcie_deinit_2_7_0, .ltssm_enable = qcom_pcie_2_3_2_ltssm_enable, .config_sid = qcom_pcie_config_sid_1_9_0, From patchwork Sat May 6 07:31:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Manivannan Sadhasivam X-Patchwork-Id: 90695 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp910529vqo; Sat, 6 May 2023 00:41:59 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ77BSktwgY89B9/8stOtKUVLOwCK30N2GSJnaKaQodp70w2sf36Wc1SV+L9fdZKUISWD6zq X-Received: by 2002:a05:6a20:4401:b0:ef:44da:9418 with SMTP id ce1-20020a056a20440100b000ef44da9418mr5414616pzb.17.1683358919673; Sat, 06 May 2023 00:41:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1683358919; cv=none; d=google.com; s=arc-20160816; b=fwtF67gzzScPVzbOM7YoQ9buvGN2MbGyeZYZtVZAd0/7ClPqxfUfeYBQ1+rPB64wFT 2Gmz4OhUe922mitDDCEhozIz0eot4R7K071Xe6SjqtWbKrZknM+eZIsvloBJ9/E/0/YQ q5smQCUA48/oQ52770GHotdaPvYkUyaR2sS48X+kOMv5aSuWqD5lcKnW8Sr/kF4jSq6G FgYKctDz8UFOwt9yqSMoSU2zcQzrnfo/zAZZmJeLHhU+/7H7Mccn856J5n3X4lqpEM55 UitaiHwUVakpG4V3rFznJZHpfgfapXSgxYfknOg65/uPj/fPivO8ymXuwXiJQBU/K33S xUdA== 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=E0cuEgJuHushMGf06sKVJF54IdMYX1ODr1anndZly5Y=; b=zVr2NvOza6eFVWAYJFrDbe/ogR2Ey8YVHsR9RHJqtMTTPV/awZqELeghZBcU8IDnch P4tPmTX4PkqnjAH9MurO7/nBGVbU9YmENDQZyA4ONXIjFx5nviVYwk2VMWsCB8Hd9FBg i/WwKJUehr2Nh9p+Z1bmt5AScW0VD4TbcidfMOdUxl/vqu8n2m0AqHlb6I5jLM0cy2Rk tDMwwNCh97b+6q0/L3pX7/g3v8Ywq0pKy3TN+e2CrkfipnyTWjTzaYifUqHosEkTMMjw iQYXFWs6u+FRMss9MlbtnwQNkBlZQWoQ01WPK2fgY//bL+SgASRFHyQQUKPwTtwyPSSd UD8A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=MASRw1jo; 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 s10-20020a63770a000000b00518ebc6f91fsi3989230pgc.851.2023.05.06.00.41.44; Sat, 06 May 2023 00:41:59 -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=MASRw1jo; 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 S231303AbjEFHcU (ORCPT + 99 others); Sat, 6 May 2023 03:32:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38324 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230350AbjEFHcN (ORCPT ); Sat, 6 May 2023 03:32:13 -0400 Received: from mail-pf1-x432.google.com (mail-pf1-x432.google.com [IPv6:2607:f8b0:4864:20::432]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 852D611B4F for ; Sat, 6 May 2023 00:32:03 -0700 (PDT) Received: by mail-pf1-x432.google.com with SMTP id d2e1a72fcca58-6439f186366so1096287b3a.2 for ; Sat, 06 May 2023 00:32:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1683358323; x=1685950323; 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=E0cuEgJuHushMGf06sKVJF54IdMYX1ODr1anndZly5Y=; b=MASRw1jou8CKtdgS0fQmjwHGCCa0uKGPWDJcRBGuMkFMrTrYiGd+dfR5QBz80yO6ic tGl1k/gAMJvS51WuYXPTwRiD5HuwNXHiR6aDRX60RYwTLwsob9gKrLB9rJG1Z4cUictd 9CRp7FweEoNHsPDldzl9uFJjsZMleaUhO7fgsGJPZnUABoPjFznBYs2dwaetwK/5Rfcp N3bhWCcAktcKONAgp6cqHDjNdORlCi3K+bSLb+eSJWX+4oMqveP8s4siRySszE/mmbPP NYgo1fdMbL50BzL5vMSbnqgkPJGtKnOinAk7QkGIEgu1EokbWLksMJzbcA+t6PAswPD/ 3Jfg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683358323; x=1685950323; 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=E0cuEgJuHushMGf06sKVJF54IdMYX1ODr1anndZly5Y=; b=EL61ZY2OafP00p97pfZT6H3jhIDHQRPZ+ec5qFMUpyEdWyD4OJhAWnBx3ctw3zMyuS +0KTkj0Y9S7AExg4Axbbo09zU1kurKexMYm0+8aO2LRQB9wJyhJLCq9wkKHibD2Eoi5p EBt6U+VCsC/HYJefhb1yMaFk6ChbudLiak+eEssyA2iEZxvtSPpTcIPqjtZvVbPslMkN rcQnxGZNSe/fUeHGaJHvtHj3HIAIMBB5Uz5LjS5P7n1S1vK/4rlaJ+5uASezqND/aDGP u0lP50unbL3VrbnRS7oMye/gtfywA+x4m5ZahIXPIXmpIiu990IZYIkO2oZWWqgf/yK1 AiEA== X-Gm-Message-State: AC+VfDy3ZlIdHUXQfXaOanNUrufz8frJZI+cLJzR38p4G7O3uOZh/b+W 31NRDNdr1ygF63t1qp/HEq1m0TiTkRrPHfmzWQ== X-Received: by 2002:a05:6a20:4401:b0:ef:44da:9418 with SMTP id ce1-20020a056a20440100b000ef44da9418mr5387055pzb.17.1683358323105; Sat, 06 May 2023 00:32:03 -0700 (PDT) Received: from localhost.localdomain ([120.138.12.87]) by smtp.gmail.com with ESMTPSA id z16-20020aa785d0000000b0062a56e51fd7sm2627373pfn.188.2023.05.06.00.31.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 06 May 2023 00:32:02 -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 4/8] PCI: qcom: Do not advertise hotplug capability for IPs v2.3.3 and v2.9.0 Date: Sat, 6 May 2023 13:01:35 +0530 Message-Id: <20230506073139.8789-5-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?1765129762159001789?= X-GMAIL-MSGID: =?utf-8?q?1765129762159001789?= SoCs making use of Qcom PCIe controller IPs v2.3.3 and v2.9.0 do not support hotplug functionality. But the hotplug capability bit is set by default in the hardware. This causes the kernel PCI core to register hotplug service for the controller and send hotplug commands to it. But those commands will timeout generating messages as below during boot and suspend/resume. [ 5.782159] pcieport 0001:00:00.0: pciehp: Timeout on hotplug command 0x03c0 (issued 2020 msec ago) [ 5.810161] pcieport 0001:00:00.0: pciehp: Timeout on hotplug command 0x03c0 (issued 2048 msec ago) [ 7.838162] pcieport 0001:00:00.0: pciehp: Timeout on hotplug command 0x07c0 (issued 2020 msec ago) [ 7.870159] pcieport 0001:00:00.0: pciehp: Timeout on hotplug command 0x07c0 (issued 2052 msec ago) This not only spams the console output but also induces a delay of a couple of seconds. To fix this issue, let's not set the HPC bit in PCI_EXP_SLTCAP register as a part of the post init sequence to not advertise the hotplug capability for the controller. Signed-off-by: Manivannan Sadhasivam Reviewed-by: Dmitry Baryshkov Reviewed-by: Dmitry Baryshkov --- drivers/pci/controller/dwc/pcie-qcom.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/pci/controller/dwc/pcie-qcom.c b/drivers/pci/controller/dwc/pcie-qcom.c index 00246726c21d..3d5b3ce9e2da 100644 --- a/drivers/pci/controller/dwc/pcie-qcom.c +++ b/drivers/pci/controller/dwc/pcie-qcom.c @@ -140,7 +140,6 @@ PCI_EXP_SLTCAP_AIP | \ PCI_EXP_SLTCAP_PIP | \ PCI_EXP_SLTCAP_HPS | \ - PCI_EXP_SLTCAP_HPC | \ PCI_EXP_SLTCAP_EIP | \ PCIE_CAP_SLOT_POWER_LIMIT_VAL | \ PCIE_CAP_SLOT_POWER_LIMIT_SCALE) From patchwork Sat May 6 07:31:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Manivannan Sadhasivam X-Patchwork-Id: 90696 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp910531vqo; Sat, 6 May 2023 00:42:00 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4etsew9zG967PqUwBFjTO+1FoRyZgjJUJaNlWcBINuDE7NchKScXDfpNklxKr9ClxAAqgJ X-Received: by 2002:a05:6a20:6a0e:b0:f2:5b9f:fe73 with SMTP id p14-20020a056a206a0e00b000f25b9ffe73mr5540552pzk.28.1683358919874; Sat, 06 May 2023 00:41:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1683358919; cv=none; d=google.com; s=arc-20160816; b=YjWm6mtxr7jyAS7NrGz7P4VzG8OuR0KMyWC57jvvSwg6enVKgb91YZW85UulpXdW2Q QhJatYlRxfUFkyi+G2OWPo+5yIffI+X1gDH7W3LFEvnSTTRrgcd+K5Oma/9/jofC2h0o v7qofCIJtzZldTomkq42jfQ3a6ZYB+jD6CarwzmF96WMu63lDkVidxZsSRIT9Bb8Px/w wwDZT/gFurxXjGc/mVT/h+nIwuKrwH/DWjcQvRiJv56dxERe32aRmZuDFZO+C185pPQD /+VR6pNZuvvTPgCQVYWTk0vV+z67Pt0nJxpqWdTcUC9YKfyBLh+33pqz0yQLEerW4cyW N5yQ== 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=shRj8ftKXp337A2020wykIm+2u6OMQWOSQ5tcyDxEKE=; b=ScKRf41ly2kr3G+5KzpOjrQOlReGkkTMtwPU1G/nUsANfG+0/diTRrBEN7ouiLo/CA 6h1F0DogI0EuoS43GELpXxR3LuEKPnxqXFneUVxEa5SbvZzHP5kin2SeXrKASrWImDek c58lEZE7D4T90Rb3th98aeamMwtunCGh/mIyqR/kc5GAQtaOG4cJibcfvVGJ9M685m+2 +mftXjY2G563NGJ5UtWcUcbbxeDdkugdp2GPtdk563rtGZNh6tmo2RX5vIkekV7ZdGk+ MnqhBIDw6KEyV1BG3bAFhjA8WJHRzToP39uetukfG53JMJEpBxZmy76hexMzfRnTmSmy dPPw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=hxv1KxFu; 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 t191-20020a6381c8000000b0052877366da6si3699507pgd.104.2023.05.06.00.41.44; Sat, 06 May 2023 00:41:59 -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=hxv1KxFu; 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 S230461AbjEFHcm (ORCPT + 99 others); Sat, 6 May 2023 03:32:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38314 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231286AbjEFHcQ (ORCPT ); Sat, 6 May 2023 03:32:16 -0400 Received: from mail-pf1-x42c.google.com (mail-pf1-x42c.google.com [IPv6:2607:f8b0:4864:20::42c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B344CA5F4 for ; Sat, 6 May 2023 00:32:07 -0700 (PDT) Received: by mail-pf1-x42c.google.com with SMTP id d2e1a72fcca58-64115e652eeso24375742b3a.0 for ; Sat, 06 May 2023 00:32:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1683358327; x=1685950327; 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=shRj8ftKXp337A2020wykIm+2u6OMQWOSQ5tcyDxEKE=; b=hxv1KxFuTlv4Tsnr7ZmqXer+eNX48oCZLX02AzcyHqkZItHhulNrlXaKKcMCaZQB1b vGK1GZG4HdObP7FU8u9bKKI+pEKRzOD4l0vLrtQN1DLWwDcWFfgRgJCBtE2aoW/pxcma ewPEYsWXnAOEVbz0R4icvIeOL9yKH7rZTR+gP27SQF0n9P3++ezkz69+IBRVJNKVG75G hHPGUA5TgH2oKIMdPgUZ4HoITNKGlDvtY5nAFsryTKN6yrlTokoLgooGEax8J4oyEs2l NcFY/phTAeyzN0wgQbvZizS4Icoq8lFlWYlWlsFEed1oDk8ZZhragCCCwjDOmDgpbJUu GUVQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683358327; x=1685950327; 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=shRj8ftKXp337A2020wykIm+2u6OMQWOSQ5tcyDxEKE=; b=AaqmGnNWCZLqc/vycCwPioCpBCvfUmljigvuPmLI2gaATOSxYyoGs8Zz3/xo/fCZrj lVjE4K1GiecIbehS6c46Z2FSNRlQxqqUI4XGWT7N4bdK7qVnP6hrUAoq3E9Dj7l63wny Bx1mI/4677O5VPGEfIs3H2UbdVkn7q2F0eo7hjazusE3oayQV9Re5JcMV/fiR1D/trOD VIRdZOcrsgBnmn925hbpLI4E1/T2rr1ielXNK43wQzt70TpXdVxo+HNFQ+o0fyjVYMKE X4fTVygCDyBWVUDfUlii2zZaz7TVQ435u/T6fSW99hMCzakXIdCLo1j4aApNonX80UzF RvJQ== X-Gm-Message-State: AC+VfDy3O2e+/DJ1eOS5CFxnWrX9bnQ44uud5/3sy+vNQBIbJI5aYdx1 podPPhBYZKd6emMonqmPRaxllvdCA6EiDZH9Aw== X-Received: by 2002:a05:6a00:198a:b0:643:5455:2577 with SMTP id d10-20020a056a00198a00b0064354552577mr4523912pfl.3.1683358326780; Sat, 06 May 2023 00:32:06 -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.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 06 May 2023 00:32:06 -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 5/8] PCI: qcom: Do not advertise hotplug capability for IP v2.3.2 Date: Sat, 6 May 2023 13:01:36 +0530 Message-Id: <20230506073139.8789-6-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=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?1765129762819246460?= X-GMAIL-MSGID: =?utf-8?q?1765129762819246460?= SoCs making use of Qcom PCIe controller IP v2.3.2 do not support hotplug functionality. But the hotplug capability bit is set by default in the hardware. This causes the kernel PCI core to register hotplug service for the controller and send hotplug commands to it. But those commands will timeout generating messages as below during boot and suspend/resume. [ 5.782159] pcieport 0001:00:00.0: pciehp: Timeout on hotplug command 0x03c0 (issued 2020 msec ago) [ 5.810161] pcieport 0001:00:00.0: pciehp: Timeout on hotplug command 0x03c0 (issued 2048 msec ago) [ 7.838162] pcieport 0001:00:00.0: pciehp: Timeout on hotplug command 0x07c0 (issued 2020 msec ago) [ 7.870159] pcieport 0001:00:00.0: pciehp: Timeout on hotplug command 0x07c0 (issued 2052 msec ago) This not only spams the console output but also induces a delay of a couple of seconds. To fix this issue, let's clear the HPC bit in PCI_EXP_SLTCAP register as a part of the post init sequence to not advertise the hotplug capability for the controller. Signed-off-by: Manivannan Sadhasivam --- drivers/pci/controller/dwc/pcie-qcom.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/drivers/pci/controller/dwc/pcie-qcom.c b/drivers/pci/controller/dwc/pcie-qcom.c index 3d5b3ce9e2da..33353be396ec 100644 --- a/drivers/pci/controller/dwc/pcie-qcom.c +++ b/drivers/pci/controller/dwc/pcie-qcom.c @@ -579,6 +579,8 @@ static int qcom_pcie_init_2_3_2(struct qcom_pcie *pcie) static int qcom_pcie_post_init_2_3_2(struct qcom_pcie *pcie) { + struct dw_pcie *pci = pcie->pci; + u16 offset = dw_pcie_find_capability(pci, PCI_CAP_ID_EXP); u32 val; /* enable PCIe clocks and resets */ @@ -602,6 +604,14 @@ static int qcom_pcie_post_init_2_3_2(struct qcom_pcie *pcie) val |= EN; writel(val, pcie->parf + PARF_AXI_MSTR_WR_ADDR_HALT_V2); + dw_pcie_dbi_ro_wr_en(pci); + + val = readl(pci->dbi_base + offset + PCI_EXP_SLTCAP); + val &= ~PCI_EXP_SLTCAP_HPC; + writel(val, pci->dbi_base + offset + PCI_EXP_SLTCAP); + + dw_pcie_dbi_ro_wr_dis(pci); + return 0; } 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, }; From patchwork Sat May 6 07:31:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Manivannan Sadhasivam X-Patchwork-Id: 90701 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp914598vqo; Sat, 6 May 2023 00:54:37 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5WsBFqHs7yJWdbJVaP36PomIGuq2BuOwM6aFbXDfgtnJee2ngdHENdJPJsqLcX+476iWf+ X-Received: by 2002:a05:6a20:4315:b0:f0:9cbd:78e3 with SMTP id h21-20020a056a20431500b000f09cbd78e3mr5512807pzk.0.1683359677593; Sat, 06 May 2023 00:54:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1683359677; cv=none; d=google.com; s=arc-20160816; b=vbWHkqyxIagJv1ZNIi3FFfVDP7T+fDxR80EfTGXLgxuvLkK3lo6DUvTD5iUBNETTJd pUA6Yh4itRD+Ck8zMkyla4JCFGrCKKWXiqCI8oe0v4eSiW6GvPM3lQzHEKyaotg/JiD0 +G/eugy68wxiOGP9sGx2DUEq7L+khAOsEKJ2U66nV7iicyXj9vmLjnb1VWV2ZRJzCrrS WBw0XySYrbjNhvowGVtU7j9aKV63qSmXj82SOKgvoUlnriIuIMUd7hjmhOmxvndyZJGo I837SWWqsSbjTQVVOFRI64jhl6FjUPDTm6ChF/BBpjmVRCR578p3TwRi08awjBgfI+s2 cD7Q== 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=ZH0yxvscWy6M74r31hy+vSy8BszcaFbA7sdRCYqfUk8=; b=xC1LgMIaObigxyd73l0adjsFh+zsy9Nd0jA+tDmLnXruRfG8kLLx88rWZHNZicVAWn q2CsEDUZly0bcuIzVxvdtN+sLW7KULYV2OXkGEzsbzSnWu9/o9dAPY4IgupRUWT2YcFV m+YfxX3nLeCoeYmJihrWhqSKZSMEdjHbEO5gZkJgPiv3WWLUK9yH3/pBXy+cp4OLbksD HVBwM4xSHWtl49CvBkwjFbQ4x5eN2zyhZMTe9Lzm+AOcLCZuFnNFYPWrVrcxSJBq5T+u WaQCZHfsT7cfxjjoIrZWKXbX70jclZHJi6C8hCzDB6vac+8Mf5vMavx/NwT0z2xWmroj ZYyA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ySWPP+6j; 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 d9-20020a631d09000000b0052c96dcaa83si3826724pgd.327.2023.05.06.00.54.24; Sat, 06 May 2023 00:54:37 -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=ySWPP+6j; 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 S231584AbjEFHdE (ORCPT + 99 others); Sat, 6 May 2023 03:33:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38858 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231479AbjEFHch (ORCPT ); Sat, 6 May 2023 03:32:37 -0400 Received: from mail-pg1-x52e.google.com (mail-pg1-x52e.google.com [IPv6:2607:f8b0:4864:20::52e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2ACE51161F for ; Sat, 6 May 2023 00:32:17 -0700 (PDT) Received: by mail-pg1-x52e.google.com with SMTP id 41be03b00d2f7-51b661097bfso1837590a12.0 for ; Sat, 06 May 2023 00:32:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1683358334; x=1685950334; 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=ZH0yxvscWy6M74r31hy+vSy8BszcaFbA7sdRCYqfUk8=; b=ySWPP+6jIHHGIxP0yxEcdDnkFlhMJHYfneDfATLw9zMYLX2ozUlUZ2/ZEZmbaQVEF4 3MPSq4i3HTLfHZnN5RChGZpZ/mCOcFL4MKrb0/aKcLNyUYd/0r67zWstgvY8IbpEnjXe qWxs8Kw8GsztiCABc/rtgCfuBP2BQ54tYENFCDTJrItVUNU5qNpgOVZdNOd8Ystoqtdj 2NXxWojhXMxZyRa399J5BzY00p3S0r4z4zbctYKsqAakNe1nrlwm3Ghj2rugZAmoi5oc e7/XdXV/0NbQJOXtxfuoPaVScA/grZjUhOLfGa19bUe6/Cm5nVkRtiDGvKDUXMJEwqkj 80ng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683358334; x=1685950334; 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=ZH0yxvscWy6M74r31hy+vSy8BszcaFbA7sdRCYqfUk8=; b=Bh6TUbg5UxAODMSYXzY+W+kVZXP7goKW2Eh6BoRlUTnhlB+Clr/+69ikB7HEsYSFFt Jm6q+13f36cz7UryTp8pseD9SgICtYk7g2u+k4IdHJuYpEdp7MMGtF/Jnaky90AU/u80 02Okixj2v5sZMYtftsn4AGPwHTOioqZeNTuRGo0B8t1BevbSlq21AZYSfUtsbeRfkdfT LNCex1JnpBw4dNyvlHkvCq3t+HWI72Iu+L4vK8QML0C1O39ZWDI4W5yb6azmfm/BBwpU EplRCGWVjl8Bb9ttMfU/9Fb9V4h/nr6ms2+Edf9i4ksaKdNfFvMUA/I47Pw6FJT61D2B bBPA== X-Gm-Message-State: AC+VfDwvB3wYvtDaz4BzQDt044KLamDX4bMAIz8TV6554g6QOEhHPOst 0lP613hG9NmF3LwqYhsUSWuq X-Received: by 2002:a05:6a20:3d82:b0:ff:6110:66c5 with SMTP id s2-20020a056a203d8200b000ff611066c5mr2409592pzi.5.1683358334075; Sat, 06 May 2023 00:32:14 -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.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 06 May 2023 00:32:13 -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 7/8] PCI: qcom: Do not advertise hotplug capability for IP v1.0.0 Date: Sat, 6 May 2023 13:01:38 +0530 Message-Id: <20230506073139.8789-8-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?1765130557459695540?= X-GMAIL-MSGID: =?utf-8?q?1765130557459695540?= SoCs making use of Qcom PCIe controller IP v1.0.0 do not support hotplug functionality. But the hotplug capability bit is set by default in the hardware. This causes the kernel PCI core to register hotplug service for the controller and send hotplug commands to it. But those commands will timeout generating messages as below during boot and suspend/resume. [ 5.782159] pcieport 0001:00:00.0: pciehp: Timeout on hotplug command 0x03c0 (issued 2020 msec ago) [ 5.810161] pcieport 0001:00:00.0: pciehp: Timeout on hotplug command 0x03c0 (issued 2048 msec ago) [ 7.838162] pcieport 0001:00:00.0: pciehp: Timeout on hotplug command 0x07c0 (issued 2020 msec ago) [ 7.870159] pcieport 0001:00:00.0: pciehp: Timeout on hotplug command 0x07c0 (issued 2052 msec ago) This not only spams the console output but also induces a delay of a couple of seconds. To fix this issue, let's clear the HPC bit in PCI_EXP_SLTCAP register as a part of the post init sequence to not advertise the hotplug capability for the controller. Signed-off-by: Manivannan Sadhasivam --- drivers/pci/controller/dwc/pcie-qcom.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/drivers/pci/controller/dwc/pcie-qcom.c b/drivers/pci/controller/dwc/pcie-qcom.c index 0c5e825c6360..6fbaf7b419e6 100644 --- a/drivers/pci/controller/dwc/pcie-qcom.c +++ b/drivers/pci/controller/dwc/pcie-qcom.c @@ -497,16 +497,27 @@ static int qcom_pcie_init_1_0_0(struct qcom_pcie *pcie) static int qcom_pcie_post_init_1_0_0(struct qcom_pcie *pcie) { + struct dw_pcie *pci = pcie->pci; + u16 offset = dw_pcie_find_capability(pci, PCI_CAP_ID_EXP); + u32 val; + /* change DBI base address */ writel(0, pcie->parf + PARF_DBI_BASE_ADDR); if (IS_ENABLED(CONFIG_PCI_MSI)) { - u32 val = readl(pcie->parf + PARF_AXI_MSTR_WR_ADDR_HALT); - + val = readl(pcie->parf + PARF_AXI_MSTR_WR_ADDR_HALT); val |= EN; writel(val, pcie->parf + PARF_AXI_MSTR_WR_ADDR_HALT); } + dw_pcie_dbi_ro_wr_en(pci); + + val = readl(pci->dbi_base + offset + PCI_EXP_SLTCAP); + val &= ~PCI_EXP_SLTCAP_HPC; + writel(val, pci->dbi_base + offset + PCI_EXP_SLTCAP); + + dw_pcie_dbi_ro_wr_dis(pci); + return 0; } From patchwork Sat May 6 07:31:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Manivannan Sadhasivam X-Patchwork-Id: 90694 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp910468vqo; Sat, 6 May 2023 00:41:46 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6KnhSjvsaSntw7HNZct0aiuboJrdxjt54OE5byJCCvQy9BTRnAeFu7zVTuZtSqYZRg5arx X-Received: by 2002:a17:90a:b297:b0:24d:ff56:f8c1 with SMTP id c23-20020a17090ab29700b0024dff56f8c1mr4123849pjr.13.1683358905944; Sat, 06 May 2023 00:41:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1683358905; cv=none; d=google.com; s=arc-20160816; b=JRD+S6FNxm4Igy7JQg6khPyCLfqHJrkcMljGDdj3/M+MlQfV3seJHxgJwtyiCg57OC xCPTu0ZE2/Ju3u3KkpEWaAJOZY07zJ2xYGO9Xd6w+dkFt5naSmRh5IviufMy7JOEaOCp 6Z1EvXx10LsCx9zhxQ8fzeMphhihwc25fPf85AG19TC0XEI+vc5ue9jioy0K8yE3mBWI BTDQXbeLyjOdXTF8WlFrichw+ug3f9dvnxHrY0d5ni6FPQYgWyrwLWdTVQ/uZhoosihU cwpIPvlLl6LrgdH1t0WGKvn9LVQtlAXm9z093Im69uKfnmKMuA9l1Zpv60ok7Xp11wca OioA== 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=+zAQtr5L4Bacr5B+5i29IgpdXCjszEPez4niVXikONQ=; b=MogSiRN1u1RwMzBMHCbJYeEBGE3erNXVGyL796nGJHiRviYkaVQxLdYka13Gxzfvej eyRD3X9W7sh3E6I9RSSibIbn5eDwYL3/3v7DMv0P4etUfVmqUCUpJrUT+Q7FxaSMYZE4 MVtWitPzTuIT98xDz1Jew1utiUKA9WBthlljdYzJHgRnUW++6V2hPzXhOl8zAN9C31g7 j2qNABVpvDv6OK+w1h3Kwzm2nuwgOBNcwCw3BMVq8L9pUayU+4njzi+lEIsAygu8zXR1 xHcKZPCgF3+0O+iAUcOoffZ8zcZ+ONdhdcgI9XaUkteLJ9p+Y7hjdwGXNNFSKM2OvMeK fzGg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="wFH50Le/"; 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 a21-20020a17090acb9500b0024799a3324dsi8047639pju.162.2023.05.06.00.41.30; Sat, 06 May 2023 00:41:45 -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="wFH50Le/"; 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 S231818AbjEFHdI (ORCPT + 99 others); Sat, 6 May 2023 03:33:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38922 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231510AbjEFHcj (ORCPT ); Sat, 6 May 2023 03:32:39 -0400 Received: from mail-pf1-x42a.google.com (mail-pf1-x42a.google.com [IPv6:2607:f8b0:4864:20::42a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DE0EB11613 for ; Sat, 6 May 2023 00:32:19 -0700 (PDT) Received: by mail-pf1-x42a.google.com with SMTP id d2e1a72fcca58-6434e263962so2035365b3a.2 for ; Sat, 06 May 2023 00:32:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1683358338; x=1685950338; 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=+zAQtr5L4Bacr5B+5i29IgpdXCjszEPez4niVXikONQ=; b=wFH50Le/fmj4VFIj5E1ssn8UqO1UF/RgItUl8Ehkil1aR1oKGwi6jXvtdYOToJXE3r hPA9OvKYf9OGiXOZhCNaEbN9iohK87X74Oja/lyvHOZ/ctJKzU8ZzuHcp+zTZ3MIqgwc wZUyvPKfY5JXwjc1pOtVBd1+0wy6d7UlGBRdQpeT8WeuuCNXfY0ZWTlzP2RvgHEWeU2X JlPs68wMooNWK3vCjZRCI9umNG7+sgcTxraJde1qMguztx5qYRqKma+4V0E9qiXgIo/d QTU6WSw1lXq5FbF7Hi6q61rjFvGSz89PQ8lPpvRyu+UMgWMc5m97z/UueFj02OhvdCe8 FhJw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683358338; x=1685950338; 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=+zAQtr5L4Bacr5B+5i29IgpdXCjszEPez4niVXikONQ=; b=hV4pKu1Sdw9jYA1nOgf+INZqrTmCRw9qBocRtVvs/X1oS8R8B/vZkjxvcb1SsU89nB 7Nl4vy72JcJEK+6e+kGM3Eg6EnXAThC31zj1JwXzLnnIXrGdd+Dm+ZVn+mI+MSE/R43I i/j5GYQ3i0JoATRiOPg2bdIRI3jENWNKMTk52yitQTglsHpO8Ktyl65B1Ufuf4GlCfAQ gZSebdTRvlmQKFLyHm4/0hNODP1YR2hMClCYYk9DCJFxGHKTWcknEgJqZO/sUhFw2Avp k/w/o6RRun16NkVkki1lH+LhrnWeWnamQDe2nWmXN+J0vAgaeRJINnqAhLGJRg2YEU64 k7GQ== X-Gm-Message-State: AC+VfDz2mMXrUWqUHhEDEoYHroiJH37FAeDAxudL2v4ng+DRnAGcTx7I +LizyzNHYIMkpAvNnfS9W9nY X-Received: by 2002:a05:6a00:1ad0:b0:63b:5f78:d6db with SMTP id f16-20020a056a001ad000b0063b5f78d6dbmr5591751pfv.21.1683358337796; Sat, 06 May 2023 00:32:17 -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.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 06 May 2023 00:32:17 -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 8/8] PCI: qcom: Do not advertise hotplug capability for IP v2.1.0 Date: Sat, 6 May 2023 13:01:39 +0530 Message-Id: <20230506073139.8789-9-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=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?1765129748410523643?= X-GMAIL-MSGID: =?utf-8?q?1765129748410523643?= SoCs making use of Qcom PCIe controller IP v2.1.0 do not support hotplug functionality. But the hotplug capability bit is set by default in the hardware. This causes the kernel PCI core to register hotplug service for the controller and send hotplug commands to it. But those commands will timeout generating messages as below during boot and suspend/resume. [ 5.782159] pcieport 0001:00:00.0: pciehp: Timeout on hotplug command 0x03c0 (issued 2020 msec ago) [ 5.810161] pcieport 0001:00:00.0: pciehp: Timeout on hotplug command 0x03c0 (issued 2048 msec ago) [ 7.838162] pcieport 0001:00:00.0: pciehp: Timeout on hotplug command 0x07c0 (issued 2020 msec ago) [ 7.870159] pcieport 0001:00:00.0: pciehp: Timeout on hotplug command 0x07c0 (issued 2052 msec ago) This not only spams the console output but also induces a delay of a couple of seconds. To fix this issue, let's clear the HPC bit in PCI_EXP_SLTCAP register as a part of the post init sequence to not advertise the hotplug capability for the controller. Signed-off-by: Manivannan Sadhasivam --- drivers/pci/controller/dwc/pcie-qcom.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/drivers/pci/controller/dwc/pcie-qcom.c b/drivers/pci/controller/dwc/pcie-qcom.c index 6fbaf7b419e6..68af95c836d2 100644 --- a/drivers/pci/controller/dwc/pcie-qcom.c +++ b/drivers/pci/controller/dwc/pcie-qcom.c @@ -373,6 +373,7 @@ static int qcom_pcie_post_init_2_1_0(struct qcom_pcie *pcie) { struct qcom_pcie_resources_2_1_0 *res = &pcie->res.v2_1_0; struct dw_pcie *pci = pcie->pci; + u16 offset = dw_pcie_find_capability(pci, PCI_CAP_ID_EXP); struct device *dev = pci->dev; struct device_node *node = dev->of_node; u32 val; @@ -424,6 +425,14 @@ static int qcom_pcie_post_init_2_1_0(struct qcom_pcie *pcie) writel(CFG_BRIDGE_SB_INIT, pci->dbi_base + AXI_MSTR_RESP_COMP_CTRL1); + dw_pcie_dbi_ro_wr_en(pci); + + val = readl(pci->dbi_base + offset + PCI_EXP_SLTCAP); + val &= ~PCI_EXP_SLTCAP_HPC; + writel(val, pci->dbi_base + offset + PCI_EXP_SLTCAP); + + dw_pcie_dbi_ro_wr_dis(pci); + return 0; }