Skip to contentSkip to conversation

package/rtl8189s: fixes for autobuilder failures

PATCH In review Sergey Matyukevich 3 participants 8 messages May 9, 2022 – May 28, 2022

lore
Share & tools
lore
#0 lore raw

cover package/rtl8189s: fixes for autobuilder failures

Hi all,

This patch series includes several patches that are supposed to fix recent rtl8189fs build failures. Fixes include:
- fix rtl8189fs builds for big-endian platforms
- enable kernel options required for rtl8189fs driver

Besides, bump driver version to pull the latest fixes for 5.1 - 5.17 kernels.

Regards,
Sergey

Sergey Matyukevich (3):
package/rtl8189fs: enable required kernel options package/rtl8189fs: bump revision package/rtl8189fs: fix big-endian builds

 ...1-Makefile-remove-default-endianness.patch | 30 +++++++++++++++++++
 .../0001-include-disable-debug-messages.patch | 28 -----------------
 package/rtl8189fs/rtl8189fs.hash              |  2 +-
 package/rtl8189fs/rtl8189fs.mk                | 12 ++++++--
 4 files changed, 41 insertions(+), 31 deletions(-)
 create mode 100644 package/rtl8189fs/0001-Makefile-remove-default-endianness.patch
 delete mode 100644 package/rtl8189fs/0001-include-disable-debug-messages.patch
Signature · 6 lines
2.35.1

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#1 lore raw

PATCH 1/3 package/rtl8189fs: enable required kernel options

Enable Linux kernel configuration options required by the driver. Those are wireless networking and sdio support.

Fixes:
- http://autobuild.buildroot.net/results/ed6e29e44333ccae2728ca3321ff876c3056eada/

---
 package/rtl8189fs/rtl8189fs.mk | 7 +++++++
 1 file changed, 7 insertions(+)
package/rtl8189fs/rtl8189fs.mk +7 -0
index 40b735c21b..0cca0b751d 100644
@@ -13,5 +13,12 @@ RTL8189FS_MODULE_MAKE_OPTS = \
 	KVER=$(LINUX_VERSION_PROBED) \
 	KSRC=$(LINUX_DIR)
 
+define RTL8189FS_LINUX_CONFIG_FIXUPS
+	$(call KCONFIG_ENABLE_OPT,CONFIG_WIRELESS)
+	$(call KCONFIG_ENABLE_OPT,CONFIG_CFG80211)
+	$(call KCONFIG_ENABLE_OPT,CONFIG_MAC80211)
+	$(call KCONFIG_ENABLE_OPT,CONFIG_MMC)
+endef
+
 $(eval $(kernel-module))
 $(eval $(generic-package))
Signature · 6 lines
2.35.1

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#2 lore raw

Re: [Buildroot] [PATCH 1/3] package/rtl8189fs: enable required kernel options

Quoted 9 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Sergey" == Sergey Matyukevich <[email protected]> writes:

Enable Linux kernel configuration options required by the driver. Those are wireless networking and sdio support.

Fixes:
- http://autobuild.buildroot.net/results/ed6e29e44333ccae2728ca3321ff876c3056eada/

Committed to 2022.02.x, thanks.

Signature · 5 lines
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#3 lore raw

PATCH 2/3 package/rtl8189fs: bump revision

In reply to Sergey Matyukevich

Bump package revision to pull various fixes for v5.1 - v5.17 kernels. Patch that disables verbose debug is no more compatible with updated driver since build flags in Makefile has been changed. Drop it.

---
 .../0001-include-disable-debug-messages.patch | 28 -------------------
 package/rtl8189fs/rtl8189fs.hash              |  2 +-
 package/rtl8189fs/rtl8189fs.mk                |  2 +-
 3 files changed, 2 insertions(+), 30 deletions(-)
 delete mode 100644 package/rtl8189fs/0001-include-disable-debug-messages.patch
