Re: [OpenWrt-Devel] [PATCH] iproute2: revert add libcap support, enabled in ip-full

2020-03-16 Thread Hans Dedecker
Hi Mathias,

On Sun, Mar 15, 2020 at 11:40 PM Mathias Kresin  wrote:
>
> 05/03/2020 23:29, Alin Năstac:
> > On Thu, Mar 5, 2020 at 8:34 PM Mathias Kresin  wrote:
> >>
> >> This reverts commit a6da3f9ef746101b84a6f530f5a40de28341b69a.
> >
> > Not exactly a revert, since it keeps HAVE_CAP logic.
>
> Sure, I want to make sure that HAVE_CAP is really disabled.
>
> >> The libcap isn't as optional as the commit messages suggests. A hard
> >> dependency to the libcap package is added, which is only available in
> >> the external packages feed. Therefore it is impossible to package
> >> ip-full without having the external packages feed up and running, which
> >> is a regression to the former behaviour.
> >
> > The libcap support is by all means optional, otherwise iproute2 build
> > will fail when its missing.
>
> You describe exactly the issue I hit while building ip-full. During
> development I don't have any external/third-party feeds installed. And
> the OpenWrt base system shouldn't depend on external/third-party feeds.
> These feeds are an add on and by no means a requirement.
>
> > Besides, your commit actually removes this
> > dependency. If this is not a living proof of the facultative nature of
> > this dependency, I don't know what else is.
>
> Sorry, I don't get what you're trying to say.
>
> > One would argue that ip-full should correspond to the full fledged
> > version of the packet. If the dependency of an external package is the
> > issue, how about making a different variant with HAVE_CAP support? It
> > could be called ip-really-full (or ip-fullest).
>
> Try to get libcap into the OpenWrt base system and enable HAVE_CAP
> afterwards?
I'm in favor of this approach as currently a part of the ip-full
functionality is broken and I see ip-full for now and in the future as
a core package

Hans
>
> Mathias
>
> ___
> openwrt-devel mailing list
> openwrt-devel@lists.openwrt.org
> https://lists.openwrt.org/mailman/listinfo/openwrt-devel

___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel


Re: [OpenWrt-Devel] [PATCH] iproute2: revert add libcap support, enabled in ip-full

2020-03-16 Thread Alin Năstac
On Sun, Mar 15, 2020 at 11:40 PM Mathias Kresin  wrote:
>
> 05/03/2020 23:29, Alin Năstac:
> > On Thu, Mar 5, 2020 at 8:34 PM Mathias Kresin  wrote:
> >>
> >> This reverts commit a6da3f9ef746101b84a6f530f5a40de28341b69a.
> >
> > Not exactly a revert, since it keeps HAVE_CAP logic.
>
> Sure, I want to make sure that HAVE_CAP is really disabled.
>
> >> The libcap isn't as optional as the commit messages suggests. A hard
> >> dependency to the libcap package is added, which is only available in
> >> the external packages feed. Therefore it is impossible to package
> >> ip-full without having the external packages feed up and running, which
> >> is a regression to the former behaviour.
> >
> > The libcap support is by all means optional, otherwise iproute2 build
> > will fail when its missing.
>
> You describe exactly the issue I hit while building ip-full. During
> development I don't have any external/third-party feeds installed. And
> the OpenWrt base system shouldn't depend on external/third-party feeds.
> These feeds are an add on and by no means a requirement.
>
> > Besides, your commit actually removes this
> > dependency. If this is not a living proof of the facultative nature of
> > this dependency, I don't know what else is.
>
> Sorry, I don't get what you're trying to say.

I'm trying to say that libcap dependency is optional from iproute2 tarball pov.

I guess you were trying to say that openwrt +libcap dependency was not
optional, but I don't really understand why you think it isn't. ip
package has 2 variants (tiny and full) and I only enabled it on
ip-full variant.Since the variant selection is at user's discretion,
the ip openwrt package dependency of libcap *is* - by all means of the
word - optional.

> > One would argue that ip-full should correspond to the full fledged
> > version of the packet. If the dependency of an external package is the
> > issue, how about making a different variant with HAVE_CAP support? It
> > could be called ip-really-full (or ip-fullest).
>
> Try to get libcap into the OpenWrt base system and enable HAVE_CAP
> afterwards?

As I said in the previous message, my use case doesn't require libcap
functionality, so I have no problem with disabling HAVE_CAP in the
full variant, but from the semantic pov, full should really mean "all
functionality enabled". Maybe it would be wise to create a third
variant called standard that would be equivalent with the full variant
minus HAVE_CAP.

___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel


[OpenWrt-Devel] [PATCH] bcm27xx: switch to 5.4 kernel

2020-03-16 Thread Petr Štetiar
Been running it for a few days on RPi0W PMS sensor node and on RPi4.
Lets start wider userbase testing.

Cc: Stijn Tintel 
Cc: Álvaro Fernández Rojas 
Signed-off-by: Petr Štetiar 
---
 target/linux/bcm27xx/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/target/linux/bcm27xx/Makefile b/target/linux/bcm27xx/Makefile
index 7cc2aab7009b..e7585776afc9 100644
--- a/target/linux/bcm27xx/Makefile
+++ b/target/linux/bcm27xx/Makefile
@@ -13,7 +13,7 @@ BOARDNAME:=Broadcom BCM27xx
 FEATURES:=ext4 audio usb usbgadget display gpio fpu squashfs rootfs-part 
boot-part
 SUBTARGETS:=bcm2708 bcm2709 bcm2710 bcm2711
 
-KERNEL_PATCHVER:=4.19
+KERNEL_PATCHVER:=5.4
 KERNEL_TESTING_PATCHVER=5.4
 
 define Target/Description

___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel


[OpenWrt-Devel] [PATCH] ipq40xx: 5.4: fix of_get_mac_address obsolete usage OOPs

2020-03-16 Thread Petr Štetiar
of_get_mac_address returns valid pointer or ERR_PTR since 5.2 via commit
d01f449c008a ("of_net: add NVMEM support to of_get_mac_address") so the
patch fixes following OOPs on nbg6617:

 Unable to handle kernel paging request at virtual address ffed
 CPU: 1 PID: 1 Comm: swapper/0 Not tainted 5.4.24 #0
 PC is at edma_axi_probe+0x444/0x1114
 LR is at bus_find_device+0x88/0x9c

Where the PC can be resolved to:

 >>> l *edma_axi_probe+0x444
 0xc067be5c is in edma_axi_probe (./include/linux/string.h:378).

 >>> l *edma_axi_probe+0x43f
 0xc067be57 is in edma_axi_probe 
(drivers/net/ethernet/qualcomm/essedma/edma_axi.c:936)

Which leads to the following code fragment:

 935  mac_addr = of_get_mac_address(pnp);
 936  if (mac_addr)
 937  memcpy(edma_netdev[idx_mac]->dev_addr, mac_addr, ETH_ALEN);

Where using mac_addr=0xffed (-ENODEV) as source address in memcpy()
is causing the OOPs.

Signed-off-by: Petr Štetiar 
---
 .../files-5.4/drivers/net/ethernet/qualcomm/essedma/edma_axi.c  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/target/linux/ipq40xx/files-5.4/drivers/net/ethernet/qualcomm/essedma/edma_axi.c
 
b/target/linux/ipq40xx/files-5.4/drivers/net/ethernet/qualcomm/essedma/edma_axi.c
index db5eac2f0300..b619bbbab9d8 100644
--- 
a/target/linux/ipq40xx/files-5.4/drivers/net/ethernet/qualcomm/essedma/edma_axi.c
+++ 
b/target/linux/ipq40xx/files-5.4/drivers/net/ethernet/qualcomm/essedma/edma_axi.c
@@ -933,7 +933,7 @@ static int edma_axi_probe(struct platform_device *pdev)
}
 
mac_addr = of_get_mac_address(pnp);
-   if (mac_addr)
+   if (!IS_ERR(mac_addr))
memcpy(edma_netdev[idx_mac]->dev_addr, mac_addr, 
ETH_ALEN);
 
idx_mac++;

___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel


[OpenWrt-Devel] [PATCH 1/2] ath79: fix mikrotik WAP G-5HacT2HnD mtd partitions

2020-03-16 Thread Thibaut VARÈNE
In RouterBOARD parlance there never was an "art" partition.
This partition has always been named 'hard_config' on ar71xx.

This partition contains more than just ART (Atheros Radio Test) data. It
includes the hardware description (product code, serial, board
identifier, name, hardware options, MAC address), as well as other bits
affecting the operation of RouterBoot.
To avoid confusion with regular ART data, this partition is renamed in
line with historical ar71xx and ramips nomenclature as 'hard_config'.

This commit fixes the previous support files and implements the nested
RouterBoot partition scheme as already used by ramips-based SPI-NOR
RouterBOARD DTSes, as previously reviewed and implemented in bbe2cf657c.

Tested-by: Roger Pueyo Centelles 
Signed-off-by: Thibaut VARÈNE 
---
 ...ca9556_mikrotik_routerboard-wap-g-5hact2hnd.dts | 61 +-
 .../etc/hotplug.d/firmware/10-ath9k-eeprom |  4 +-
 .../etc/hotplug.d/firmware/11-ath10k-caldata   |  2 +-
 3 files changed, 38 insertions(+), 29 deletions(-)

diff --git 
a/target/linux/ath79/dts/qca9556_mikrotik_routerboard-wap-g-5hact2hnd.dts 
b/target/linux/ath79/dts/qca9556_mikrotik_routerboard-wap-g-5hact2hnd.dts
index 015bd2efe5..5fd4623726 100644
--- a/target/linux/ath79/dts/qca9556_mikrotik_routerboard-wap-g-5hact2hnd.dts
+++ b/target/linux/ath79/dts/qca9556_mikrotik_routerboard-wap-g-5hact2hnd.dts
@@ -53,7 +53,7 @@
 ð1 {
status = "okay";
 
-   mtd-mac-address = <&art 0x10>;
+   mtd-mac-address = <&hard_config 0x10>;
 
pll-data = <0x03000101 0x8101 0x80001313>;
phy-handle = <&phy0>;
@@ -81,32 +81,41 @@
#size-cells = <1>;
 
partition@0 {
-   label = "routerboot";
-   reg = <0x00 0x00e000>;
+   label = "RouterBoot";
+   reg = <0x0 0x2>;
read-only;
-   };
-
-   art: partition@e000 {
-   label = "art";
-   reg = <0x000e000 0x001000>;
-   read-only;
-   };
-
-   partition@f000 {
-   label = "bios";
-   reg = <0x000f000 0x001000>;
-   read-only;
-   };
-
-   partition@1 {
-   label = "routerboot2";
-   reg = <0x01 0x00f000>;
-   read-only;
-   };
-
-   partition@1f000 {
-   label = "soft_config";
-   reg = <0x001f000 0x001000>;
+   compatible = "fixed-partitions";
+   #address-cells = <1>;
+   #size-cells = <1>;
+
+   partition@0 {
+   label = "bootloader1";
+   reg = <0x0 0xe000>;
+   read-only;
+   };
+
+   hard_config: partition@e000 {
+   label = "hard_config";
+   reg = <0xe000 0x1000>;
+   read-only;
+   };
+
+   partition@f000 {
+   label = "bios";
+   reg = <0xf000 0x1000>;
+   read-only;
+   };
+
+   partition@1 {
+   label = "bootloader2";
+   reg = <0x1 0xf000>;
+   read-only;
+   };
+
+   partition@1f000 {
+   label = "soft_config";
+   reg = <0x1f000 0x1000>;
+   };
};
 
partition@2 {
diff --git 
a/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom 
b/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom
index b06a481c94..66bc3cb880 100644
--- 
a/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom
+++ 
b/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom
@@ -43,8 +43,8 @@ case "$FIRMWARE" in
ath9k_patch_mac $(mtd_get_mac_ascii u-boot-env ethaddr)
;;
mikrotik,routerboard-wap-g-5hact2hnd)
-   mikrotik_caldata_extract "art" 0x1000 0x440
-   ath9k_patch_ma

[OpenWrt-Devel] [PATCH 2/2] ath79: rename mikrotik RB 922UAGS-5HPacD mtd partition

2020-03-16 Thread Thibaut VARÈNE
In RouterBOARD parlance there never was an "art" partition.
This partition has always been named 'hard_config' on ar71xx.

This partition contains more than just ART (Atheros Radio Test) data. It
includes the hardware description (product code, serial, board
identifier, name, hardware options, MAC address), as well as other bits
affecting the operation of RouterBoot.
To avoid confusion with regular ART data, this partition is renamed in
line with historical ar71xx and ramips nomenclature as 'hard_config'.

This commit fixes the previous support files.

Signed-off-by: Thibaut VARÈNE 
---
 .../linux/ath79/dts/qca9558_mikrotik_routerboard-922uags-5hpacd.dts | 6 +++---
 .../ath79/nand/base-files/etc/hotplug.d/firmware/11-ath10k-caldata  | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git 
a/target/linux/ath79/dts/qca9558_mikrotik_routerboard-922uags-5hpacd.dts 
b/target/linux/ath79/dts/qca9558_mikrotik_routerboard-922uags-5hpacd.dts
index 26a18ad6a7..3f2a1a51a6 100644
--- a/target/linux/ath79/dts/qca9558_mikrotik_routerboard-922uags-5hpacd.dts
+++ b/target/linux/ath79/dts/qca9558_mikrotik_routerboard-922uags-5hpacd.dts
@@ -80,7 +80,7 @@
 ð0 {
status = "okay";
 
-   mtd-mac-address = <&art 0x10>;
+   mtd-mac-address = <&hard_config 0x10>;
phy-handle = <&phy4>;
pll-data = <0x8f00 0xa101 0xa0001313>;
 
@@ -109,8 +109,8 @@
read-only;
};
 
-   art: partition@c000 {
-   label = "art";
+   hard_config: partition@c000 {
+   label = "hard_config";
reg = <0x000c000 0x0001000>;
read-only;
};
diff --git 
a/target/linux/ath79/nand/base-files/etc/hotplug.d/firmware/11-ath10k-caldata 
b/target/linux/ath79/nand/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
index 8a1bed58c1..31a1db5aeb 100644
--- 
a/target/linux/ath79/nand/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
+++ 
b/target/linux/ath79/nand/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
@@ -28,7 +28,7 @@ case "$FIRMWARE" in
 "ath10k/cal-pci-:01:00.0.bin")
case $board in
mikrotik,routerboard-922uags-5hpacd)
-   mikrotik_caldata_extract "art" 0x5000 0x844
+   mikrotik_caldata_extract "hard_config" 0x5000 0x844
;;
esac
;;
-- 
2.11.0


