Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1753372AbdI0PtN (ORCPT <rfc822;w@1wt.eu>);
        Wed, 27 Sep 2017 11:49:13 -0400
Received: from szxga05-in.huawei.com ([45.249.212.191]:7060 "EHLO
        szxga05-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1752819AbdI0PtL (ORCPT
        <rfc822;linux-kernel@vger.kernel.org>);
        Wed, 27 Sep 2017 11:49:11 -0400
Date: Wed, 27 Sep 2017 16:48:46 +0100
From: Jonathan Cameron <Jonathan.Cameron@huawei.com>
To: Jan Glauber <jglauber@cavium.com>
CC: Mark Rutland <mark.rutland@arm.com>, Will Deacon <will.deacon@arm.com>,
        David Daney <david.daney@cavium.com>,
        Suzuki K Poulose <Suzuki.Poulose@arm.com>,
        <linux-kernel@vger.kernel.org>,
        Zhangshaokun <zhangshaokun@hisilicon.com>,
        Borislav Petkov <bp@alien8.de>, <linux-arm-kernel@lists.infradead.org>
Subject: Re: [PATCH v10 6/7] perf: cavium: Support transmit-link PMU
 counters
Message-ID: <20170927164846.00001cbe@huawei.com>
In-Reply-To: <20170925123502.17289-7-jglauber@cavium.com>
References: <20170925123502.17289-1-jglauber@cavium.com>
        <20170925123502.17289-7-jglauber@cavium.com>
Organization: Huawei
X-Mailer: Claws Mail 3.15.0 (GTK+ 2.24.31; x86_64-w64-mingw32)
MIME-Version: 1.0
Content-Type: text/plain; charset="US-ASCII"
Content-Transfer-Encoding: 7bit
X-Originating-IP: [10.206.48.115]
X-CFilter-Loop: Reflected
X-Mirapoint-Virus-RAPID-Raw: score=unknown(0),
        refid=str=0001.0A010201.59CBC871.012E,ss=1,re=0.000,recu=0.000,reip=0.000,cl=1,cld=1,fgs=0,
        ip=0.0.0.0,
        so=2014-11-16 11:51:01,
        dmn=2013-03-21 17:37:32
X-Mirapoint-Loop-Id: 14f98d66873382c769df4efb75aae9a9
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
Content-Length: 2621
Lines: 86

On Mon, 25 Sep 2017 14:35:01 +0200
Jan Glauber <jglauber@cavium.com> wrote:

> Add support for the transmit-link (OCX TLK) PMU counters found
> on Caviums SOCs with a processor interconnect.
> 
> Properties of the OCX TLK counters:
> - per-unit control
> - fixed purpose
> - writable
> - one PCI device with multiple TLK units
> 
> Signed-off-by: Jan Glauber <jglauber@cavium.com>

Something odd happened in
drivers/soc/cavium/Kconfig...

Otherwise whole series looks sensible to me.

Jonathan

> ---
>  drivers/perf/Kconfig            |   7 ++
>  drivers/perf/cavium_pmu.c       | 230 ++++++++++++++++++++++++++++++++++++++++
>  drivers/soc/cavium/Kconfig      |   4 +
>  drivers/soc/cavium/cavium_ocx.c |   4 +
>  include/linux/soc/cavium/ocx.h  |   3 +
>  5 files changed, 248 insertions(+)
> 

<snip>

>  static int __init cvm_pmu_init(void)
>  {
>  	INIT_LIST_HEAD(&cvm_pmu_lmcs);
> diff --git a/drivers/soc/cavium/Kconfig b/drivers/soc/cavium/Kconfig
> index fe56503d20f4..2c7406872b18 100644
> --- a/drivers/soc/cavium/Kconfig
> +++ b/drivers/soc/cavium/Kconfig
> @@ -8,3 +8,7 @@ config CAVIUM_LMC
>  config CAVIUM_OCX
>  	depends on ARCH_THUNDER
>  	def_tristate m
> +
> +config CAVIUM_OCX
> +        depends on ARCH_THUNDER
> +	def_tristate m

Something odd going on here...

> diff --git a/drivers/soc/cavium/cavium_ocx.c b/drivers/soc/cavium/cavium_ocx.c
> index fa3341b0744f..de1ad146c0dd 100644
> --- a/drivers/soc/cavium/cavium_ocx.c
> +++ b/drivers/soc/cavium/cavium_ocx.c
> @@ -13,6 +13,8 @@
>  static int cvm_ocx_probe(struct pci_dev *pdev,
>  			 const struct pci_device_id *ent)
>  {
> +	if (IS_ENABLED(CONFIG_CAVIUM_PMU_OCX_TLK))
> +		cvm_ocx_tlk_pmu_probe(pdev, ent);
>  	if (IS_ENABLED(CONFIG_EDAC_THUNDERX))
>  		thunderx_edac_ocx_probe(pdev, ent);
>  	return 0;
> @@ -20,6 +22,8 @@ static int cvm_ocx_probe(struct pci_dev *pdev,
>  
>  static void cvm_ocx_remove(struct pci_dev *pdev)
>  {
> +	if (IS_ENABLED(CONFIG_CAVIUM_PMU_OCX_TLK))
> +		cvm_ocx_tlk_pmu_remove(pdev);
>  	if (IS_ENABLED(CONFIG_EDAC_THUNDERX))
>  		thunderx_edac_ocx_remove(pdev);
>  }
> diff --git a/include/linux/soc/cavium/ocx.h b/include/linux/soc/cavium/ocx.h
> index 29f55b3d3171..f7b2caada671 100644
> --- a/include/linux/soc/cavium/ocx.h
> +++ b/include/linux/soc/cavium/ocx.h
> @@ -3,6 +3,9 @@
>  
>  #include <linux/pci.h>
>  
> +int cvm_ocx_tlk_pmu_probe(struct pci_dev *pdev, const struct pci_device_id *ent);
> +void cvm_ocx_tlk_pmu_remove(struct pci_dev *pdev);
> +
>  int thunderx_edac_ocx_probe(struct pci_dev *pdev, const struct pci_device_id *ent);
>  void thunderx_edac_ocx_remove(struct pci_dev *pdev);
>