package/rtl8189fs/0001-include-disable-debug-messages.patch deleted +0 -28
deleted file mode 100644
index 532982b1d3..0000000000
@@ -1,28 +0,0 @@
-From 5d3a44ff1aeb8ace6e08df3cad16102aaac1ef09 Mon Sep 17 00:00:00 2001
-From: Sergey Matyukevich <[email protected]>
-Date: Sun, 13 Jun 2021 15:51:51 +0300
-Subject: [PATCH] include: disable debug messages
-
-Disable debug messages to make rtl8189fs driver less noisy.
-
-Signed-off-by: Sergey Matyukevich <[email protected]>
----
- include/autoconf.h | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/include/autoconf.h b/include/autoconf.h
-index 44efe42..b5df57b 100644
---- a/include/autoconf.h
-+++ b/include/autoconf.h
-@@ -224,8 +224,6 @@
- /*
-  * Debug Related Config
-  */
--#define CONFIG_DEBUG /* DBG_871X, etc... */
--
- #ifdef CONFIG_DEBUG
- #define DBG	1	// for ODM & BTCOEX debug
- //#define CONFIG_DEBUG_RTL871X /* RT_TRACE, RT_PRINT_DATA, _func_enter_, _func_exit_ */
--- 
-2.32.0
-
package/rtl8189fs/rtl8189fs.hash +1 -1
index f9772f2a89..d5d18a8ba8 100644
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256  fd74248b8cc62e54a954502228be221ace6051832a972b8b3005cc05e9c87761  rtl8189fs-73f826f0fa74b2fc1ad67eaf92bf9787947ae673.tar.gz
+sha256  41eee18d8a4289c2eac07af3224c62214a9b694a717bf497cd34a95b955f3d49  rtl8189fs-94a61cbf46ce87b7c9b8aa53123aeb142133a3c9.tar.gz
package/rtl8189fs/rtl8189fs.mk +1 -1
index 0cca0b751d..6031a3072c 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-RTL8189FS_VERSION = 73f826f0fa74b2fc1ad67eaf92bf9787947ae673
+RTL8189FS_VERSION = 94a61cbf46ce87b7c9b8aa53123aeb142133a3c9
 RTL8189FS_SITE = $(call github,jwrdegoede,rtl8189ES_linux,$(RTL8189FS_VERSION))
 RTL8189FS_LICENSE = GPL-2.0
 
Signature · 6 lines
2.35.1

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#4 lore raw

Re: [Buildroot] [PATCH 2/3] package/rtl8189fs: bump revision

Quoted 7 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Sergey" == Sergey Matyukevich <[email protected]> writes:

Bump package revision to pull various fixes for v5.1 - v5.17 kernels. Patch that disables verbose debug is no more compatible with updated driver since build flags in Makefile has been changed. Drop it.

Committed to 2022.02.x, thanks.

Quoted 70 lines
---
 .../0001-include-disable-debug-messages.patch | 28 -------------------
 package/rtl8189fs/rtl8189fs.hash              |  2 +-
 package/rtl8189fs/rtl8189fs.mk                |  2 +-
 3 files changed, 2 insertions(+), 30 deletions(-)
 delete mode 100644 package/rtl8189fs/0001-include-disable-debug-messages.patch
package/rtl8189fs/0001-include-disable-debug-messages.patch deleted +0 -28
deleted file mode 100644
index 532982b1d3..0000000000
@@ -1,28 +0,0 @@
-From 5d3a44ff1aeb8ace6e08df3cad16102aaac1ef09 Mon Sep 17 00:00:00 2001
-From: Sergey Matyukevich <[email protected]>
-Date: Sun, 13 Jun 2021 15:51:51 +0300
-Subject: [PATCH] include: disable debug messages
-
-Disable debug messages to make rtl8189fs driver less noisy.
-
-Signed-off-by: Sergey Matyukevich <[email protected]>
----
- include/autoconf.h | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/include/autoconf.h b/include/autoconf.h
-index 44efe42..b5df57b 100644
---- a/include/autoconf.h
-+++ b/include/autoconf.h
-@@ -224,8 +224,6 @@
- /*
-  * Debug Related Config
-  */
--#define CONFIG_DEBUG /* DBG_871X, etc... */
--
- #ifdef CONFIG_DEBUG
- #define DBG	1	// for ODM & BTCOEX debug
- //#define CONFIG_DEBUG_RTL871X /* RT_TRACE, RT_PRINT_DATA, _func_enter_, _func_exit_ */
--- 
-2.32.0
-
package/rtl8189fs/rtl8189fs.hash +1 -1
index f9772f2a89..d5d18a8ba8 100644
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256  fd74248b8cc62e54a954502228be221ace6051832a972b8b3005cc05e9c87761  rtl8189fs-73f826f0fa74b2fc1ad67eaf92bf9787947ae673.tar.gz
+sha256  41eee18d8a4289c2eac07af3224c62214a9b694a717bf497cd34a95b955f3d49  rtl8189fs-94a61cbf46ce87b7c9b8aa53123aeb142133a3c9.tar.gz
package/rtl8189fs/rtl8189fs.mk +1 -1
index 0cca0b751d..6031a3072c 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-RTL8189FS_VERSION = 73f826f0fa74b2fc1ad67eaf92bf9787947ae673
+RTL8189FS_VERSION = 94a61cbf46ce87b7c9b8aa53123aeb142133a3c9
 RTL8189FS_SITE = $(call github,jwrdegoede,rtl8189ES_linux,$(RTL8189FS_VERSION))
 RTL8189FS_LICENSE = GPL-2.0
 
