Received: by 2002:a05:6358:bb9e:b0:b9:5105:a5b4 with SMTP id df30csp4953992rwb; Tue, 6 Sep 2022 15:58:12 -0700 (PDT) X-Google-Smtp-Source: AA6agR4WLFKWVrAgLdSA3cFHCcQdIWHmdWANpl2DcZMg0Lu6Kf0UdWyv1dm1vdH+F9lHQvDmDqbM X-Received: by 2002:a17:902:ecc6:b0:174:90c5:613b with SMTP id a6-20020a170902ecc600b0017490c5613bmr898480plh.28.1662505091747; Tue, 06 Sep 2022 15:58:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1662505091; cv=none; d=google.com; s=arc-20160816; b=Cg4OBfikbnUwp/3B9/NY+lEIKVhK3de0MfHZEGTZedqFw4j+MIIeSHCvrffZhZhMBv EBDEp9X3Uk7TB25X57fI3uxCw1KzUFgzzFGsS8BUV1Zzwr7VFMegiLTNCaOD/JFad3j8 5AvzzEssoW+/1pf8SmZOSrXauLevLaZYnjMjmRtX77cC7fyMfBhJRz5ve7tjSw1lr2tS XM9dVIdli7YG3g++r+J1g97wM+7FIIJUiidUyAO2c9a1+qwu4kLokeJzw4rA/dv14ZXf pZvuQ9+wGaGEnpdkn8pbsgo9P+H2dLITo/bZAdGh22NN80QbitfEiojpLQsKP+V61/Zo lyFQ== 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=s6SN/Pspmf7qJobbJ1Pit7nsAwChfSKnhny3hYdqPg4=; b=nxikoY0kRpOGYO1TbJJkaGlsBSjLFP5eCUruyIODcGO6xlYO49T6Ik3DoE8o/YNAfu pzWNe3pqZar6N6701Yhs7XC7+Gs67SK/sK24vdvivTjR//T/354MPXbYsrput3IIRKea R0xAJwUxe2oU+S2e3qcEuuVSb2gH8hwh+RToR4ffQzkrxcx4CttDsXcM4+aaYmKSxHP8 A932bZ4a61PmoI+ib/Mgxkuxe77dQhedcSuEXp4baABD7h/WjWIKOljO6FRSaKveqJ3J X4pIpEpGIaLecAXRrhqUrJlQzFEDhMD/hGM5jOcvsXgpR/0JqfmBY/qfODRtf5WbmP3g 8WdQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="WB/Q/NGN"; 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 Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id t20-20020a170902e1d400b0017541cd26c0si3488532pla.446.2022.09.06.15.57.59; Tue, 06 Sep 2022 15:58:11 -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="WB/Q/NGN"; 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 S230000AbiIFWYe (ORCPT + 99 others); Tue, 6 Sep 2022 18:24:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48510 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229980AbiIFWYM (ORCPT ); Tue, 6 Sep 2022 18:24:12 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 192E5AA37A; Tue, 6 Sep 2022 15:24:09 -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 2C3FBB81AAC; Tue, 6 Sep 2022 22:24:08 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A52FEC433C1; Tue, 6 Sep 2022 22:24:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1662503046; bh=JiLQVQZBxN5nRTMlR7cEglY0khs6D7MoN1CEw3gMigY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WB/Q/NGNxNddoHQZVZnZ49FOmWp0IHWFoYWk8jnMiTy3qwlpYySJ/m34isSAP38/v p4cDMYCxZWrY498gXfajG5pAummooJHA7LICDLDdyRvhzQNYuZbD2T2MOsu5gl2QBZ NP524JN2QOFsL7jcfNnHMQvVhICL4c+HqQ/d3hfIVQJcsNern9p99hRMRKJZyrsS7L iiRsBKbr+MCaP3z2UHgarMwy9zQ/6n1voHtQjhYTDj9COoKpQRz42BlemYwscF9VuH CQns395hbUc3wCGHBxyEVOLDOIYcQuogbVtzNPF6qhtYHC2AHQwAChQPLjIRb240oI 1WxXcZogNOwmw== From: Bjorn Helgaas To: Kai-Heng Feng , Rajvi Jingar , "Rafael J . Wysocki" Cc: Koba Ko , Mika Westerberg , "David E . Box" , Sathyanarayanan Kuppuswamy , linux-pci@vger.kernel.org, linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, Bjorn Helgaas Subject: [PATCH v3 06/10] PCI/PTM: Add pci_enable_ptm() wrapper Date: Tue, 6 Sep 2022 17:23:47 -0500 Message-Id: <20220906222351.64760-7-helgaas@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220906222351.64760-1-helgaas@kernel.org> References: <20220906222351.64760-1-helgaas@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.1 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,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 From: Bjorn Helgaas Implement pci_enable_ptm() as a wrapper around an internal __pci_enable_ptm() that we can use during resume to enable PTM without emitting log messages. Signed-off-by: Bjorn Helgaas --- drivers/pci/pcie/ptm.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/drivers/pci/pcie/ptm.c b/drivers/pci/pcie/ptm.c index 762299984469..4a9f045126ca 100644 --- a/drivers/pci/pcie/ptm.c +++ b/drivers/pci/pcie/ptm.c @@ -152,7 +152,7 @@ void pci_ptm_init(struct pci_dev *dev) pci_enable_ptm(dev, NULL); } -int pci_enable_ptm(struct pci_dev *dev, u8 *granularity) +static int __pci_enable_ptm(struct pci_dev *dev) { int ptm = dev->ptm_cap; struct pci_dev *ups; @@ -177,6 +177,17 @@ int pci_enable_ptm(struct pci_dev *dev, u8 *granularity) ctrl |= PCI_PTM_CTRL_ROOT; pci_write_config_dword(dev, ptm + PCI_PTM_CTRL, ctrl); + return 0; +} + +int pci_enable_ptm(struct pci_dev *dev, u8 *granularity) +{ + int rc; + + rc = __pci_enable_ptm(dev); + if (rc) + return rc; + dev->ptm_enabled = 1; pci_ptm_info(dev); -- 2.25.1