netdev - Re: [PATCH net V2] cxgb4: fix thermal zone build error

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Date:   Thu, 15 Nov 2018 10:05:56 -0800
From:   Randy Dunlap <rdunlap@...radead.org>
To:     Ganesh Goudar <ganeshgr@...lsio.com>, netdev@...r.kernel.org,
        davem@...emloft.net
Cc:     nirranjan@...lsio.com, indranil@...lsio.com, dt@...lsio.com,
        sergei.shtylyov@...entembedded.com
Subject: Re: [PATCH net V2] cxgb4: fix thermal zone build error

On 11/15/18 2:06 AM, Ganesh Goudar wrote:
> with CONFIG_THERMAL=m and cxgb4 as built-in build fails, and
> 'commit e70a57fa59bb ("cxgb4: fix thermal configuration dependencies")'
> tries to fix it but when cxgb4i is made built-in build fails again,
> use IS_REACHABLE instead of IS_ENABLED to fix the issue.
> 
> Fixes: e70a57fa59bb (cxgb4: fix thermal configuration dependencies)
> Reported-by: Randy Dunlap <rdunlap@...radead.org>
> Signed-off-by: Ganesh Goudar <ganeshgr@...lsio.com>

Acked-by: Randy Dunlap <rdunlap@...radead.org>

Thanks.

> ---
> V2: Fixing spelling mistake and avoid preprocessor conditionals.
> ---
>  drivers/net/ethernet/chelsio/Kconfig            | 1 -
>  drivers/net/ethernet/chelsio/cxgb4/Makefile     | 4 +---
>  drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 4 ++--
>  3 files changed, 3 insertions(+), 6 deletions(-)
> 
> diff --git a/drivers/net/ethernet/chelsio/Kconfig b/drivers/net/ethernet/chelsio/Kconfig
> index 75c1c5e..e2cdfa7 100644
> --- a/drivers/net/ethernet/chelsio/Kconfig
> +++ b/drivers/net/ethernet/chelsio/Kconfig
> @@ -67,7 +67,6 @@ config CHELSIO_T3
>  config CHELSIO_T4
>  	tristate "Chelsio Communications T4/T5/T6 Ethernet support"
>  	depends on PCI && (IPV6 || IPV6=n)
> -	depends on THERMAL || !THERMAL
>  	select FW_LOADER
>  	select MDIO
>  	select ZLIB_DEFLATE
> diff --git a/drivers/net/ethernet/chelsio/cxgb4/Makefile b/drivers/net/ethernet/chelsio/cxgb4/Makefile
> index 78e5d17..91d8a88 100644
> --- a/drivers/net/ethernet/chelsio/cxgb4/Makefile
> +++ b/drivers/net/ethernet/chelsio/cxgb4/Makefile
> @@ -12,6 +12,4 @@ cxgb4-objs := cxgb4_main.o l2t.o smt.o t4_hw.o sge.o clip_tbl.o cxgb4_ethtool.o
>  cxgb4-$(CONFIG_CHELSIO_T4_DCB) +=  cxgb4_dcb.o
>  cxgb4-$(CONFIG_CHELSIO_T4_FCOE) +=  cxgb4_fcoe.o
>  cxgb4-$(CONFIG_DEBUG_FS) += cxgb4_debugfs.o
> -ifdef CONFIG_THERMAL
> -cxgb4-objs += cxgb4_thermal.o
> -endif
> +cxgb4-$(CONFIG_THERMAL) += cxgb4_thermal.o
> diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
> index 05a4692..d49db46 100644
> --- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
> +++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
> @@ -5863,7 +5863,7 @@ static int init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
>  	if (!is_t4(adapter->params.chip))
>  		cxgb4_ptp_init(adapter);
>  
> -	if (IS_ENABLED(CONFIG_THERMAL) &&
> +	if (IS_REACHABLE(CONFIG_THERMAL) &&
>  	    !is_t4(adapter->params.chip) && (adapter->flags & FW_OK))
>  		cxgb4_thermal_init(adapter);
>  
> @@ -5932,7 +5932,7 @@ static void remove_one(struct pci_dev *pdev)
>  
>  		if (!is_t4(adapter->params.chip))
>  			cxgb4_ptp_stop(adapter);
> -		if (IS_ENABLED(CONFIG_THERMAL))
> +		if (IS_REACHABLE(CONFIG_THERMAL))
>  			cxgb4_thermal_remove(adapter);
>  
>  		/* If we allocated filters, free up state associated with any
> 


-- 
~Randy