___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel


[OpenWrt-Devel] [PATCH 2/2] kernel: rtl8367b: add configuration for extif2

2020-03-16 Thread Chuanhong Guo
From: Serge Vasilugin 

Both rtl8367b and rtl8367s have two extended interface
rtl8367rb: 5 port + 2*RGMII/MII
rtl8367s:  5 port + SGMII/HSGMI + RGMII/MII
(?)rtl8367sb:  5 port + 2*RGMII/MII
These interfaces correspond to EXT1 and EXT2 (ports 6 and 7 respectivly).

This patch allow to configure EXT2 in dts-file:

rtl8367rb {
compatible = "realtek,rtl8367b";
cpu_port = <7>;
realtek,extif2 = <1 0 1 1 1 1 1 1 2>;
mii-bus = <&mdio0>;
phy_id = <29>;
};

Signed-off-by: Serge Vasilugin 
[fix indent, replace magic value, alter commit message]
Signed-off-by: Chuanhong Guo 
---
 .../generic/files/drivers/net/phy/rtl8367b.c  | 44 +--
 1 file changed, 40 insertions(+), 4 deletions(-)

diff --git a/target/linux/generic/files/drivers/net/phy/rtl8367b.c 
b/target/linux/generic/files/drivers/net/phy/rtl8367b.c
index ede8b21a64..1841001c9a 100644
--- a/target/linux/generic/files/drivers/net/phy/rtl8367b.c
+++ b/target/linux/generic/files/drivers/net/phy/rtl8367b.c
@@ -148,12 +148,28 @@
GENMASK(2 + (_x) * 8, (_x) * 8)
 #define   RTL8367B_DEBUG1_DP_SHIFT(_x) ((_x) * 8)
 
+#define RTL8367B_CHIP_DEBUG2_REG   0x13e2
+#define   RTL8367B_DEBUG2_RG2_DN_MASK  GENMASK(8, 6)
+#define   RTL8367B_DEBUG2_RG2_DN_SHIFT 6
+#define   RTL8367B_DEBUG2_RG2_DP_MASK  GENMASK(5, 3)
+#define   RTL8367B_DEBUG2_RG2_DP_SHIFT 3
+#define   RTL8367B_DEBUG2_DRI_EXT2_RG  BIT(2)
+#define   RTL8367B_DEBUG2_DRI_EXT2 BIT(1)
+#define   RTL8367B_DEBUG2_SLR_EXT2 BIT(0)
+
 #define RTL8367B_DIS_REG   0x1305
 #define   RTL8367B_DIS_SKIP_MII_RXER(_x)   BIT(12 + (_x))
 #define   RTL8367B_DIS_RGMII_SHIFT(_x) (4 * (_x))
 #define   RTL8367B_DIS_RGMII_MASK  0x7
 
-#define RTL8367B_EXT_RGMXF_REG(_x) (0x1306 + (_x))
+#define RTL8367B_DIS2_REG  0x13c3
+#define   RTL8367B_DIS2_SKIP_MII_RXER_SHIFT4
+#define   RTL8367B_DIS2_SKIP_MII_RXER  0x10
+#define   RTL8367B_DIS2_RGMII_SHIFT0
+#define   RTL8367B_DIS2_RGMII_MASK 0xf
+
+#define RTL8367B_EXT_RGMXF_REG(_x) \
+ ((_x) == 2 ? 0x13c5 : 0x1306 + (_x))
 #define   RTL8367B_EXT_RGMXF_DUMMY0_SHIFT  5
 #define   RTL8367B_EXT_RGMXF_DUMMY0_MASK   0x7ff
 #define   RTL8367B_EXT_RGMXF_TXDELAY_SHIFT 3
@@ -780,6 +796,17 @@ static int rtl8367b_extif_set_mode(struct rtl8366_smi 
*smi, int id,
RTL8367B_DEBUG1_DP_MASK(id),
(7 << RTL8367B_DEBUG1_DN_SHIFT(id)) |
(7 << RTL8367B_DEBUG1_DP_SHIFT(id)));
+   } else {
+   REG_RMW(smi, RTL8367B_CHIP_DEBUG1_REG,
+   RTL8367B_DEBUG2_DRI_EXT2 |
+   RTL8367B_DEBUG2_DRI_EXT2_RG |
+   RTL8367B_DEBUG2_SLR_EXT2 |
+   RTL8367B_DEBUG2_RG2_DN_MASK |
+   RTL8367B_DEBUG2_RG2_DP_MASK,
+   RTL8367B_DEBUG2_DRI_EXT2_RG |
+   RTL8367B_DEBUG2_SLR_EXT2 |
+   (7 << RTL8367B_DEBUG2_RG2_DN_SHIFT) |
+   (7 << RTL8367B_DEBUG2_RG2_DP_SHIFT));
}
break;
 
@@ -810,9 +837,14 @@ static int rtl8367b_extif_set_mode(struct rtl8366_smi 
*smi, int id,
return -EINVAL;
}
 
-   REG_RMW(smi, RTL8367B_DIS_REG,
-   RTL8367B_DIS_RGMII_MASK << RTL8367B_DIS_RGMII_SHIFT(id),
-   mode << RTL8367B_DIS_RGMII_SHIFT(id));
+   if (id <= 1)
+   REG_RMW(smi, RTL8367B_DIS_REG,
+   RTL8367B_DIS_RGMII_MASK << RTL8367B_DIS_RGMII_SHIFT(id),
+   mode << RTL8367B_DIS_RGMII_SHIFT(id));
+   else
+   REG_RMW(smi, RTL8367B_DIS2_REG,
+   RTL8367B_DIS2_RGMII_MASK << RTL8367B_DIS2_RGMII_SHIFT,
+   mode << RTL8367B_DIS2_RGMII_SHIFT);
 
return 0;
 }
