From patchwork Mon Jul 17 06:55:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sricharan Ramabadhran X-Patchwork-Id: 121077 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c923:0:b0:3e4:2afc:c1 with SMTP id j3csp954020vqt; Mon, 17 Jul 2023 00:18:15 -0700 (PDT) X-Google-Smtp-Source: APBJJlEbvBr+h5m3Lt3VguxoU7bO2WogX4qc7NTLHHsTIMq1EOrXmt1gBdGbjNZmfSnKOBq5Z5EY X-Received: by 2002:a05:6a21:3286:b0:11d:4c79:90ee with SMTP id yt6-20020a056a21328600b0011d4c7990eemr14504894pzb.25.1689578295125; Mon, 17 Jul 2023 00:18:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689578295; cv=none; d=google.com; s=arc-20160816; b=vWxNSgqNorPAK2hSOB7rYoRXM20KgO1m/yKSRXjSZDo7/rWw8V2Ex/tPr9GWe8tl23 Qw/+USk9xkZH8IPb2ckrm0+AOI5zvDAn4ZgSxlKHK2qYKZv/bCaPxA0kY2fG+Y0RuDHA 1uRtzjpsIwJsZi+1kzq/SM63CbW8bWZMbAfmA/VEdG8qhvllffk4oCeQ/tueP35ThV0o JCfbczl9IaOX+J5YW0pdGGHazpOOYqzwugv2hAssyVxu7CVn82AK0cQCTvD1rm+uq4vP e0meVqNEqt2jHuadxGmDhQiDjSrIyIY7nr+rQu1mjB/VqAM05kzFggQWVEUfxWx9NO1y H0dA== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=g4jY08W4kjg8cNxCym6elKR8yZ/6YW4p12ni0hCw8uc=; fh=JPejjPaswKwq3FTzXIB+RWEXtt1Mo0jROngXh1agR7g=; b=RQu1dMIhmVWfKodc45RBcorjYXXRLk4zFjOyHvasgzByv4pAz/kTNM1RNJXp63ebnr /GajDIf1P8O+hSx4hytwLoyy9hSFtRk/Lps36mo/2bkrdbbF5p4qDyiTvpBySGTs7e0u GojFeCY1PFJ7nzhJXY89DN+a0NvudxWWGldAAopRBleB3heTMG1svLki7zoy+ddQe+Km V165bhZ3sZ6tKhN0tQGthhBbnnPWh3bOkO03p//tP+rN/RoH79+EspXn97QtzvI7oYTc eOS+jhssw3d8KUIDe2NzG39guuZ3JUZtUL875O9Vv22p6x3I8HAxVmO8TwR9ryMoNNFF 2Fiw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@quicinc.com header.s=qcppdkim1 header.b=LEZxZY36; 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=quicinc.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id s14-20020a65644e000000b0055b1327cd9asi11422028pgv.175.2023.07.17.00.18.02; Mon, 17 Jul 2023 00:18:15 -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=@quicinc.com header.s=qcppdkim1 header.b=LEZxZY36; 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=quicinc.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229623AbjGQG5P (ORCPT + 99 others); Mon, 17 Jul 2023 02:57:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47268 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230128AbjGQG4s (ORCPT ); Mon, 17 Jul 2023 02:56:48 -0400 Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.131]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DE09110E6; Sun, 16 Jul 2023 23:56:34 -0700 (PDT) Received: from pps.filterd (m0279873.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 36H5V79K000860; Mon, 17 Jul 2023 06:55:58 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quicinc.com; h=from : to : cc : subject : date : message-id : mime-version : content-transfer-encoding : content-type; s=qcppdkim1; bh=g4jY08W4kjg8cNxCym6elKR8yZ/6YW4p12ni0hCw8uc=; b=LEZxZY36kKqWI/tJTZ6fRYsZj92jFTWO9bbQbmEKVr/y1ifMF2iX+q9aJl+pDWLve9L1 wA5Y+O9c3a0o772R+y5d7toBNayFw9w00uwle/8NdL22J8m8+98dUeSN8WyUs+J1E/jb Lf7uDrjdiNbNoMWhMDSRMCmlM1iqcAe3f+LrVry57Ji9xNBGQB1n9xeL+oe9NfL0AM+6 AVZRYdZUhU8mPhHWSf+rhAoQkpEYR8/XZkF42736x9Iig5tE0CuDe+3JBeYuDBf+jkRw wyI8mxrmeoyjjeuNbF/S7vN6nkCexYduBT9sjzkTBn4eUaRQtSR5H8m8rT8TlW3qP7Y8 9A== Received: from nalasppmta02.qualcomm.com (Global_NAT1.qualcomm.com [129.46.96.20]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 3run0atnq5-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 17 Jul 2023 06:55:58 +0000 Received: from nalasex01c.na.qualcomm.com (nalasex01c.na.qualcomm.com [10.47.97.35]) by NALASPPMTA02.qualcomm.com (8.17.1.5/8.17.1.5) with ESMTPS id 36H6tuhC021855 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 17 Jul 2023 06:55:56 GMT Received: from win-platform-upstream01.qualcomm.com (10.80.80.8) by nalasex01c.na.qualcomm.com (10.47.97.35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.30; Sun, 16 Jul 2023 23:55:52 -0700 From: Sricharan Ramabadhran To: , , , , , , , , , , CC: , , Subject: [PATCH V4] PCI: qcom: Fixing broken pcie bring up for 2_3_3 configs ops Date: Mon, 17 Jul 2023 12:25:35 +0530 Message-ID: <20230717065535.2065582-1-quic_srichara@quicinc.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Originating-IP: [10.80.80.8] X-ClientProxiedBy: nasanex01a.na.qualcomm.com (10.52.223.231) To nalasex01c.na.qualcomm.com (10.47.97.35) X-QCInternal: smtphost X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=5800 signatures=585085 X-Proofpoint-GUID: MFsHbXZWZPf7YdWdSxRlf7XXi2eLiZC0 X-Proofpoint-ORIG-GUID: MFsHbXZWZPf7YdWdSxRlf7XXi2eLiZC0 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.957,Hydra:6.0.591,FMLib:17.11.176.26 definitions=2023-07-17_05,2023-07-13_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 phishscore=0 adultscore=0 mlxlogscore=999 bulkscore=0 priorityscore=1501 mlxscore=0 suspectscore=0 impostorscore=0 lowpriorityscore=0 clxscore=1015 spamscore=0 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2306200000 definitions=main-2307170062 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE 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: INBOX X-GMAIL-THRID: 1771651250204587599 X-GMAIL-MSGID: 1771651250204587599 PARF_SLV_ADDR_SPACE_SIZE_2_3_3 macro is used for IPQ8074 2_3_3 post_init ops. PCIe slave addr size was initially set to 0x358, but was wrongly changed to 0x168 as a part of commit 39171b33f652 ("PCI: qcom: Remove PCIE20_ prefix from register definitions"). Fixing it, by using the right macro PARF_SLV_ADDR_SPACE_SIZE and remove the unused PARF_SLV_ADDR_SPACE_SIZE_2_3_3. Without this pcie bring up on IPQ8074 is broken now. Fixes: 39171b33f652 ("PCI: qcom: Remove PCIE20_ prefix from register definitions") Cc: Reviewed-by: Manivannan Sadhasivam Reviewed-by: Konrad Dybcio Signed-off-by: Sricharan Ramabadhran --- [v4] Fix commit sub and added '' reviewed-by tag [v3] Added reviewed-by tag, fixed subject, commit text [v2] Fixed the 'fixes tag' correctly, subject, right macro usage drivers/pci/controller/dwc/pcie-qcom.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/pci/controller/dwc/pcie-qcom.c b/drivers/pci/controller/dwc/pcie-qcom.c index 4ab30892f6ef..8418894b3de7 100644 --- a/drivers/pci/controller/dwc/pcie-qcom.c +++ b/drivers/pci/controller/dwc/pcie-qcom.c @@ -43,7 +43,6 @@ #define PARF_PHY_REFCLK 0x4c #define PARF_CONFIG_BITS 0x50 #define PARF_DBI_BASE_ADDR 0x168 -#define PARF_SLV_ADDR_SPACE_SIZE_2_3_3 0x16c /* Register offset specific to IP ver 2.3.3 */ #define PARF_MHI_CLOCK_RESET_CTRL 0x174 #define PARF_AXI_MSTR_WR_ADDR_HALT 0x178 #define PARF_AXI_MSTR_WR_ADDR_HALT_V2 0x1a8 @@ -810,8 +809,7 @@ static int qcom_pcie_post_init_2_3_3(struct qcom_pcie *pcie) u16 offset = dw_pcie_find_capability(pci, PCI_CAP_ID_EXP); u32 val; - writel(SLV_ADDR_SPACE_SZ, - pcie->parf + PARF_SLV_ADDR_SPACE_SIZE_2_3_3); + writel(SLV_ADDR_SPACE_SZ, pcie->parf + PARF_SLV_ADDR_SPACE_SIZE); val = readl(pcie->parf + PARF_PHY_CTRL); val &= ~PHY_TEST_PWR_DOWN;