From patchwork Mon Jan 22 17:28:00 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sinan Kaya X-Patchwork-Id: 10178931 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 868C0601D5 for ; Mon, 22 Jan 2018 17:28:29 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6B98028419 for ; Mon, 22 Jan 2018 17:28:29 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5EA542841E; Mon, 22 Jan 2018 17:28:29 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0F3EB28419 for ; Mon, 22 Jan 2018 17:28:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751157AbeAVR21 (ORCPT ); Mon, 22 Jan 2018 12:28:27 -0500 Received: from smtp.codeaurora.org ([198.145.29.96]:52628 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751028AbeAVR20 (ORCPT ); Mon, 22 Jan 2018 12:28:26 -0500 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id AED8060A60; Mon, 22 Jan 2018 17:28:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1516642105; bh=lglCCGERN4D79sxcDjCH4QAsMsPepBZIO9A8Qzeh65I=; h=From:To:Cc:Subject:Date:From; b=ZxL2u1LiiaDnzJjZQ/Y8NUplRJXlegsbAZSrpjGIB6OFarGtuFrYtzyMIEMO731ZW 8Bo2n1Ez5ClInG75vTidHWQB6h209d2W+AoBBZ438rvK0xETSt0KG0U4dmHImRkmCy IKo+ImrCsRJfoc7azv1kB3FeYm+onnbSZvUOInzw= Received: from drakthul.qualcomm.com (global_nat1_iad_fw.qualcomm.com [129.46.232.65]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: okaya@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id B004F60398; Mon, 22 Jan 2018 17:28:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1516642104; bh=lglCCGERN4D79sxcDjCH4QAsMsPepBZIO9A8Qzeh65I=; h=From:To:Cc:Subject:Date:From; b=dMu/Dm40ekdXdlW3PdzU053htbx7FA01CvzBNKvDc9qrD5kEwJOBx/1NN849uBzuK EBs0KfCej/+a6YL9d+br+4ps6scEYPf8vzfgGfO79JEpJMHz9U1KXaIIbvEOa2f7XA 6GiOQ4vFNVq00HmFP9pcYMgdoky465sDMbq2KmcQ= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org B004F60398 Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=none smtp.mailfrom=okaya@codeaurora.org From: Sinan Kaya To: linux-pci@vger.kernel.org, timur@codeaurora.org Cc: linux-arm-msm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Sinan Kaya , Bjorn Helgaas , Rajat Jain , Vidya Sagar , Thomas Gleixner , Kees Cook , Ard Biesheuvel , Yinghai Lu , linux-kernel@vger.kernel.org (open list) Subject: [PATCH] PCI/ASPM: Suppress common clock mode setting failure Date: Mon, 22 Jan 2018 12:28:00 -0500 Message-Id: <1516642093-15633-1-git-send-email-okaya@codeaurora.org> X-Mailer: git-send-email 1.9.1 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Code is emitting warnings when it tries to set the common clock mode for ASPM and ASPM is already configured to common clock mode by the UEFI BIOS. Let's bail out silently in such a case. pci 0004:00:00.0: ASPM: Could not configure common clock Signed-off-by: Sinan Kaya --- drivers/pci/pcie/aspm.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/pci/pcie/aspm.c b/drivers/pci/pcie/aspm.c index 9783e10..072178a 100644 --- a/drivers/pci/pcie/aspm.c +++ b/drivers/pci/pcie/aspm.c @@ -253,6 +253,11 @@ static void pcie_aspm_configure_common_clock(struct pcie_link_state *link) /* Configure upstream component */ pcie_capability_read_word(parent, PCI_EXP_LNKCTL, ®16); + + /* Port might be already in common clock mode */ + if ((same_clock) && (reg16 & PCI_EXP_LNKCTL_CCC)) + return; + parent_reg = reg16; if (same_clock) reg16 |= PCI_EXP_LNKCTL_CCC;