From patchwork Mon Oct 17 11:47:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Hovold X-Patchwork-Id: 3407 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp1401297wrs; Mon, 17 Oct 2022 04:53:14 -0700 (PDT) X-Google-Smtp-Source: AMsMyM51DLqqfHP/oIh4OWcxcch6jpIZPuq+0M99R7dNxgdqn2VSJ/3DSzbEZh4+5Z0fATC08pTL X-Received: by 2002:a05:6a00:2409:b0:54e:a3ad:d5ab with SMTP id z9-20020a056a00240900b0054ea3add5abmr12102123pfh.11.1666007594548; Mon, 17 Oct 2022 04:53:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666007594; cv=none; d=google.com; s=arc-20160816; b=kBFAyaKYms526+sRQ47uNPyyPFcJJlpXEuoMlhwsO+nAhEMjO5LK/5bUQF10Bj1c/n YCGCHiWM5AmsgfdaLisvkY1sqqpqi6OvGsolDBoD80hirVYjsz8wxrdtJ2dfWTA7fDo+ h+MdEV+mj/lAUHAFm4FuNFfBzJ49C36SepklL0F9ryfm5nBZcAE0G2iDLeJSwa0uA2u4 divZWLy/RuEd02DnmEx5I2m26CIkl/wN1x6OKvqbX8I6VYdWzxILC3f1j4SeXBX041r4 CAeu0dSSdr0csekIjoxKDK86JAGHpp0OyL7JypCKP/E3OxOLm4jI2Eb/BELOf7XvYpWU MiYQ== 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=Qo+4/HK5XwjNWp5Qb9kCTzwhT0Z08aDD+t7yw3DHd4U=; b=Y8j1oh+3XshqJFXZygIxCytdeczuhVueR0x1YagC5A1MhmEKccqQN8NGe9hErhzZvK ZIYGs8GsxeBPce26e4b2OsA9yfnwg5eLoxrUDyMaQ3I6caGwXeOEEHiw0YISj2jfXrHa TFGTx54GA5n/A5/59KMefsaIEufSpR4TiZAcD/f6+GMAo75KJUybrJLQ0xDBzNuywFy0 8gSfn8igzAnNob0j+18QxexzwSUXvw4F2iN1rqUUhWCFOoblplqb+1DnWkYxZeiUqff4 TqtS1sAY6ibZ2zdVdSy1moB78iyGJf03/Cmuzpq4icaDnBQumIM9Q4RmiTFOoOM7058M qk6Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=GcvK+rmr; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id z23-20020a656117000000b00434d869e339si11647719pgu.512.2022.10.17.04.53.00; Mon, 17 Oct 2022 04:53:14 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=GcvK+rmr; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230241AbiJQLsJ (ORCPT + 99 others); Mon, 17 Oct 2022 07:48:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46216 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230196AbiJQLsC (ORCPT ); Mon, 17 Oct 2022 07:48:02 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id ABF23501BA; Mon, 17 Oct 2022 04:48:01 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 6F0D5B81620; Mon, 17 Oct 2022 11:48:00 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1B8B4C433D7; Mon, 17 Oct 2022 11:47:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1666007279; bh=nLvYNjNcsWp65q0okwELSdi4ANG2a+C37u/lQ6/epEM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GcvK+rmrUYh1V0sc+sYyL6tCuliAdBr6oJiHYPOEgdO+5JXo6UtrbIlj5Pi2r1uDd R8+yvvBSTZvEj4xUP0206m+BBwdG7VxbCvDbSQjoo9y16rBLy3YiBvck2c3q5GYXlX dPgnGP/8GtfpdOsu5yZlQBqd7TKsj2wJCt++LlXvzx3YrsBAI1dO6gyqGCH2lJfGFl Va/FrcKvRv/kO+GzzvSFw4KkIRiPNpgPqaiFL0HEJYbz1lLaaS/W8aIWsKUITz02+D 26ZPuFeb6sl7tFONXKAdajlG1SfaE4YeUrXfBcTnhiQqzHsm5wTTJWEs9Ypfpnx0pX bwUkv77KeLXjg== Received: from johan by xi.lan with local (Exim 4.94.2) (envelope-from ) id 1okOay-0002B1-OG; Mon, 17 Oct 2022 13:47:48 +0200 From: Johan Hovold To: Stanimir Varbanov , Lorenzo Pieralisi Cc: Andy Gross , Bjorn Andersson , Konrad Dybcio , Bjorn Helgaas , Rob Herring , =?utf-8?q?Krzysztof_Wilczy=C5=84ski?= , Manivannan Sadhasivam , linux-arm-msm@vger.kernel.org, linux-pci@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Johan Hovold Subject: [PATCH v3 1/2] PCI: qcom: Fix host-init error handling Date: Mon, 17 Oct 2022 13:47:04 +0200 Message-Id: <20221017114705.8277-2-johan+linaro@kernel.org> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20221017114705.8277-1-johan+linaro@kernel.org> References: <20221017114705.8277-1-johan+linaro@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1746935579465189301?= X-GMAIL-MSGID: =?utf-8?q?1746935579465189301?= Implement the new host_deinit() callback so that the PHY is powered off and regulators and clocks are disabled also on late host-init errors. Fixes: 82a823833f4e ("PCI: qcom: Add Qualcomm PCIe controller driver") Signed-off-by: Johan Hovold Reviewed-by: Manivannan Sadhasivam --- drivers/pci/controller/dwc/pcie-qcom.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/drivers/pci/controller/dwc/pcie-qcom.c b/drivers/pci/controller/dwc/pcie-qcom.c index 0c13f976626f..417be4d225ed 100644 --- a/drivers/pci/controller/dwc/pcie-qcom.c +++ b/drivers/pci/controller/dwc/pcie-qcom.c @@ -1534,8 +1534,19 @@ static int qcom_pcie_host_init(struct dw_pcie_rp *pp) return ret; } +static void qcom_pcie_host_deinit(struct dw_pcie_rp *pp) +{ + struct dw_pcie *pci = to_dw_pcie_from_pp(pp); + struct qcom_pcie *pcie = to_qcom_pcie(pci); + + qcom_ep_reset_assert(pcie); + phy_power_off(pcie->phy); + pcie->cfg->ops->deinit(pcie); +} + static const struct dw_pcie_host_ops qcom_pcie_dw_ops = { - .host_init = qcom_pcie_host_init, + .host_init = qcom_pcie_host_init, + .host_deinit = qcom_pcie_host_deinit, }; /* Qcom IP rev.: 2.1.0 Synopsys IP rev.: 4.01a */