hak5
/
openwrt-owl
mirror of https://github.com/hak5/openwrt-owl.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

kernel: modules: fix kmod-regmap redux 

Jonas Gorski commented on the previous patch:
|This is actually the wrong fix and papers over an issue in one of our
|local patches.
|
|We intentionally allow regmap to be built as a module, see
|
|/target/linux/generic/hack-4.14/259-regmap_dynamic.patch
|[...]
|[The regulator code] optionally supports regmap thanks to the stubs
|provided if regmap is disabled - which breaks if you compile regmap
|as a module.

In order to mitigate this issue, this patch reverts the previous patch
and replaces the existing IS_ENABLED(CONFIG_REGMAP) with
IS_REACHABLE(CONFIG_REGMAP). This solves this particular issue as the
regulator code will now automatically fallback to the regmap stubs in
case the kmod-regmap module is enabled, but nothing else sets
CONFIG_REGMAP=y.

Note: There's still a potential issue that this patch doesn't solve:
If someone ever wants to make a OpenWrt kernel package for a
regulator module that requires the REGMAP feature for a target that
doesn't set CONFIG_REGMAP=y but has CONFIG_REGULATOR=y, the resulting
kmod-regulator-xyz package will not work on the target.
Luckily, there aren't any in-tree OpenWrt kernel module packages for
regulators at the moment. On the bright side: regmap is a critical
part nowadays and all new and upcoming architectures require it by
default. This will likely only ever be a problem for legacy targets
and devices that cannot afford to enable REGMAP.

Cc: Jonas Gorski <jonas.gorski@gmail.com>
Cc: John Crispin <john@phrozen.org>
Fixes: d00913d121 ("kernel: modules: fix kmod-regmap")
Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
master
Christian Lamparter 2018-08-03 23:49:22 +02:00 committed by John Crispin
parent f6d81e2fa1
commit 3fce12568a
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package/kernel/linux/modules/other.mk
View File

@ -718,7 +718,7 @@ define KernelPackage/regmap
SUBMENU:=$(OTHER_MENU) SUBMENU:=$(OTHER_MENU)
TITLE:=Generic register map support TITLE:=Generic register map support
DEPENDS:=+kmod-lib-lzo +kmod-i2c-core DEPENDS:=+kmod-lib-lzo +kmod-i2c-core
KCONFIG:=CONFIG_REGMAP=y \ KCONFIG:=CONFIG_REGMAP \
CONFIG_REGMAP_MMIO \ CONFIG_REGMAP_MMIO \
CONFIG_REGMAP_SPI \ CONFIG_REGMAP_SPI \
CONFIG_REGMAP_I2C \ CONFIG_REGMAP_I2C \

2
target/linux/generic/hack-4.14/259-regmap_dynamic.patch
View File

@ -103,7 +103,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
}) })
-#ifdef CONFIG_REGMAP -#ifdef CONFIG_REGMAP
+#if IS_ENABLED(CONFIG_REGMAP) +#if IS_REACHABLE(CONFIG_REGMAP)
enum regmap_endian { enum regmap_endian {
/* Unspecified -> 0 -> Backwards compatible default */ /* Unspecified -> 0 -> Backwards compatible default */