Signature · 6 lines
2.35.1

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
Signature · 5 lines
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#5 lore raw

PATCH 3/3 package/rtl8189fs: fix big-endian builds

In reply to Sergey Matyukevich

Fix rtl8189fs builds for big-endian platforms. For this purpose remove default little-endian configuration option from rtl8189fs Makefile. Configure proper endianness using USER_EXTRA_CFLAGS instead.

Fixes:
- http://autobuild.buildroot.net/results/51e95561103e40ae94f38b9bb944bdfcd4ab50ed/
- http://autobuild.buildroot.net/results/8ac7921926ab48aeb95dc4ea20f3c9970094c71d/
- http://autobuild.buildroot.net/results/7f0bdd03c41bcc9e567fe722ed271e5dcf210f44/

---
 ...1-Makefile-remove-default-endianness.patch | 30 +++++++++++++++++++
 package/rtl8189fs/rtl8189fs.mk                |  3 +-
 2 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 package/rtl8189fs/0001-Makefile-remove-default-endianness.patch
package/rtl8189fs/0001-Makefile-remove-default-endianness.patch new file +30 -0
new file mode 100644
index 0000000000..47e42415eb
@@ -0,0 +1,30 @@
+From 480d9da302885d9e8b3d1f9c68def569e3c8a8c0 Mon Sep 17 00:00:00 2001
+From: Sergey Matyukevich <[email protected]>
+Date: Mon, 9 May 2022 00:17:21 +0300
+Subject: [PATCH] Makefile: remove default endianness
+
+There is no way to remove configuration options from EXTRA_CFLAGS
+without editing Makefile. So default LE configuration can not be
+conveniently replaced by BE. Remove default endianness from the
+Makefile to enable its configuration via USER_EXTRA_CFLAGS.
+
+Signed-off-by: Sergey Matyukevich <[email protected]>
+---
+ Makefile | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index dfca305..fde4e6b 100644
+--- a/Makefile
++++ b/Makefile
+@@ -22,7 +22,6 @@ endif
+ 
+ EXTRA_CFLAGS += -I$(src)/include
+ 
+-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN
+ EXTRA_CFLAGS += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT
+ 
+ EXTRA_LDFLAGS += --strip-debug
+-- 
+2.35.1
+
package/rtl8189fs/rtl8189fs.mk +2 -1
index 6031a3072c..1c398919ba 100644
@@ -11,7 +11,8 @@ RTL8189FS_LICENSE = GPL-2.0
 RTL8189FS_MODULE_MAKE_OPTS = \
 	CONFIG_RTL8189FS=m \
 	KVER=$(LINUX_VERSION_PROBED) \
-	KSRC=$(LINUX_DIR)
+	KSRC=$(LINUX_DIR) \
+	USER_EXTRA_CFLAGS="-DCONFIG_$(call qstrip,$(BR2_ENDIAN))_ENDIAN"
 
 define RTL8189FS_LINUX_CONFIG_FIXUPS
 	$(call KCONFIG_ENABLE_OPT,CONFIG_WIRELESS)
Signature · 6 lines
2.35.1

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#6 lore raw

Re: [Buildroot] [PATCH 3/3] package/rtl8189fs: fix big-endian builds

Quoted 10 lines · Sergey Matyukevich

Fix rtl8189fs builds for big-endian platforms. For this purpose remove default little-endian configuration option from rtl8189fs Makefile. Configure proper endianness using USER_EXTRA_CFLAGS instead.

Fixes:
- http://autobuild.buildroot.net/results/51e95561103e40ae94f38b9bb944bdfcd4ab50ed/
- http://autobuild.buildroot.net/results/8ac7921926ab48aeb95dc4ea20f3c9970094c71d/
- http://autobuild.buildroot.net/results/7f0bdd03c41bcc9e567fe722ed271e5dcf210f44/

Series applied to master. However...

