From patchwork Thu May 11 13:14:26 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: 92578 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp4369892vqo; Thu, 11 May 2023 06:25:56 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4+EM/xijN/tWObz3zgbTnUU42ueiELg79gfzkjkzj7MCJh3bhVBYDxGMiq0Q5vpR0s0wFC X-Received: by 2002:a05:6a20:8f05:b0:103:73a6:5ca5 with SMTP id b5-20020a056a208f0500b0010373a65ca5mr6237709pzk.47.1683811555811; Thu, 11 May 2023 06:25:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1683811555; cv=none; d=google.com; s=arc-20160816; b=zezHvdYoA9d6Cdwnd/c0CG+JAiEv956kuW3DCgo17x9dSiXCJ5qhj8VZ4MnJG82cTT Eol/0o87F6GtqPLEM044GpUURdnDNyk34vzIQxOnikq8wigZ55zQBFsETo5hqVrQ7DKH tye08mYf5gQbqFSdBIHnZ+xAe80WSX1lzjKkCMba9lU9cETuHd/JFmIohI1ZTnbgaMBX avr9dQL9nrXFK79Zh8p1JKUULcswpNv3T1SN53CeQt3uDGDI9l4P5zzQpiBCLemhFeKN Aaj82eWY0iFdbJOIdIiSY2VoTtOa9Xi0PT+Qu00Apjo0JMiiBZvA8Rsn+azwDsxxGRQg utIA== 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=UJL3D8HWHbcs1l9yGe7pj1Qva/z6HSuz7HKAVjKv48Q=; b=K3p1e2vehEBWNCsmY4dsH85R2U+gTznBlG9yOtVsWtu7Fr/nfR1NXTz8eRZoWVffpR HPmU2+D7rHjSMEJYRHxa1mZKO3fJTPtgTEfHsDLNfNMNMRm5cCfvf3ZgoYlndGLotpbX D+qmv/oX5aoQDAQAbcOLBE0gyr4plP1LeiR5S0YBFi/DuFGP7whGDN6pDqC8NIst0vV3 1oy8P3bh4w/AvxKfHrg/h+naPPtHV7YBXMgfqEexC0aqM7VhBKUrCOLa5lDFsWC9uT3g PXnKKNZ2txRgw9LJ6e51Ogm7NBLKrILeUdfvHiykR4gTbVqxi9ktCeD4Et9coAKP0len QgmQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=eeK4O2yG; 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 h189-20020a636cc6000000b005023e0f160dsi6291973pgc.489.2023.05.11.06.25.41; Thu, 11 May 2023 06:25:55 -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=eeK4O2yG; 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 S237788AbjEKNPV (ORCPT + 99 others); Thu, 11 May 2023 09:15:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33948 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238024AbjEKNPK (ORCPT ); Thu, 11 May 2023 09:15:10 -0400 Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C137286B6; Thu, 11 May 2023 06:14:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1683810899; x=1715346899; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=j2mH7twU8xcKQ+ibOA7cifbNNveZqlGmmYNV0ZHAcVE=; b=eeK4O2yGfVOf+BvkAaNQkzqMkwSVTBKzTBFc+yutTiWBwm4pGrqmbd2Z 1krvOInYRUkzaW5oQpYDsqt0gRBeiBSmmQkc6Q6ThQJpbDfWi7hrimfry E41TVxeB2QobzlBMpljZDD7Jwz5rFb9lZBrUwbVGi7Qo0mO5H0WnRPi3h fdx2OfWanIolAsDegiUfFTmEwi9DaXoqrBpWdtyuReP4bBhnPhE6WLs0m BXiw4pocLGqJxiHD2enbwjoeyx91jKrf+9xQfCP7TO1nzSH7O+9Go4pFR vJnau8tQRqJEoKwxtrxeoUfgYhI2zXnJJrHOOKrPaB5JCw9xUu0Mag3e0 Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10706"; a="378619339" X-IronPort-AV: E=Sophos;i="5.99,266,1677571200"; d="scan'208";a="378619339" Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 May 2023 06:14:59 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10706"; a="650169475" X-IronPort-AV: E=Sophos;i="5.99,266,1677571200"; d="scan'208";a="650169475" Received: from jsanche3-mobl1.ger.corp.intel.com (HELO ijarvine-MOBL2.ger.corp.intel.com) ([10.252.39.112]) by orsmga003-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 May 2023 06:14:56 -0700 From: =?utf-8?q?Ilpo_J=C3=A4rvinen?= To: linux-pci@vger.kernel.org, Bjorn Helgaas , Rob Herring , Lorenzo Pieralisi , =?utf-8?q?Krzysztof_Wilczy=C5=84ski?= , Lukas Wunner , Bjorn Helgaas , linux-kernel@vger.kernel.org Cc: =?utf-8?q?Ilpo_J=C3=A4rvinen?= Subject: [PATCH 02/17] PCI: pciehp: Protect LNKCTL changes Date: Thu, 11 May 2023 16:14:26 +0300 Message-Id: <20230511131441.45704-3-ilpo.jarvinen@linux.intel.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230511131441.45704-1-ilpo.jarvinen@linux.intel.com> References: <20230511131441.45704-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: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1765604385653039490?= X-GMAIL-MSGID: =?utf-8?q?1765604385653039490?= As hotplug is not the only driver touching LNKCTL, use the pcie_lnkctl_clear_and_set() helper which handles concurrent changes correctly. Suggested-by: Lukas Wunner Signed-off-by: Ilpo Järvinen --- drivers/pci/hotplug/pciehp_hpc.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/drivers/pci/hotplug/pciehp_hpc.c b/drivers/pci/hotplug/pciehp_hpc.c index f8c70115b691..14ffbb27957c 100644 --- a/drivers/pci/hotplug/pciehp_hpc.c +++ b/drivers/pci/hotplug/pciehp_hpc.c @@ -332,17 +332,10 @@ 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_lnkctl_clear_and_set(pdev, 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; }