From: Keller, Jacob E <jacob.e.keller@intel.com>
To: intel-wired-lan@osuosl.org
Subject: [Intel-wired-lan] [next-queue v4 01/17] fm10k: conditionally compile DCB and DebugFS support
Date: Fri, 16 Oct 2015 17:50:35 +0000 [thread overview]
Message-ID: <1445017835.13478.0.camel@intel.com> (raw)
In-Reply-To: <804857E1F29AAC47BF68C404FC60A1847EC5408D@ORSMSX105.amr.corp.intel.com>
On Thu, 2015-10-15 at 23:39 +0000, Allan, Bruce W wrote:
> > -----Original Message-----
> > From: Intel-wired-lan [mailto:
> > intel-wired-lan-bounces at lists.osuosl.org] On
> > Behalf Of Jacob Keller
> > Sent: Thursday, October 15, 2015 3:54 PM
> > To: Intel Wired LAN
> > Subject: [Intel-wired-lan] [next-queue v4 01/17] fm10k:
> > conditionally
> > compile DCB and DebugFS support
> >
> > Rather than wrapping fm10k_dcbnl.c and fm10k_debugfs.c support with
> > #ifdef blocks, just conditionally include the .o files in the
> > Makefile.
> > Also, since we're modifying it, update the copyright year on the
> > Makefile.
> >
> > Signed-off-by: Jacob Keller <jacob.e.keller@intel.com>
> > ---
> > drivers/net/ethernet/intel/fm10k/Makefile | 20
> > +++++++++++++++----
> > -
> > drivers/net/ethernet/intel/fm10k/fm10k.h | 4 ++++
> > drivers/net/ethernet/intel/fm10k/fm10k_dcbnl.c | 4 ----
> > drivers/net/ethernet/intel/fm10k/fm10k_debugfs.c | 4 ----
> > drivers/net/ethernet/intel/fm10k/fm10k_pci.c | 4 ++++
> > 5 files changed, 23 insertions(+), 13 deletions(-)
> >
> > diff --git a/drivers/net/ethernet/intel/fm10k/Makefile
> > b/drivers/net/ethernet/intel/fm10k/Makefile
> > index 08859dd220a8..b006ff66d028 100644
> > --- a/drivers/net/ethernet/intel/fm10k/Makefile
> > +++ b/drivers/net/ethernet/intel/fm10k/Makefile
> > @@ -1,7 +1,7 @@
> >
> > ##########################################################
> > ######################
> > #
> > # Intel Ethernet Switch Host Interface Driver
> > -# Copyright(c) 2013 - 2014 Intel Corporation.
> > +# Copyright(c) 2013 - 2015 Intel Corporation.
> > #
> > # This program is free software; you can redistribute it and/or
> > modify it
> > # under the terms and conditions of the GNU General Public
> > License,
> > @@ -27,7 +27,17 @@
> >
> > obj-$(CONFIG_FM10K) += fm10k.o
> >
> > -fm10k-objs := fm10k_main.o fm10k_common.o fm10k_pci.o \
> > - fm10k_netdev.o fm10k_ethtool.o fm10k_pf.o fm10k_vf.o
> > \
> > - fm10k_mbx.o fm10k_iov.o fm10k_tlv.o \
> > - fm10k_debugfs.o fm10k_ptp.o fm10k_dcbnl.o
> > +fm10k-y := fm10k_main.o \
> > + fm10k_common.o \
> > + fm10k_pci.o \
> > + fm10k_ptp.o \
> > + fm10k_netdev.o \
> > + fm10k_ethtool.o \
> > + fm10k_pf.o \
> > + fm10k_vf.o \
> > + fm10k_mbx.o \
> > + fm10k_iov.o \
> > + fm10k_tlv.o
> > +
> > +fm10k-$(CONFIG_DEBUG_FS) += fm10k_debugfs.o
> > +fm10k-$(CONFIG_DCB) += fm10k_dcbnl.o
> > diff --git a/drivers/net/ethernet/intel/fm10k/fm10k.h
> > b/drivers/net/ethernet/intel/fm10k/fm10k.h
> > index 48809e5d3f79..aa9674a3d9ee 100644
> > --- a/drivers/net/ethernet/intel/fm10k/fm10k.h
> > +++ b/drivers/net/ethernet/intel/fm10k/fm10k.h
> > @@ -551,5 +551,9 @@ int fm10k_get_ts_config(struct net_device
> > *netdev,
> > struct ifreq *ifr);
> > int fm10k_set_ts_config(struct net_device *netdev, struct ifreq
> > *ifr);
> >
> > /* DCB */
> > +#ifdef CONFIG_DCB
> > void fm10k_dcbnl_set_ops(struct net_device *dev);
> > +#else
> > +static inline void fm10k_dcbnl_set_ops(void) {}
> > +#endif
> > #endif /* _FM10K_H_ */
> > diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_dcbnl.c
> > b/drivers/net/ethernet/intel/fm10k/fm10k_dcbnl.c
> > index 5c7a4d7662d8..2be4361839db 100644
> > --- a/drivers/net/ethernet/intel/fm10k/fm10k_dcbnl.c
> > +++ b/drivers/net/ethernet/intel/fm10k/fm10k_dcbnl.c
> > @@ -20,7 +20,6 @@
> >
> > #include "fm10k.h"
> >
> > -#ifdef CONFIG_DCB
> > /**
> > * fm10k_dcbnl_ieee_getets - get the ETS configuration for the
> > device
> > * @dev: netdev interface for the device
> > @@ -155,7 +154,6 @@ static const struct dcbnl_rtnl_ops
> > fm10k_dcbnl_ops
> > = {
> > .setdcbx = fm10k_dcbnl_setdcbx,
> > };
> >
> > -#endif /* CONFIG_DCB */
> > /**
> > * fm10k_dcbnl_set_ops - Configures dcbnl ops pointer for netdev
> > * @dev: netdev interface for the device
> > @@ -164,11 +162,9 @@ static const struct dcbnl_rtnl_ops
> > fm10k_dcbnl_ops
> > = {
> > **/
> > void fm10k_dcbnl_set_ops(struct net_device *dev)
> > {
> > -#ifdef CONFIG_DCB
> > struct fm10k_intfc *interface = netdev_priv(dev);
> > struct fm10k_hw *hw = &interface->hw;
> >
> > if (hw->mac.type == fm10k_mac_pf)
> > dev->dcbnl_ops = &fm10k_dcbnl_ops;
> > -#endif /* CONFIG_DCB */
> > }
> > diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_debugfs.c
> > b/drivers/net/ethernet/intel/fm10k/fm10k_debugfs.c
> > index 5304bc1fbecd..5d6137faf7d1 100644
> > --- a/drivers/net/ethernet/intel/fm10k/fm10k_debugfs.c
> > +++ b/drivers/net/ethernet/intel/fm10k/fm10k_debugfs.c
> > @@ -18,8 +18,6 @@
> > * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR
> > 97124-
> > 6497
> > */
> >
> > -#ifdef CONFIG_DEBUG_FS
> > -
> > #include "fm10k.h"
> >
> > #include <linux/debugfs.h>
> > @@ -258,5 +256,3 @@ void fm10k_dbg_exit(void)
> > debugfs_remove_recursive(dbg_root);
> > dbg_root = NULL;
> > }
> > -
> > -#endif /* CONFIG_DEBUG_FS */
> > diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_pci.c
> > b/drivers/net/ethernet/intel/fm10k/fm10k_pci.c
> > index 5fbffbaefe32..0dece3c07727 100644
> > --- a/drivers/net/ethernet/intel/fm10k/fm10k_pci.c
> > +++ b/drivers/net/ethernet/intel/fm10k/fm10k_pci.c
> > @@ -1729,8 +1729,10 @@ static int fm10k_sw_init(struct fm10k_intfc
> > *interface,
> > netdev->hw_features &= ~NETIF_F_GSO_UDP_TUNNEL;
> > }
> >
> > +#ifdef CONFIG_DCB
> > /* initialize DCBNL interface */
> > fm10k_dcbnl_set_ops(netdev);
> > +#endif
>
> The #ifdef CONFIG_DCB/#endif is not needed; fm10k_dcbnl_set_ops()
> will be a nop when CONFIG_DCB is not defined.
>
Sorry yes you mentioned this before and I simply lost track of it..
Will fix.
> >
> > /* Initialize service timer and service task */
> > set_bit(__FM10K_SERVICE_DISABLE, &interface->state);
> > @@ -1919,8 +1921,10 @@ static int fm10k_probe(struct pci_dev *pdev,
> > if (err)
> > goto err_sw_init;
> >
> > +#if IS_ENABLED(CONFIG_DEBUG_FS)
> > /* enable debugfs support */
> > fm10k_dbg_intfc_init(interface);
> > +#endif
>
> The #if IS_ENABLED(CONFIG_DEBUG_FS)/#endif is not needed;
> fm10k_dbg_intfc_init() will be a nop when CONFIG_DEBUG_FS is not
> defined.
>
Yep will fix.
Regards,
Jake
> >
> > err = fm10k_init_queueing_scheme(interface);
> > if (err)
> > --
> > 2.6.1.264.gbab76a9
> >
> > _______________________________________________
> > Intel-wired-lan mailing list
> > Intel-wired-lan at lists.osuosl.org
> > http://lists.osuosl.org/mailman/listinfo/intel-wired-lan
prev parent reply other threads:[~2015-10-16 17:50 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-15 22:54 [Intel-wired-lan] [next-queue v4 01/17] fm10k: conditionally compile DCB and DebugFS support Jacob Keller
2015-10-15 22:54 ` [Intel-wired-lan] [next-queue v4 02/17] fm10k: set netdev features in one location Jacob Keller
2015-10-15 22:54 ` [Intel-wired-lan] [next-queue v4 03/17] fm10k: reset max_queues on init_hw_vf failure Jacob Keller
2015-10-15 22:54 ` [Intel-wired-lan] [next-queue v4 04/17] fm10k: always check init_hw for errors Jacob Keller
2015-10-15 22:54 ` [Intel-wired-lan] [next-queue v4 05/17] fm10k: reinitialize queuing scheme after calling init_hw Jacob Keller
2015-10-15 22:54 ` [Intel-wired-lan] [next-queue v4 06/17] fm10k: Correct typecast in fm10k_update_xc_addr_pf Jacob Keller
2015-10-15 22:54 ` [Intel-wired-lan] [next-queue v4 07/17] fm10k: explicitly typecast vlan values to u16 Jacob Keller
2015-10-15 22:54 ` [Intel-wired-lan] [next-queue v4 08/17] fm10k: add statistics for actual DWORD count of mbmem mailbox Jacob Keller
2015-10-15 22:54 ` [Intel-wired-lan] [next-queue v4 09/17] fm10k: rename mbx_tx_oversized statistic to mbx_tx_dropped Jacob Keller
2015-10-15 22:54 ` [Intel-wired-lan] [next-queue v4 10/17] fm10k: add TEB check to fm10k_gre_is_nvgre Jacob Keller
2015-10-15 22:54 ` [Intel-wired-lan] [next-queue v4 11/17] fm10k: Add support for ITR scaling based on PCIe link speed Jacob Keller
2015-10-15 22:54 ` [Intel-wired-lan] [next-queue v4 12/17] fm10k: introduce ITR_IS_ADAPTIVE macro Jacob Keller
2015-10-15 22:54 ` [Intel-wired-lan] [next-queue v4 13/17] fm10k: Update adaptive ITR algorithm Jacob Keller
2015-10-16 4:01 ` Alexander Duyck
2015-10-15 22:54 ` [Intel-wired-lan] [next-queue v4 14/17] fm10k: use macro for default Tx and Rx ITR values Jacob Keller
2015-10-15 22:54 ` [Intel-wired-lan] [next-queue v4 15/17] fm10k: change default Tx ITR to 25usec Jacob Keller
2015-10-15 22:54 ` [Intel-wired-lan] [next-queue v4 16/17] fm10k: TRIVIAL fix typo of hardware Jacob Keller
2015-10-15 22:54 ` [Intel-wired-lan] [next-queue v4 17/17] fm10k: TRIVIAL cleanup order at top of fm10k_xmit_frame Jacob Keller
2015-10-15 23:39 ` [Intel-wired-lan] [next-queue v4 01/17] fm10k: conditionally compile DCB and DebugFS support Allan, Bruce W
2015-10-16 17:50 ` Keller, Jacob E [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1445017835.13478.0.camel@intel.com \
--to=jacob.e.keller@intel.com \
--cc=intel-wired-lan@osuosl.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).