Quoted 12 lines
---
  ...1-Makefile-remove-default-endianness.patch | 30 +++++++++++++++++++
  package/rtl8189fs/rtl8189fs.mk                |  3 +-
  2 files changed, 32 insertions(+), 1 deletion(-)

create mode 100644 package/rtl8189fs/0001-Makefile-remove-default-endianness.patch

package/rtl8189fs/0001-Makefile-remove-default-endianness.patch new file +0 -0
new file mode 100644
index 0000000000..47e42415eb

package/rtl8189fs/0001-Makefile-remove-default-endianness.patch line 9

Quoted 9 lines
package/rtl8189fs/0001-Makefile-remove-default-endianness.patch new file +9 -0
@@ -0,0 +1,30 @@
+From 480d9da302885d9e8b3d1f9c68def569e3c8a8c0 Mon Sep 17 00:00:00 2001
+From: Sergey Matyukevich <[email protected]>
+Date: Mon, 9 May 2022 00:17:21 +0300
+Subject: [PATCH] Makefile: remove default endianness
+
+There is no way to remove configuration options from EXTRA_CFLAGS
+without editing Makefile. So default LE configuration can not be
+conveniently replaced by BE. Remove default endianness from the
+Makefile to enable its configuration via USER_EXTRA_CFLAGS.

I don't know if it works, but if USER_EXTRA_CFLAGS is added _after_
EXTRA_CFLAGS, you can still override it with:

USER_EXTRA_CFLAGS="-UCONFIG_LITTLE_ENDIAN -DCONFIG_$(call qstrip,$(BR2_ENDIAN))_ENDIAN"

or, simpler:

ifeq ($(BR2_ENDIAN),"BIG") USER_EXTRA_CFLAGS="-UCONFIG_LITTLE_ENDIAN -DCONFIG_BIG_ENDIAN" endif

If USER_EXTRA_CFLAGS comes before, then there's indeed nothing you can do. In that case, please send the patch upstream.

Regards,
Arnout

Quoted 26 lines
package/rtl8189fs/0001-Makefile-remove-default-endianness.patch new file +21 -0
+
+Signed-off-by: Sergey Matyukevich <[email protected]>
+---
+ Makefile | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index dfca305..fde4e6b 100644
+--- a/Makefile
++++ b/Makefile
+@@ -22,7 +22,6 @@ endif
+
+ EXTRA_CFLAGS += -I$(src)/include
+
+-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN
+ EXTRA_CFLAGS += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT
+
+ EXTRA_LDFLAGS += --strip-debug
+--
+2.35.1
+
package/rtl8189fs/rtl8189fs.mk +0 -0
index 6031a3072c..1c398919ba 100644

package/rtl8189fs/rtl8189fs.mk RTL8189FS_LICENSE = GPL-2.0 · line 18

Quoted 9 lines
package/rtl8189fs/rtl8189fs.mk +2 -1
@@ -11,7 +11,8 @@ RTL8189FS_LICENSE = GPL-2.0
  RTL8189FS_MODULE_MAKE_OPTS = \
  	CONFIG_RTL8189FS=m \
  	KVER=$(LINUX_VERSION_PROBED) \
-	KSRC=$(LINUX_DIR)
+	KSRC=$(LINUX_DIR) \
+	USER_EXTRA_CFLAGS="-DCONFIG_$(call qstrip,$(BR2_ENDIAN))_ENDIAN"
 
  define RTL8189FS_LINUX_CONFIG_FIXUPS
  	$(call KCONFIG_ENABLE_OPT,CONFIG_WIRELESS)

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot

#7 lore raw

Re: [Buildroot] [PATCH 3/3] package/rtl8189fs: fix big-endian builds

In reply to Sergey Matyukevich
Quoted 6 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Sergey" == Sergey Matyukevich <[email protected]> writes:

Fix rtl8189fs builds for big-endian platforms. For this purpose remove default little-endian configuration option from rtl8189fs Makefile. Configure proper endianness using USER_EXTRA_CFLAGS instead.

Quoted 6 lines

Fixes:
- http://autobuild.buildroot.net/results/51e95561103e40ae94f38b9bb944bdfcd4ab50ed/
- http://autobuild.buildroot.net/results/8ac7921926ab48aeb95dc4ea20f3c9970094c71d/
- http://autobuild.buildroot.net/results/7f0bdd03c41bcc9e567fe722ed271e5dcf210f44/

Committed to 2022.02.x, thanks.

Signature · 5 lines
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot