| Message ID | 20190103213519.9754-1-jeffrey.t.kirsher@intel.com |
|---|---|
| State | Changes Requested |
| Delegated to: | David Miller |
| Headers | show |
| Series | ixgbe: fix Kconfig when driver is not a module | expand |
On Thu, 2019-01-03 at 13:35 -0800, Jeff Kirsher wrote: > The new ability added to the driver to use mii_bus to handle MII > related > ioctls is causing compile issues when the driver is compiled into the > kernel (i.e. not a module). > > The simple solution of requiring the driver to be compiled as a > module when > MDIO_BUS is a module, causes a recursion Kconfig issue due to IPSec > dependencies. > > So created another Kconfig option for ixgbe, to enable mdio_bus > support for > DSA devices. This solution solves the problem when the ixgbe driver > is > compiled into the kernel and MDIO_BUS is compiled as a module. In > this > case, the IXGBE_MDIO option is disabled and the code is not compiled > into the driver. > > CC: Dave Jones <davej@codemonkey.org.uk> > CC: Steve Douthit <stephend@silicom-usa.com> > CC: Florian Fainelli <f.fainelli@gmail.com> > Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> > --- > drivers/net/ethernet/intel/Kconfig | 11 ++++++++++- > drivers/net/ethernet/intel/ixgbe/ixgbe.h | 4 ++++ > drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 12 ++++++++++-- > drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c | 4 ++++ > drivers/net/ethernet/intel/ixgbe/ixgbe_phy.h | 3 ++- > 5 files changed, 30 insertions(+), 4 deletions(-) I have done the following compile tests to comfirm this resolves the issue: Kconfig: 1 2 3 4 -------- --- --- --- --- ixgbe m m y y ixgbe_mdio y n y y mdio_bus m m m y phylib m m m y Test #3 resulted in ixgbe_mdio being disabled and code not compiled into the driver.
> -----Original Message----- > From: Intel-wired-lan [mailto:intel-wired-lan-bounces@osuosl.org] On > Behalf Of Jeff Kirsher > Sent: Thursday, January 3, 2019 1:35 PM > To: intel-wired-lan@lists.osuosl.org > Cc: netdev@vger.kernel.org; Florian Fainelli <f.fainelli@gmail.com>; Dave > Jones <davej@codemonkey.org.uk> > Subject: [Intel-wired-lan] [PATCH] ixgbe: fix Kconfig when driver is not a > module > > The new ability added to the driver to use mii_bus to handle MII related > ioctls is causing compile issues when the driver is compiled into the kernel > (i.e. not a module). > > The simple solution of requiring the driver to be compiled as a module when > MDIO_BUS is a module, causes a recursion Kconfig issue due to IPSec > dependencies. > > So created another Kconfig option for ixgbe, to enable mdio_bus support for > DSA devices. This solution solves the problem when the ixgbe driver is > compiled into the kernel and MDIO_BUS is compiled as a module. In this > case, the IXGBE_MDIO option is disabled and the code is not compiled into > the driver. > > CC: Dave Jones <davej@codemonkey.org.uk> > CC: Steve Douthit <stephend@silicom-usa.com> > CC: Florian Fainelli <f.fainelli@gmail.com> > Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> > --- > drivers/net/ethernet/intel/Kconfig | 11 ++++++++++- > drivers/net/ethernet/intel/ixgbe/ixgbe.h | 4 ++++ > drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 12 ++++++++++-- > drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c | 4 ++++ > drivers/net/ethernet/intel/ixgbe/ixgbe_phy.h | 3 ++- > 5 files changed, 30 insertions(+), 4 deletions(-) Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
On 1/3/19 4:35 PM, Jeff Kirsher wrote: > The new ability added to the driver to use mii_bus to handle MII related > ioctls is causing compile issues when the driver is compiled into the > kernel (i.e. not a module). > > The simple solution of requiring the driver to be compiled as a module when > MDIO_BUS is a module, causes a recursion Kconfig issue due to IPSec > dependencies. > > So created another Kconfig option for ixgbe, to enable mdio_bus support for > DSA devices. This solution solves the problem when the ixgbe driver is > compiled into the kernel and MDIO_BUS is compiled as a module. In this > case, the IXGBE_MDIO option is disabled and the code is not compiled > into the driver. > > CC: Dave Jones <davej@codemonkey.org.uk> > CC: Steve Douthit <stephend@silicom-usa.com> > CC: Florian Fainelli <f.fainelli@gmail.com> > Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> > --- > drivers/net/ethernet/intel/Kconfig | 11 ++++++++++- > drivers/net/ethernet/intel/ixgbe/ixgbe.h | 4 ++++ > drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 12 ++++++++++-- > drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c | 4 ++++ > drivers/net/ethernet/intel/ixgbe/ixgbe_phy.h | 3 ++- > 5 files changed, 30 insertions(+), 4 deletions(-) > > diff --git a/drivers/net/ethernet/intel/Kconfig b/drivers/net/ethernet/intel/Kconfig > index 31fb76ee9d82..35317ecdd0c3 100644 > --- a/drivers/net/ethernet/intel/Kconfig > +++ b/drivers/net/ethernet/intel/Kconfig > @@ -159,7 +159,6 @@ config IXGBE > tristate "Intel(R) 10GbE PCI Express adapters support" > depends on PCI > select MDIO > - select MDIO_DEVICE > imply PTP_1588_CLOCK > ---help--- > This driver supports Intel(R) 10GbE PCI Express family of > @@ -210,6 +209,16 @@ config IXGBE_IPSEC > ---help--- > Enable support for IPSec offload in ixgbe.ko > > +config IXGBE_MDIO > + bool "MDIO Support for DSA devices" > + default n > + depends on IXGBE && MDIO_BUS && !(IXGBE=y && MDIO_BUS=m) > + ---help--- > + Say Y here if you want MDIO_BUS support for DSA devices in the > + driver. This is also useful for accessing the entire clause 22/45 address space, which may be worth a mention in the help text. > + If unsure, say N. > + > config IXGBEVF > tristate "Intel(R) 10GbE PCI Express Virtual Function Ethernet support" > depends on PCI_MSI > diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe.h b/drivers/net/ethernet/intel/ixgbe/ixgbe.h > index 08d85e336bd4..9d7496508ee0 100644 > --- a/drivers/net/ethernet/intel/ixgbe/ixgbe.h > +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe.h > @@ -12,7 +12,9 @@ > #include <linux/aer.h> > #include <linux/if_vlan.h> > #include <linux/jiffies.h> > +#ifdef CONFIG_IXGBE_MDIO > #include <linux/phy.h> > +#endif > > #include <linux/timecounter.h> > #include <linux/net_tstamp.h> > @@ -562,7 +564,9 @@ struct ixgbe_adapter { > struct net_device *netdev; > struct bpf_prog *xdp_prog; > struct pci_dev *pdev; > +#ifdef CONFIG_IXGBE_MDIO > struct mii_bus *mii_bus; > +#endif > > unsigned long state; > > diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c > index d2ce7f0bc32d..afa0337f7ba0 100644 > --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c > +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c > @@ -39,7 +39,9 @@ > #include "ixgbe.h" > #include "ixgbe_common.h" > #include "ixgbe_dcb_82599.h" > +#ifdef CONFIG_IXGBE_MDIO > #include "ixgbe_phy.h" > +#endif > #include "ixgbe_sriov.h" > #include "ixgbe_model.h" > #include "ixgbe_txrx_common.h" > @@ -8791,6 +8793,7 @@ ixgbe_mdio_read(struct net_device *netdev, int prtad, int devad, u16 addr) > u16 value; > int rc; > > +#ifdef CONFIG_IXGBE_MDIO > if (adapter->mii_bus) { > int regnum = addr; > > @@ -8799,7 +8802,7 @@ ixgbe_mdio_read(struct net_device *netdev, int prtad, int devad, u16 addr) > > return mdiobus_read(adapter->mii_bus, prtad, regnum); > } > - > +#endif > if (prtad != hw->phy.mdio.prtad) > return -EINVAL; > rc = hw->phy.ops.read_reg(hw, addr, devad, &value); > @@ -8814,6 +8817,7 @@ static int ixgbe_mdio_write(struct net_device *netdev, int prtad, int devad, > struct ixgbe_adapter *adapter = netdev_priv(netdev); > struct ixgbe_hw *hw = &adapter->hw; > > +#ifdef CONFIG_IXGBE_MDIO > if (adapter->mii_bus) { > int regnum = addr; > > @@ -8822,7 +8826,7 @@ static int ixgbe_mdio_write(struct net_device *netdev, int prtad, int devad, > > return mdiobus_write(adapter->mii_bus, prtad, regnum, value); > } > - > +#endif > if (prtad != hw->phy.mdio.prtad) > return -EINVAL; > return hw->phy.ops.write_reg(hw, addr, devad, value); > @@ -11141,7 +11145,9 @@ static int ixgbe_probe(struct pci_dev *pdev, const struct pci_device_id *ent) > IXGBE_LINK_SPEED_10GB_FULL | IXGBE_LINK_SPEED_1GB_FULL, > true); > > +#ifdef CONFIG_IXGBE_MDIO > ixgbe_mii_bus_init(hw); > +#endif > > return 0; > > @@ -11193,8 +11199,10 @@ static void ixgbe_remove(struct pci_dev *pdev) > set_bit(__IXGBE_REMOVING, &adapter->state); > cancel_work_sync(&adapter->service_task); > > +#ifdef CONFIG_IXGBE_MDIO > if (adapter->mii_bus) > mdiobus_unregister(adapter->mii_bus); > +#endif > > #ifdef CONFIG_IXGBE_DCA > if (adapter->flags & IXGBE_FLAG_DCA_ENABLED) { > diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c > index cc4907f9ff02..05da21920863 100644 > --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c > +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c > @@ -3,7 +3,9 @@ > > #include <linux/pci.h> > #include <linux/delay.h> > +#ifdef CONFIG_IXGBE_MDIO > #include <linux/iopoll.h> > +#endif > #include <linux/sched.h> > > #include "ixgbe.h" > @@ -659,6 +661,7 @@ s32 ixgbe_write_phy_reg_generic(struct ixgbe_hw *hw, u32 reg_addr, > return status; > } > > +#ifdef CONFIG_IXGBE_MDIO > #define IXGBE_HW_READ_REG(addr) IXGBE_READ_REG(hw, addr) > > /** > @@ -956,6 +959,7 @@ s32 ixgbe_mii_bus_init(struct ixgbe_hw *hw) > adapter->mii_bus = NULL; > return -ENODEV; > } > +#endif > > /** > * ixgbe_setup_phy_link_generic - Set and restart autoneg > diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.h b/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.h > index 214b01085718..88b851178d7e 100644 > --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.h > +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.h > @@ -120,8 +120,9 @@ > /* SFP+ SFF-8472 Compliance code */ > #define IXGBE_SFF_SFF_8472_UNSUP 0x00 > > +#ifdef CONFIG_IXGBE_MDIO > s32 ixgbe_mii_bus_init(struct ixgbe_hw *hw); > - > +#endif > s32 ixgbe_identify_phy_generic(struct ixgbe_hw *hw); > s32 ixgbe_reset_phy_generic(struct ixgbe_hw *hw); > s32 ixgbe_read_phy_reg_generic(struct ixgbe_hw *hw, u32 reg_addr, > Just tested this against a DSA dev in hardware and it works, but I still think the simpler solution would be to just select PHYLIB: diff --git a/drivers/net/ethernet/intel/Kconfig b/drivers/net/ethernet/intel/Kconfig index 31fb76ee9d82..a1246e89aad4 100644 --- a/drivers/net/ethernet/intel/Kconfig +++ b/drivers/net/ethernet/intel/Kconfig @@ -159,7 +159,7 @@ config IXGBE tristate "Intel(R) 10GbE PCI Express adapters support" depends on PCI select MDIO - select MDIO_DEVICE + select PHYLIB imply PTP_1588_CLOCK ---help--- This driver supports Intel(R) 10GbE PCI Express family of That seems to be the pattern for most of the other ethernet adapters: $ grep -r 'select PHYLIB' drivers/net/ethernet/ | wc -l 71 vs checking MDIO_BUS (not counting this patch): $ grep -r 'depends on.*MDIO_BUS' drivers/net/ethernet/ | wc -l 0 AFAICT in the Kconfig language a || between two dependency expressions returns the max() of the two expr where (n, m, y) = (0, 1, 2). So in the case of multiple drivers selecting the same symbol if any are built-in then the selected symbol must also be built-in. This has held true for the little bit of poking around I've done via menuconfig, but I'm definitely not a Kconfig expert. In any case you can have my: Tested-by: Stephen Douthit <stephend@silicom-usa.com>
On Fri, 2019-01-04 at 00:00 +0000, Steve Douthit wrote: > Just tested this against a DSA dev in hardware and it works, but I > still think the simpler solution would be to just select PHYLIB: > > diff --git a/drivers/net/ethernet/intel/Kconfig > b/drivers/net/ethernet/intel/Kconfig > index 31fb76ee9d82..a1246e89aad4 100644 > --- a/drivers/net/ethernet/intel/Kconfig > +++ b/drivers/net/ethernet/intel/Kconfig > @@ -159,7 +159,7 @@ config IXGBE > tristate "Intel(R) 10GbE PCI Express adapters support" > depends on PCI > select MDIO > - select MDIO_DEVICE > + select PHYLIB > imply PTP_1588_CLOCK > ---help--- > This driver supports Intel(R) 10GbE PCI Express family of > > That seems to be the pattern for most of the other ethernet adapters: > $ grep -r 'select PHYLIB' drivers/net/ethernet/ | wc -l > 71 > > vs checking MDIO_BUS (not counting this patch): > $ grep -r 'depends on.*MDIO_BUS' drivers/net/ethernet/ | wc -l > 0 I initially tried that, but we get a recursive Kconfig dependency error when IPSec is enabled as well, which I noted in the commit message. I agree the help text could be expanded to include the clause 22/45 address information, so I will submit a v2 of the patch.
On 1/3/19 7:55 PM, Jeff Kirsher wrote: > I initially tried that, but we get a recursive Kconfig dependency error > when IPSec is enabled as well, which I noted in the commit message. I'm not running into the dependency issue you mention in my own testing of the 'select PHYLIB' patch. All of the following configurations build for me with no issues: 0 1 2 3 4 5 CONFIG_IXGBE m m m m y y CONFIG_IXGBE_IPSEC n y n y n y CONFIG_MDIO_BUS m m y y y y CONFIG_PHYLIB m m y y y y I also confirmed that I can't have CONFIG_MDIO_BUS=m and CONFIG_IXGBE=y. Setting CONFIG_IXGBE=y forces CONFIG_MDIO_BUS=y. Base config I started with is here: https://pastebin.com/yFsiRRQZ That's the config 0 from above, the only diff to the other configs was to set the appropriate symbol to 'y'. I also tested against the config Dave posted (accepting fixdep defaults) and that also worked. What am I missing here? Can you post the config you were using that had the dependency problem with CONFIG_IXGBE_IPSEC?
On Fri, 2019-01-04 at 15:09 +0000, Steve Douthit wrote: > On 1/3/19 7:55 PM, Jeff Kirsher wrote: > > I initially tried that, but we get a recursive Kconfig dependency > > error > > when IPSec is enabled as well, which I noted in the commit message. > I'm not running into the dependency issue you mention in my own > testing > of the 'select PHYLIB' patch. All of the following configurations > build > for me with no issues: > > 0 1 2 3 4 5 > CONFIG_IXGBE m m m m y y > CONFIG_IXGBE_IPSEC n y n y n y > CONFIG_MDIO_BUS m m y y y y > CONFIG_PHYLIB m m y y y y > > I also confirmed that I can't have CONFIG_MDIO_BUS=m and > CONFIG_IXGBE=y. > Setting CONFIG_IXGBE=y forces CONFIG_MDIO_BUS=y. > > Base config I started with is here: https://pastebin.com/yFsiRRQZ > That's the config 0 from above, the only diff to the other configs > was > to set the appropriate symbol to 'y'. > > I also tested against the config Dave posted (accepting fixdep > defaults) > and that also worked. > > What am I missing here? > > Can you post the config you were using that had the dependency > problem > with CONFIG_IXGBE_IPSEC? I was using 'make allmodconfig' and then altering CONFIG_IXGBE=y to get the error, but it appears that you are correct. Using select PHYLIB or imply PHYLIB does resolve the problem. I am wondering through all the iterations of testing, I somehow missed using either of those. I swore I had tested those and got this error: drivers/dma/Kconfig:5:error: recursive dependency detected! drivers/dma/Kconfig:5: symbol DMADEVICES is selected by CRYPTO_DEV_SP_CCP drivers/crypto/ccp/Kconfig:9: symbol CRYPTO_DEV_SP_CCP depends on CRYPTO crypto/Kconfig:16: symbol CRYPTO is selected by XFRM_ALGO net/xfrm/Kconfig:13: symbol XFRM_ALGO is selected by IXGBE_IPSEC drivers/net/ethernet/intel/Kconfig:204: symbol IXGBE_IPSEC depends on IXGBE drivers/net/ethernet/intel/Kconfig:158: symbol IXGBE depends on PHYLIB drivers/net/phy/Kconfig:181: symbol PHYLIB is selected by ARC_EMAC_CORE drivers/net/ethernet/arc/Kconfig:18: symbol ARC_EMAC_CORE is selected by ARC_EMAC drivers/net/ethernet/arc/Kconfig:24: symbol ARC_EMAC depends on OF_IRQ drivers/of/Kconfig:68: symbol OF_IRQ depends on IRQ_DOMAIN kernel/irq/Kconfig:63: symbol IRQ_DOMAIN is selected by IRQ_DOMAIN_HIERARCHY kernel/irq/Kconfig:72: symbol IRQ_DOMAIN_HIERARCHY is selected by GENERIC_MSI_IRQ_DOMAIN kernel/irq/Kconfig:89: symbol GENERIC_MSI_IRQ_DOMAIN is selected by MV_XOR_V2 drivers/dma/Kconfig:379: symbol MV_XOR_V2 depends on DMADEVICES For a resolution refer to Documentation/kbuild/kconfig-language.txt subsection "Kconfig recursive dependency limitations" make[2]: *** [scripts/kconfig/Makefile:69: syncconfig] Error 1 make[1]: *** [Makefile:544: syncconfig] Error 2 make: *** [Makefile:640: include/config/auto.conf] Error 2 But now I only get that when I use: depends on PHYLIB Since you suggestion is much simply, I will go with your suggestion. Expect a v3, with your simplified solution.
diff --git a/drivers/net/ethernet/intel/Kconfig b/drivers/net/ethernet/intel/Kconfig index 31fb76ee9d82..35317ecdd0c3 100644 --- a/drivers/net/ethernet/intel/Kconfig +++ b/drivers/net/ethernet/intel/Kconfig @@ -159,7 +159,6 @@ config IXGBE tristate "Intel(R) 10GbE PCI Express adapters support" depends on PCI select MDIO - select MDIO_DEVICE imply PTP_1588_CLOCK ---help--- This driver supports Intel(R) 10GbE PCI Express family of @@ -210,6 +209,16 @@ config IXGBE_IPSEC ---help--- Enable support for IPSec offload in ixgbe.ko +config IXGBE_MDIO + bool "MDIO Support for DSA devices" + default n + depends on IXGBE && MDIO_BUS && !(IXGBE=y && MDIO_BUS=m) + ---help--- + Say Y here if you want MDIO_BUS support for DSA devices in the + driver. + + If unsure, say N. + config IXGBEVF tristate "Intel(R) 10GbE PCI Express Virtual Function Ethernet support" depends on PCI_MSI diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe.h b/drivers/net/ethernet/intel/ixgbe/ixgbe.h index 08d85e336bd4..9d7496508ee0 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe.h +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe.h @@ -12,7 +12,9 @@ #include <linux/aer.h> #include <linux/if_vlan.h> #include <linux/jiffies.h> +#ifdef CONFIG_IXGBE_MDIO #include <linux/phy.h> +#endif #include <linux/timecounter.h> #include <linux/net_tstamp.h> @@ -562,7 +564,9 @@ struct ixgbe_adapter { struct net_device *netdev; struct bpf_prog *xdp_prog; struct pci_dev *pdev; +#ifdef CONFIG_IXGBE_MDIO struct mii_bus *mii_bus; +#endif unsigned long state; diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c index d2ce7f0bc32d..afa0337f7ba0 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c @@ -39,7 +39,9 @@ #include "ixgbe.h" #include "ixgbe_common.h" #include "ixgbe_dcb_82599.h" +#ifdef CONFIG_IXGBE_MDIO #include "ixgbe_phy.h" +#endif #include "ixgbe_sriov.h" #include "ixgbe_model.h" #include "ixgbe_txrx_common.h" @@ -8791,6 +8793,7 @@ ixgbe_mdio_read(struct net_device *netdev, int prtad, int devad, u16 addr) u16 value; int rc; +#ifdef CONFIG_IXGBE_MDIO if (adapter->mii_bus) { int regnum = addr; @@ -8799,7 +8802,7 @@ ixgbe_mdio_read(struct net_device *netdev, int prtad, int devad, u16 addr) return mdiobus_read(adapter->mii_bus, prtad, regnum); } - +#endif if (prtad != hw->phy.mdio.prtad) return -EINVAL; rc = hw->phy.ops.read_reg(hw, addr, devad, &value); @@ -8814,6 +8817,7 @@ static int ixgbe_mdio_write(struct net_device *netdev, int prtad, int devad, struct ixgbe_adapter *adapter = netdev_priv(netdev); struct ixgbe_hw *hw = &adapter->hw; +#ifdef CONFIG_IXGBE_MDIO if (adapter->mii_bus) { int regnum = addr; @@ -8822,7 +8826,7 @@ static int ixgbe_mdio_write(struct net_device *netdev, int prtad, int devad, return mdiobus_write(adapter->mii_bus, prtad, regnum, value); } - +#endif if (prtad != hw->phy.mdio.prtad) return -EINVAL; return hw->phy.ops.write_reg(hw, addr, devad, value); @@ -11141,7 +11145,9 @@ static int ixgbe_probe(struct pci_dev *pdev, const struct pci_device_id *ent) IXGBE_LINK_SPEED_10GB_FULL | IXGBE_LINK_SPEED_1GB_FULL, true); +#ifdef CONFIG_IXGBE_MDIO ixgbe_mii_bus_init(hw); +#endif return 0; @@ -11193,8 +11199,10 @@ static void ixgbe_remove(struct pci_dev *pdev) set_bit(__IXGBE_REMOVING, &adapter->state); cancel_work_sync(&adapter->service_task); +#ifdef CONFIG_IXGBE_MDIO if (adapter->mii_bus) mdiobus_unregister(adapter->mii_bus); +#endif #ifdef CONFIG_IXGBE_DCA if (adapter->flags & IXGBE_FLAG_DCA_ENABLED) { diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c index cc4907f9ff02..05da21920863 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c @@ -3,7 +3,9 @@ #include <linux/pci.h> #include <linux/delay.h> +#ifdef CONFIG_IXGBE_MDIO #include <linux/iopoll.h> +#endif #include <linux/sched.h> #include "ixgbe.h" @@ -659,6 +661,7 @@ s32 ixgbe_write_phy_reg_generic(struct ixgbe_hw *hw, u32 reg_addr, return status; } +#ifdef CONFIG_IXGBE_MDIO #define IXGBE_HW_READ_REG(addr) IXGBE_READ_REG(hw, addr) /** @@ -956,6 +959,7 @@ s32 ixgbe_mii_bus_init(struct ixgbe_hw *hw) adapter->mii_bus = NULL; return -ENODEV; } +#endif /** * ixgbe_setup_phy_link_generic - Set and restart autoneg diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.h b/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.h index 214b01085718..88b851178d7e 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.h +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.h @@ -120,8 +120,9 @@ /* SFP+ SFF-8472 Compliance code */ #define IXGBE_SFF_SFF_8472_UNSUP 0x00 +#ifdef CONFIG_IXGBE_MDIO s32 ixgbe_mii_bus_init(struct ixgbe_hw *hw); - +#endif s32 ixgbe_identify_phy_generic(struct ixgbe_hw *hw); s32 ixgbe_reset_phy_generic(struct ixgbe_hw *hw); s32 ixgbe_read_phy_reg_generic(struct ixgbe_hw *hw, u32 reg_addr,
The new ability added to the driver to use mii_bus to handle MII related ioctls is causing compile issues when the driver is compiled into the kernel (i.e. not a module). The simple solution of requiring the driver to be compiled as a module when MDIO_BUS is a module, causes a recursion Kconfig issue due to IPSec dependencies. So created another Kconfig option for ixgbe, to enable mdio_bus support for DSA devices. This solution solves the problem when the ixgbe driver is compiled into the kernel and MDIO_BUS is compiled as a module. In this case, the IXGBE_MDIO option is disabled and the code is not compiled into the driver. CC: Dave Jones <davej@codemonkey.org.uk> CC: Steve Douthit <stephend@silicom-usa.com> CC: Florian Fainelli <f.fainelli@gmail.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> --- drivers/net/ethernet/intel/Kconfig | 11 ++++++++++- drivers/net/ethernet/intel/ixgbe/ixgbe.h | 4 ++++ drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 12 ++++++++++-- drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c | 4 ++++ drivers/net/ethernet/intel/ixgbe/ixgbe_phy.h | 3 ++- 5 files changed, 30 insertions(+), 4 deletions(-)