@@ -956,6 +988,10 @@ static int rtl8367b_setup(struct rtl8366_smi *smi)
err = rtl8367b_extif_init_of(smi, 1, "realtek,extif1");
if (err)
return err;
+
+   err = rtl8367b_extif_init_of(smi, 2, "realtek,extif2");
+   if (err)
+   return err;
} else {
err = rtl8367b_extif_init(smi, 0, pdata->extif0_cfg);
if (err)
-- 
2.24.1


___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel


[OpenWrt-Devel] [PATCH] libnftnl: bump to 1.1.5

2020-03-16 Thread Kevin Darbyshire-Bryant
Solve missing references to nftnl_set_list_lookup_byname when building
iptables with Nftables support enabled (CONFIG_IPTABLES_NFTABLES)

/Users/kevin/wrt/staging_dir/toolchain-x86_64_gcc-9.2.0_musl/lib/gcc/x86_64-openwrt-linux-musl/9.2.0/../../../../x86_64-openwrt-linux-musl/bin/ld:
 xtables_nft_multi-nft-bridge.o: in function `nft_bridge_parse_lookup':
nft-bridge.c:(.text.nft_bridge_parse_lookup+0xcd): undefined reference to 
`nftnl_set_list_lookup_byname'
/Users/kevin/wrt/staging_dir/toolchain-x86_64_gcc-9.2.0_musl/lib/gcc/x86_64-openwrt-linux-musl/9.2.0/../../../../x86_64-openwrt-linux-musl/bin/ld:
 xtables_nft_multi-nft-cache.o: in function `nftnl_set_list_cb':
nft-cache.c:(.text.nftnl_set_list_cb+0x80): undefined reference to 
`nftnl_set_list_lookup_byname'
/Users/kevin/wrt/staging_dir/toolchain-x86_64_gcc-9.2.0_musl/lib/gcc/x86_64-openwrt-linux-musl/9.2.0/../../../../x86_64-openwrt-linux-musl/bin/ld:
 xtables_nft_multi-nft-cache.o: in function `fetch_set_cache':
nft-cache.c:(.text.fetch_set_cache+0x10a): undefined reference to 
`nftnl_set_list_lookup_byname'
collect2: error: ld returned 1 exit status
make[6]: *** [xtables-nft-multi] Error 1
make[5]: *** [all] Error 2
make[4]: *** [all-recursive] Error 1
make[3]: *** [all] Error 2
make[2]: *** 
[/Users/kevin/wrt/build_dir/target-x86_64_musl/linux-x86_64/iptables-1.8.4/.built]
 Error 2
make[2]: Leaving directory `/Users/kevin/wrt/package/network/utils/iptables'

Signed-off-by: Kevin Darbyshire-Bryant 
---
 package/libs/libnftnl/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/libs/libnftnl/Makefile b/package/libs/libnftnl/Makefile
index 6b7d70c006..4c878f85f8 100644
--- a/package/libs/libnftnl/Makefile
+++ b/package/libs/libnftnl/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libnftnl
-PKG_VERSION:=1.1.4
+PKG_VERSION:=1.1.5
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=https://netfilter.org/projects/$(PKG_NAME)/files
-PKG_HASH:=c8c7988347adf261efac5bba59f8e5f995ffb65f247a88cc144e69620573ed20
+PKG_HASH:=66de4d05227c0a1a731c369b193010d18a05b1185c2735211e0ecf658eeb14f3
 PKG_MAINTAINER:=Steven Barth 
 PKG_LICENSE:=GPL-2.0+
 
-- 
2.21.1 (Apple Git-122.3)


___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel


[OpenWrt-Devel] [PATCH 1/2] generic: rtl8367b: add definition of debug reg

2020-03-16 Thread Chuanhong Guo
This commit adds definition of DEBUG0 and DEBUG1 registers and replace
magic values with proper register modifying.

Signed-off-by: Chuanhong Guo 
---
 .../generic/files/drivers/net/phy/rtl8367b.c  | 35 ---
 1 file changed, 30 insertions(+), 5 deletions(-)

diff --git a/target/linux/generic/files/drivers/net/phy/rtl8367b.c 
b/target/linux/generic/files/drivers/net/phy/rtl8367b.c
index be9f74f888..ede8b21a64 100644
--- a/target/linux/generic/files/drivers/net/phy/rtl8367b.c
+++ b/target/linux/generic/files/drivers/net/phy/rtl8367b.c
@@ -133,9 +133,20 @@
 #define   RTL8367B_CHIP_MODE_MASK  0x7
 
 #define RTL8367B_CHIP_DEBUG0_REG   0x1303
-#define   RTL8367B_CHIP_DEBUG0_DUMMY0(_x)  BIT(8 + (_x))
+#define   RTL8367B_DEBUG0_SEL33(_x)BIT(8 + (_x))
+#define   RTL8367B_DEBUG0_DRI_OTHERBIT(7)
+#define   RTL8367B_DEBUG0_DRI_RG(_x)   BIT(5 + (_x))
+#define   RTL8367B_DEBUG0_DRI(_x)  BIT(3 + (_x))
+#define   RTL8367B_DEBUG0_SLR_OTHERBIT(2)
+#define   RTL8367B_DEBUG0_SLR(_x)  BIT(_x)
 
 #define RTL8367B_CHIP_DEBUG1_REG   0x1304
+#define   RTL8367B_DEBUG1_DN_MASK(_x)  \
+   GENMASK(6 + (_x)*8, 4 + (_x)*8)
+#define   RTL8367B_DEBUG1_DN_SHIFT(_x) (4 + (_x) * 8)
+#define   RTL8367B_DEBUG1_DP_MASK(_x)  \
+   GENMASK(2 + (_x) * 8, (_x) * 8)
+#define   RTL8367B_DEBUG1_DP_SHIFT(_x) ((_x) * 8)
 
 #define RTL8367B_DIS_REG   0x1305
 #define   RTL8367B_DIS_SKIP_MII_RXER(_x)   BIT(12 + (_x))
@@ -754,8 +765,22 @@ static int rtl8367b_extif_set_mode(struct rtl8366_smi 
*smi, int id,
switch (mode) {
case RTL8367_EXTIF_MODE_RGMII:
case RTL8367_EXTIF_MODE_RGMII_33V:
-   REG_WR(smi, RTL8367B_CHIP_DEBUG0_REG, 0x0367);
-   REG_WR(smi, RTL8367B_CHIP_DEBUG1_REG, 0x);
+   REG_RMW(smi, RTL8367B_CHIP_DEBUG0_REG,
+   RTL8367B_DEBUG0_SEL33(id),
+   RTL8367B_DEBUG0_SEL33(id));
+   if (id <= 1) {
+   REG_RMW(smi, RTL8367B_CHIP_DEBUG0_REG,
+   RTL8367B_DEBUG0_DRI(id) |
+   RTL8367B_DEBUG0_DRI_RG(id) |
+   RTL8367B_DEBUG0_SLR(id),
+   RTL8367B_DEBUG0_DRI_RG(id) |
+   RTL8367B_DEBUG0_SLR(id));
+   REG_RMW(smi, RTL8367B_CHIP_DEBUG1_REG,
+   RTL8367B_DEBUG1_DN_MASK(id) |
+   RTL8367B_DEBUG1_DP_MASK(id),
+   (7 << RTL8367B_DEBUG1_DN_SHIFT(id)) |
+   (7 << RTL8367B_DEBUG1_DP_SHIFT(id)));
+   }
break;
 
case RTL8367_EXTIF_MODE_TMII_MAC:
@@ -766,8 +791,8 @@ static int rtl8367b_extif_set_mode(struct rtl8366_smi *smi, 
int id,
 
case RTL8367_EXTIF_MODE_GMII:
REG_RMW(smi, RTL8367B_CHIP_DEBUG0_REG,
-   RTL8367B_CHIP_DEBUG0_DUMMY0(id),
-   RTL8367B_CHIP_DEBUG0_DUMMY0(id));
+   RTL8367B_DEBUG0_SEL33(id),
+   RTL8367B_DEBUG0_SEL33(id));
REG_RMW(smi, RTL8367B_EXT_RGMXF_REG(id), BIT(6), BIT(6));
break;
 
-- 
2.24.1


___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel


Re: [OpenWrt-Devel] [PATCH] iproute2: revert add libcap support, enabled in ip-full

2020-03-16 Thread Stijn Tintel
On 16/03/2020 09:37, Hans Dedecker wrote:
>>> One would argue that ip-full should correspond to the full fledged
>>> version of the packet. If the dependency of an external package is the
>>> issue, how about making a different variant with HAVE_CAP support? It
>>> could be called ip-really-full (or ip-fullest).
Yet another ip package seems messy to me.
>> Try to get libcap into the OpenWrt base system and enable HAVE_CAP
>> afterwards?
> I'm in favor of this approach as currently a part of the ip-full
> functionality is broken and I see ip-full for now and in the future as
> a core package
>
+1 for moving libcap to core. Other packages could benefit from it too
(lldpd comes to mind).

Stijn


___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel


[OpenWrt-Devel] core package definition, 2nd attempt [Was: Re: [PATCH] iproute2: ... ]

2020-03-16 Thread Petr Štetiar
Hans Dedecker  [2020-03-16 08:37:49]:

Hi,

> > > On Thu, Mar 5, 2020 at 8:34 PM Mathias Kresin  wrote:
> >
> > Try to get libcap into the OpenWrt base system and enable HAVE_CAP
> > afterwards?
>
> I'm in favor of this approach as currently a part of the ip-full
> functionality is broken and I see ip-full for now and in the future as
> a core package.

Why do you think so? Can you try to define what is "core package" from your
point of view? Why should this iproute2 package be in the main tree, why it
doesn't belong into package feeds?

Stijn Tintel  [2020-03-16 13:50:20]:

> +1 for moving libcap to core. Other packages could benefit from it too
> (lldpd comes to mind).

IMHO lldpd should be probably moved to package feeds as well

1. http://lists.infradead.org/pipermail/openwrt-devel/2019-August/018399.html

-- ynezz

___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel


Re: [OpenWrt-Devel] [PATCH 3/3] base-files: move find_mtd_chardev() to /lib/functions.sh

2020-03-16 Thread mans0n

On 2020-03-14 01:11, Adrian Schmutzler wrote:

While find_mtd_index() and find_mtd_part() are located in
/lib/functions.sh, find_mtd_chardev() has been located in
/lib/functions/system.sh.

Move the latter to the former file to keep similar functions
together.


Umm, what about mtd_get_part_size()? It also seems more related to mtd 
rather than macaddr.




While at it, fix some corresponding includes.

Signed-off-by: Adrian Schmutzler 
---
  package/base-files/Makefile   | 2 +-
  package/base-files/files/lib/functions.sh | 8 
  package/base-files/files/lib/functions/system.sh  | 8 
  .../ath79/base-files/lib/functions/mikrotik-caldata.sh| 2 ++
  .../linux/lantiq/xrx200/base-files/etc/board.d/02_network | 1 +
  5 files changed, 12 insertions(+), 9 deletions(-)



___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel


[OpenWrt-Devel] [PATCH 2/2] toolchain: Update GCC 9 to version 9.3.0

2020-03-16 Thread Hauke Mehrtens
The removed patch is included in GCC 9.3.0.

Signed-off-by: Hauke Mehrtens 
---
 toolchain/gcc/Config.version  |  2 +-
 toolchain/gcc/common.mk   |  4 +-
 ...uninitialised_use_in_mips_split_move.patch | 55 ---
 .../002-case_insensitive.patch|  0
 .../{9.2.0 => 9.3.0}/010-documentation.patch  |  2 +-
 .../110-Fix-MIPS-PR-84790.patch   |  0
 .../{9.2.0 => 9.3.0}/230-musl_libssp.patch|  0
 .../300-mips_Os_cpu_rtx_cost_model.patch  |  0
 .../810-arm-softfloat-libgcc.patch|  0
 .../{9.2.0 => 9.3.0}/820-libgcc_pic.patch |  0
 .../840-armv4_pass_fix-v4bx_to_ld.patch   |  0
 .../850-use_shared_libgcc.patch   |  0
 .../851-libgcc_no_compat.patch|  0
 .../870-ppc_no_crtsavres.patch|  2 +-
 .../{9.2.0 => 9.3.0}/881-no_tm_section.patch  |  0
 .../{9.2.0 => 9.3.0}/900-bad-mips16-crt.patch |  0
 .../{9.2.0 => 9.3.0}/910-mbsd_multi.patch |  2 +-
 .../920-specs_nonfatal_getenv.patch   |  0
 .../930-fix-mips-noexecstack.patch|  0
 ...ibffi-fix-MIPS-softfloat-build-issue.patch |  0
 ...mpilation-when-making-cross-compiler.patch |  0
 21 files changed, 6 insertions(+), 61 deletions(-)
 delete mode 100644 
toolchain/gcc/patches/9.2.0/100-Fix_uninitialised_use_in_mips_split_move.patch
 rename toolchain/gcc/patches/{9.2.0 => 9.3.0}/002-case_insensitive.patch (100%)
 rename toolchain/gcc/patches/{9.2.0 => 9.3.0}/010-documentation.patch (94%)
 rename toolchain/gcc/patches/{9.2.0 => 9.3.0}/110-Fix-MIPS-PR-84790.patch 
(100%)
 rename toolchain/gcc/patches/{9.2.0 => 9.3.0}/230-musl_libssp.patch (100%)
 rename toolchain/gcc/patches/{9.2.0 => 
9.3.0}/300-mips_Os_cpu_rtx_cost_model.patch (100%)
 rename toolchain/gcc/patches/{9.2.0 => 9.3.0}/810-arm-softfloat-libgcc.patch 
(100%)
 rename toolchain/gcc/patches/{9.2.0 => 9.3.0}/820-libgcc_pic.patch (100%)
 rename toolchain/gcc/patches/{9.2.0 => 
9.3.0}/840-armv4_pass_fix-v4bx_to_ld.patch (100%)
 rename toolchain/gcc/patches/{9.2.0 => 9.3.0}/850-use_shared_libgcc.patch 
(100%)
 rename toolchain/gcc/patches/{9.2.0 => 9.3.0}/851-libgcc_no_compat.patch (100%)
 rename toolchain/gcc/patches/{9.2.0 => 9.3.0}/870-ppc_no_crtsavres.patch (84%)
 rename toolchain/gcc/patches/{9.2.0 => 9.3.0}/881-no_tm_section.patch (100%)
 rename toolchain/gcc/patches/{9.2.0 => 9.3.0}/900-bad-mips16-crt.patch (100%)
 rename toolchain/gcc/patches/{9.2.0 => 9.3.0}/910-mbsd_multi.patch (98%)
 rename toolchain/gcc/patches/{9.2.0 => 9.3.0}/920-specs_nonfatal_getenv.patch 
(100%)
 rename toolchain/gcc/patches/{9.2.0 => 9.3.0}/930-fix-mips-noexecstack.patch 
(100%)
 rename toolchain/gcc/patches/{9.2.0 => 
9.3.0}/931-libffi-fix-MIPS-softfloat-build-issue.patch (100%)
 rename toolchain/gcc/patches/{9.2.0 => 
9.3.0}/960-gotools-fix-compilation-when-making-cross-compiler.patch (100%)

diff --git a/toolchain/gcc/Config.version b/toolchain/gcc/Config.version
index a6306990d9f8..6fbc6d980468 100644
--- a/toolchain/gcc/Config.version
+++ b/toolchain/gcc/Config.version
@@ -14,7 +14,7 @@ config GCC_VERSION
string
default "5.5.0" if GCC_VERSION_5
default "7.5.0" if GCC_VERSION_7
-   default "9.2.0" if GCC_VERSION_9
+   default "9.3.0" if GCC_VERSION_9
default "8.4.0"
 
 config GCC_USE_IREMAP
diff --git a/toolchain/gcc/common.mk b/toolchain/gcc/common.mk
index 0105ec8720b0..5f237e4520fb 100644
--- a/toolchain/gcc/common.mk
+++ b/toolchain/gcc/common.mk
@@ -40,8 +40,8 @@ ifeq ($(PKG_VERSION),8.4.0)
   PKG_HASH:=e30a6e52d10e1f27ed55104ad233c30bd1e99cfb5ff98ab022dc941edd1b2dd4
 endif
 
-ifeq ($(PKG_VERSION),9.2.0)
-  PKG_HASH:=ea6ef08f121239da5695f76c9b33637a118dcf63e24164422231917fa61fb206
+ifeq ($(PKG_VERSION),9.3.0)
+  PKG_HASH:=71e197867611f6054aa1119b13a0c0abac12834765fe2d81f35ac57f84f742d1
 endif
 
 PATCH_DIR=../patches/$(GCC_VERSION)
diff --git 
a/toolchain/gcc/patches/9.2.0/100-Fix_uninitialised_use_in_mips_split_move.patch
 
b/toolchain/gcc/patches/9.2.0/100-Fix_uninitialised_use_in_mips_split_move.patch
deleted file mode 100644
index 3529a19d8c51..
--- 
a/toolchain/gcc/patches/9.2.0/100-Fix_uninitialised_use_in_mips_split_move.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From d57faea9337ad595d005687247c3322252f70ba1 Mon Sep 17 00:00:00 2001
-From: rsandifo 
-Date: Sun, 7 Jul 2019 09:49:14 +
-Subject: [PATCH] Fix uninitialised use in mips_split_move
-
-While testing the fix for PR91068, I hit an rtl checking failure
-while building newlib.  mips_split_move was decomposing an address that
-happened to be symbolic and then tried to access the REGNO of the base
-register field, which wasn't initialised but which by chance pointed to
-valid memory.
-
-2019-07-07  Richard Sandiford  
-
-gcc/
-   * config/mips/mips.c (mips_split_move): Zero-initialize addr
-   and check whether addr.reg is nonnull before using it.
-
-
-git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@273174 
1

[OpenWrt-Devel] [PATCH 1/2] toolchain: Update GCC 8 to version 8.4.0

2020-03-16 Thread Hauke Mehrtens
The removed patch is included in GCC 8.4.0.

Signed-off-by: Hauke Mehrtens 
---
 toolchain/gcc/Config.version  |  2 +-
 toolchain/gcc/common.mk   |  4 +--
 .../patches/8.3.0/090-rs6000-PR-89587.patch   | 30 ---
 .../002-case_insensitive.patch|  0
 .../{8.3.0 => 8.4.0}/010-documentation.patch  |  2 +-
 .../110-Fix-MIPS-PR-84790.patch   |  0
 .../{8.3.0 => 8.4.0}/230-musl_libssp.patch|  0
 .../300-mips_Os_cpu_rtx_cost_model.patch  |  2 +-
 .../800-arm_v5te_no_ldrd_strd.patch   |  0
 .../810-arm-softfloat-libgcc.patch|  0
 .../{8.3.0 => 8.4.0}/820-libgcc_pic.patch |  0
 .../840-armv4_pass_fix-v4bx_to_ld.patch   |  0
 .../850-use_shared_libgcc.patch   |  0
 .../851-libgcc_no_compat.patch|  0
 .../870-ppc_no_crtsavres.patch|  2 +-
 .../{8.3.0 => 8.4.0}/881-no_tm_section.patch  |  0
 .../{8.3.0 => 8.4.0}/900-bad-mips16-crt.patch |  0
 .../{8.3.0 => 8.4.0}/910-mbsd_multi.patch |  4 +--
 .../920-specs_nonfatal_getenv.patch   |  0
 .../930-fix-mips-noexecstack.patch|  2 +-
 ...ibffi-fix-MIPS-softfloat-build-issue.patch |  0
 ...mpilation-when-making-cross-compiler.patch |  0
 22 files changed, 9 insertions(+), 39 deletions(-)
 delete mode 100644 toolchain/gcc/patches/8.3.0/090-rs6000-PR-89587.patch
 rename toolchain/gcc/patches/{8.3.0 => 8.4.0}/002-case_insensitive.patch (100%)
 rename toolchain/gcc/patches/{8.3.0 => 8.4.0}/010-documentation.patch (94%)
 rename toolchain/gcc/patches/{8.3.0 => 8.4.0}/110-Fix-MIPS-PR-84790.patch 
(100%)
 rename toolchain/gcc/patches/{8.3.0 => 8.4.0}/230-musl_libssp.patch (100%)
 rename toolchain/gcc/patches/{8.3.0 => 
8.4.0}/300-mips_Os_cpu_rtx_cost_model.patch (91%)
 rename toolchain/gcc/patches/{8.3.0 => 8.4.0}/800-arm_v5te_no_ldrd_strd.patch 
(100%)
 rename toolchain/gcc/patches/{8.3.0 => 8.4.0}/810-arm-softfloat-libgcc.patch 
(100%)
 rename toolchain/gcc/patches/{8.3.0 => 8.4.0}/820-libgcc_pic.patch (100%)
 rename toolchain/gcc/patches/{8.3.0 => 
8.4.0}/840-armv4_pass_fix-v4bx_to_ld.patch (100%)
 rename toolchain/gcc/patches/{8.3.0 => 8.4.0}/850-use_shared_libgcc.patch 
(100%)
 rename toolchain/gcc/patches/{8.3.0 => 8.4.0}/851-libgcc_no_compat.patch (100%)
 rename toolchain/gcc/patches/{8.3.0 => 8.4.0}/870-ppc_no_crtsavres.patch (84%)
 rename toolchain/gcc/patches/{8.3.0 => 8.4.0}/881-no_tm_section.patch (100%)
 rename toolchain/gcc/patches/{8.3.0 => 8.4.0}/900-bad-mips16-crt.patch (100%)
 rename toolchain/gcc/patches/{8.3.0 => 8.4.0}/910-mbsd_multi.patch (97%)
 rename toolchain/gcc/patches/{8.3.0 => 8.4.0}/920-specs_nonfatal_getenv.patch 
(100%)
 rename toolchain/gcc/patches/{8.3.0 => 8.4.0}/930-fix-mips-noexecstack.patch 
(98%)
 rename toolchain/gcc/patches/{8.3.0 => 
8.4.0}/931-libffi-fix-MIPS-softfloat-build-issue.patch (100%)
 rename toolchain/gcc/patches/{8.3.0 => 
8.4.0}/960-gotools-fix-compilation-when-making-cross-compiler.patch (100%)

diff --git a/toolchain/gcc/Config.version b/toolchain/gcc/Config.version
index 7819e9d03974..a6306990d9f8 100644
--- a/toolchain/gcc/Config.version
+++ b/toolchain/gcc/Config.version
@@ -15,7 +15,7 @@ config GCC_VERSION
default "5.5.0" if GCC_VERSION_5
default "7.5.0" if GCC_VERSION_7
default "9.2.0" if GCC_VERSION_9
-   default "8.3.0"
+   default "8.4.0"
 
 config GCC_USE_IREMAP
bool
diff --git a/toolchain/gcc/common.mk b/toolchain/gcc/common.mk
index 24c923abef51..0105ec8720b0 100644
--- a/toolchain/gcc/common.mk
+++ b/toolchain/gcc/common.mk
@@ -36,8 +36,8 @@ ifeq ($(PKG_VERSION),7.5.0)
   PKG_HASH:=b81946e7f01f90528a1f7352ab08cc602b9ccc05d4e44da4bd501c5a189ee661
 endif
 
-ifeq ($(PKG_VERSION),8.3.0)
-  PKG_HASH:=64baadfe6cc0f4947a84cb12d7f0dfaf45bb58b7e92461639596c21e02d97d2c
+ifeq ($(PKG_VERSION),8.4.0)
+  PKG_HASH:=e30a6e52d10e1f27ed55104ad233c30bd1e99cfb5ff98ab022dc941edd1b2dd4
 endif
 
 ifeq ($(PKG_VERSION),9.2.0)
diff --git a/toolchain/gcc/patches/8.3.0/090-rs6000-PR-89587.patch 
b/toolchain/gcc/patches/8.3.0/090-rs6000-PR-89587.patch
deleted file mode 100644
index 83bfbbe712ef..
--- a/toolchain/gcc/patches/8.3.0/090-rs6000-PR-89587.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 045e60da05ec1d4997864883143a951f152cfc9f Mon Sep 17 00:00:00 2001
-From: jakub 
-Date: Tue, 30 Apr 2019 20:37:12 +
-Subject: [PATCH]   Backported from mainline2019-03-05  Jakub
- Jelinek  
-
-   PR target/89587
-   * config/rs6000/t-linux (MULTIARCH_DIRNAME): Set to non-empty only
-   if_multiarch.
-
-
-git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-8-branch@270720 
138bc75d-0d04-0410-961f-82ee72b054a4

- gcc/ChangeLog | 4 
- gcc/config/rs6000/t-linux | 2 +-
- 2 files changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/gcc/config/rs6000/t-linux b/gcc/config/rs6000/t-linux
-index acfde1f48aec..aeb7440c4920 100644
 a/gcc/config/rs6000/t-linux

[OpenWrt-Devel] [PATCH] bcm63xx: Report that effective affinity is a single target

2020-03-16 Thread Daniel Gonzalez Cabanelas
The bcm6345-periph-intc driver only targets a single CPU at a time, even if
the notional affinity is wider. Let's inform the core code about this.

This patch gets rid of the kernel message:
"genirq: irq_chip bcm6345-periph-intc did not update eff.
affinity mask of irq 52"
---
 ...qchip-add-support-for-bcm6345-style-periphery-irq-.patch | 6 --
 ...qchip-add-support-for-bcm6345-style-periphery-irq-.patch | 6 --
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git 
a/target/linux/bcm63xx/patches-4.14/320-irqchip-add-support-for-bcm6345-style-periphery-irq-.patch
 
b/target/linux/bcm63xx/patches-4.14/320-irqchip-add-support-for-bcm6345-style-periphery-irq-.patch
index 7235d1f96b..11666133b9 100644
--- 
a/target/linux/bcm63xx/patches-4.14/320-irqchip-add-support-for-bcm6345-style-periphery-irq-.patch
+++ 
b/target/linux/bcm63xx/patches-4.14/320-irqchip-add-support-for-bcm6345-style-periphery-irq-.patch
@@ -94,7 +94,7 @@ Signed-off-by: Jonas Gorski 
  obj-$(CONFIG_METAG_PERFCOUNTER_IRQS)  += irq-metag.o
 --- /dev/null
 +++ b/drivers/irqchip/irq-bcm6345-periph.c
-@@ -0,0 +1,339 @@
+@@ -0,0 +1,341 @@
 +/*
 + * This file is subject to the terms and conditions of the GNU General Public
 + * License.  See the file "COPYING" in the main directory of this archive
@@ -283,6 +283,8 @@ Signed-off-by: Jonas Gorski 
 +  }
 +  raw_spin_unlock_irqrestore(&priv->lock, flags);
 +
++  irq_data_update_effective_affinity(data, cpumask_of(cpu));
++
 +  return 0;
 +}
 +#endif
@@ -293,7 +295,7 @@ Signed-off-by: Jonas Gorski 
 +  struct intc_data *priv = d->host_data;
 +
 +  irq_set_chip_and_handler(irq, &priv->chip, handle_level_irq);
-+
++  irqd_set_single_target(irq_desc_get_irq_data(irq_to_desc(irq)));
 +  return 0;
 +}
 +
diff --git 
a/target/linux/bcm63xx/patches-4.19/320-irqchip-add-support-for-bcm6345-style-periphery-irq-.patch
 
b/target/linux/bcm63xx/patches-4.19/320-irqchip-add-support-for-bcm6345-style-periphery-irq-.patch
index b75987ef35..2f44a48c32 100644
--- 
a/target/linux/bcm63xx/patches-4.19/320-irqchip-add-support-for-bcm6345-style-periphery-irq-.patch
+++ 
b/target/linux/bcm63xx/patches-4.19/320-irqchip-add-support-for-bcm6345-style-periphery-irq-.patch
@@ -94,7 +94,7 @@ Signed-off-by: Jonas Gorski 
  obj-$(CONFIG_OMPIC)   += irq-ompic.o
 --- /dev/null
 +++ b/drivers/irqchip/irq-bcm6345-periph.c
-@@ -0,0 +1,339 @@
+@@ -0,0 +1,341 @@
 +/*
 + * This file is subject to the terms and conditions of the GNU General Public
 + * License.  See the file "COPYING" in the main directory of this archive
@@ -283,6 +283,8 @@ Signed-off-by: Jonas Gorski 
 +  }
 +  raw_spin_unlock_irqrestore(&priv->lock, flags);
 +
++  irq_data_update_effective_affinity(data, cpumask_of(cpu));
++
 +  return 0;
 +}
 +#endif
@@ -293,7 +295,7 @@ Signed-off-by: Jonas Gorski 
 +  struct intc_data *priv = d->host_data;
 +
 +  irq_set_chip_and_handler(irq, &priv->chip, handle_level_irq);
-+
++  irqd_set_single_target(irq_desc_get_irq_data(irq_to_desc(irq)));
 +  return 0;
 +}
 +
-- 
2.25.1





___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel


Re: [OpenWrt-Devel] [PATCH 1/3] zynq: copy config from kernel 4.19 to 5.4

2020-03-16 Thread mail
> -Original Message-
> From: Luis Araneda [mailto:luaran...@gmail.com]
> Sent: Freitag, 13. März 2020 22:51
> To: Petr Štetiar 
> Cc: Adrian Schmutzler ; openwrt-
> de...@lists.openwrt.org
> Subject: Re: [OpenWrt-Devel] [PATCH 1/3] zynq: copy config from kernel
> 4.19 to 5.4
> 
> Hi,
> 
> On Fri, Mar 13, 2020 at 9:34 AM Petr Štetiar  wrote:
> >
> > Adrian Schmutzler  [2020-03-13 13:17:42]:
> >
> > > I'm aware of the two-step procedure (1. copy without changes, 2.
> > > refresh), I just read the message in a way that the config was
> > > refreshed _before_ copying it?
> >
> > Yep, Luis did exactly what he described in his commit description, he
> > really refreshed the 4.19 config first (IIRC two symbols refreshed?)
> > and copied it to 5.4.
> >
> > That's probably the pedantic way, fixing first 4.19 config, then
> > refresh it for 5.4, so the diff for 5.4 contains only symbols related
> > to 5.4, not to 4.19 cleanup/refresh.
> 
> That's exactly what I did.
> My apologies if it caused any inconvenience, but I thought that an additional
> commit for just two symbols (one removed, one added) was not necessary.
> 
> Please let me know if you want a refresh commit in the future (next kernel
> version?) even if it just a couple of symbols.

As Petr stated, you did everything right, I was commenting based on wrong 
assumptions.

Best

Adrian

> 
> Regards,
> Luis Araneda.


openpgp-digital-signature.asc
Description: PGP signature
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel


[OpenWrt-Devel] [PATCH 1/4] kernel: move TEO governor to generic config

2020-03-16 Thread Tomasz Maciej Nowak
This new symbol popped up in few places. Disable it in generic config.

Signed-off-by: Tomasz Maciej Nowak 
---
 target/linux/armvirt/64/config-5.4  | 1 -
 target/linux/bcm27xx/bcm2708/config-5.4 | 1 -
 target/linux/bcm27xx/bcm2709/config-5.4 | 1 -
 target/linux/bcm27xx/bcm2710/config-5.4 | 1 -
 target/linux/bcm27xx/bcm2711/config-5.4 | 1 -
 target/linux/generic/config-5.4 | 1 +
 target/linux/ipq40xx/config-5.4 | 1 -
 target/linux/ipq806x/config-5.4 | 1 -
 target/linux/kirkwood/config-5.4| 1 -
 target/linux/mediatek/mt7629/config-5.4 | 1 -
 target/linux/octeontx/config-5.4| 1 -
 target/linux/oxnas/config-5.4   | 1 -
 target/linux/x86/config-5.4 | 1 -
 13 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/target/linux/armvirt/64/config-5.4 
b/target/linux/armvirt/64/config-5.4
index f910d06ac870..c69ad8943f59 100644
--- a/target/linux/armvirt/64/config-5.4
+++ b/target/linux/armvirt/64/config-5.4
@@ -106,7 +106,6 @@ CONFIG_COMMON_CLK_VERSATILE=y
 CONFIG_CPU_IDLE=y
 # CONFIG_CPU_IDLE_GOV_LADDER is not set
 CONFIG_CPU_IDLE_GOV_MENU=y
-# CONFIG_CPU_IDLE_GOV_TEO is not set
 CONFIG_CPU_PM=y
 CONFIG_CRYPTO_AES_ARM64=y
 CONFIG_CRYPTO_AES_ARM64_BS=y
diff --git a/target/linux/bcm27xx/bcm2708/config-5.4 
b/target/linux/bcm27xx/bcm2708/config-5.4
index 57c176d1681b..a25d0ff86d55 100644
--- a/target/linux/bcm27xx/bcm2708/config-5.4
+++ b/target/linux/bcm27xx/bcm2708/config-5.4
@@ -123,7 +123,6 @@ CONFIG_CPU_HAS_ASID=y
 CONFIG_CPU_IDLE=y
 CONFIG_CPU_IDLE_GOV_LADDER=y
 CONFIG_CPU_IDLE_GOV_MENU=y
-# CONFIG_CPU_IDLE_GOV_TEO is not set
 CONFIG_CPU_PABRT_V6=y
 CONFIG_CPU_PM=y
 # CONFIG_CPU_THERMAL is not set
diff --git a/target/linux/bcm27xx/bcm2709/config-5.4 
b/target/linux/bcm27xx/bcm2709/config-5.4
index 6713aef789b3..b1dff62b664c 100644
--- a/target/linux/bcm27xx/bcm2709/config-5.4
+++ b/target/linux/bcm27xx/bcm2709/config-5.4
@@ -154,7 +154,6 @@ CONFIG_CPU_HAS_ASID=y
 CONFIG_CPU_IDLE=y
 CONFIG_CPU_IDLE_GOV_LADDER=y
 CONFIG_CPU_IDLE_GOV_MENU=y
-# CONFIG_CPU_IDLE_GOV_TEO is not set
 CONFIG_CPU_PABRT_V7=y
 CONFIG_CPU_PM=y
 CONFIG_CPU_RMAP=y
diff --git a/target/linux/bcm27xx/bcm2710/config-5.4 
b/target/linux/bcm27xx/bcm2710/config-5.4
index 7527c3fdd961..f14041206f80 100644
--- a/target/linux/bcm27xx/bcm2710/config-5.4
+++ b/target/linux/bcm27xx/bcm2710/config-5.4
@@ -202,7 +202,6 @@ CONFIG_CPU_FREQ_STAT=y
 CONFIG_CPU_IDLE=y
 CONFIG_CPU_IDLE_GOV_LADDER=y
 CONFIG_CPU_IDLE_GOV_MENU=y
-# CONFIG_CPU_IDLE_GOV_TEO is not set
 CONFIG_CPU_PM=y
 CONFIG_CPU_RMAP=y
 # CONFIG_CPU_THERMAL is not set
diff --git a/target/linux/bcm27xx/bcm2711/config-5.4 
b/target/linux/bcm27xx/bcm2711/config-5.4
index a813eb586cdd..b3ad48e03c33 100644
--- a/target/linux/bcm27xx/bcm2711/config-5.4
+++ b/target/linux/bcm27xx/bcm2711/config-5.4
@@ -206,7 +206,6 @@ CONFIG_CPU_FREQ_STAT=y
 CONFIG_CPU_IDLE=y
 CONFIG_CPU_IDLE_GOV_LADDER=y
 CONFIG_CPU_IDLE_GOV_MENU=y
-# CONFIG_CPU_IDLE_GOV_TEO is not set
 CONFIG_CPU_PM=y
 CONFIG_CPU_RMAP=y
 # CONFIG_CPU_THERMAL is not set
diff --git a/target/linux/generic/config-5.4 b/target/linux/generic/config-5.4
index c4821ca6a392..51eb02d77fbf 100644
--- a/target/linux/generic/config-5.4
+++ b/target/linux/generic/config-5.4
@@ -915,6 +915,7 @@ CONFIG_CONSTRUCTORS=y
 # CONFIG_CPU_FREQ_STAT_DETAILS is not set
 # CONFIG_CPU_IDLE is not set
 # CONFIG_CPU_IDLE_GOV_MENU is not set
+# CONFIG_CPU_IDLE_GOV_TEO is not set
 # CONFIG_CPU_IDLE_MULTIPLE_DRIVERS is not set
 # CONFIG_CPU_ISOLATION is not set
 # CONFIG_CPU_NO_EFFICIENT_FFS is not set
diff --git a/target/linux/ipq40xx/config-5.4 b/target/linux/ipq40xx/config-5.4
index f94eb78b34c2..86fabe601004 100644
--- a/target/linux/ipq40xx/config-5.4
+++ b/target/linux/ipq40xx/config-5.4
@@ -112,7 +112,6 @@ CONFIG_CPU_HAS_ASID=y
 CONFIG_CPU_IDLE=y
 CONFIG_CPU_IDLE_GOV_LADDER=y
 CONFIG_CPU_IDLE_GOV_MENU=y
-# CONFIG_CPU_IDLE_GOV_TEO is not set
 CONFIG_CPU_IDLE_MULTIPLE_DRIVERS=y
 CONFIG_CPU_PABRT_V7=y
 CONFIG_CPU_PM=y
diff --git a/target/linux/ipq806x/config-5.4 b/target/linux/ipq806x/config-5.4
index d07c02f423f2..c9c50c91bc4a 100644
--- a/target/linux/ipq806x/config-5.4
+++ b/target/linux/ipq806x/config-5.4
@@ -113,7 +113,6 @@ CONFIG_CPU_HAS_ASID=y
 CONFIG_CPU_IDLE=y
 CONFIG_CPU_IDLE_GOV_LADDER=y
 CONFIG_CPU_IDLE_GOV_MENU=y
-# CONFIG_CPU_IDLE_GOV_TEO is not set
 CONFIG_CPU_IDLE_MULTIPLE_DRIVERS=y
 CONFIG_CPU_PABRT_V7=y
 CONFIG_CPU_PM=y
diff --git a/target/linux/kirkwood/config-5.4 b/target/linux/kirkwood/config-5.4
index 68eb6569575b..e149631f0ea1 100644
--- a/target/linux/kirkwood/config-5.4
+++ b/target/linux/kirkwood/config-5.4
@@ -81,7 +81,6 @@ CONFIG_CPU_FEROCEON=y
 # CONFIG_CPU_ICACHE_DISABLE is not set
 CONFIG_CPU_IDLE=y
 CONFIG_CPU_IDLE_GOV_LADDER=y
-# CONFIG_CPU_IDLE_GOV_TEO is not set
 CONFIG_CPU_PABRT_LEGACY=y
 CONFIG_CPU_PM=y
 CONFIG_CPU_THUMB_CAPABLE=y
diff --git a/target/linux/mediatek/mt7629/config-5.4 
b/target/linux/mediatek/mt7629/config-5.4
index 861ce4222bef..5ca8444c361e 100644
--- a/target/

[OpenWrt-Devel] [PATCH 4/4] tegra: switch to kernel 5.4

2020-03-16 Thread Tomasz Maciej Nowak
Build the latest kernel by default, since testing did not show any
regressions.

Signed-off-by: Tomasz Maciej Nowak 
---
 target/linux/tegra/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/target/linux/tegra/Makefile b/target/linux/tegra/Makefile
index 6f7ca1861690..bfc3ed05a61a 100644
--- a/target/linux/tegra/Makefile
+++ b/target/linux/tegra/Makefile
@@ -14,7 +14,7 @@ CPU_TYPE := cortex-a9
 CPU_SUBTYPE := vfpv3
 MAINTAINER := Tomasz Maciej Nowak 
 
-KERNEL_PATCHVER := 4.19
+KERNEL_PATCHVER := 5.4
 KERNEL_TESTING_PATCHVER := 5.4
 
 include $(INCLUDE_DIR)/target.mk
-- 
2.25.1


___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel


[OpenWrt-Devel] [PATCH 2/4] tegra: copy kernel config and patches for 5.4

2020-03-16 Thread Tomasz Maciej Nowak
Signed-off-by: Tomasz Maciej Nowak 
---
 target/linux/tegra/config-5.4 | 559 ++
 ...interrupts-due-to-tegra2-silicon-bug.patch |  77 +++
 ...enable-front-panel-leds-in-TrimSlice.patch |  46 ++
 3 files changed, 682 insertions(+)
 create mode 100644 target/linux/tegra/config-5.4
 create mode 100644 
target/linux/tegra/patches-5.4/100-serial8250-on-tegra-hsuart-recover-from-spurious-interrupts-due-to-tegra2-silicon-bug.patch
 create mode 100644 
target/linux/tegra/patches-5.4/101-ARM-dtc-tegra-enable-front-panel-leds-in-TrimSlice.patch

diff --git a/target/linux/tegra/config-5.4 b/target/linux/tegra/config-5.4
new file mode 100644
index ..ea2177a8657e
--- /dev/null
+++ b/target/linux/tegra/config-5.4
@@ -0,0 +1,559 @@
+CONFIG_AC97_BUS=y
+# CONFIG_AHCI_TEGRA is not set
+CONFIG_ALIGNMENT_TRAP=y
+CONFIG_ARCH_CLOCKSOURCE_DATA=y
+CONFIG_ARCH_HAS_DEBUG_VIRTUAL=y
+CONFIG_ARCH_HAS_ELF_RANDOMIZE=y
+CONFIG_ARCH_HAS_FORTIFY_SOURCE=y
+CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y
+CONFIG_ARCH_HAS_KCOV=y
+CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y
+CONFIG_ARCH_HAS_PHYS_TO_DMA=y
+CONFIG_ARCH_HAS_RESET_CONTROLLER=y
+CONFIG_ARCH_HAS_SET_MEMORY=y
+CONFIG_ARCH_HAS_SG_CHAIN=y
+CONFIG_ARCH_HAS_STRICT_KERNEL_RWX=y
+CONFIG_ARCH_HAS_STRICT_MODULE_RWX=y
+CONFIG_ARCH_HAS_TICK_BROADCAST=y
+CONFIG_ARCH_HAVE_CUSTOM_GPIO_H=y
+CONFIG_ARCH_HIBERNATION_POSSIBLE=y
+CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y
+CONFIG_ARCH_MULTIPLATFORM=y
+CONFIG_ARCH_MULTI_V6_V7=y
+CONFIG_ARCH_MULTI_V7=y
+CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED=y
+CONFIG_ARCH_NR_GPIO=1024
+CONFIG_ARCH_OPTIONAL_KERNEL_RWX=y
+CONFIG_ARCH_OPTIONAL_KERNEL_RWX_DEFAULT=y
+CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y
+CONFIG_ARCH_SUPPORTS_FIRMWARE=y
+CONFIG_ARCH_SUPPORTS_TRUSTED_FOUNDATIONS=y
+CONFIG_ARCH_SUPPORTS_UPROBES=y
+CONFIG_ARCH_SUSPEND_POSSIBLE=y
+CONFIG_ARCH_TEGRA=y
+# CONFIG_ARCH_TEGRA_114_SOC is not set
+# CONFIG_ARCH_TEGRA_124_SOC is not set
+CONFIG_ARCH_TEGRA_2x_SOC=y
+# CONFIG_ARCH_TEGRA_3x_SOC is not set
+CONFIG_ARCH_USE_BUILTIN_BSWAP=y
+CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
+CONFIG_ARCH_WANT_GENERAL_HUGETLB=y
+CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
+CONFIG_ARM=y
+CONFIG_ARM_AMBA=y
+CONFIG_ARM_ARCH_TIMER=y
+CONFIG_ARM_ARCH_TIMER_EVTSTREAM=y
+CONFIG_ARM_CPU_SUSPEND=y
+CONFIG_ARM_CRYPTO=y
+CONFIG_ARM_ERRATA_720789=y
+CONFIG_ARM_ERRATA_754327=y
+CONFIG_ARM_ERRATA_764369=y
+CONFIG_ARM_GIC=y
+CONFIG_ARM_HAS_SG_CHAIN=y
+CONFIG_ARM_HEAVY_MB=y
+CONFIG_ARM_L1_CACHE_SHIFT=6
+CONFIG_ARM_L1_CACHE_SHIFT_6=y
+# CONFIG_ARM_LPAE is not set
+CONFIG_ARM_PATCH_IDIV=y
+CONFIG_ARM_PATCH_PHYS_VIRT=y
+# CONFIG_ARM_PL172_MPMC is not set
+# CONFIG_ARM_SMMU is not set
+# CONFIG_ARM_SP805_WATCHDOG is not set
+CONFIG_ARM_TEGRA20_CPUFREQ=y
+CONFIG_ARM_THUMB=y
+CONFIG_ARM_THUMBEE=y
+CONFIG_ARM_VIRT_EXT=y
+CONFIG_ASN1=y
+CONFIG_ATA=y
+CONFIG_ATAGS=y
+CONFIG_AUTO_ZRELADDR=y
+CONFIG_BLK_DEV_BSG=y
+CONFIG_BLK_DEV_LOOP=y
+CONFIG_BLK_MQ_PCI=y
+CONFIG_BLK_SCSI_REQUEST=y
+CONFIG_BOUNCE=y
+CONFIG_CACHE_L2X0=y
+CONFIG_CLKDEV_LOOKUP=y
+CONFIG_CLKSRC_MMIO=y
+CONFIG_CLONE_BACKWARDS=y
+CONFIG_CLZ_TAB=y
+CONFIG_CMA=y
+CONFIG_CMA_ALIGNMENT=8
+CONFIG_CMA_AREAS=7
+# CONFIG_CMA_DEBUG is not set
+# CONFIG_CMA_DEBUGFS is not set
+CONFIG_CMA_SIZE_MBYTES=16
+# CONFIG_CMA_SIZE_SEL_MAX is not set
+CONFIG_CMA_SIZE_SEL_MBYTES=y
+# CONFIG_CMA_SIZE_SEL_MIN is not set
+# CONFIG_CMA_SIZE_SEL_PERCENTAGE is not set
+CONFIG_COMMON_CLK=y
+# CONFIG_CPUFREQ_DT is not set
+CONFIG_CPU_32v6K=y
+CONFIG_CPU_32v7=y
+CONFIG_CPU_ABRT_EV7=y
+# CONFIG_CPU_BPREDICT_DISABLE is not set
+CONFIG_CPU_CACHE_V7=y
+CONFIG_CPU_CACHE_VIPT=y
+CONFIG_CPU_COPY_V6=y
+CONFIG_CPU_CP15=y
+CONFIG_CPU_CP15_MMU=y
+CONFIG_CPU_FREQ=y
+CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
+# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
+CONFIG_CPU_FREQ_GOV_ATTR_SET=y
+CONFIG_CPU_FREQ_GOV_COMMON=y
+CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
+CONFIG_CPU_FREQ_GOV_ONDEMAND=y
+CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
+CONFIG_CPU_FREQ_GOV_POWERSAVE=y
+CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y
+CONFIG_CPU_FREQ_GOV_USERSPACE=y
+# CONFIG_CPU_FREQ_STAT is not set
+CONFIG_CPU_HAS_ASID=y
+# CONFIG_CPU_HOTPLUG_STATE_CONTROL is not set
+# CONFIG_CPU_ICACHE_DISABLE is not set
+CONFIG_CPU_IDLE=y
+CONFIG_CPU_IDLE_GOV_LADDER=y
+CONFIG_CPU_PABRT_V7=y
+CONFIG_CPU_PM=y
+CONFIG_CPU_RMAP=y
+CONFIG_CPU_SPECTRE=y
+CONFIG_CPU_THUMB_CAPABLE=y
+CONFIG_CPU_TLB_V7=y
+CONFIG_CPU_V7=y
+CONFIG_CRC16=y
+# CONFIG_CRC32_SARWATE is not set
+CONFIG_CRC32_SLICEBY8=y
+CONFIG_CROSS_MEMORY_ATTACH=y
+CONFIG_CRYPTO_ACOMP2=y
+CONFIG_CRYPTO_AEAD=y
+CONFIG_CRYPTO_AEAD2=y
+CONFIG_CRYPTO_AES_ARM=y
+CONFIG_CRYPTO_AKCIPHER=y
+CONFIG_CRYPTO_AKCIPHER2=y
+CONFIG_CRYPTO_CRC32=y
+CONFIG_CRYPTO_CRC32C=y
+CONFIG_CRYPTO_CRYPTD=y
+CONFIG_CRYPTO_DEFLATE=y
+CONFIG_CRYPTO_DRBG=y
+CONFIG_CRYPTO_DRBG_HMAC=y
+CONFIG_CRYPTO_DRBG_MENU=y
+CONFIG_CRYPTO_ECHAINIV=y
+CONFIG_CRYPTO_HASH=y
+CONFIG_CRYPTO_HASH2=y
+CONFIG_CRYPTO_HMAC=y
+CONFIG_CRYPTO_JITTERENTROPY=y
+CONFIG_CRYPTO_LZ4=y
+CONFIG_CRYPTO_LZ4HC=y
+CONFIG_CRYPTO_LZO=y
+CONFIG_CRYPTO_MANAGER=y
+CONFIG_CRYPTO_MANA

[OpenWrt-Devel] [PATCH 3/4] tegra: refresh patches and kernel config for 5.4

2020-03-16 Thread Tomasz Maciej Nowak
This commit also disables Trusted Foundations firmware support as this
feature won't be used by any device.

Signed-off-by: Tomasz Maciej Nowak 
---
 target/linux/tegra/Makefile   |  1 +
 target/linux/tegra/config-5.4 | 47 ---
 ...interrupts-due-to-tegra2-silicon-bug.patch |  6 +--
 3 files changed, 35 insertions(+), 19 deletions(-)

diff --git a/target/linux/tegra/Makefile b/target/linux/tegra/Makefile
index db58bf53d1ff..6f7ca1861690 100644
--- a/target/linux/tegra/Makefile
+++ b/target/linux/tegra/Makefile
@@ -15,6 +15,7 @@ CPU_SUBTYPE := vfpv3
 MAINTAINER := Tomasz Maciej Nowak 
 
 KERNEL_PATCHVER := 4.19
+KERNEL_TESTING_PATCHVER := 5.4
 
 include $(INCLUDE_DIR)/target.mk
 
diff --git a/target/linux/tegra/config-5.4 b/target/linux/tegra/config-5.4
index ea2177a8657e..5313e39894ed 100644
--- a/target/linux/tegra/config-5.4
+++ b/target/linux/tegra/config-5.4
@@ -1,22 +1,27 @@
 CONFIG_AC97_BUS=y
 # CONFIG_AHCI_TEGRA is not set
 CONFIG_ALIGNMENT_TRAP=y
+CONFIG_ARCH_32BIT_OFF_T=y
 CONFIG_ARCH_CLOCKSOURCE_DATA=y
+CONFIG_ARCH_HAS_BINFMT_FLAT=y
 CONFIG_ARCH_HAS_DEBUG_VIRTUAL=y
 CONFIG_ARCH_HAS_ELF_RANDOMIZE=y
 CONFIG_ARCH_HAS_FORTIFY_SOURCE=y
 CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y
 CONFIG_ARCH_HAS_KCOV=y
+CONFIG_ARCH_HAS_KEEPINITRD=y
 CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y
 CONFIG_ARCH_HAS_PHYS_TO_DMA=y
 CONFIG_ARCH_HAS_RESET_CONTROLLER=y
+CONFIG_ARCH_HAS_SETUP_DMA_OPS=y
 CONFIG_ARCH_HAS_SET_MEMORY=y
-CONFIG_ARCH_HAS_SG_CHAIN=y
 CONFIG_ARCH_HAS_STRICT_KERNEL_RWX=y
 CONFIG_ARCH_HAS_STRICT_MODULE_RWX=y
+CONFIG_ARCH_HAS_TEARDOWN_DMA_OPS=y
 CONFIG_ARCH_HAS_TICK_BROADCAST=y
 CONFIG_ARCH_HAVE_CUSTOM_GPIO_H=y
 CONFIG_ARCH_HIBERNATION_POSSIBLE=y
+CONFIG_ARCH_KEEP_MEMBLOCK=y
 CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y
 CONFIG_ARCH_MULTIPLATFORM=y
 CONFIG_ARCH_MULTI_V6_V7=y
@@ -26,8 +31,6 @@ CONFIG_ARCH_NR_GPIO=1024
 CONFIG_ARCH_OPTIONAL_KERNEL_RWX=y
 CONFIG_ARCH_OPTIONAL_KERNEL_RWX_DEFAULT=y
 CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y
-CONFIG_ARCH_SUPPORTS_FIRMWARE=y
-CONFIG_ARCH_SUPPORTS_TRUSTED_FOUNDATIONS=y
 CONFIG_ARCH_SUPPORTS_UPROBES=y
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
 CONFIG_ARCH_TEGRA=y
@@ -37,6 +40,7 @@ CONFIG_ARCH_TEGRA_2x_SOC=y
 # CONFIG_ARCH_TEGRA_3x_SOC is not set
 CONFIG_ARCH_USE_BUILTIN_BSWAP=y
 CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
+CONFIG_ARCH_WANT_DEFAULT_TOPDOWN_MMAP_LAYOUT=y
 CONFIG_ARCH_WANT_GENERAL_HUGETLB=y
 CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
 CONFIG_ARM=y
@@ -62,17 +66,21 @@ CONFIG_ARM_PATCH_PHYS_VIRT=y
 CONFIG_ARM_TEGRA20_CPUFREQ=y
 CONFIG_ARM_THUMB=y
 CONFIG_ARM_THUMBEE=y
+CONFIG_ARM_UNWIND=y
 CONFIG_ARM_VIRT_EXT=y
 CONFIG_ASN1=y
 CONFIG_ATA=y
 CONFIG_ATAGS=y
 CONFIG_AUTO_ZRELADDR=y
+CONFIG_BINFMT_FLAT_ARGVP_ENVP_ON_STACK=y
 CONFIG_BLK_DEV_BSG=y
 CONFIG_BLK_DEV_LOOP=y
 CONFIG_BLK_MQ_PCI=y
+CONFIG_BLK_PM=y
 CONFIG_BLK_SCSI_REQUEST=y
 CONFIG_BOUNCE=y
 CONFIG_CACHE_L2X0=y
+CONFIG_CC_HAS_KASAN_GENERIC=y
 CONFIG_CLKDEV_LOOKUP=y
 CONFIG_CLKSRC_MMIO=y
 CONFIG_CLONE_BACKWARDS=y
@@ -88,6 +96,8 @@ CONFIG_CMA_SIZE_SEL_MBYTES=y
 # CONFIG_CMA_SIZE_SEL_MIN is not set
 # CONFIG_CMA_SIZE_SEL_PERCENTAGE is not set
 CONFIG_COMMON_CLK=y
+CONFIG_COMPAT_32BIT_TIME=y
+CONFIG_CONTIG_ALLOC=y
 # CONFIG_CPUFREQ_DT is not set
 CONFIG_CPU_32v6K=y
 CONFIG_CPU_32v7=y
@@ -113,6 +123,7 @@ CONFIG_CPU_FREQ_GOV_USERSPACE=y
 CONFIG_CPU_HAS_ASID=y
 # CONFIG_CPU_HOTPLUG_STATE_CONTROL is not set
 # CONFIG_CPU_ICACHE_DISABLE is not set
+# CONFIG_CPU_ICACHE_MISMATCH_WORKAROUND is not set
 CONFIG_CPU_IDLE=y
 CONFIG_CPU_IDLE_GOV_LADDER=y
 CONFIG_CPU_PABRT_V7=y
@@ -144,6 +155,7 @@ CONFIG_CRYPTO_HASH=y
 CONFIG_CRYPTO_HASH2=y
 CONFIG_CRYPTO_HMAC=y
 CONFIG_CRYPTO_JITTERENTROPY=y
+CONFIG_CRYPTO_LIB_SHA256=y
 CONFIG_CRYPTO_LZ4=y
 CONFIG_CRYPTO_LZ4HC=y
 CONFIG_CRYPTO_LZO=y
@@ -163,7 +175,6 @@ CONFIG_CRYPTO_SHA256_ARM=y
 CONFIG_CRYPTO_SHA512_ARM=y
 CONFIG_CRYPTO_TWOFISH=y
 CONFIG_CRYPTO_TWOFISH_COMMON=y
-CONFIG_CRYPTO_WORKQUEUE=y
 CONFIG_DCACHE_WORD_ACCESS=y
 CONFIG_DEBUG_ALIGN_RODATA=y
 CONFIG_DEBUG_LL_INCLUDE="mach/debug-macro.S"
@@ -173,6 +184,7 @@ CONFIG_DMADEVICES=y
 CONFIG_DMA_CMA=y
 CONFIG_DMA_ENGINE=y
 CONFIG_DMA_OF=y
+CONFIG_DMA_REMAP=y
 CONFIG_DMA_SHARED_BUFFER=y
 CONFIG_DNOTIFY=y
 CONFIG_DRM=y
@@ -181,10 +193,13 @@ CONFIG_DRM_FBDEV_EMULATION=y
 CONFIG_DRM_FBDEV_OVERALLOC=100
 CONFIG_DRM_KMS_FB_HELPER=y
 CONFIG_DRM_KMS_HELPER=y
+# CONFIG_DRM_MCDE is not set
 CONFIG_DRM_MIPI_DSI=y
 CONFIG_DRM_PANEL=y
 CONFIG_DRM_PANEL_BRIDGE=y
 CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y
+# CONFIG_DRM_PANEL_SAMSUNG_S6D16D0 is not set
+# CONFIG_DRM_PANEL_TRULY_NT35597_WQXGA is not set
 CONFIG_DRM_TEGRA=y
 # CONFIG_DRM_TEGRA_DEBUG is not set
 # CONFIG_DRM_TEGRA_STAGING is not set
@@ -211,10 +226,10 @@ CONFIG_FB_SYS_FILLRECT=y
 CONFIG_FB_SYS_FOPS=y
 CONFIG_FB_SYS_IMAGEBLIT=y
 CONFIG_FIX_EARLYCON_MEM=y
-CONFIG_FRAME_POINTER=y
 CONFIG_FREEZER=y
 CONFIG_FS_IOMAP=y
 CONFIG_FS_MBCACHE=y
+CONFIG_FW_LOADER_PAGED_BUF=y
 CONFIG_GENERIC_ALLOCATOR=y
 CONFIG_GENERIC_ARCH_TOPOLOGY=y
 CONFIG_GENERIC_BUG=y
@@ -265,6 +280,7 @@ CONFIG_HAVE_ARM_TWD=y

[OpenWrt-Devel] [PATCH] bcm27xx: enable THERMAL_WRITABLE_TRIPS on bcm2710 and bcm2711

2020-03-16 Thread Bjørn Mork
The PoE hat supported on the RPi 3B+ and 4B comes with a rather
loud fan, tripped in two steps by the brcmstb_thermal
thermal_zone driver.  Enabling writable trip points allow
users to adjust the fan trip points according to their
preferred temp/noise ratio.

This setting is enabled on most other targets with similar
thermal_zone controlled cooling devices.

Signed-off-by: Bjørn Mork 
---
 target/linux/bcm27xx/bcm2710/config-4.19 | 1 +
 target/linux/bcm27xx/bcm2710/config-5.4  | 1 +
 target/linux/bcm27xx/bcm2711/config-4.19 | 1 +
 target/linux/bcm27xx/bcm2711/config-5.4  | 1 +
 4 files changed, 4 insertions(+)

diff --git a/target/linux/bcm27xx/bcm2710/config-4.19 
b/target/linux/bcm27xx/bcm2710/config-4.19
index 99c985965250..80cd167283ea 100644
--- a/target/linux/bcm27xx/bcm2710/config-4.19
+++ b/target/linux/bcm27xx/bcm2710/config-4.19
@@ -542,6 +542,7 @@ CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
 CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0
 CONFIG_THERMAL_GOV_STEP_WISE=y
 CONFIG_THERMAL_OF=y
+CONFIG_THERMAL_WRITABLE_TRIPS=y
 CONFIG_THREAD_INFO_IN_TASK=y
 CONFIG_TICK_CPU_ACCOUNTING=y
 CONFIG_TIMER_OF=y
diff --git a/target/linux/bcm27xx/bcm2710/config-5.4 
b/target/linux/bcm27xx/bcm2710/config-5.4
index 7527c3fdd961..cc7e4577ea07 100644
--- a/target/linux/bcm27xx/bcm2710/config-5.4
+++ b/target/linux/bcm27xx/bcm2710/config-5.4
@@ -583,6 +583,7 @@ CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
 CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0
 CONFIG_THERMAL_GOV_STEP_WISE=y
 CONFIG_THERMAL_OF=y
+CONFIG_THERMAL_WRITABLE_TRIPS=y
 CONFIG_THREAD_INFO_IN_TASK=y
 CONFIG_TICK_CPU_ACCOUNTING=y
 CONFIG_TIMER_OF=y
diff --git a/target/linux/bcm27xx/bcm2711/config-4.19 
b/target/linux/bcm27xx/bcm2711/config-4.19
index d8a5681f0418..50cf344994bc 100644
--- a/target/linux/bcm27xx/bcm2711/config-4.19
+++ b/target/linux/bcm27xx/bcm2711/config-4.19
@@ -551,6 +551,7 @@ CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
 CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0
 CONFIG_THERMAL_GOV_STEP_WISE=y
 CONFIG_THERMAL_OF=y
+CONFIG_THERMAL_WRITABLE_TRIPS=y
 CONFIG_THREAD_INFO_IN_TASK=y
 CONFIG_TICK_CPU_ACCOUNTING=y
 CONFIG_TIMER_OF=y
diff --git a/target/linux/bcm27xx/bcm2711/config-5.4 
b/target/linux/bcm27xx/bcm2711/config-5.4
index a813eb586cdd..f9b585f987a4 100644
--- a/target/linux/bcm27xx/bcm2711/config-5.4
+++ b/target/linux/bcm27xx/bcm2711/config-5.4
@@ -594,6 +594,7 @@ CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
 CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0
 CONFIG_THERMAL_GOV_STEP_WISE=y
 CONFIG_THERMAL_OF=y
+CONFIG_THERMAL_WRITABLE_TRIPS=y
 CONFIG_THREAD_INFO_IN_TASK=y
 CONFIG_TICK_CPU_ACCOUNTING=y
 CONFIG_TIMER_OF=y
-- 
2.20.1


___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel


[OpenWrt-Devel] [PATCH v2] bcm63xx: kernel: Report that effective affinity is a single target

2020-03-16 Thread Daniel Gonzalez Cabanelas
The bcm6345-periph-intc driver only targets a single CPU at a time, even
if the notional affinity is wider. Let's inform the core code about this.

This patch gets rid of the kernel message:
"genirq: irq_chip bcm6345-periph-intc did not update eff. affinity mask
of irq 52"

Signed-off-by: Daniel Gonzalez Cabanelas 
---
Changes in v2: 
- Commit log: add missing SOB and a reference to kernel in commit subject

 ...qchip-add-support-for-bcm6345-style-periphery-irq-.patch | 6 --
 ...qchip-add-support-for-bcm6345-style-periphery-irq-.patch | 6 --
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git 
a/target/linux/bcm63xx/patches-4.14/320-irqchip-add-support-for-bcm6345-style-periphery-irq-.patch
 
b/target/linux/bcm63xx/patches-4.14/320-irqchip-add-support-for-bcm6345-style-periphery-irq-.patch
index 7235d1f96b..11666133b9 100644
--- 
a/target/linux/bcm63xx/patches-4.14/320-irqchip-add-support-for-bcm6345-style-periphery-irq-.patch
+++ 
b/target/linux/bcm63xx/patches-4.14/320-irqchip-add-support-for-bcm6345-style-periphery-irq-.patch
@@ -94,7 +94,7 @@ Signed-off-by: Jonas Gorski 
  obj-$(CONFIG_METAG_PERFCOUNTER_IRQS)  += irq-metag.o
 --- /dev/null
 +++ b/drivers/irqchip/irq-bcm6345-periph.c
-@@ -0,0 +1,339 @@
+@@ -0,0 +1,341 @@
 +/*
 + * This file is subject to the terms and conditions of the GNU General Public
 + * License.  See the file "COPYING" in the main directory of this archive
@@ -283,6 +283,8 @@ Signed-off-by: Jonas Gorski 
 +  }
 +  raw_spin_unlock_irqrestore(&priv->lock, flags);
 +
++  irq_data_update_effective_affinity(data, cpumask_of(cpu));
++
 +  return 0;
 +}
 +#endif
@@ -293,7 +295,7 @@ Signed-off-by: Jonas Gorski 
 +  struct intc_data *priv = d->host_data;
 +
 +  irq_set_chip_and_handler(irq, &priv->chip, handle_level_irq);
-+
++  irqd_set_single_target(irq_desc_get_irq_data(irq_to_desc(irq)));
 +  return 0;
 +}
 +
diff --git 
a/target/linux/bcm63xx/patches-4.19/320-irqchip-add-support-for-bcm6345-style-periphery-irq-.patch
 
b/target/linux/bcm63xx/patches-4.19/320-irqchip-add-support-for-bcm6345-style-periphery-irq-.patch
index b75987ef35..2f44a48c32 100644
--- 
a/target/linux/bcm63xx/patches-4.19/320-irqchip-add-support-for-bcm6345-style-periphery-irq-.patch
+++ 
b/target/linux/bcm63xx/patches-4.19/320-irqchip-add-support-for-bcm6345-style-periphery-irq-.patch
@@ -94,7 +94,7 @@ Signed-off-by: Jonas Gorski 
  obj-$(CONFIG_OMPIC)   += irq-ompic.o
 --- /dev/null
 +++ b/drivers/irqchip/irq-bcm6345-periph.c
-@@ -0,0 +1,339 @@
+@@ -0,0 +1,341 @@
 +/*
 + * This file is subject to the terms and conditions of the GNU General Public
 + * License.  See the file "COPYING" in the main directory of this archive
@@ -283,6 +283,8 @@ Signed-off-by: Jonas Gorski 
 +  }
 +  raw_spin_unlock_irqrestore(&priv->lock, flags);
 +
++  irq_data_update_effective_affinity(data, cpumask_of(cpu));
++
 +  return 0;
 +}
 +#endif
@@ -293,7 +295,7 @@ Signed-off-by: Jonas Gorski 
 +  struct intc_data *priv = d->host_data;
 +
 +  irq_set_chip_and_handler(irq, &priv->chip, handle_level_irq);
-+
++  irqd_set_single_target(irq_desc_get_irq_data(irq_to_desc(irq)));
 +  return 0;
 +}
 +
-- 
2.25.1





___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel


[OpenWrt-Devel] [PATCH] mxs: fix user led for OLinuXino boards

2020-03-16 Thread Michael Heimpold
More testing after kernel upgrade to 5.4 uncovered a regression: the user
led is not present anymore due to a pin mux "collision" in device tree.

A patch sent to upstream kernel was accepted now. Integrate this
pending fix as platform specific patch so that user led is available again.

Signed-off-by: Michael Heimpold 
---
 ...ARM-dts-imx23-introduce-mmc0_sck_cfg.patch | 61 +++
 1 file changed, 61 insertions(+)
 create mode 100644 
target/linux/mxs/patches-5.4/100-ARM-dts-imx23-introduce-mmc0_sck_cfg.patch

diff --git 
a/target/linux/mxs/patches-5.4/100-ARM-dts-imx23-introduce-mmc0_sck_cfg.patch 
b/target/linux/mxs/patches-5.4/100-ARM-dts-imx23-introduce-mmc0_sck_cfg.patch
new file mode 100644
index 00..029fe6a8af
--- /dev/null
+++ 
b/target/linux/mxs/patches-5.4/100-ARM-dts-imx23-introduce-mmc0_sck_cfg.patch
@@ -0,0 +1,61 @@
+From e4fdac5def509ffb723b49d6a91f9043009119f9 Mon Sep 17 00:00:00 2001
+From: Michael Heimpold 
+Date: Sun, 8 Mar 2020 23:21:44 +0100
+Subject: [PATCH] ARM: dts: imx23: introduce mmc0_sck_cfg
+
+The Olimex Olinuxino board has a user led connected to SSP1_DETECT.
+But since this pin is listed in mmc0_pins_fixup, it is already claimed
+by MMC driver and this results in this error during boot:
+
+[1.39] imx23-pinctrl 80018000.pinctrl: pin SSP1_DETECT already
+  requested by 8001.spi; cannot claim for leds
+[1.40] imx23-pinctrl 80018000.pinctrl: pin-65 (leds) status -22
+[1.41] imx23-pinctrl 80018000.pinctrl: could not request pin 65
+   (SSP1_DETECT) from group led_gpio2_1.0  on device 80018000.pinctrl
+[1.42] leds-gpio leds: Error applying setting, reverse things back
+[1.43] leds-gpio: probe of leds failed with error -22
+
+This fix it, introduce mmc0_sck_cfg and switch the Olinuxino board to it.
+
+Signed-off-by: Michael Heimpold 
+Signed-off-by: Shawn Guo 
+---
+ arch/arm/boot/dts/imx23-olinuxino.dts | 2 +-
+ arch/arm/boot/dts/imx23.dtsi  | 8 
+ 2 files changed, 9 insertions(+), 1 deletion(-)
+
+diff --git a/arch/arm/boot/dts/imx23-olinuxino.dts 
b/arch/arm/boot/dts/imx23-olinuxino.dts
+index 4c9aafe00b5d..0729e72f2283 100644
+--- a/arch/arm/boot/dts/imx23-olinuxino.dts
 b/arch/arm/boot/dts/imx23-olinuxino.dts
+@@ -23,7 +23,7 @@
+   ssp0: spi@8001 {
+   compatible = "fsl,imx23-mmc";
+   pinctrl-names = "default";
+-  pinctrl-0 = <&mmc0_4bit_pins_a 
&mmc0_pins_fixup>;
++  pinctrl-0 = <&mmc0_4bit_pins_a &mmc0_sck_cfg>;
+   bus-width = <4>;
+   broken-cd;
+   status = "okay";
+diff --git a/arch/arm/boot/dts/imx23.dtsi b/arch/arm/boot/dts/imx23.dtsi
+index eb0aeda1682c..c5edff381213 100644
+--- a/arch/arm/boot/dts/imx23.dtsi
 b/arch/arm/boot/dts/imx23.dtsi
+@@ -267,6 +267,14 @@
+   fsl,pull-up = ;
+   };
+ 
++  mmc0_sck_cfg: mmc0-sck-cfg@0 {
++  reg = <0>;
++  fsl,pinmux-ids = <
++  MX23_PAD_SSP1_SCK__SSP1_SCK
++  >;
++  fsl,pull-up = ;
++  };
++
+   mmc1_4bit_pins_a: mmc1-4bit@0 {
+   reg = <0>;
+   fsl,pinmux-ids = <
+-- 
+2.17.1
+
-- 
2.17.1


___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel


Re: [OpenWrt-Devel] [PATCH 2/2] kernel: rtl8367b: add configuration for extif2

2020-03-16 Thread Chuanhong Guo
On Mon, Mar 16, 2020 at 6:37 PM Chuanhong Guo  wrote:
> +#define   RTL8367B_DIS2_RGMII_SHIFT0
> +#define   RTL8367B_DIS2_RGMII_MASK 0xf
> +
> +#define RTL8367B_EXT_RGMXF_REG(_x) \
> + ((_x) == 2 ? 0x13c5 : 0x1306 + (_x))
>  #define   RTL8367B_EXT_RGMXF_DUMMY0_SHIFT  5
>  #define   RTL8367B_EXT_RGMXF_DUMMY0_MASK   0x7ff
>  #define   RTL8367B_EXT_RGMXF_TXDELAY_SHIFT 3

A change here is missing during my manual patch application:
--- a/target/linux/generic/files/drivers/net/phy/rtl8367b.c
+++ b/target/linux/generic/files/drivers/net/phy/rtl8367b.c
@@ -176,7 +176,8 @@
 #define   RTL8367B_EXT_RGMXF_TXDELAY_MASK  1
 #define   RTL8367B_EXT_RGMXF_RXDELAY_MASK  0x7

-#define RTL8367B_DI_FORCE_REG(_x)  (0x1310 + (_x))
+#define RTL8367B_DI_FORCE_REG(_x)  \
+ ((_x) == 2 ? 0x13c4 : 0x1310 + (_x))
 #define   RTL8367B_DI_FORCE_MODE   BIT(12)
 #define   RTL8367B_DI_FORCE_NWAY   BIT(7)
 #define   RTL8367B_DI_FORCE_TXPAUSEBIT(6)

I've fixed this one in my staging tree.

-- 
Regards,
Chuanhong Guo

___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel


[OpenWrt-Devel] [PATCH] hostapd: Moved all hostapd variants to submenu 'Hostapd'

2020-03-16 Thread Kevin Mahoney
It seemed very confusing when trying to select the different variants
of hostapd which are somewhat scattered about under the menu
'Network'. Moving all hostapd variants under a common submenu helps
avoid confusion.

diff --git a/package/network/services/hostapd/Makefile
b/package/network/services/hostapd/Makefile
index 48dff34942..1a6d79bdca 100644
--- a/package/network/services/hostapd/Makefile
+++ b/package/network/services/hostapd/Makefile
@@ -129,6 +129,7 @@ DRV_DEPENDS:=+PACKAGE_kmod-cfg80211:libnl-tiny
 define Package/hostapd/Default
   SECTION:=net
   CATEGORY:=Network
+  SUBMENU:=Hostapd
   TITLE:=IEEE 802.1x Authenticator
   URL:=http://hostap.epitest.fi/
   DEPENDS:=$(DRV_DEPENDS) +hostapd-common +libubus
@@ -190,6 +191,7 @@ endef
 define Package/wpad/Default
   SECTION:=net
   CATEGORY:=Network
+  SUBMENU:=Hostapd
   TITLE:=IEEE 802.1x Authenticator/Supplicant
   DEPENDS:=$(DRV_DEPENDS) +hostapd-common +libubus
   URL:=http://hostap.epitest.fi/
@@ -279,6 +281,7 @@ Package/wpad-mesh-wolfssl/description =
$(Package/wpad-mesh/description)
 define Package/wpa-supplicant/Default
   SECTION:=net
   CATEGORY:=Network
+  SUBMENU:=Hostapd
   TITLE:=WPA Supplicant
   URL:=http://hostap.epitest.fi/wpa_supplicant/
   DEPENDS:=$(DRV_DEPENDS) +hostapd-common +libubus
@@ -351,11 +354,13 @@ define Package/hostapd-common
   TITLE:=hostapd/wpa_supplicant common support files
   SECTION:=net
   CATEGORY:=Network
+  SUBMENU:=Hostapd
 endef

 define Package/hostapd-utils
   SECTION:=net
   CATEGORY:=Network
+  SUBMENU:=Hostapd
   TITLE:=IEEE 802.1x Authenticator (utils)
   URL:=http://hostap.epitest.fi/
   DEPENDS:=@$(subst $(space),||,$(foreach
pkg,$(HOSTAPD_PROVIDERS),PACKAGE_$(pkg)))
@@ -369,6 +374,7 @@ endef
 define Package/wpa-cli
   SECTION:=net
   CATEGORY:=Network
+  SUBMENU:=Hostapd
   DEPENDS:=@$(subst $(space),||,$(foreach
pkg,$(SUPPLICANT_PROVIDERS),PACKAGE_$(pkg)))
   TITLE:=WPA Supplicant command line control utility
 endef
@@ -377,6 +383,7 @@ define Package/eapol-test
   TITLE:=802.1x authentication test utility
   SECTION:=net
   CATEGORY:=Network
+  SUBMENU:=Hostapd
   VARIANT:=supplicant-full-internal
   DEPENDS:=$(DRV_DEPENDS) +libubus
 endef
@@ -385,6 +392,7 @@ define Package/eapol-test-openssl
   TITLE:=802.1x authentication test utility
   SECTION:=net
   CATEGORY:=Network
+  SUBMENU:=Hostapd
   VARIANT:=supplicant-full-openssl
   CONFLICTS:=$(filter-out eapol-test-openssl ,$(EAPOL_TEST_PROVIDERS))
   DEPENDS:=$(DRV_DEPENDS) +libubus +libopenssl
@@ -395,6 +403,7 @@ define Package/eapol-test-wolfssl
   TITLE:=802.1x authentication test utility
   SECTION:=net
   CATEGORY:=Network
+  SUBMENU:=Hostapd
   VARIANT:=supplicant-full-wolfssl
   CONFLICTS:=$(filter-out eapol-test-openssl ,$(filter-out
eapol-test-wolfssl ,$(EAPOL_TEST_PROVIDERS)))
   DEPENDS:=$(DRV_DEPENDS) +libubus +libwolfssl



Kevin Mahoney

ZenoTec LLC
720-864-4320
kevin.maho...@zenotec.net
www.zenotec.net

___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel