| Message ID | 5d0d7286445acef822a806dc89fcbf9eb2672ade.1541150589.git.lorenzo.bianconi@redhat.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | mt76: fix building without CONFIG_LEDS_CLASS | expand |
Lorenzo Bianconi <lorenzo.bianconi@redhat.com> writes: > From: Arnd Bergmann <arnd@arndb.de> > > When CONFIG_LEDS_CLASS is disabled, or it is a loadable module while > mt76 is built-in, we run into a link error: > > drivers/net/wireless/mediatek/mt76/mac80211.o: In function `mt76_register_device': > mac80211.c:(.text+0xb78): relocation truncated to fit: R_AARCH64_CALL26 against undefined symbol `devm_of_led_classdev_register' > > We don't really need a hard dependency here as the driver can presumably > work just fine without LEDs, so this follows the iwlwifi example and > adds a separate Kconfig option for the LED support, this will be available > whenever it will link, and otherwise the respective code gets left out from > the driver object. > > Fixes: 17f1de56df05 ("mt76: add common code shared between multiple chipsets") > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > Signed-off-by: Lorenzo Bianconi <lorenzo.bianconi@redhat.com> Should this go to 4.20? A linker error is pretty bad, even though I think this is few months old issue already. And are conflicts with -next version of mt76 likely? -- Kalle Valo
> Lorenzo Bianconi <lorenzo.bianconi@redhat.com> writes: > > > From: Arnd Bergmann <arnd@arndb.de> > > > > When CONFIG_LEDS_CLASS is disabled, or it is a loadable module while > > mt76 is built-in, we run into a link error: > > > > drivers/net/wireless/mediatek/mt76/mac80211.o: In function `mt76_register_device': > > mac80211.c:(.text+0xb78): relocation truncated to fit: R_AARCH64_CALL26 against undefined symbol `devm_of_led_classdev_register' > > > > We don't really need a hard dependency here as the driver can presumably > > work just fine without LEDs, so this follows the iwlwifi example and > > adds a separate Kconfig option for the LED support, this will be available > > whenever it will link, and otherwise the respective code gets left out from > > the driver object. > > > > Fixes: 17f1de56df05 ("mt76: add common code shared between multiple chipsets") > > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > > Signed-off-by: Lorenzo Bianconi <lorenzo.bianconi@redhat.com> > > Should this go to 4.20? A linker error is pretty bad, even though I > think this is few months old issue already. I guess so. The patch is based on top of Felix's repository so it apply with a 'fuzz' on net-next/wireless-drivers-next but the patch is ok. Do I need to resend or it is ok? Regards, Lorenzo > > And are conflicts with -next version of mt76 likely? > > -- > Kalle Valo
Lorenzo Bianconi <lorenzo.bianconi@redhat.com> writes: >> Lorenzo Bianconi <lorenzo.bianconi@redhat.com> writes: >> >> > From: Arnd Bergmann <arnd@arndb.de> >> > >> > When CONFIG_LEDS_CLASS is disabled, or it is a loadable module while >> > mt76 is built-in, we run into a link error: >> > >> > drivers/net/wireless/mediatek/mt76/mac80211.o: In function `mt76_register_device': >> > mac80211.c:(.text+0xb78): relocation truncated to fit: >> > R_AARCH64_CALL26 against undefined symbol >> > `devm_of_led_classdev_register' >> > >> > We don't really need a hard dependency here as the driver can presumably >> > work just fine without LEDs, so this follows the iwlwifi example and >> > adds a separate Kconfig option for the LED support, this will be available >> > whenever it will link, and otherwise the respective code gets left out from >> > the driver object. >> > >> > Fixes: 17f1de56df05 ("mt76: add common code shared between multiple chipsets") >> > Signed-off-by: Arnd Bergmann <arnd@arndb.de> >> > Signed-off-by: Lorenzo Bianconi <lorenzo.bianconi@redhat.com> >> >> Should this go to 4.20? A linker error is pretty bad, even though I >> think this is few months old issue already. > > I guess so. The patch is based on top of Felix's repository so it apply with a > 'fuzz' on net-next/wireless-drivers-next but the patch is ok. Do I need to > resend or it is ok? Doesn't seem to apply to wireless-drivers (which I fast forwarded to v4.20-rc1 today): Failed to apply the patch: ['git', 'am', '-s', '-3'] failed: 128 fatal: sha1 information is lacking or useless (drivers/net/wireless/mediatek/mt76/mt76x2/pci_init.c). error: could not build fake ancestor So please rebase and resend. -- Kalle Valo
diff --git a/drivers/net/wireless/mediatek/mt76/Kconfig b/drivers/net/wireless/mediatek/mt76/Kconfig index 0ccbcd7e887d..c30d8f5bbf2a 100644 --- a/drivers/net/wireless/mediatek/mt76/Kconfig +++ b/drivers/net/wireless/mediatek/mt76/Kconfig @@ -1,6 +1,12 @@ config MT76_CORE tristate +config MT76_LEDS + bool + depends on MT76_CORE + depends on LEDS_CLASS=y || MT76_CORE=LEDS_CLASS + default y + config MT76_USB tristate depends on MT76_CORE diff --git a/drivers/net/wireless/mediatek/mt76/mac80211.c b/drivers/net/wireless/mediatek/mt76/mac80211.c index 2a699e8b79bf..7d219ff2d480 100644 --- a/drivers/net/wireless/mediatek/mt76/mac80211.c +++ b/drivers/net/wireless/mediatek/mt76/mac80211.c @@ -345,9 +345,11 @@ int mt76_register_device(struct mt76_dev *dev, bool vht, mt76_check_sband(dev, NL80211_BAND_2GHZ); mt76_check_sband(dev, NL80211_BAND_5GHZ); - ret = mt76_led_init(dev); - if (ret) - return ret; + if (IS_ENABLED(CONFIG_MT76_LEDS)) { + ret = mt76_led_init(dev); + if (ret) + return ret; + } return ieee80211_register_hw(hw); } diff --git a/drivers/net/wireless/mediatek/mt76/mt76x2/pci_init.c b/drivers/net/wireless/mediatek/mt76/mt76x2/pci_init.c index 7b53b2be28c2..b6f1efb7daa8 100644 --- a/drivers/net/wireless/mediatek/mt76/mt76x2/pci_init.c +++ b/drivers/net/wireless/mediatek/mt76/mt76x2/pci_init.c @@ -417,8 +417,10 @@ int mt76x2_register_device(struct mt76x02_dev *dev) wiphy_ext_feature_set(wiphy, NL80211_EXT_FEATURE_VHT_IBSS); /* init led callbacks */ - dev->mt76.led_cdev.brightness_set = mt76x2_led_set_brightness; - dev->mt76.led_cdev.blink_set = mt76x2_led_set_blink; + if (IS_ENABLED(CONFIG_MT76_LEDS)) { + dev->mt76.led_cdev.brightness_set = mt76x2_led_set_brightness; + dev->mt76.led_cdev.blink_set = mt76x2_led_set_blink; + } ret = mt76_register_device(&dev->mt76, true, mt76x02_rates, ARRAY_SIZE(mt76x02_rates));