From patchwork Wed Nov 6 22:24:17 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 1190733 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-pci-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=kernel.org Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.b="t2rPKzYg"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 477h1J5fXgz9sP3 for ; Thu, 7 Nov 2019 09:25:08 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727023AbfKFWZI (ORCPT ); Wed, 6 Nov 2019 17:25:08 -0500 Received: from mail.kernel.org ([198.145.29.99]:42168 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726817AbfKFWZI (ORCPT ); Wed, 6 Nov 2019 17:25:08 -0500 Received: from localhost (unknown [69.71.4.100]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 2972A2166E; Wed, 6 Nov 2019 22:25:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573079107; bh=NqKgcoRD8Fxe8s22bkEne22XCbz650EvgtZNN84wf1s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=t2rPKzYg/B+OV76/WYnG0MRvkziYkHm5CPodrKxpNJgojzdHlV2rbqzbJk1y2IUQe 8h/ROGJ6THAAe/a0tqtQ9KnaXNodC4Cbrds+mBhcLv+69Z+3t1gxsRXRrdjTeji4dn 8tQm1/McPwnbpucjLmrSSb/Azwaj/2aJ3KtNFMSU= From: Bjorn Helgaas To: linux-pci@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Bjorn Helgaas Subject: [PATCH 1/5] PCI/PTM: Remove spurious "d" from granularity message Date: Wed, 6 Nov 2019 16:24:17 -0600 Message-Id: <20191106222420.10216-2-helgaas@kernel.org> X-Mailer: git-send-email 2.24.0.rc1.363.gb1bccd3e3d-goog In-Reply-To: <20191106222420.10216-1-helgaas@kernel.org> References: <20191106222420.10216-1-helgaas@kernel.org> MIME-Version: 1.0 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org From: Bjorn Helgaas The granularity message has an extra "d": pci 0000:02:00.0: PTM enabled, 4dns granularity Remove the "d" so the message is simply "PTM enabled, 4ns granularity". Fixes: 8b2ec318eece ("PCI: Add PTM clock granularity information") Signed-off-by: Bjorn Helgaas Cc: Jonathan Yong --- drivers/pci/pcie/ptm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/pci/pcie/ptm.c b/drivers/pci/pcie/ptm.c index 98cfa30f3fae..9361f3aa26ab 100644 --- a/drivers/pci/pcie/ptm.c +++ b/drivers/pci/pcie/ptm.c @@ -21,7 +21,7 @@ static void pci_ptm_info(struct pci_dev *dev) snprintf(clock_desc, sizeof(clock_desc), ">254ns"); break; default: - snprintf(clock_desc, sizeof(clock_desc), "%udns", + snprintf(clock_desc, sizeof(clock_desc), "%uns", dev->ptm_granularity); break; } From patchwork Wed Nov 6 22:24:18 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 1190734 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-pci-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=kernel.org Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.b="GnBo0iM5"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 477h1q1Wq9z9sP3 for ; Thu, 7 Nov 2019 09:25:35 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727109AbfKFWZe (ORCPT ); Wed, 6 Nov 2019 17:25:34 -0500 Received: from mail.kernel.org ([198.145.29.99]:42474 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726817AbfKFWZe (ORCPT ); Wed, 6 Nov 2019 17:25:34 -0500 Received: from localhost (unknown [69.71.4.100]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 5C81521848; Wed, 6 Nov 2019 22:25:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573079133; bh=38YTlOFF2LwXTtqqi0l0MmFmAxPVKs8CCcWEJ81Bo30=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GnBo0iM5B0woiOYVuklG9j/bVyoCK5feTzs5egucalAaCQ4o3ko0w+hPXwxti67Na eFDKNuWsJB3hbXvJp6BH4WprvhImPLtmerjHsNrn8n0Mb3zsL0sTWVljS3BxWR2ltg Cea9dR1KLyeV93EugjhoTJTA/QZrmFOtT1rXG8mo= From: Bjorn Helgaas To: linux-pci@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Bjorn Helgaas , Jonathan Yong Subject: [PATCH 2/5] PCI/PTM: Remove dependency on PCIEPORTBUS Date: Wed, 6 Nov 2019 16:24:18 -0600 Message-Id: <20191106222420.10216-3-helgaas@kernel.org> X-Mailer: git-send-email 2.24.0.rc1.363.gb1bccd3e3d-goog In-Reply-To: <20191106222420.10216-1-helgaas@kernel.org> References: <20191106222420.10216-1-helgaas@kernel.org> MIME-Version: 1.0 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org From: Bjorn Helgaas The PTM support does not depend on the portdrv, so remove the Kconfig dependency. Signed-off-by: Bjorn Helgaas Cc: Jonathan Yong Reviewed-by: Andrew Murray --- drivers/pci/pcie/Kconfig | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/pci/pcie/Kconfig b/drivers/pci/pcie/Kconfig index 362eb8cfa53b..b0d781d72d1b 100644 --- a/drivers/pci/pcie/Kconfig +++ b/drivers/pci/pcie/Kconfig @@ -135,7 +135,6 @@ config PCIE_DPC config PCIE_PTM bool "PCI Express Precision Time Measurement support" - depends on PCIEPORTBUS help This enables PCI Express Precision Time Measurement (PTM) support. From patchwork Wed Nov 6 22:24:19 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 1190736 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-pci-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=kernel.org Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.b="oTHc5guV"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 477h2110ghz9sPK for ; Thu, 7 Nov 2019 09:25:45 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732737AbfKFWZh (ORCPT ); Wed, 6 Nov 2019 17:25:37 -0500 Received: from mail.kernel.org ([198.145.29.99]:42568 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726779AbfKFWZg (ORCPT ); Wed, 6 Nov 2019 17:25:36 -0500 Received: from localhost (unknown [69.71.4.100]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id F0BFE217D7; Wed, 6 Nov 2019 22:25:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573079136; bh=Wr7xMJjYrsbjxLJcHAFZuiwd/4pLB2LiIoF36AQSsZs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=oTHc5guVQalA+UlzS1Q9sEABtP3HBhq/rFL306xwOCVo7k9f09OohfbxkP1BQgjzi +eILlCRhgK9rNtjPy0l/S1fIYjrvR6RHx6R3C8+fxmLxOglS03gEreRpmqdX6dX6S8 Q5m29YhmyvKcAMMt/P3NLi4NFPp0vQxL8hQW3ScQ= From: Bjorn Helgaas To: linux-pci@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Bjorn Helgaas Subject: [PATCH 3/5] PCI/ASPM: Remove dependency on PCIEPORTBUS Date: Wed, 6 Nov 2019 16:24:19 -0600 Message-Id: <20191106222420.10216-4-helgaas@kernel.org> X-Mailer: git-send-email 2.24.0.rc1.363.gb1bccd3e3d-goog In-Reply-To: <20191106222420.10216-1-helgaas@kernel.org> References: <20191106222420.10216-1-helgaas@kernel.org> MIME-Version: 1.0 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org From: Bjorn Helgaas The ASPM support does not depend on the portdrv, so remove the Kconfig dependency. Signed-off-by: Bjorn Helgaas Reviewed-by: Andrew Murray --- drivers/pci/pcie/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/pci/pcie/Kconfig b/drivers/pci/pcie/Kconfig index b0d781d72d1b..b196ad816129 100644 --- a/drivers/pci/pcie/Kconfig +++ b/drivers/pci/pcie/Kconfig @@ -63,7 +63,7 @@ config PCIE_ECRC # config PCIEASPM bool "PCI Express ASPM control" if EXPERT - depends on PCI && PCIEPORTBUS + depends on PCI default y help This enables OS control over PCI Express ASPM (Active State From patchwork Wed Nov 6 22:24:20 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 1190735 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-pci-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=kernel.org Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.b="FsVwAkie"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 477h201L5cz9sP7 for ; Thu, 7 Nov 2019 09:25:44 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732750AbfKFWZj (ORCPT ); Wed, 6 Nov 2019 17:25:39 -0500 Received: from mail.kernel.org ([198.145.29.99]:42638 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726779AbfKFWZj (ORCPT ); Wed, 6 Nov 2019 17:25:39 -0500 Received: from localhost (unknown [69.71.4.100]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id BA62D2166E; Wed, 6 Nov 2019 22:25:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573079139; bh=kQtOLA3B3nA3S+jkpxr7YQP3yBSf6AdbgOlbifPGyrI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FsVwAkiesIZj/bchIhj2En3MwR2U034qRkJP3vGBrIhQ/DlB5hJ2MBFXcPX9M6H1b S4eyyz5uFoNJVr03aJPhKxR31szwe45vxve7hpoZW0Dd2N4HjpKJJHs+ovxuFE88ln TUMkkDE1MxmvZmTqnvDO9KQOf9KkLPrXVj8TbrLo= From: Bjorn Helgaas To: linux-pci@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Bjorn Helgaas Subject: [PATCH 4/5] PCI: Remove PCIe Kconfig dependencies on PCI Date: Wed, 6 Nov 2019 16:24:20 -0600 Message-Id: <20191106222420.10216-5-helgaas@kernel.org> X-Mailer: git-send-email 2.24.0.rc1.363.gb1bccd3e3d-goog In-Reply-To: <20191106222420.10216-1-helgaas@kernel.org> References: <20191106222420.10216-1-helgaas@kernel.org> MIME-Version: 1.0 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org From: Bjorn Helgaas drivers/pci/pcie/Kconfig is only sourced by drivers/pci/Kconfig, and only when PCI is defined, so there's no need to depend on PCI again. Remove the unnecessary dependencies. Signed-off-by: Bjorn Helgaas Reviewed-by: Andrew Murray --- drivers/pci/pcie/Kconfig | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/pci/pcie/Kconfig b/drivers/pci/pcie/Kconfig index b196ad816129..207dac2fd588 100644 --- a/drivers/pci/pcie/Kconfig +++ b/drivers/pci/pcie/Kconfig @@ -4,7 +4,6 @@ # config PCIEPORTBUS bool "PCI Express Port Bus support" - depends on PCI help This enables PCI Express Port Bus support. Users can then enable support for Native Hot-Plug, Advanced Error Reporting, Power @@ -63,7 +62,6 @@ config PCIE_ECRC # config PCIEASPM bool "PCI Express ASPM control" if EXPERT - depends on PCI default y help This enables OS control over PCI Express ASPM (Active State From patchwork Wed Nov 6 22:24:21 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 1190737 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-pci-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=kernel.org Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.b="VvKkJE/U"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 477h264Fgpz9sPK for ; Thu, 7 Nov 2019 09:25:50 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732763AbfKFWZn (ORCPT ); Wed, 6 Nov 2019 17:25:43 -0500 Received: from mail.kernel.org ([198.145.29.99]:42714 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728149AbfKFWZm (ORCPT ); Wed, 6 Nov 2019 17:25:42 -0500 Received: from localhost (unknown [69.71.4.100]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 341A721848; Wed, 6 Nov 2019 22:25:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573079142; bh=4oc5GVAOqhLsNNVeJWSPpy36QsbUzSTu6fOqxyLp4JM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VvKkJE/UwWIz+zJYb40wq8kiXbuHCTCDp5pi7pYSQC1w5SGmmkaUI96tOquwIfCAN REidiPtmivEBNh8otNI4SZmh2723ZCdElWtT+xUT0OtWvW9jD77EpWmgbf12cmChCi xGOBBKue83py/1v7lqzBSXpw/Yt1SsRVtMYzE/v0= From: Bjorn Helgaas To: linux-pci@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Bjorn Helgaas Subject: [PATCH 5/5] PCI: Allow building PCIe things without PCIEPORTBUS Date: Wed, 6 Nov 2019 16:24:21 -0600 Message-Id: <20191106222420.10216-6-helgaas@kernel.org> X-Mailer: git-send-email 2.24.0.rc1.363.gb1bccd3e3d-goog In-Reply-To: <20191106222420.10216-1-helgaas@kernel.org> References: <20191106222420.10216-1-helgaas@kernel.org> MIME-Version: 1.0 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org From: Bjorn Helgaas Some things in drivers/pci/pcie (aspm.c and ptm.c) do not depend on the PCIe portdrv, so we should be able to build them even if PCIEPORTBUS is not selected. Remove the PCIEPORTBUS guard from building pcie/. Signed-off-by: Bjorn Helgaas Reviewed-by: Andrew Murray --- drivers/pci/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/pci/Makefile b/drivers/pci/Makefile index 28cdd8c0213a..522d2b974e91 100644 --- a/drivers/pci/Makefile +++ b/drivers/pci/Makefile @@ -7,6 +7,8 @@ obj-$(CONFIG_PCI) += access.o bus.o probe.o host-bridge.o \ pci-sysfs.o rom.o setup-res.o irq.o vpd.o \ setup-bus.o vc.o mmap.o setup-irq.o +obj-$(CONFIG_PCI) += pcie/ + ifdef CONFIG_PCI obj-$(CONFIG_PROC_FS) += proc.o obj-$(CONFIG_SYSFS) += slot.o @@ -15,7 +17,6 @@ endif obj-$(CONFIG_OF) += of.o obj-$(CONFIG_PCI_QUIRKS) += quirks.o -obj-$(CONFIG_PCIEPORTBUS) += pcie/ obj-$(CONFIG_HOTPLUG_PCI) += hotplug/ obj-$(CONFIG_PCI_MSI) += msi.o obj-$(CONFIG_PCI_ATS) += ats.o