From patchwork Thu Jul 13 12:44:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ilpo_J=C3=A4rvinen?= X-Patchwork-Id: 119860 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a6b2:0:b0:3e4:2afc:c1 with SMTP id c18csp1804619vqm; Thu, 13 Jul 2023 06:00:46 -0700 (PDT) X-Google-Smtp-Source: APBJJlED6HIFY3+8LVPmP3V4E8WDRO7GdFgTK0Vb3CbU3Jed1WNeLB/9WIhR7Q5A2Yuxe25r3yJx X-Received: by 2002:a92:60c:0:b0:345:cf3f:2fd with SMTP id x12-20020a92060c000000b00345cf3f02fdmr1546067ilg.13.1689253246177; Thu, 13 Jul 2023 06:00:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689253246; cv=none; d=google.com; s=arc-20160816; b=NbjPzOYWXnlO6FslN+42+CkBAzqCsc4GIyHbzfklfOFyucpt1Usy4maGYnH21E0Sh3 /zny0W2OwvdGNQPAMOj99tzjAQ/SD4hf224DI19u0UKARoyAE61Amv3yDSuWtK23/fvx qmWkGdZcMNs5ZabUDbETDz47wc82og16VEqgjY9sIhB8pAAIGUKcspFt5gp9DkGoNfhF cBYoKfIRCErnf/B9Av+Ro/E6RXeKK7wK1dkEpNvqCrn1zM3D9NqzeuuwLpEMJmnH7rQ0 B2UBa7YpYAoJA0fcsDjXPcVyuncImKiFycwAOo7RNxY9ccp02Mkn/gk3RzMeauJdRdlG RmAg== 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=smwaJzhTi7B3QggAvtZ+wXBzGRpLQ3KL5+IukVd1Cao=; fh=Oh12CUlWM6q26IWhJj7iQeO77lZpEATE49xwZ++0rl0=; b=KgeQWAZpvjODiaWkM2D52QVM+11/+3WghGxand5/k99LX/7GGZFKmlSMG9w9+dDxIT DpYehKeVmuhoZx6qw29x/Hnr+CmDjfXyn2BVg0cQN+huDSg5aNjXnErVB7DzX6u5XTxE WpNdlQu+3g1QpOYa2WThNzeAJEV4U+8v8lfuVKHcBEOn+ViVI9WZnP2aVo9juJ+i0Vq2 YaBzEzM9GoVrY/74G4qmP6B/supVfHxBn3L6hmNRTYIlMMHHZJm60JXL3fHiir9pj6Ux V3AAoO/m0XKTq+hu2/93MuEOXMr3EWFdCWrfOlN65XGNn1DR+nyLxGkMLUbFdvg8bDyI 7g8w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=m+6h248c; 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=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id i4-20020a633c44000000b00553361ff1a9si4829749pgn.746.2023.07.13.06.00.31; Thu, 13 Jul 2023 06:00:46 -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=@intel.com header.s=Intel header.b=m+6h248c; 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=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234380AbjGMMpw (ORCPT + 99 others); Thu, 13 Jul 2023 08:45:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55638 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234506AbjGMMpr (ORCPT ); Thu, 13 Jul 2023 08:45:47 -0400 Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E8928213C; Thu, 13 Jul 2023 05:45:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1689252346; x=1720788346; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=6XrYSLnRiRdBPpgn0CFb5orJiB6ktHC50J1M1HARYbo=; b=m+6h248cNwKj1OvN7NaU3rKCTyH896M5AAvpRqQzMZ56oSQxWaxDBGFM yccl+13U8z0ZmRJf9G87GEH4eM9AcJUOqADR9su1G8waB9nbkIg/GpNwA 3xwbgOSX/DvBdD7mtrP833TMyxKzN/IAMiX8ZTZs/7jz42VFBl5ieMVVt lvhyBQG+jyomTPIggGhJOpQfQ6lkm8ErmxIYogqXFLg36d3b8+xB9P0Zt vRbdrYRZbL8swgZOyyTqcE5CHtj6HW4MaSCp06yyp35MTTQvrpi1+zIHk 6805kyBB32k1hdrhEoeK6gY7qLuldHtSbZEDTa1jTwQaLm0l1VdTLY3BS g==; X-IronPort-AV: E=McAfee;i="6600,9927,10770"; a="367796825" X-IronPort-AV: E=Sophos;i="6.01,202,1684825200"; d="scan'208";a="367796825" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Jul 2023 05:45:45 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10770"; a="757144406" X-IronPort-AV: E=Sophos;i="6.01,202,1684825200"; d="scan'208";a="757144406" Received: from ijarvine-mobl2.ger.corp.intel.com ([10.251.222.39]) by orsmga001-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Jul 2023 05:45:40 -0700 From: =?utf-8?q?Ilpo_J=C3=A4rvinen?= To: linux-pci@vger.kernel.org, Bjorn Helgaas , Lorenzo Pieralisi , Rob Herring , =?utf-8?q?Krzysztof_Wilczy=C5=84ski?= , Emmanuel Grumbach , "Rafael J . Wysocki" , Heiner Kallweit , Lukas Wunner , Jesse Barnes , Yinghai Lu , linux-kernel@vger.kernel.org Cc: Dean Luick , Andy Shevchenko , =?utf-8?q?Jonas_Dre?= =?utf-8?q?=C3=9Fler?= , =?utf-8?q?Ilpo_J=C3=A4rvinen?= , stable@vger.kernel.org Subject: [PATCH v4 03/11] PCI: pciehp: Use RMW accessors for changing LNKCTL Date: Thu, 13 Jul 2023 15:44:57 +0300 Message-Id: <20230713124505.94866-4-ilpo.jarvinen@linux.intel.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230713124505.94866-1-ilpo.jarvinen@linux.intel.com> References: <20230713124505.94866-1-ilpo.jarvinen@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE, 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: 1771310411874378573 X-GMAIL-MSGID: 1771310411874378573 As hotplug is not the only driver touching LNKCTL, use the RMW capability accessor which handles concurrent changes correctly. Fixes: 7f822999e12a ("PCI: pciehp: Add Disable/enable link functions") Suggested-by: Lukas Wunner Signed-off-by: Ilpo Järvinen Acked-by: Rafael J. Wysocki Cc: stable@vger.kernel.org --- drivers/pci/hotplug/pciehp_hpc.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/drivers/pci/hotplug/pciehp_hpc.c b/drivers/pci/hotplug/pciehp_hpc.c index 8711325605f0..e9ec77d8d44a 100644 --- a/drivers/pci/hotplug/pciehp_hpc.c +++ b/drivers/pci/hotplug/pciehp_hpc.c @@ -332,17 +332,11 @@ int pciehp_check_link_status(struct controller *ctrl) static int __pciehp_link_set(struct controller *ctrl, bool enable) { struct pci_dev *pdev = ctrl_dev(ctrl); - u16 lnk_ctrl; - pcie_capability_read_word(pdev, PCI_EXP_LNKCTL, &lnk_ctrl); + pcie_capability_clear_and_set_word(pdev, PCI_EXP_LNKCTL, + PCI_EXP_LNKCTL_LD, + !enable ? PCI_EXP_LNKCTL_LD : 0); - if (enable) - lnk_ctrl &= ~PCI_EXP_LNKCTL_LD; - else - lnk_ctrl |= PCI_EXP_LNKCTL_LD; - - pcie_capability_write_word(pdev, PCI_EXP_LNKCTL, lnk_ctrl); - ctrl_dbg(ctrl, "%s: lnk_ctrl = %x\n", __func__, lnk_ctrl); return 0; }