Re: [PATCH 0/2] ath25: add 5.4 kernel support (not for merge)

2020-09-03 Thread Russell Senior
> "Daniel" == Daniel Golle  writes:

Daniel> On Fri, Sep 04, 2020 at 03:20:49AM +0300, Sergey Ryazanov wrote:
>> This series introduces support for 5.4 kernel. I know that this
>> target was dropped earlier this week. And I think that this was a
>> good decision. So, this series is not for merging, but for reference
>> if someone still uses one of these boards and want to create a custom
>> build with a modern kernel version.

Daniel> I'd say as you have apprently really managed to get it booting
Daniel> it is worth reverting the removal and including it.  Sure, a bit
Daniel> late, but there is hardware out there which would benefit from
Daniel> recent OpenWrt (old ubnt gear, fonera, ... some of them 8/32).
Daniel> But in terms of resources, ath25 is more advanced than good-old
Daniel> bcm47xx and also played an important role in OpenWrt history.

Daniel> Maybe I'm just nostalgic...

+1


-- 
Russell Senior, President
russ...@personaltelco.net

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


[PATCH 4/4] netifd: vxlan: add aging and maxaddress options

2020-09-03 Thread Johannes Kimmel
For both options the values can just be passed to the kernel. All
unsigned values are accepted, thus no range checking required.

Signed-off-by: Johannes Kimmel 
---
 system-linux.c | 10 ++
 system.c   |  2 ++
 system.h   |  2 ++
 3 files changed, 14 insertions(+)

diff --git a/system-linux.c b/system-linux.c
index a68af63..c497509 100644
--- a/system-linux.c
+++ b/system-linux.c
@@ -3235,6 +3235,16 @@ static int system_add_vxlan(const char *name, const 
unsigned int link, struct bl
system_vxlan_map_bool_attr(msg, tb_data, IFLA_VXLAN_L3MISS , 
VXLAN_DATA_ATTR_L3MISS, false);
system_vxlan_map_bool_attr(msg, tb_data, IFLA_VXLAN_GBP , 
VXLAN_DATA_ATTR_GBP, false);
 
+   if ((cur = tb_data[VXLAN_DATA_ATTR_AGEING])) {
+   uint32_t ageing = blobmsg_get_u32(cur);
+   nla_put_u32(msg, IFLA_VXLAN_AGEING, ageing);
+   }
+
+   if ((cur = tb_data[VXLAN_DATA_ATTR_LIMIT])) {
+   uint32_t maxaddress = blobmsg_get_u32(cur);
+   nla_put_u32(msg, IFLA_VXLAN_LIMIT, maxaddress);
+   }
+
if ((cur = tb[TUNNEL_ATTR_TOS])) {
char *str = blobmsg_get_string(cur);
unsigned tos = 1;
diff --git a/system.c b/system.c
index 95721e1..834748e 100644
--- a/system.c
+++ b/system.c
@@ -46,6 +46,8 @@ static const struct blobmsg_policy 
vxlan_data_attrs[__VXLAN_DATA_ATTR_MAX] = {
[VXLAN_DATA_ATTR_L2MISS] = { .name = "l2miss", .type = 
BLOBMSG_TYPE_BOOL },
[VXLAN_DATA_ATTR_L3MISS] = { .name = "l3miss", .type = 
BLOBMSG_TYPE_BOOL },
[VXLAN_DATA_ATTR_GBP] = { .name = "gbp", .type = BLOBMSG_TYPE_BOOL },
+   [VXLAN_DATA_ATTR_AGEING] = { .name = "ageing", .type = 
BLOBMSG_TYPE_INT32 },
+   [VXLAN_DATA_ATTR_LIMIT] = { .name = "maxaddress", .type = 
BLOBMSG_TYPE_INT32 },
 };
 
 const struct uci_blob_param_list vxlan_data_attr_list = {
diff --git a/system.h b/system.h
index 290c2e5..52161a8 100644
--- a/system.h
+++ b/system.h
@@ -52,6 +52,8 @@ enum vxlan_data {
VXLAN_DATA_ATTR_L2MISS,
VXLAN_DATA_ATTR_L3MISS,
VXLAN_DATA_ATTR_GBP,
+   VXLAN_DATA_ATTR_AGEING,
+   VXLAN_DATA_ATTR_LIMIT,
__VXLAN_DATA_ATTR_MAX
 };
 
-- 
2.28.0


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


[PATCH 3/4] netifd: vxlan: add most missing boolean options

2020-09-03 Thread Johannes Kimmel
adds the folloing missing options:
  - learning
  - rsc
  - proxy
  - l2miss
  - l3miss
  - gbp

See ip-link(3) for their meaning.

still missing:
  - external
  - gpe

I'm not sure how to handle them at the moment. It's unclear to me what
IFLA_VXLAN_* value corresponds to the 'external' option and according to
the manpage, gpe depends on it.

Signed-off-by: Johannes Kimmel 
---
 system-linux.c | 12 +++-
 system.c   |  6 ++
 system.h   |  6 ++
 3 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/system-linux.c b/system-linux.c
index 88b064c..a68af63 100644
--- a/system-linux.c
+++ b/system-linux.c
@@ -3080,7 +3080,11 @@ static void system_vxlan_map_bool_attr(struct nl_msg 
*msg, struct blob_attr **tb
if (invert) {
val = !val;
}
-   nla_put_u8(msg, attrtype, val);
+   if ((attrtype == IFLA_VXLAN_GBP) && val) {
+   nla_put_flag(msg, attrtype);
+   } else {
+   nla_put_u8(msg, attrtype, val);
+   }
}
 }
 
@@ -3224,6 +3228,12 @@ static int system_add_vxlan(const char *name, const 
unsigned int link, struct bl
system_vxlan_map_bool_attr(msg, tb_data, IFLA_VXLAN_UDP_CSUM, 
VXLAN_DATA_ATTR_TXCSUM, false);
system_vxlan_map_bool_attr(msg, tb_data, IFLA_VXLAN_UDP_ZERO_CSUM6_RX, 
VXLAN_DATA_ATTR_RXCSUM, true);
system_vxlan_map_bool_attr(msg, tb_data, IFLA_VXLAN_UDP_ZERO_CSUM6_TX, 
VXLAN_DATA_ATTR_TXCSUM, true);
+   system_vxlan_map_bool_attr(msg, tb_data, IFLA_VXLAN_LEARNING, 
VXLAN_DATA_ATTR_LEARNING, false);
+   system_vxlan_map_bool_attr(msg, tb_data, IFLA_VXLAN_RSC , 
VXLAN_DATA_ATTR_RSC, false);
+   system_vxlan_map_bool_attr(msg, tb_data, IFLA_VXLAN_PROXY , 
VXLAN_DATA_ATTR_PROXY, false);
+   system_vxlan_map_bool_attr(msg, tb_data, IFLA_VXLAN_L2MISS , 
VXLAN_DATA_ATTR_L2MISS, false);
+   system_vxlan_map_bool_attr(msg, tb_data, IFLA_VXLAN_L3MISS , 
VXLAN_DATA_ATTR_L3MISS, false);
+   system_vxlan_map_bool_attr(msg, tb_data, IFLA_VXLAN_GBP , 
VXLAN_DATA_ATTR_GBP, false);
 
if ((cur = tb[TUNNEL_ATTR_TOS])) {
char *str = blobmsg_get_string(cur);
diff --git a/system.c b/system.c
index 4133e55..95721e1 100644
--- a/system.c
+++ b/system.c
@@ -40,6 +40,12 @@ static const struct blobmsg_policy 
vxlan_data_attrs[__VXLAN_DATA_ATTR_MAX] = {
[VXLAN_DATA_ATTR_TXCSUM] = { .name = "txcsum", .type = 
BLOBMSG_TYPE_BOOL },
[VXLAN_DATA_ATTR_SRCPORTMIN] = { .name = "srcportmin", .type = 
BLOBMSG_TYPE_INT32 },
[VXLAN_DATA_ATTR_SRCPORTMAX] = { .name = "srcportmax", .type = 
BLOBMSG_TYPE_INT32 },
+   [VXLAN_DATA_ATTR_LEARNING] = { .name = "learning", .type = 
BLOBMSG_TYPE_BOOL },
+   [VXLAN_DATA_ATTR_RSC] = { .name = "rsc", .type = BLOBMSG_TYPE_BOOL },
+   [VXLAN_DATA_ATTR_PROXY] = { .name = "proxy", .type = BLOBMSG_TYPE_BOOL 
},
+   [VXLAN_DATA_ATTR_L2MISS] = { .name = "l2miss", .type = 
BLOBMSG_TYPE_BOOL },
+   [VXLAN_DATA_ATTR_L3MISS] = { .name = "l3miss", .type = 
BLOBMSG_TYPE_BOOL },
+   [VXLAN_DATA_ATTR_GBP] = { .name = "gbp", .type = BLOBMSG_TYPE_BOOL },
 };
 
 const struct uci_blob_param_list vxlan_data_attr_list = {
diff --git a/system.h b/system.h
index bf9e1d7..290c2e5 100644
--- a/system.h
+++ b/system.h
@@ -46,6 +46,12 @@ enum vxlan_data {
VXLAN_DATA_ATTR_TXCSUM,
VXLAN_DATA_ATTR_SRCPORTMIN,
VXLAN_DATA_ATTR_SRCPORTMAX,
+   VXLAN_DATA_ATTR_LEARNING,
+   VXLAN_DATA_ATTR_RSC,
+   VXLAN_DATA_ATTR_PROXY,
+   VXLAN_DATA_ATTR_L2MISS,
+   VXLAN_DATA_ATTR_L3MISS,
+   VXLAN_DATA_ATTR_GBP,
__VXLAN_DATA_ATTR_MAX
 };
 
-- 
2.28.0


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


[PATCH 1/4] netifd: vxlan: handle srcport range

2020-09-03 Thread Johannes Kimmel
This adds adds the ability to set the source port range for vxlan
interfaces.

By default vxlans will use a random port within the ephermal range as
source ports for packets. This is done to aid scaleability within a
datacenter.

But with these defaults it's impossible to punch through NATs or
traverese most stateful firewalls easily. One solution is to fix the
srcport to the same as dstport.

If only srcportmin is specified, then srcportmax is set in a way that
outgoing packets will only use srcportmin.

If a range is to be specified, srcportmin and srcportmax have to be
specified. srcportmax is exclusive.

If only srcportmax is specified, the value is ignored and defaults are
used.

Signed-off-by: Johannes Kimmel 
---
 system-linux.c | 26 ++
 system.c   |  2 ++
 system.h   |  2 ++
 3 files changed, 30 insertions(+)

diff --git a/system-linux.c b/system-linux.c
index c5583e0..5ff8749 100644
--- a/system-linux.c
+++ b/system-linux.c
@@ -3184,6 +3184,32 @@ static int system_add_vxlan(const char *name, const 
unsigned int link, struct bl
}
nla_put_u16(msg, IFLA_VXLAN_PORT, htons(port));
 
+   if ((cur = tb_data[VXLAN_DATA_ATTR_SRCPORTMIN])) {
+   struct ifla_vxlan_port_range srcports = {0,0};
+
+   uint32_t low = blobmsg_get_u32(cur);
+   if (low < 1 || low > 65535 - 1) {
+   ret = -EINVAL;
+   goto failure;
+   }
+
+   srcports.low = htons((uint16_t) low);
+   srcports.high = htons((uint16_t) (low+1));
+
+   if ((cur = tb_data[VXLAN_DATA_ATTR_SRCPORTMAX])) {
+   uint32_t high = blobmsg_get_u32(cur);
+   if (high < 1 || high > 65535) {
+   ret = -EINVAL;
+   goto failure;
+   }
+   if (high > low) {
+   srcports.high = htons((uint16_t) high);
+   }
+   }
+
+   nla_put(msg, IFLA_VXLAN_PORT_RANGE, sizeof(srcports), 
);
+   }
+
if ((cur = tb_data[VXLAN_DATA_ATTR_RXCSUM])) {
bool rxcsum = blobmsg_get_bool(cur);
nla_put_u8(msg, IFLA_VXLAN_UDP_ZERO_CSUM6_RX, !rxcsum);
diff --git a/system.c b/system.c
index bbdfef7..4133e55 100644
--- a/system.c
+++ b/system.c
@@ -38,6 +38,8 @@ static const struct blobmsg_policy 
vxlan_data_attrs[__VXLAN_DATA_ATTR_MAX] = {
[VXLAN_DATA_ATTR_MACADDR] = { .name = "macaddr", .type = 
BLOBMSG_TYPE_STRING },
[VXLAN_DATA_ATTR_RXCSUM] = { .name = "rxcsum", .type = 
BLOBMSG_TYPE_BOOL },
[VXLAN_DATA_ATTR_TXCSUM] = { .name = "txcsum", .type = 
BLOBMSG_TYPE_BOOL },
+   [VXLAN_DATA_ATTR_SRCPORTMIN] = { .name = "srcportmin", .type = 
BLOBMSG_TYPE_INT32 },
+   [VXLAN_DATA_ATTR_SRCPORTMAX] = { .name = "srcportmax", .type = 
BLOBMSG_TYPE_INT32 },
 };
 
 const struct uci_blob_param_list vxlan_data_attr_list = {
diff --git a/system.h b/system.h
index 015987f..bf9e1d7 100644
--- a/system.h
+++ b/system.h
@@ -44,6 +44,8 @@ enum vxlan_data {
VXLAN_DATA_ATTR_MACADDR,
VXLAN_DATA_ATTR_RXCSUM,
VXLAN_DATA_ATTR_TXCSUM,
+   VXLAN_DATA_ATTR_SRCPORTMIN,
+   VXLAN_DATA_ATTR_SRCPORTMAX,
__VXLAN_DATA_ATTR_MAX
 };
 
-- 
2.28.0


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


[PATCH 2/4] netifd: vxlan: refactor mapping of boolean attrs

2020-09-03 Thread Johannes Kimmel
Add a small function to handle boolean options and make use of it to handle:
  - rxcsum
  - txcsum

Signed-off-by: Johannes Kimmel 
---
 system-linux.c | 24 ++--
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/system-linux.c b/system-linux.c
index 5ff8749..88b064c 100644
--- a/system-linux.c
+++ b/system-linux.c
@@ -3073,6 +3073,17 @@ failure:
 #endif
 
 #ifdef IFLA_VXLAN_MAX
+static void system_vxlan_map_bool_attr(struct nl_msg *msg, struct blob_attr 
**tb_data, int attrtype, int vxlandatatype, bool invert) {
+   struct blob_attr *cur;
+   if ((cur = tb_data[vxlandatatype])) {
+   bool val = blobmsg_get_bool(cur);
+   if (invert) {
+   val = !val;
+   }
+   nla_put_u8(msg, attrtype, val);
+   }
+}
+
 static int system_add_vxlan(const char *name, const unsigned int link, struct 
blob_attr **tb, bool v6)
 {
struct blob_attr *tb_data[__VXLAN_DATA_ATTR_MAX];
@@ -3210,16 +3221,9 @@ static int system_add_vxlan(const char *name, const 
unsigned int link, struct bl
nla_put(msg, IFLA_VXLAN_PORT_RANGE, sizeof(srcports), 
);
}
 
-   if ((cur = tb_data[VXLAN_DATA_ATTR_RXCSUM])) {
-   bool rxcsum = blobmsg_get_bool(cur);
-   nla_put_u8(msg, IFLA_VXLAN_UDP_ZERO_CSUM6_RX, !rxcsum);
-   }
-
-   if ((cur = tb_data[VXLAN_DATA_ATTR_TXCSUM])) {
-   bool txcsum = blobmsg_get_bool(cur);
-   nla_put_u8(msg, IFLA_VXLAN_UDP_CSUM, txcsum);
-   nla_put_u8(msg, IFLA_VXLAN_UDP_ZERO_CSUM6_TX, !txcsum);
-   }
+   system_vxlan_map_bool_attr(msg, tb_data, IFLA_VXLAN_UDP_CSUM, 
VXLAN_DATA_ATTR_TXCSUM, false);
+   system_vxlan_map_bool_attr(msg, tb_data, IFLA_VXLAN_UDP_ZERO_CSUM6_RX, 
VXLAN_DATA_ATTR_RXCSUM, true);
+   system_vxlan_map_bool_attr(msg, tb_data, IFLA_VXLAN_UDP_ZERO_CSUM6_TX, 
VXLAN_DATA_ATTR_TXCSUM, true);
 
if ((cur = tb[TUNNEL_ATTR_TOS])) {
char *str = blobmsg_get_string(cur);
-- 
2.28.0


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


Re: [PATCH 0/2] ath25: add 5.4 kernel support (not for merge)

2020-09-03 Thread Daniel Golle
On Fri, Sep 04, 2020 at 03:20:49AM +0300, Sergey Ryazanov wrote:
> This series introduces support for 5.4 kernel. I know that this target
> was dropped earlier this week. And I think that this was a good
> decision. So, this series is not for merging, but for reference if
> someone still uses one of these boards and want to create a custom build
> with a modern kernel version.

I'd say as you have apprently really managed to get it booting it is
worth reverting the removal and including it.
Sure, a bit late, but there is hardware out there which would benefit
from recent OpenWrt (old ubnt gear, fonera, ... some of them 8/32).
But in terms of resources, ath25 is more advanced than good-old
bcm47xx and also played an important role in OpenWrt history.

Maybe I'm just nostalgic...

> 
> Sergey Ryazanov (2):
>   ath25: add kernel 5.4 support
>   ath25: eth: fix crash on skb DMA (un-)map
> 
>  target/linux/ath25/Makefile   |  1 +
>  .../linux/ath25/{config-4.14 => config-5.4}   | 73 +++
>  .../107-ar5312_gpio.patch | 20 ++---
>  .../108-ar2315_gpio.patch | 18 ++---
>  .../110-ar2313_ethernet.patch | 40 +-
>  .../120-spiflash.patch|  9 +--
>  .../130-watchdog.patch|  4 +-
>  .../140-redboot_boardconfig.patch | 14 ++--
>  .../141-redboot_partition_scan.patch} |  8 +-
>  .../142-redboot_various_erase_size_fix.patch  | 16 ++--
>  .../210-reset_button.patch|  0
>  .../220-enet_micrel_workaround.patch  | 10 +--
>  .../330-board_leds.patch  |  0
>  13 files changed, 112 insertions(+), 101 deletions(-)
>  copy target/linux/ath25/{config-4.14 => config-5.4} (76%)
>  copy target/linux/ath25/{patches-4.14 => patches-5.4}/107-ar5312_gpio.patch 
> (92%)
>  copy target/linux/ath25/{patches-4.14 => patches-5.4}/108-ar2315_gpio.patch 
> (95%)
>  copy target/linux/ath25/{patches-4.14 => 
> patches-5.4}/110-ar2313_ethernet.patch (98%)
>  copy target/linux/ath25/{patches-4.14 => patches-5.4}/120-spiflash.patch 
> (98%)
>  copy target/linux/ath25/{patches-4.14 => patches-5.4}/130-watchdog.patch 
> (98%)
>  copy target/linux/ath25/{patches-4.14 => 
> patches-5.4}/140-redboot_boardconfig.patch (81%)
>  copy target/linux/{ath79/patches-5.4/408-mtd-redboot_partition_scan.patch => 
> ath25/patches-5.4/141-redboot_partition_scan.patch} (79%)
>  copy target/linux/ath25/{patches-4.14 => 
> patches-5.4}/142-redboot_various_erase_size_fix.patch (81%)
>  copy target/linux/ath25/{patches-4.14 => patches-5.4}/210-reset_button.patch 
> (100%)
>  copy target/linux/ath25/{patches-4.14 => 
> patches-5.4}/220-enet_micrel_workaround.patch (88%)
>  copy target/linux/ath25/{patches-4.14 => patches-5.4}/330-board_leds.patch 
> (100%)
> 
> -- 
> 2.26.2
> 
> 
> ___
> 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


[PATCH 0/2] ath25: add 5.4 kernel support (not for merge)

2020-09-03 Thread Sergey Ryazanov
This series introduces support for 5.4 kernel. I know that this target
was dropped earlier this week. And I think that this was a good
decision. So, this series is not for merging, but for reference if
someone still uses one of these boards and want to create a custom build
with a modern kernel version.

Sergey Ryazanov (2):
  ath25: add kernel 5.4 support
  ath25: eth: fix crash on skb DMA (un-)map

 target/linux/ath25/Makefile   |  1 +
 .../linux/ath25/{config-4.14 => config-5.4}   | 73 +++
 .../107-ar5312_gpio.patch | 20 ++---
 .../108-ar2315_gpio.patch | 18 ++---
 .../110-ar2313_ethernet.patch | 40 +-
 .../120-spiflash.patch|  9 +--
 .../130-watchdog.patch|  4 +-
 .../140-redboot_boardconfig.patch | 14 ++--
 .../141-redboot_partition_scan.patch} |  8 +-
 .../142-redboot_various_erase_size_fix.patch  | 16 ++--
 .../210-reset_button.patch|  0
 .../220-enet_micrel_workaround.patch  | 10 +--
 .../330-board_leds.patch  |  0
 13 files changed, 112 insertions(+), 101 deletions(-)
 copy target/linux/ath25/{config-4.14 => config-5.4} (76%)
 copy target/linux/ath25/{patches-4.14 => patches-5.4}/107-ar5312_gpio.patch 
(92%)
 copy target/linux/ath25/{patches-4.14 => patches-5.4}/108-ar2315_gpio.patch 
(95%)
 copy target/linux/ath25/{patches-4.14 => 
patches-5.4}/110-ar2313_ethernet.patch (98%)
 copy target/linux/ath25/{patches-4.14 => patches-5.4}/120-spiflash.patch (98%)
 copy target/linux/ath25/{patches-4.14 => patches-5.4}/130-watchdog.patch (98%)
 copy target/linux/ath25/{patches-4.14 => 
patches-5.4}/140-redboot_boardconfig.patch (81%)
 copy target/linux/{ath79/patches-5.4/408-mtd-redboot_partition_scan.patch => 
ath25/patches-5.4/141-redboot_partition_scan.patch} (79%)
 copy target/linux/ath25/{patches-4.14 => 
patches-5.4}/142-redboot_various_erase_size_fix.patch (81%)
 copy target/linux/ath25/{patches-4.14 => patches-5.4}/210-reset_button.patch 
(100%)
 copy target/linux/ath25/{patches-4.14 => 
patches-5.4}/220-enet_micrel_workaround.patch (88%)
 copy target/linux/ath25/{patches-4.14 => patches-5.4}/330-board_leds.patch 
(100%)

-- 
2.26.2


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


[PATCH 2/2] ath25: eth: fix crash on skb DMA (un-)map

2020-09-03 Thread Sergey Ryazanov
AR2315 Ethernet driver pass NULL instead of a real device pointer to DMA
(un-)map calls. With kernel version 5.4 such behaviour causes a kernel
panic. Fix this issue by preserving device pointer during the probe
procedure and pass it to each skb data DMA (un-)map call.

Signed-off-by: Sergey Ryazanov 
---
 .../linux/ath25/patches-5.4/110-ar2313_ethernet.patch  | 10 ++
 .../ath25/patches-5.4/220-enet_micrel_workaround.patch | 10 +-
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/target/linux/ath25/patches-5.4/110-ar2313_ethernet.patch 
b/target/linux/ath25/patches-5.4/110-ar2313_ethernet.patch
index e4f5fa8d2e..57c18abf69 100644
--- a/target/linux/ath25/patches-5.4/110-ar2313_ethernet.patch
+++ b/target/linux/ath25/patches-5.4/110-ar2313_ethernet.patch
@@ -33,7 +33,7 @@
 +obj-$(CONFIG_NET_AR231X) += ar231x.o
 --- /dev/null
 +++ b/drivers/net/ethernet/atheros/ar231x/ar231x.c
-@@ -0,0 +1,1119 @@
+@@ -0,0 +1,1120 @@
 +/*
 + * ar231x.c: Linux driver for the Atheros AR231x Ethernet device.
 + *
@@ -225,6 +225,7 @@
 +
 +  sp = netdev_priv(dev);
 +  sp->dev = dev;
++  sp->pdev = pdev;
 +  sp->cfg = pdev->dev.platform_data;
 +
 +  sprintf(buf, "eth%d_membase", pdev->id);
@@ -787,7 +788,7 @@
 +  break;
 +  }
 +  /* done with this descriptor */
-+  dma_unmap_single(NULL, txdesc->addr,
++  dma_unmap_single(>pdev->dev, txdesc->addr,
 +   txdesc->devcs & DMA_TX1_BSIZE_MASK,
 +   DMA_TO_DEVICE);
 +  txdesc->status = 0;
@@ -1014,7 +1015,7 @@
 +  /* Setup the transmit descriptor. */
 +  td->devcs = ((skb->len << DMA_TX1_BSIZE_SHIFT) |
 +   (DMA_TX1_LS | DMA_TX1_IC | DMA_TX1_CHAINED));
-+  td->addr = dma_map_single(NULL, skb->data, skb->len, DMA_TO_DEVICE);
++  td->addr = dma_map_single(>pdev->dev, skb->data, skb->len, 
DMA_TO_DEVICE);
 +  td->status = DMA_TX_OWN;
 +
 +  /* kick transmitter last */
@@ -1155,7 +1156,7 @@
 +
 --- /dev/null
 +++ b/drivers/net/ethernet/atheros/ar231x/ar231x.h
-@@ -0,0 +1,281 @@
+@@ -0,0 +1,282 @@
 +/*
 + * ar231x.h: Linux driver for the Atheros AR231x Ethernet device.
 + *
@@ -1379,6 +1380,7 @@
 + */
 +struct ar231x_private {
 +  struct net_device *dev;
++  struct platform_device *pdev;
 +  int version;
 +  u32 mb[2];
 +
diff --git a/target/linux/ath25/patches-5.4/220-enet_micrel_workaround.patch 
b/target/linux/ath25/patches-5.4/220-enet_micrel_workaround.patch
index 91b9792515..9051e1b466 100644
--- a/target/linux/ath25/patches-5.4/220-enet_micrel_workaround.patch
+++ b/target/linux/ath25/patches-5.4/220-enet_micrel_workaround.patch
@@ -41,7 +41,7 @@
  static int ar231x_probe(struct platform_device *pdev)
  {
struct net_device *dev;
-@@ -273,6 +300,24 @@ static int ar231x_probe(struct platform_
+@@ -274,6 +301,24 @@ static int ar231x_probe(struct platform_
  
mdiobus_register(sp->mii_bus);
  
@@ -66,7 +66,7 @@
if (ar231x_mdiobus_probe(dev) != 0) {
printk(KERN_ERR "%s: mdiobus_probe failed\n", dev->name);
rx_tasklet_cleanup(dev);
-@@ -326,8 +371,10 @@ static int ar231x_remove(struct platform
+@@ -327,8 +372,10 @@ static int ar231x_remove(struct platform
rx_tasklet_cleanup(dev);
ar231x_init_cleanup(dev);
unregister_netdev(dev);
@@ -79,7 +79,7 @@
kfree(dev);
return 0;
  }
-@@ -870,7 +917,8 @@ static int ar231x_open(struct net_device
+@@ -871,7 +918,8 @@ static int ar231x_open(struct net_device
  
sp->eth_regs->mac_control |= MAC_CONTROL_RE;
  
@@ -89,7 +89,7 @@
  
return 0;
  }
-@@ -951,7 +999,8 @@ static int ar231x_close(struct net_devic
+@@ -952,7 +1000,8 @@ static int ar231x_close(struct net_devic
  
  #endif
  
@@ -99,7 +99,7 @@
  
return 0;
  }
-@@ -995,6 +1044,9 @@ static int ar231x_ioctl(struct net_devic
+@@ -996,6 +1045,9 @@ static int ar231x_ioctl(struct net_devic
  {
struct ar231x_private *sp = netdev_priv(dev);
  
-- 
2.26.2


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


[PATCH 1/2] ath25: add kernel 5.4 support

2020-09-03 Thread Sergey Ryazanov
Copy and refresh patches and config from 4.14. The only couple of fixes
required to make kernel buildable:
* rework ethernet supported link modes to linkmode bitmask;
* drop erase callback invocation from AR2315 MTD driver.

Signed-off-by: Sergey Ryazanov 
---
 target/linux/ath25/Makefile   |  1 +
 .../linux/ath25/{config-4.14 => config-5.4}   | 73 +++
 .../107-ar5312_gpio.patch | 20 ++---
 .../108-ar2315_gpio.patch | 18 ++---
 .../110-ar2313_ethernet.patch | 30 
 .../120-spiflash.patch|  9 +--
 .../130-watchdog.patch|  4 +-
 .../140-redboot_boardconfig.patch | 14 ++--
 .../141-redboot_partition_scan.patch} |  8 +-
 .../142-redboot_various_erase_size_fix.patch  | 16 ++--
 .../210-reset_button.patch|  0
 .../220-enet_micrel_workaround.patch  |  0
 .../330-board_leds.patch  |  0
 13 files changed, 101 insertions(+), 92 deletions(-)
 copy target/linux/ath25/{config-4.14 => config-5.4} (76%)
 copy target/linux/ath25/{patches-4.14 => patches-5.4}/107-ar5312_gpio.patch 
(92%)
 copy target/linux/ath25/{patches-4.14 => patches-5.4}/108-ar2315_gpio.patch 
(95%)
 copy target/linux/ath25/{patches-4.14 => 
patches-5.4}/110-ar2313_ethernet.patch (98%)
 copy target/linux/ath25/{patches-4.14 => patches-5.4}/120-spiflash.patch (98%)
 copy target/linux/ath25/{patches-4.14 => patches-5.4}/130-watchdog.patch (98%)
 copy target/linux/ath25/{patches-4.14 => 
patches-5.4}/140-redboot_boardconfig.patch (81%)
 copy target/linux/{ath79/patches-5.4/408-mtd-redboot_partition_scan.patch => 
ath25/patches-5.4/141-redboot_partition_scan.patch} (79%)
 copy target/linux/ath25/{patches-4.14 => 
patches-5.4}/142-redboot_various_erase_size_fix.patch (81%)
 copy target/linux/ath25/{patches-4.14 => patches-5.4}/210-reset_button.patch 
(100%)
 copy target/linux/ath25/{patches-4.14 => 
patches-5.4}/220-enet_micrel_workaround.patch (100%)
 copy target/linux/ath25/{patches-4.14 => patches-5.4}/330-board_leds.patch 
(100%)

diff --git a/target/linux/ath25/Makefile b/target/linux/ath25/Makefile
index f885112460..0ed40bd54b 100644
--- a/target/linux/ath25/Makefile
+++ b/target/linux/ath25/Makefile
@@ -12,6 +12,7 @@ BOARDNAME:=Atheros AR231x/AR5312
 FEATURES:=squashfs low_mem small_flash
 
 KERNEL_PATCHVER:=4.14
+KERNEL_TESTING_PATCHVER:=5.4
 
 define Target/Description
Build firmware images for Atheros SoC boards
diff --git a/target/linux/ath25/config-4.14 b/target/linux/ath25/config-5.4
similarity index 76%
copy from target/linux/ath25/config-4.14
copy to target/linux/ath25/config-5.4
index 734f598cd0..f59f48f655 100644
--- a/target/linux/ath25/config-4.14
+++ b/target/linux/ath25/config-5.4
@@ -1,26 +1,26 @@
 CONFIG_ADM6996_PHY=y
 CONFIG_AR2315_WDT=y
 CONFIG_AR8216_PHY=y
-CONFIG_ARCH_BINFMT_ELF_STATE=y
+CONFIG_ARCH_32BIT_OFF_T=y
 CONFIG_ARCH_CLOCKSOURCE_DATA=y
-CONFIG_ARCH_DISCARD_MEMBLOCK=y
+CONFIG_ARCH_HAS_DMA_COHERENT_TO_PFN=y
+CONFIG_ARCH_HAS_DMA_PREP_COHERENT=y
+CONFIG_ARCH_HAS_DMA_WRITE_COMBINE=y
 CONFIG_ARCH_HAS_ELF_RANDOMIZE=y
-# CONFIG_ARCH_HAS_GCOV_PROFILE_ALL is not set
-# CONFIG_ARCH_HAS_SG_CHAIN is not set
-# CONFIG_ARCH_HAS_STRICT_KERNEL_RWX is not set
-# CONFIG_ARCH_HAS_STRICT_MODULE_RWX is not set
+CONFIG_ARCH_HAS_PHYS_TO_DMA=y
+CONFIG_ARCH_HAS_PTE_SPECIAL=y
+CONFIG_ARCH_HAS_SYNC_DMA_FOR_DEVICE=y
+CONFIG_ARCH_HAS_UNCACHED_SEGMENT=y
 CONFIG_ARCH_HIBERNATION_POSSIBLE=y
-CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y
-CONFIG_ARCH_MIGHT_HAVE_PC_SERIO=y
 CONFIG_ARCH_MMAP_RND_BITS_MAX=15
 CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MAX=15
-# CONFIG_ARCH_OPTIONAL_KERNEL_RWX is not set
-# CONFIG_ARCH_OPTIONAL_KERNEL_RWX_DEFAULT is not set
 CONFIG_ARCH_SUPPORTS_UPROBES=y
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
 CONFIG_ARCH_USE_BUILTIN_BSWAP=y
+CONFIG_ARCH_USE_MEMREMAP_PROT=y
 CONFIG_ARCH_USE_QUEUED_RWLOCKS=y
 CONFIG_ARCH_USE_QUEUED_SPINLOCKS=y
+CONFIG_ARCH_WANT_DEFAULT_TOPDOWN_MMAP_LAYOUT=y
 CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
 CONFIG_ATH25=y
 CONFIG_BLK_MQ_PCI=y
@@ -29,8 +29,10 @@ CONFIG_CLONE_BACKWARDS=y
 CONFIG_CMDLINE="console=ttyS0,9600 rootfstype=squashfs,jffs2"
 CONFIG_CMDLINE_BOOL=y
 # CONFIG_CMDLINE_OVERRIDE is not set
+CONFIG_COMPAT_32BIT_TIME=y
 CONFIG_CPU_BIG_ENDIAN=y
 CONFIG_CPU_GENERIC_DUMP_TLB=y
+CONFIG_CPU_HAS_LOAD_STORE_LR=y
 CONFIG_CPU_HAS_PREFETCH=y
 CONFIG_CPU_HAS_SYNC=y
 CONFIG_CPU_MIPS32=y
@@ -38,23 +40,34 @@ CONFIG_CPU_MIPS32_R1=y
 CONFIG_CPU_MIPSR1=y
 CONFIG_CPU_NEEDS_NO_SMARTMIPS_OR_MICROMIPS=y
 CONFIG_CPU_R4K_CACHE_TLB=y
-CONFIG_CPU_R4K_FPU=y
 CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y
 CONFIG_CPU_SUPPORTS_HIGHMEM=y
 CONFIG_CRYPTO_RNG2=y
-CONFIG_CRYPTO_WORKQUEUE=y
 CONFIG_CSRC_R4K=y
 CONFIG_DMA_NONCOHERENT=y
+CONFIG_DMA_NONCOHERENT_CACHE_SYNC=y
 CONFIG_EARLY_PRINTK=y
+CONFIG_EFI_EARLYCON=y
 CONFIG_ETHERNET_PACKET_MANGLE=y
+CONFIG_FONT_8x16=y
+CONFIG_FONT_AUTOSELECT=y
+CONFIG_FONT_SUPPORT=y
+CONFIG_FORCE_PCI=y

[PATCH] zones: fix max length of zone names

2020-09-03 Thread David Bauer
Previously the max length of a zone name was assuming the max
length for a extension in netfilter is 32 bytes while in reality it is
only 29.

Fix this incorrect assumption to allow firewall3 to validate the zone
name lengths correctly.

Signed-off-by: David Bauer 
---
 zones.h | 8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/zones.h b/zones.h
index d786736..beb0e22 100644
--- a/zones.h
+++ b/zones.h
@@ -22,8 +22,12 @@
 #include "options.h"
 #include "iptables.h"
 
-/* 32 - sizeof("postrouting_") - sizeof("_rule") - sizeof("\0") */
-#define FW3_ZONE_MAXNAMELEN 14
+/* XT_EXTENSION_MAXNAMELEN (29)
+ *  - sizeof("postrouting_")
+ *  - sizeof("_rule")
+ *  - sizeof("\0")
+ */
+#define FW3_ZONE_MAXNAMELEN 11
 
 extern const struct fw3_option fw3_zone_opts[];
 
-- 
2.28.0


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


[PATCH 19.07 v2 4/6] ath10k-firmware: move CT firmwares to new package

2020-09-03 Thread Baptiste Jonglez
From: Álvaro Fernández Rojas 

Signed-off-by: Álvaro Fernández Rojas 
(cherry picked from commit 658e68f85c2645e0132edc6b30a9c76cc17292de)
---
 package/firmware/ath10k-ct-firmware/Makefile | 524 +++
 package/firmware/ath10k-firmware/Makefile| 446 
 2 files changed, 524 insertions(+), 446 deletions(-)
 create mode 100644 package/firmware/ath10k-ct-firmware/Makefile

diff --git a/package/firmware/ath10k-ct-firmware/Makefile 
b/package/firmware/ath10k-ct-firmware/Makefile
new file mode 100644
index 00..79bdeeec4f
--- /dev/null
+++ b/package/firmware/ath10k-ct-firmware/Makefile
@@ -0,0 +1,524 @@
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=ath10k-ct-firmware
+PKG_VERSION:=2020-03-25
+PKG_RELEASE:=1
+
+include $(INCLUDE_DIR)/package.mk
+
+ATH10K_FIRMWARE_REV:=d622d160e9f552ead68d9ae81b715422892dc2ef
+ATH10K_FIRMWARE_URL:=@GITHUB/kvalo/ath10k-firmware/$(ATH10K_FIRMWARE_REV)
+
+QCA9887_BOARD_FILE:=ath10k-firmware-$(ATH10K_FIRMWARE_REV)-qca9887-board.bin
+define Download/qca9887-board
+  FILE:=$(QCA9887_BOARD_FILE)
+  URL:=$(ATH10K_FIRMWARE_URL)/QCA9887/hw1.0
+  URL_FILE:=board.bin
+  HASH:=cf4df099f6ee05c181f55ce17297a1d32c61d725eb96246fd315ad5587c42426
+endef
+$(eval $(call Download,qca9887-board))
+
+QCA988X_BOARD_FILE:=ath10k-firmware-$(ATH10K_FIRMWARE_REV)-qca988x-board.bin
+define Download/qca988x-board
+  FILE:=$(QCA988X_BOARD_FILE)
+  URL:=$(ATH10K_FIRMWARE_URL)/QCA988X/hw2.0
+  URL_FILE:=board.bin
+  HASH:=5b5b380333c2dd3b6ce67f30e2f7008f4020bf594970d3b464fd8d4a80fcd880
+endef
+$(eval $(call Download,qca988x-board))
+
+QCA99X0_BOARD_FILE:=ath10k-firmware-$(ATH10K_FIRMWARE_REV)-qca99x0-board.bin
+define Download/qca99x0-board
+  FILE:=$(QCA99X0_BOARD_FILE)
+  URL:=$(ATH10K_FIRMWARE_URL)/QCA99X0/hw2.0
+  URL_FILE:=boardData_AR900B_CUS239_5G_v2_001.bin
+  HASH:=3bf7561ee373b369025dcd366d276d038a97d3397ccae41ce841d98a58b30aff
+endef
+$(eval $(call Download,qca99x0-board))
+
+QCA99X0_BOARD2_REV:=ddcec9efd245da9365c474f513a855a55f3ac7fe
+QCA99X0_BOARD2_FILE:=ath10k-firmware-$(QCA99X0_BOARD2_REV)-qca99x0-board-2.bin
+define Download/qca99x0-board2
+  FILE:=$(QCA99X0_BOARD2_FILE)
+  
URL:=https://source.codeaurora.org/quic/qsdk/oss/firmware/ath10k-firmware/plain/ath10k/QCA99X0/hw2.0
+  URL_FILE:=board-2.bin?id=$(QCA99X0_BOARD2_REV)
+  HASH:=03711ac21e60ef59d3815e235eb721c0c22851b5410299411085aa6f2af45401
+endef
+$(eval $(call Download,qca99x0-board2))
+
+QCA9984_BOARD2_FILE:=ath10k-firmware-$(ATH10K_FIRMWARE_REV)-qca9984-board-2.bin
+define Download/qca9984-board2
+  FILE:=$(QCA9984_BOARD2_FILE)
+  URL:=$(ATH10K_FIRMWARE_URL)/QCA9984/hw1.0
+  URL_FILE:=board-2.bin
+  HASH:=0d6d46cf0467185e3959ce3cb69e2415be6e48ab8a4bee3eb400edbe48cb9c25
+endef
+$(eval $(call Download,qca9984-board2))
+
+QCA4019_BOARD2_FILE:=ath10k-firmware-$(ATH10K_FIRMWARE_REV)-qca4019-board-2.bin
+define Download/qca4019-board2
+  FILE:=$(QCA4019_BOARD2_FILE)
+  URL:=$(ATH10K_FIRMWARE_URL)/QCA4019/hw1.0
+  URL_FILE:=board-2.bin
+  HASH:=94b66aa4ddbed5110a96364d3c7b4ebcb320e3ac4e8697660b277e76077bc338
+endef
+$(eval $(call Download,qca4019-board2))
+
+QCA9888_BOARD2_FILE:=ath10k-firmware-$(ATH10K_FIRMWARE_REV)-qca9888-board-2.bin
+define Download/qca9888-board2
+  FILE:=$(QCA9888_BOARD2_FILE)
+  URL:=$(ATH10K_FIRMWARE_URL)/QCA9888/hw2.0
+  URL_FILE:=board-2.bin
+  HASH:=5b871bb567f64525ca45adb88063211de472015d09e0f9aa3fa61ab71c8fdfd3
+endef
+$(eval $(call Download,qca9888-board2))
+
+CT_FIRMWARE_FILE = $(1)-$($(1)_FIRMWARE_FILE_CT)
+CT_FIRMWARE_FILE_HTT = $(1)-$($(1)_FIRMWARE_FILE_CT_HTT)
+
+define Download/ct-firmware
+  URL:=https://www.candelatech.com/downloads/$(2)
+  FILE:=$(call CT_FIRMWARE_FILE,$(1))
+  URL_FILE:=$($(1)_FIRMWARE_FILE_CT)
+endef
+
+define Download/ct-firmware-htt
+  URL:=https://www.candelatech.com/downloads/$(2)
+  FILE:=$(call CT_FIRMWARE_FILE_HTT,$(1))
+  URL_FILE:=$($(1)_FIRMWARE_FILE_CT_HTT)
+endef
+
+QCA988X_FIRMWARE_FILE_CT:=firmware-2-ct-full-community-22.bin.lede.017
+define Download/ath10k-firmware-qca988x-ct
+  $(call Download/ct-firmware,QCA988X,)
+  HASH:=2f0bf766e400a4c5726e77b128eb8c141ebaa778526fe2c7c5083f3b17659dbf
+endef
+$(eval $(call Download,ath10k-firmware-qca988x-ct))
+
+QCA988X_FIRMWARE_FILE_CT_HTT:=firmware-2-ct-full-htt-mgt-community-22.bin.lede.017
+define Download/ath10k-firmware-qca988x-ct-htt
+  $(call Download/ct-firmware-htt,QCA988X,)
+  HASH:=5e4285d5c6eee159a25ca14c6ce26022c32380bd7bafaedfc0c5de1510119007
+endef
+$(eval $(call Download,ath10k-firmware-qca988x-ct-htt))
+
+
+QCA9887_FIRMWARE_FILE_CT:=firmware-2-ct-full-community-22.bin.lede.017
+define Download/ath10k-firmware-qca9887-ct
+  $(call Download/ct-firmware,QCA9887,ath10k-9887)
+  HASH:=4fa30e0e1972ca3b06225a731df0f93a1b73ac67fea5bf54bb55dea3bbc0da6a
+endef
+$(eval $(call Download,ath10k-firmware-qca9887-ct))
+
+QCA9887_FIRMWARE_FILE_CT_HTT:=firmware-2-ct-full-htt-mgt-community-22.bin.lede.017
+define Download/ath10k-firmware-qca9887-ct-htt
+  $(call 

Re: MR24 wifi broken by recent commit

2020-09-03 Thread Russell Senior
> Christian Lamparter  writes:

> On 2020-09-03 10:44, Russell Senior wrote:
>> commit 9153955095f01a7ac5f2659a671f0229cbad3507 Author: Christian
>> Lamparter mailto:chunk...@gmail.com>> Date:  
>> Wed Aug 12 18:26:43 2020 +0200
>> 
>>     apm821xx: MR24: enumerate PCIe in device-tree
>> 
>>     This patch adds the pcie-switch and bridge configuration for    
>> the Meraki MR24.
>> 
>>     Signed-off-by: Christian Lamparter > >
>> 
>> The symptom is client devices can't see the beacons. Wifi ifaces
>> appear, can scan and hear other networks, but clients can't see the
>> MR24's SSIDs. Reverting the commit above and it works normally again.

> Thanks for the report. CONFIG_PCI_DEBUG



> "ath9k :44:00.0: runtime IRQ mapping not provided by arch"



> since DT overwrites the usual PCI(e) enumeration and MSI(x) is

> busted there's no choice but to specify legacy INTABCDs.


> Can you please try the attached patch?

Your patch fixes it.

I am a little curious, if it works without your commit, what is the
motivation for the commit?


-- 
Russell Senior, President
russ...@personaltelco.net

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


[PATCH 18.06] scripts: getver.sh: Fix version when running on local 18.06 branch

2020-09-03 Thread Baptiste Jonglez
From: Baptiste Jonglez 

When building from a local branch based off the "openwrt-18.06" branch,
version computation is wrong, for instance:

r6907+1154-7e15e21766

The number of local commits (1154 in this case) is wrong because it is
computed against master.  As a result, it wrongly counts *all* commits
since the beginning of the openwrt-18.06 branch as local commits.

The fix is to compare to the openwrt-18.06 branch instead, which gives the
expected result such as:

r8060+1-1238a22316

Signed-off-by: Baptiste Jonglez 
---
 scripts/getver.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/getver.sh b/scripts/getver.sh
index 9175f411db..dbd3292343 100755
--- a/scripts/getver.sh
+++ b/scripts/getver.sh
@@ -26,7 +26,7 @@ try_git() {
*)
BRANCH="$(git rev-parse --abbrev-ref HEAD)"
ORIGIN="$(git rev-parse --verify --symbolic-full-name 
${BRANCH}@{u} 2>/dev/null)"
-   [ -n "$ORIGIN" ] || ORIGIN="$(git rev-parse --verify 
--symbolic-full-name master@{u} 2>/dev/null)"
+   [ -n "$ORIGIN" ] || ORIGIN="$(git rev-parse --verify 
--symbolic-full-name openwrt-18.06@{u} 2>/dev/null)"
REV="$(git rev-list ${REBOOT}..$GET_REV | wc -l | awk '{print 
$1}')"
 
if [ -n "$ORIGIN" ]; then
-- 
2.27.0


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


[PATCH 19.07] scripts: getver.sh: Fix version when running on local 19.07 branch

2020-09-03 Thread Baptiste Jonglez
From: Baptiste Jonglez 

When building from a local branch based off the "openwrt-19.07" branch,
version computation is wrong, for instance:

r10194+1004-c53f62b111

The number of local commits (1004 in this case) is wrong because it is
computed against master.  As a result, it wrongly counts *all* commits
since the beginning of the openwrt-19.07 branch as local commits.

The fix is to compare to the openwrt-19.07 branch instead, which gives the
expected result such as:

r11192+6-8b0278a17e

Signed-off-by: Baptiste Jonglez 
---
 scripts/getver.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/getver.sh b/scripts/getver.sh
index 9175f411db..a0063505c3 100755
--- a/scripts/getver.sh
+++ b/scripts/getver.sh
@@ -26,7 +26,7 @@ try_git() {
*)
BRANCH="$(git rev-parse --abbrev-ref HEAD)"
ORIGIN="$(git rev-parse --verify --symbolic-full-name 
${BRANCH}@{u} 2>/dev/null)"
-   [ -n "$ORIGIN" ] || ORIGIN="$(git rev-parse --verify 
--symbolic-full-name master@{u} 2>/dev/null)"
+   [ -n "$ORIGIN" ] || ORIGIN="$(git rev-parse --verify 
--symbolic-full-name openwrt-19.07@{u} 2>/dev/null)"
REV="$(git rev-list ${REBOOT}..$GET_REV | wc -l | awk '{print 
$1}')"
 
if [ -n "$ORIGIN" ]; then
-- 
2.27.0


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


[PATCH 19.07 v2 5/6] ath10k-ct-firmware: update firmware images

2020-09-03 Thread Baptiste Jonglez
From: Álvaro Fernández Rojas 

No release notes this time.

Signed-off-by: Álvaro Fernández Rojas 
(cherry picked from commit 06f510df6e2aa0b1e40124bbd758672458d01482)
[adapt variables and package names because we did not backport
 2e5e9b459ed5 ("ath10k-ct-firmware: rename ct-htt packages")]
Signed-off-by: Baptiste Jonglez 
---
 package/firmware/ath10k-ct-firmware/Makefile | 50 ++--
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/package/firmware/ath10k-ct-firmware/Makefile 
b/package/firmware/ath10k-ct-firmware/Makefile
index 79bdeeec4f..6fe8ea6d3b 100644
--- a/package/firmware/ath10k-ct-firmware/Makefile
+++ b/package/firmware/ath10k-ct-firmware/Makefile
@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ath10k-ct-firmware
-PKG_VERSION:=2020-03-25
+PKG_VERSION:=2020-04-24
 PKG_RELEASE:=1
 
 include $(INCLUDE_DIR)/package.mk
@@ -88,92 +88,92 @@ define Download/ct-firmware-htt
   URL_FILE:=$($(1)_FIRMWARE_FILE_CT_HTT)
 endef
 
-QCA988X_FIRMWARE_FILE_CT:=firmware-2-ct-full-community-22.bin.lede.017
+QCA988X_FIRMWARE_FILE_CT:=firmware-2-ct-full-community-22.bin.lede.018
 define Download/ath10k-firmware-qca988x-ct
   $(call Download/ct-firmware,QCA988X,)
-  HASH:=2f0bf766e400a4c5726e77b128eb8c141ebaa778526fe2c7c5083f3b17659dbf
+  HASH:=8b4c99253aa309d35f2e060c190091b8db1b84dbda06a6a15c83ac0f9a938126
 endef
 $(eval $(call Download,ath10k-firmware-qca988x-ct))
 
-QCA988X_FIRMWARE_FILE_CT_HTT:=firmware-2-ct-full-htt-mgt-community-22.bin.lede.017
+QCA988X_FIRMWARE_FILE_CT_HTT:=firmware-2-ct-full-htt-mgt-community-22.bin.lede.018
 define Download/ath10k-firmware-qca988x-ct-htt
   $(call Download/ct-firmware-htt,QCA988X,)
-  HASH:=5e4285d5c6eee159a25ca14c6ce26022c32380bd7bafaedfc0c5de1510119007
+  HASH:=a7168916d6aa5e4d7858f8b620c0c980c76d03f390929db6f4077685ce2051e7
 endef
 $(eval $(call Download,ath10k-firmware-qca988x-ct-htt))
 
 
-QCA9887_FIRMWARE_FILE_CT:=firmware-2-ct-full-community-22.bin.lede.017
+QCA9887_FIRMWARE_FILE_CT:=firmware-2-ct-full-community-22.bin.lede.018
 define Download/ath10k-firmware-qca9887-ct
   $(call Download/ct-firmware,QCA9887,ath10k-9887)
-  HASH:=4fa30e0e1972ca3b06225a731df0f93a1b73ac67fea5bf54bb55dea3bbc0da6a
+  HASH:=459692deb186a63ab8eeddb7ad5d54779266e68ca686e7c46062554db6dca12b
 endef
 $(eval $(call Download,ath10k-firmware-qca9887-ct))
 
-QCA9887_FIRMWARE_FILE_CT_HTT:=firmware-2-ct-full-htt-mgt-community-22.bin.lede.017
+QCA9887_FIRMWARE_FILE_CT_HTT:=firmware-2-ct-full-htt-mgt-community-22.bin.lede.018
 define Download/ath10k-firmware-qca9887-ct-htt
   $(call Download/ct-firmware-htt,QCA9887,ath10k-9887)
-  HASH:=dc681b6b1e45956e7c2e418ab05eee5c943d13e775209196d9bd931ff6493935
+  HASH:=fd126a457d0927d0c8ea10d66ef5b67d5e1e0741f8692bb3016bb602d0af3098
 endef
 $(eval $(call Download,ath10k-firmware-qca9887-ct-htt))
 
 
-QCA99X0_FIRMWARE_FILE_CT:=firmware-5-ct-full-community-12.bin-lede.017
+QCA99X0_FIRMWARE_FILE_CT:=firmware-5-ct-full-community-12.bin-lede.018
 define Download/ath10k-firmware-qca99x0-ct
   $(call Download/ct-firmware,QCA99X0,ath10k-10-4b)
-  HASH:=289ea845d4bbae6f36b3af2a13a5eaa07097f52d10f7b7306cfc9e2dd394f889
+  HASH:=cf26eb37524de54af51fe9b2efffc85e0e70ab849e8607ef63ce5a8ecffeaa42
 endef
 $(eval $(call Download,ath10k-firmware-qca99x0-ct))
 
-QCA99X0_FIRMWARE_FILE_CT_HTT:=firmware-5-ct-full-htt-mgt-community-12.bin-lede.017
+QCA99X0_FIRMWARE_FILE_CT_HTT:=firmware-5-ct-full-htt-mgt-community-12.bin-lede.018
 define Download/ath10k-firmware-qca99x0-ct-htt
   $(call Download/ct-firmware-htt,QCA99X0,ath10k-10-4b)
-  HASH:=adedcd3d379a910bc3a5257d75f8970e11319f4cd9c1b34440d35821602a8b9c
+  HASH:=e9737538d7379e13ad4e4c8c519a63659b5e34a35455ed9ac4399ae8097caabc
 endef
 $(eval $(call Download,ath10k-firmware-qca99x0-ct-htt))
 
 
-QCA9984_FIRMWARE_FILE_CT:=firmware-5-ct-full-community-12.bin-lede.017
+QCA9984_FIRMWARE_FILE_CT:=firmware-5-ct-full-community-12.bin-lede.018
 define Download/ath10k-firmware-qca9984-ct
   $(call Download/ct-firmware,QCA9984,ath10k-9984-10-4b)
-  HASH:=8175be5b3946bddc042be018ff7713e67b41b59374ef4cdd183185b59274c91a
+  HASH:=a6b3d66efe640a430a837f238e91eddcd423eed6b887d3ae19716d87a71fd0b1
 endef
 $(eval $(call Download,ath10k-firmware-qca9984-ct))
 
-QCA9984_FIRMWARE_FILE_CT_HTT:=firmware-5-ct-full-htt-mgt-community-12.bin-lede.017
+QCA9984_FIRMWARE_FILE_CT_HTT:=firmware-5-ct-full-htt-mgt-community-12.bin-lede.018
 define Download/ath10k-firmware-qca9984-ct-htt
   $(call Download/ct-firmware-htt,QCA9984,ath10k-9984-10-4b)
-  HASH:=eb8b894cfe0d1aaa87f130bb7fd1815ef07b951c14df8a2ceaeb780df8f640e0
+  HASH:=96060227e372b3b210badccbe6b0bd75d9a35335a7a0f2966964e9e89f66b00f
 endef
 $(eval $(call Download,ath10k-firmware-qca9984-ct-htt))
 
 
-QCA4019_FIRMWARE_FILE_CT:=firmware-5-ct-full-community-12.bin-lede.017
+QCA4019_FIRMWARE_FILE_CT:=firmware-5-ct-full-community-12.bin-lede.018
 define Download/ath10k-firmware-qca4019-ct
   $(call Download/ct-firmware,QCA4019,ath10k-4019-10-4b)
-  

[PATCH 19.07 v2 3/6] ath10k-firmware: update ath10k-ct firmware images

2020-09-03 Thread Baptiste Jonglez
From: Álvaro Fernández Rojas 

Release notes for 017:

Wave-1:

 *  March 19, 2020:  Fix problem where power-save was not enabled when going 
off-channel to scan.
 The problem was a boolean logic inversion in the chmgr 
code, a regression I introduced
 a long time ago.

 *  March 19, 2020:  When scanning only on current working channel, do not 
bother with disable/enable
 powersave.  This should make an on-channel scan less 
obtrusive than it was previously.

 *  March 23, 2020:  Fix channel-mgr use-after-free problem that caused crashes 
in some cases.  The crash
 was exacerbated by recent power-save changes.

 *  March 23, 2020:  Fix station-mode power-save related crash:  backported the 
fix from 10.2 QCA firmware.

 *  March 23, 2020:  Attempt to better clean up power-save objects and state, 
especially in station mode.

Release notes for 016:

Wave-1 changes, some debugging code for a crash someone reported, plus:

*  February 28, 2020:  Fix custom-tx path when sending in 0x0 for rate-code.  
Have tries == 0 mean
one try but NO-ACK (similar to how wave-2 does it).

wave-2:

 * Fixed some long-ago regressions related to powersave and/or multicast.  
Maybe fix some
   additional multicast and/or tx-scheduling bugs.

Signed-off-by: Álvaro Fernández Rojas 
Acked-by: Petr Štetiar 
(cherry picked from commit 84f4a783c6987fd9d67c089a76e2f90b7491f446)
---
 package/firmware/ath10k-firmware/Makefile | 48 +++
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/package/firmware/ath10k-firmware/Makefile 
b/package/firmware/ath10k-firmware/Makefile
index af883e6f03..6eb7cf9a99 100644
--- a/package/firmware/ath10k-firmware/Makefile
+++ b/package/firmware/ath10k-firmware/Makefile
@@ -64,92 +64,92 @@ define Download/ct-firmware-htt
   URL_FILE:=$($(1)_FIRMWARE_FILE_CT_HTT)
 endef
 
-QCA988X_FIRMWARE_FILE_CT:=firmware-2-ct-full-community-22.bin.lede.015
+QCA988X_FIRMWARE_FILE_CT:=firmware-2-ct-full-community-22.bin.lede.017
 define Download/ath10k-firmware-qca988x-ct
   $(call Download/ct-firmware,QCA988X,)
-  HASH:=a3a760d0d72707feffa496b6d2266bd9195f09806553b36420b60c0f12b8b87e
+  HASH:=2f0bf766e400a4c5726e77b128eb8c141ebaa778526fe2c7c5083f3b17659dbf
 endef
 $(eval $(call Download,ath10k-firmware-qca988x-ct))
 
-QCA988X_FIRMWARE_FILE_CT_HTT:=firmware-2-ct-full-htt-mgt-community-22.bin.lede.015
+QCA988X_FIRMWARE_FILE_CT_HTT:=firmware-2-ct-full-htt-mgt-community-22.bin.lede.017
 define Download/ath10k-firmware-qca988x-ct-htt
   $(call Download/ct-firmware-htt,QCA988X,)
-  HASH:=3114a54103d2b492fa1ef903769721f59953c829020d62502a1ec411ab4146d5
+  HASH:=5e4285d5c6eee159a25ca14c6ce26022c32380bd7bafaedfc0c5de1510119007
 endef
 $(eval $(call Download,ath10k-firmware-qca988x-ct-htt))
 
 
-QCA9887_FIRMWARE_FILE_CT:=firmware-2-ct-full-community-22.bin.lede.015
+QCA9887_FIRMWARE_FILE_CT:=firmware-2-ct-full-community-22.bin.lede.017
 define Download/ath10k-firmware-qca9887-ct
   $(call Download/ct-firmware,QCA9887,ath10k-9887)
-  HASH:=71e8b76dfd7c786d2f57bb7df207dcd13a91d3b492cfbd28916f084d0d1bb5e7
+  HASH:=4fa30e0e1972ca3b06225a731df0f93a1b73ac67fea5bf54bb55dea3bbc0da6a
 endef
 $(eval $(call Download,ath10k-firmware-qca9887-ct))
 
-QCA9887_FIRMWARE_FILE_CT_HTT:=firmware-2-ct-full-htt-mgt-community-22.bin.lede.015
+QCA9887_FIRMWARE_FILE_CT_HTT:=firmware-2-ct-full-htt-mgt-community-22.bin.lede.017
 define Download/ath10k-firmware-qca9887-ct-htt
   $(call Download/ct-firmware-htt,QCA9887,ath10k-9887)
-  HASH:=b085e5d2239727b72bc647a76864431b8ac48438e6a33b1d55edc468f6ff
+  HASH:=dc681b6b1e45956e7c2e418ab05eee5c943d13e775209196d9bd931ff6493935
 endef
 $(eval $(call Download,ath10k-firmware-qca9887-ct-htt))
 
 
-QCA99X0_FIRMWARE_FILE_CT:=firmware-5-ct-full-community-12.bin-lede.015
+QCA99X0_FIRMWARE_FILE_CT:=firmware-5-ct-full-community-12.bin-lede.017
 define Download/ath10k-firmware-qca99x0-ct
   $(call Download/ct-firmware,QCA99X0,ath10k-10-4b)
-  HASH:=edebe2f6f169cdd05c81a8a78156fb3426a66f415e7946af2ae4b7310fca5fe3
+  HASH:=289ea845d4bbae6f36b3af2a13a5eaa07097f52d10f7b7306cfc9e2dd394f889
 endef
 $(eval $(call Download,ath10k-firmware-qca99x0-ct))
 
-QCA99X0_FIRMWARE_FILE_CT_HTT:=firmware-5-ct-full-htt-mgt-community-12.bin-lede.015
+QCA99X0_FIRMWARE_FILE_CT_HTT:=firmware-5-ct-full-htt-mgt-community-12.bin-lede.017
 define Download/ath10k-firmware-qca99x0-ct-htt
   $(call Download/ct-firmware-htt,QCA99X0,ath10k-10-4b)
-  HASH:=1ef67fb07da9082886e4dd554dfc19256e10b500faf9e4b2a5774d0238130bae
+  HASH:=adedcd3d379a910bc3a5257d75f8970e11319f4cd9c1b34440d35821602a8b9c
 endef
 $(eval $(call Download,ath10k-firmware-qca99x0-ct-htt))
 
 
-QCA9984_FIRMWARE_FILE_CT:=firmware-5-ct-full-community-12.bin-lede.015
+QCA9984_FIRMWARE_FILE_CT:=firmware-5-ct-full-community-12.bin-lede.017
 define Download/ath10k-firmware-qca9984-ct
   $(call Download/ct-firmware,QCA9984,ath10k-9984-10-4b)
-  

[PATCH 19.07 v2 6/6] ath10k-ct-firmware: update firmware images

2020-09-03 Thread Baptiste Jonglez
From: Michael Yartys 

Not a large change from last time, but should fix at least one rare wave-2
crash.

Tested on Netgear R7800.

Signed-off-by: Michael Yartys 
Signed-off-by: Álvaro Fernández Rojas 
(cherry picked from commit 91aab77bf1ce91b0e60e720eb147c94a02c1f2fd)
[adapt variables and package names]
[remove changes to non-full htt-mgt variants because we did not backport
 a882bfce052e ("ath10k-ct-firmware: add htt-mgt variants")]
Signed-off-by: Baptiste Jonglez 
---
 package/firmware/ath10k-ct-firmware/Makefile | 42 ++--
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/package/firmware/ath10k-ct-firmware/Makefile 
b/package/firmware/ath10k-ct-firmware/Makefile
index 6fe8ea6d3b..12fb031f8f 100644
--- a/package/firmware/ath10k-ct-firmware/Makefile
+++ b/package/firmware/ath10k-ct-firmware/Makefile
@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ath10k-ct-firmware
-PKG_VERSION:=2020-04-24
+PKG_VERSION:=2020-07-02
 PKG_RELEASE:=1
 
 include $(INCLUDE_DIR)/package.mk
@@ -88,14 +88,14 @@ define Download/ct-firmware-htt
   URL_FILE:=$($(1)_FIRMWARE_FILE_CT_HTT)
 endef
 
-QCA988X_FIRMWARE_FILE_CT:=firmware-2-ct-full-community-22.bin.lede.018
+QCA988X_FIRMWARE_FILE_CT:=firmware-2-ct-full-community-22.bin.lede.019
 define Download/ath10k-firmware-qca988x-ct
   $(call Download/ct-firmware,QCA988X,)
   HASH:=8b4c99253aa309d35f2e060c190091b8db1b84dbda06a6a15c83ac0f9a938126
 endef
 $(eval $(call Download,ath10k-firmware-qca988x-ct))
 
-QCA988X_FIRMWARE_FILE_CT_HTT:=firmware-2-ct-full-htt-mgt-community-22.bin.lede.018
+QCA988X_FIRMWARE_FILE_CT_HTT:=firmware-2-ct-full-htt-mgt-community-22.bin.lede.019
 define Download/ath10k-firmware-qca988x-ct-htt
   $(call Download/ct-firmware-htt,QCA988X,)
   HASH:=a7168916d6aa5e4d7858f8b620c0c980c76d03f390929db6f4077685ce2051e7
@@ -103,14 +103,14 @@ endef
 $(eval $(call Download,ath10k-firmware-qca988x-ct-htt))
 
 
-QCA9887_FIRMWARE_FILE_CT:=firmware-2-ct-full-community-22.bin.lede.018
+QCA9887_FIRMWARE_FILE_CT:=firmware-2-ct-full-community-22.bin.lede.019
 define Download/ath10k-firmware-qca9887-ct
   $(call Download/ct-firmware,QCA9887,ath10k-9887)
   HASH:=459692deb186a63ab8eeddb7ad5d54779266e68ca686e7c46062554db6dca12b
 endef
 $(eval $(call Download,ath10k-firmware-qca9887-ct))
 
-QCA9887_FIRMWARE_FILE_CT_HTT:=firmware-2-ct-full-htt-mgt-community-22.bin.lede.018
+QCA9887_FIRMWARE_FILE_CT_HTT:=firmware-2-ct-full-htt-mgt-community-22.bin.lede.019
 define Download/ath10k-firmware-qca9887-ct-htt
   $(call Download/ct-firmware-htt,QCA9887,ath10k-9887)
   HASH:=fd126a457d0927d0c8ea10d66ef5b67d5e1e0741f8692bb3016bb602d0af3098
@@ -118,62 +118,62 @@ endef
 $(eval $(call Download,ath10k-firmware-qca9887-ct-htt))
 
 
-QCA99X0_FIRMWARE_FILE_CT:=firmware-5-ct-full-community-12.bin-lede.018
+QCA99X0_FIRMWARE_FILE_CT:=firmware-5-ct-full-community-12.bin-lede.019
 define Download/ath10k-firmware-qca99x0-ct
   $(call Download/ct-firmware,QCA99X0,ath10k-10-4b)
-  HASH:=cf26eb37524de54af51fe9b2efffc85e0e70ab849e8607ef63ce5a8ecffeaa42
+  HASH:=7dc934f934bc4973c9273a4f22cfead8e26ec6f579647af31b718a860eca0a4b
 endef
 $(eval $(call Download,ath10k-firmware-qca99x0-ct))
 
-QCA99X0_FIRMWARE_FILE_CT_HTT:=firmware-5-ct-full-htt-mgt-community-12.bin-lede.018
+QCA99X0_FIRMWARE_FILE_CT_HTT:=firmware-5-ct-full-htt-mgt-community-12.bin-lede.019
 define Download/ath10k-firmware-qca99x0-ct-htt
   $(call Download/ct-firmware-htt,QCA99X0,ath10k-10-4b)
-  HASH:=e9737538d7379e13ad4e4c8c519a63659b5e34a35455ed9ac4399ae8097caabc
+  HASH:=71a27b245a382fe009938d2826d5c97a90dceb10ddf638325268df91837ea302
 endef
 $(eval $(call Download,ath10k-firmware-qca99x0-ct-htt))
 
 
-QCA9984_FIRMWARE_FILE_CT:=firmware-5-ct-full-community-12.bin-lede.018
+QCA9984_FIRMWARE_FILE_CT:=firmware-5-ct-full-community-12.bin-lede.019
 define Download/ath10k-firmware-qca9984-ct
   $(call Download/ct-firmware,QCA9984,ath10k-9984-10-4b)
-  HASH:=a6b3d66efe640a430a837f238e91eddcd423eed6b887d3ae19716d87a71fd0b1
+  HASH:=32d13f432691fe759ded7d027052e925233adb436cd8f729f85ec3d19ccd1dfd
 endef
 $(eval $(call Download,ath10k-firmware-qca9984-ct))
 
-QCA9984_FIRMWARE_FILE_CT_HTT:=firmware-5-ct-full-htt-mgt-community-12.bin-lede.018
+QCA9984_FIRMWARE_FILE_CT_HTT:=firmware-5-ct-full-htt-mgt-community-12.bin-lede.019
 define Download/ath10k-firmware-qca9984-ct-htt
   $(call Download/ct-firmware-htt,QCA9984,ath10k-9984-10-4b)
-  HASH:=96060227e372b3b210badccbe6b0bd75d9a35335a7a0f2966964e9e89f66b00f
+  HASH:=e8ab69777bd00b5fc6b1b7acccb55b903553a99932a5b0351602b5f690106588
 endef
 $(eval $(call Download,ath10k-firmware-qca9984-ct-htt))
 
 
-QCA4019_FIRMWARE_FILE_CT:=firmware-5-ct-full-community-12.bin-lede.018
+QCA4019_FIRMWARE_FILE_CT:=firmware-5-ct-full-community-12.bin-lede.019
 define Download/ath10k-firmware-qca4019-ct
   $(call Download/ct-firmware,QCA4019,ath10k-4019-10-4b)
-  HASH:=46d8f8f1e780813299dc8780eedcfceda103c6b4d8908589ad1adbef921714c0
+  

[PATCH 19.07 v2 0/6] Update ath10k-ct firmware

2020-09-03 Thread Baptiste Jonglez
From: Baptiste Jonglez 

This backports all recent ath10k-ct firmware bumps from master, and also
backports moving these firmwares to a new package.  Opkg package names remain
unchanged.

v2: don't backport the following changes:

2e5e9b459ed5 ("ath10k-ct-firmware: rename ct-htt packages")
a882bfce052e ("ath10k-ct-firmware: add htt-mgt variants")

Applied together, these changes would basically change the firmware
variant that we distribute in the "ath10k-firmware-*-ct-htt" packages
from the "full" version to the "diet / non-full" version.

Even though these ath10k-ct-htt firmwares are not used in default OpenWrt
images, this change would not be acceptable for a backport.  Downstream users
might rely on these variants.

As a result, we don't backport the "diet / non-full" variant at all.


Michael Yartys (2):
  ath10k-firmware: update ath10k-ct firmware
  ath10k-ct-firmware: update firmware images

Stefan Lippers-Hollmann (1):
  ath10k-firmware: update Candela Tech firmware images

Álvaro Fernández Rojas (3):
  ath10k-firmware: update ath10k-ct firmware images
  ath10k-firmware: move CT firmwares to new package
  ath10k-ct-firmware: update firmware images

 package/firmware/ath10k-ct-firmware/Makefile | 524 +++
 package/firmware/ath10k-firmware/Makefile| 446 
 2 files changed, 524 insertions(+), 446 deletions(-)
 create mode 100644 package/firmware/ath10k-ct-firmware/Makefile

-- 
2.27.0


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


[PATCH 19.07 v2 2/6] ath10k-firmware: update ath10k-ct firmware

2020-09-03 Thread Baptiste Jonglez
From: Michael Yartys 

This supports better per-chain noise floor reporting, which in turn allows for
better RSSI reporting in the driver.

Wave-2 fixes a long-standing rate-ctrl problem when connected to xbox (and 
probably other devices).

Wave-2 has fix for crash likely related to rekeying.

Wave-1 has some debugging code added where a user reported a crash.

Tested-by: Stefan Lippers-Hollmann   
[ipq806x+qca9984,ipq4019+qca9986]
Signed-off-by: Michael Yartys 
(cherry picked from commit 18622638831707038556b9b8bd5a0b4d4a53ce53)
---
 package/firmware/ath10k-firmware/Makefile | 48 +++
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/package/firmware/ath10k-firmware/Makefile 
b/package/firmware/ath10k-firmware/Makefile
index 9f1e7e676b..af883e6f03 100644
--- a/package/firmware/ath10k-firmware/Makefile
+++ b/package/firmware/ath10k-firmware/Makefile
@@ -64,92 +64,92 @@ define Download/ct-firmware-htt
   URL_FILE:=$($(1)_FIRMWARE_FILE_CT_HTT)
 endef
 
-QCA988X_FIRMWARE_FILE_CT:=firmware-2-ct-full-community-22.bin.lede.014
+QCA988X_FIRMWARE_FILE_CT:=firmware-2-ct-full-community-22.bin.lede.015
 define Download/ath10k-firmware-qca988x-ct
   $(call Download/ct-firmware,QCA988X,)
-  HASH:=19db86003509dedb8ace339c183813ca637d65af24d00666411d1590efe33e13
+  HASH:=a3a760d0d72707feffa496b6d2266bd9195f09806553b36420b60c0f12b8b87e
 endef
 $(eval $(call Download,ath10k-firmware-qca988x-ct))
 
-QCA988X_FIRMWARE_FILE_CT_HTT:=firmware-2-ct-full-htt-mgt-community-22.bin.lede.014
+QCA988X_FIRMWARE_FILE_CT_HTT:=firmware-2-ct-full-htt-mgt-community-22.bin.lede.015
 define Download/ath10k-firmware-qca988x-ct-htt
   $(call Download/ct-firmware-htt,QCA988X,)
-  HASH:=454e67dab545e720369a07be2fee16de008c76db4ab3119e7760bf9f7504c066
+  HASH:=3114a54103d2b492fa1ef903769721f59953c829020d62502a1ec411ab4146d5
 endef
 $(eval $(call Download,ath10k-firmware-qca988x-ct-htt))
 
 
-QCA9887_FIRMWARE_FILE_CT:=firmware-2-ct-full-community-22.bin.lede.014
+QCA9887_FIRMWARE_FILE_CT:=firmware-2-ct-full-community-22.bin.lede.015
 define Download/ath10k-firmware-qca9887-ct
   $(call Download/ct-firmware,QCA9887,ath10k-9887)
-  HASH:=b3c738328427e124701a5735d65cde0f60e4172ae5bc23b00e5b16df7995dbd4
+  HASH:=71e8b76dfd7c786d2f57bb7df207dcd13a91d3b492cfbd28916f084d0d1bb5e7
 endef
 $(eval $(call Download,ath10k-firmware-qca9887-ct))
 
-QCA9887_FIRMWARE_FILE_CT_HTT:=firmware-2-ct-full-htt-mgt-community-22.bin.lede.014
+QCA9887_FIRMWARE_FILE_CT_HTT:=firmware-2-ct-full-htt-mgt-community-22.bin.lede.015
 define Download/ath10k-firmware-qca9887-ct-htt
   $(call Download/ct-firmware-htt,QCA9887,ath10k-9887)
-  HASH:=4432ccee23133bbaa4a5552e50a1e7e889b257362603e05530e751b67c29b7b5
+  HASH:=b085e5d2239727b72bc647a76864431b8ac48438e6a33b1d55edc468f6ff
 endef
 $(eval $(call Download,ath10k-firmware-qca9887-ct-htt))
 
 
-QCA99X0_FIRMWARE_FILE_CT:=firmware-5-ct-full-community-12.bin-lede.014
+QCA99X0_FIRMWARE_FILE_CT:=firmware-5-ct-full-community-12.bin-lede.015
 define Download/ath10k-firmware-qca99x0-ct
   $(call Download/ct-firmware,QCA99X0,ath10k-10-4b)
-  HASH:=9a908f743604a468b651a5f73c49e6b0ba11a05c677b9726fbf041b849d88b25
+  HASH:=edebe2f6f169cdd05c81a8a78156fb3426a66f415e7946af2ae4b7310fca5fe3
 endef
 $(eval $(call Download,ath10k-firmware-qca99x0-ct))
 
-QCA99X0_FIRMWARE_FILE_CT_HTT:=firmware-5-ct-full-htt-mgt-community-12.bin-lede.014
+QCA99X0_FIRMWARE_FILE_CT_HTT:=firmware-5-ct-full-htt-mgt-community-12.bin-lede.015
 define Download/ath10k-firmware-qca99x0-ct-htt
   $(call Download/ct-firmware-htt,QCA99X0,ath10k-10-4b)
-  HASH:=800dd0816702aaca75f3eb5436c2ea724a6c24833838cd54399b9286b4d4fbe8
+  HASH:=1ef67fb07da9082886e4dd554dfc19256e10b500faf9e4b2a5774d0238130bae
 endef
 $(eval $(call Download,ath10k-firmware-qca99x0-ct-htt))
 
 
-QCA9984_FIRMWARE_FILE_CT:=firmware-5-ct-full-community-12.bin-lede.014
+QCA9984_FIRMWARE_FILE_CT:=firmware-5-ct-full-community-12.bin-lede.015
 define Download/ath10k-firmware-qca9984-ct
   $(call Download/ct-firmware,QCA9984,ath10k-9984-10-4b)
-  HASH:=a8b12dba478e8c9d4a215f82324382c7554a900e83c31775f8511af84e59fef7
+  HASH:=c2f04da3285aad37baef9c37c9905a31927175dd234cd4378fd56c106e5c9379
 endef
 $(eval $(call Download,ath10k-firmware-qca9984-ct))
 
-QCA9984_FIRMWARE_FILE_CT_HTT:=firmware-5-ct-full-htt-mgt-community-12.bin-lede.014
+QCA9984_FIRMWARE_FILE_CT_HTT:=firmware-5-ct-full-htt-mgt-community-12.bin-lede.015
 define Download/ath10k-firmware-qca9984-ct-htt
   $(call Download/ct-firmware-htt,QCA9984,ath10k-9984-10-4b)
-  HASH:=d185651b5d3d1f0082720bc6c2bbe43b2a00cdb6333403fac9336a720b1d93ae
+  HASH:=0c9ede1036750d68885e6481fa84f3cb72192b8440b47719344f7327a030f05d
 endef
 $(eval $(call Download,ath10k-firmware-qca9984-ct-htt))
 
 
-QCA4019_FIRMWARE_FILE_CT:=firmware-5-ct-full-community-12.bin-lede.014
+QCA4019_FIRMWARE_FILE_CT:=firmware-5-ct-full-community-12.bin-lede.015
 define Download/ath10k-firmware-qca4019-ct
   $(call Download/ct-firmware,QCA4019,ath10k-4019-10-4b)
-  

[PATCH 19.07 v2 1/6] ath10k-firmware: update Candela Tech firmware images

2020-09-03 Thread Baptiste Jonglez
From: Stefan Lippers-Hollmann 

The release notes since last time for wave-1:

 * No changes to wave-1, but I make a version .014 copy anyway to keep
   the makefile in sync.

The release notes since last time for wave-2:

 * December 16, 2019: Wave-2 has a fix to make setting txpower work
  better. Before setting the power was ignored at
  least some of the time (it also appeared to work
  mostly, so I guess it was being correctly set in
  other ways).

Signed-off-by: Stefan Lippers-Hollmann 
(cherry picked from commit 65982642668e859540b21c2bd3bf907493df830a)
---
 package/firmware/ath10k-firmware/Makefile | 40 +++
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/package/firmware/ath10k-firmware/Makefile 
b/package/firmware/ath10k-firmware/Makefile
index b6a7c94e89..9f1e7e676b 100644
--- a/package/firmware/ath10k-firmware/Makefile
+++ b/package/firmware/ath10k-firmware/Makefile
@@ -64,14 +64,14 @@ define Download/ct-firmware-htt
   URL_FILE:=$($(1)_FIRMWARE_FILE_CT_HTT)
 endef
 
-QCA988X_FIRMWARE_FILE_CT:=firmware-2-ct-full-community-22.bin.lede.013
+QCA988X_FIRMWARE_FILE_CT:=firmware-2-ct-full-community-22.bin.lede.014
 define Download/ath10k-firmware-qca988x-ct
   $(call Download/ct-firmware,QCA988X,)
   HASH:=19db86003509dedb8ace339c183813ca637d65af24d00666411d1590efe33e13
 endef
 $(eval $(call Download,ath10k-firmware-qca988x-ct))
 
-QCA988X_FIRMWARE_FILE_CT_HTT:=firmware-2-ct-full-htt-mgt-community-22.bin.lede.013
+QCA988X_FIRMWARE_FILE_CT_HTT:=firmware-2-ct-full-htt-mgt-community-22.bin.lede.014
 define Download/ath10k-firmware-qca988x-ct-htt
   $(call Download/ct-firmware-htt,QCA988X,)
   HASH:=454e67dab545e720369a07be2fee16de008c76db4ab3119e7760bf9f7504c066
@@ -79,14 +79,14 @@ endef
 $(eval $(call Download,ath10k-firmware-qca988x-ct-htt))
 
 
-QCA9887_FIRMWARE_FILE_CT:=firmware-2-ct-full-community-22.bin.lede.013
+QCA9887_FIRMWARE_FILE_CT:=firmware-2-ct-full-community-22.bin.lede.014
 define Download/ath10k-firmware-qca9887-ct
   $(call Download/ct-firmware,QCA9887,ath10k-9887)
   HASH:=b3c738328427e124701a5735d65cde0f60e4172ae5bc23b00e5b16df7995dbd4
 endef
 $(eval $(call Download,ath10k-firmware-qca9887-ct))
 
-QCA9887_FIRMWARE_FILE_CT_HTT:=firmware-2-ct-full-htt-mgt-community-22.bin.lede.013
+QCA9887_FIRMWARE_FILE_CT_HTT:=firmware-2-ct-full-htt-mgt-community-22.bin.lede.014
 define Download/ath10k-firmware-qca9887-ct-htt
   $(call Download/ct-firmware-htt,QCA9887,ath10k-9887)
   HASH:=4432ccee23133bbaa4a5552e50a1e7e889b257362603e05530e751b67c29b7b5
@@ -94,62 +94,62 @@ endef
 $(eval $(call Download,ath10k-firmware-qca9887-ct-htt))
 
 
-QCA99X0_FIRMWARE_FILE_CT:=firmware-5-ct-full-community-12.bin-lede.013
+QCA99X0_FIRMWARE_FILE_CT:=firmware-5-ct-full-community-12.bin-lede.014
 define Download/ath10k-firmware-qca99x0-ct
   $(call Download/ct-firmware,QCA99X0,ath10k-10-4b)
-  HASH:=6fa74a3fc87cba97dbc4a7213b760f8d997cd9c5f11900d47d387b23764cf20a
+  HASH:=9a908f743604a468b651a5f73c49e6b0ba11a05c677b9726fbf041b849d88b25
 endef
 $(eval $(call Download,ath10k-firmware-qca99x0-ct))
 
-QCA99X0_FIRMWARE_FILE_CT_HTT:=firmware-5-ct-full-htt-mgt-community-12.bin-lede.013
+QCA99X0_FIRMWARE_FILE_CT_HTT:=firmware-5-ct-full-htt-mgt-community-12.bin-lede.014
 define Download/ath10k-firmware-qca99x0-ct-htt
   $(call Download/ct-firmware-htt,QCA99X0,ath10k-10-4b)
-  HASH:=68e92820c51270eba4f68b24654c4a9408902b2600762b70204f4cb5419bb714
+  HASH:=800dd0816702aaca75f3eb5436c2ea724a6c24833838cd54399b9286b4d4fbe8
 endef
 $(eval $(call Download,ath10k-firmware-qca99x0-ct-htt))
 
 
-QCA9984_FIRMWARE_FILE_CT:=firmware-5-ct-full-community-12.bin-lede.013
+QCA9984_FIRMWARE_FILE_CT:=firmware-5-ct-full-community-12.bin-lede.014
 define Download/ath10k-firmware-qca9984-ct
   $(call Download/ct-firmware,QCA9984,ath10k-9984-10-4b)
-  HASH:=08aeb883bd2d9258e8f1907cca8a0d2eda1c559a66e228dadffd6798f6877c7d
+  HASH:=a8b12dba478e8c9d4a215f82324382c7554a900e83c31775f8511af84e59fef7
 endef
 $(eval $(call Download,ath10k-firmware-qca9984-ct))
 
-QCA9984_FIRMWARE_FILE_CT_HTT:=firmware-5-ct-full-htt-mgt-community-12.bin-lede.013
+QCA9984_FIRMWARE_FILE_CT_HTT:=firmware-5-ct-full-htt-mgt-community-12.bin-lede.014
 define Download/ath10k-firmware-qca9984-ct-htt
   $(call Download/ct-firmware-htt,QCA9984,ath10k-9984-10-4b)
-  HASH:=38ed59a2b3c66c10926706a21ae2d3aeaf83e589f19345a8f48d6520522e4fde
+  HASH:=d185651b5d3d1f0082720bc6c2bbe43b2a00cdb6333403fac9336a720b1d93ae
 endef
 $(eval $(call Download,ath10k-firmware-qca9984-ct-htt))
 
 
-QCA4019_FIRMWARE_FILE_CT:=firmware-5-ct-full-community-12.bin-lede.013
+QCA4019_FIRMWARE_FILE_CT:=firmware-5-ct-full-community-12.bin-lede.014
 define Download/ath10k-firmware-qca4019-ct
   $(call Download/ct-firmware,QCA4019,ath10k-4019-10-4b)
-  HASH:=feca75fe89af9a3e998047f85ff3428676f4d574b770d51773bb419d0dd98e5a
+  HASH:=4c2e48835219f420b18dc58e31d1387dae0da70d8170c3fc5e7bce39c06cf355
 endef
 

Re: [PATCH] util-linux: fix build when libmagic is present

2020-09-03 Thread Sebastian Kemper
On Tue, Sep 01, 2020 at 03:37:03PM -0700, Rosen Penev wrote:
> Signed-off-by: Rosen Penev 
> ---

Acked-by: Sebastian Kemper 

Please apply to get util-linux building. We need libuuid for telephony
and others :-)

Regards,
Seb

>  package/utils/util-linux/Makefile | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/package/utils/util-linux/Makefile 
> b/package/utils/util-linux/Makefile
> index 0fc9819c58..05ceaa413e 100644
> --- a/package/utils/util-linux/Makefile
> +++ b/package/utils/util-linux/Makefile
> @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
>
>  PKG_NAME:=util-linux
>  PKG_VERSION:=2.36
> -PKG_RELEASE:=1
> +PKG_RELEASE:=2
>
>  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
>  PKG_SOURCE_URL:=@KERNEL/linux/utils/$(PKG_NAME)/v2.36
> @@ -526,6 +526,7 @@ CONFIGURE_ARGS += \
>   --without-python\
>   --without-udev  \
>   --without-readline  \
> + --without-libmagic  \
>   --with-ncursesw
>
>  TARGET_CFLAGS += $(FPIC) -std=gnu99

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


Re: [PATCH] tools/zstd: update to 1.4.5

2020-09-03 Thread Etienne Champetier
Hello Rosen,

Le mer. 2 sept. 2020 à 23:20, Rosen Penev  a écrit :
>
> Fix URL. The GITHUB macro is meant to be used for files inside a git
> repository. This gets downloaded purely by accident (19.07 packages
> feed has zstd 1.4.5 with the file in sources.openwrt.org).
>
> Remove upstream backport.
>
> Signed-off-by: Rosen Penev 
> ---
>  tools/zstd/Makefile   |  6 +-
>  ...re-portable-header-prefix-usage-1987.patch | 61 ---
>  2 files changed, 3 insertions(+), 64 deletions(-)
>  delete mode 100644 
> tools/zstd/patches/0001-build-issue-More-portable-header-prefix-usage-1987.patch
>
> diff --git a/tools/zstd/Makefile b/tools/zstd/Makefile
> index 7459725e8e..ef268c0b86 100644
> --- a/tools/zstd/Makefile
> +++ b/tools/zstd/Makefile
> @@ -1,11 +1,11 @@
>  include $(TOPDIR)/rules.mk
>
>  PKG_NAME:=zstd
> -PKG_VERSION:=1.4.4
> +PKG_VERSION:=1.4.5


There is a blocker regression in 1.4.5 for some use case:
https://github.com/facebook/zstd/issues/
Haven't checked if it impacts anything in OpenWrt

Best
Etienne

> [snip]

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


Re: MR24 wifi broken by recent commit

2020-09-03 Thread Christian Lamparter

On 2020-09-03 10:44, Russell Senior wrote:

commit 9153955095f01a7ac5f2659a671f0229cbad3507
Author: Christian Lamparter mailto:chunk...@gmail.com>>
Date:   Wed Aug 12 18:26:43 2020 +0200

     apm821xx: MR24: enumerate PCIe in device-tree

     This patch adds the pcie-switch and bridge configuration for
     the Meraki MR24.

     Signed-off-by: Christian Lamparter >


The symptom is client devices can't see the beacons. Wifi ifaces appear, 
can scan and hear other networks, but clients can't see the MR24's 
SSIDs. Reverting the commit above and it works normally again.


Thanks for the report. CONFIG_PCI_DEBUG



"ath9k :44:00.0: runtime IRQ mapping not provided by arch"



since DT overwrites the usual PCI(e) enumeration and MSI(x) is

busted there's no choice but to specify legacy INTABCDs.


Can you please try the attached patch?
---
diff --git a/target/linux/apm821xx/dts/meraki-mr24.dts 
b/target/linux/apm821xx/dts/meraki-mr24.dts

index 102df59ef0..b28fd2449f 100644
--- a/target/linux/apm821xx/dts/meraki-mr24.dts
+++ b/target/linux/apm821xx/dts/meraki-mr24.dts
@@ -227,6 +227,7 @@
/* Atheros AR9380 2.4GHz */
compatible = "pci168c,0030";
reg = <0x0043 0 0 0 0>;
+   interrupts = <3>; /* INTC 4.1.1 */
};
};

@@ -241,6 +242,7 @@
/* Atheros AR9380 5GHz */
compatible = "pci168c,0030";
reg = <0x0044 0 0 0 0>;
+   interrupts = <4>; /* INTD 4.1.1 */
};
};
};

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


Re: Upcoming 19.07.4 and 18.07.9 stable releases

2020-09-03 Thread Nick Lowe
It seems there is an important ath10k patch included in the 4.4.235,
4.9.235, 4.14.196 and 4.19.143, 5.4.62 LTS kernels that is applicable
for OpenWRT users who are not using an up to date CT driver with Wave
2 QCA 802.11ac generation hardware, it is already merged for CT.

It resolves a PCIe hang seen due to the DMA burst size value meaning
different things between Wave 1 and Wave 2 hardware.

The issue resolved is that a value of 0 for the DMA burst size has a
different meaning and instruction depending on the generation.

Cheers,

Nick

On Sun, Aug 30, 2020 at 1:45 PM Baptiste Jonglez
 wrote:
>
> On 29-08-20, Baptiste Jonglez wrote:
> > On 28-08-20, Hauke Mehrtens wrote:
> > > Hi,
> > >
> > > I would like to do a 19.07.4 and a 18.06.9 release on Sunday or
> > > beginning of next week.
> >
> > Cool, looks good to me.
> >
> > > Is there something missing in the current branches which should get into
> > > this release?
> >
> > There's the ath10k-ct-firmware bump for 19.07: 
> > https://patchwork.ozlabs.org/project/openwrt/list/?q=19.07
> >
> > I plan to look at the LuCI issue mentioned here: 
> > https://openwrt.org/docs/guide-developer/releases/goals/19.07.4
>
> I backported a fix for the LuCI issue, the pull request needs to be merged
> before the 19.07.4 release: https://github.com/openwrt/luci/pull/4402
>
> Thanks,
> Baptiste
> ___
> 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: [PATCH 19.07 7/8] ath10k-ct-firmware: add htt-mgt variants

2020-09-03 Thread Adrian Schmutzler
> > These HTT firmwares are not used in default openwrt images, but they
> > could be used downstream: it does not seem wise to distribute a
> > different firmware variant under the same package name.
> 
> Those compiled out features are not used by any ath10k driver as far as I
> know.
> If the driver doesn't use it, I don't see how anything else could...
> 
> Its still worth testing, but I think that diet variant is probably the best 
> choice.

My point mainly was that it's against the idea of a stable branch to suddenly 
rename firmware variants in a .4 revision.

So, it would be better to use patches 1-4, drop the htt renames (5,7) and then 
just rebase patches 6 and 8 for the 19.07 branch.

Best

Adrian

> 
> Thanks,
> Ben
> 
> >
> > I will send a v2 fixing this.
> >
> > On 25-08-20, Baptiste Jonglez wrote:
> >> From: Álvaro Fernández Rojas 
> >>
> >> For wave-2, there is now a new variant: htt-mgt-community (vs the old
> >> full-htt-mgt-community).
> >>
> >> The non-full one (hence forth 'diet') compiles out a lot of firmware
> >> features that ath10k does not use. This saves a lot of resources and
> >> lets one configure more stations/vdevs/etc using fwcfg.
> >>
> >> Signed-off-by: Álvaro Fernández Rojas  (cherry
> >> picked from commit a882bfce052e78bd344dcbd36efb32acf1340d7a)
> >> ---
> >>   package/firmware/ath10k-ct-firmware/Makefile | 155
> ++-
> >>   1 file changed, 154 insertions(+), 1 deletion(-)
> >>
> >> diff --git a/package/firmware/ath10k-ct-firmware/Makefile
> >> b/package/firmware/ath10k-ct-firmware/Makefile
> >> index 6a35e9c75c..18370b7d85 100644
> >> --- a/package/firmware/ath10k-ct-firmware/Makefile
> >> +++ b/package/firmware/ath10k-ct-firmware/Makefile
> >> @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
> >>
> >>   PKG_NAME:=ath10k-ct-firmware
> >>   PKG_VERSION:=2020-04-24
> >> -PKG_RELEASE:=1
> >> +PKG_RELEASE:=2
> >>
> >>   include $(INCLUDE_DIR)/package.mk
> >>
> >> @@ -75,6 +75,7 @@ $(eval $(call Download,qca9888-board2))
> >>
> >>   CT_FIRMWARE_FILE = $(1)-$($(1)_FIRMWARE_FILE_CT)
> >>   CT_FIRMWARE_FILE_FULL_HTT = $(1)-
> $($(1)_FIRMWARE_FILE_CT_FULL_HTT)
> >> +CT_FIRMWARE_FILE_HTT = $(1)-$($(1)_FIRMWARE_FILE_CT_HTT)
> >>
> >>   define Download/ct-firmware
> >> URL:=https://www.candelatech.com/downloads/$(2)
> >> @@ -88,6 +89,12 @@ define Download/ct-firmware-full-htt
> >> URL_FILE:=$($(1)_FIRMWARE_FILE_CT_FULL_HTT)
> >>   endef
> >>
> >> +define Download/ct-firmware-htt
> >> +  URL:=https://www.candelatech.com/downloads/$(2)
> >> +  FILE:=$(call CT_FIRMWARE_FILE_HTT,$(1))
> >> +  URL_FILE:=$($(1)_FIRMWARE_FILE_CT_HTT)
> >> +endef
> >> +
> >>   QCA988X_FIRMWARE_FILE_CT:=firmware-2-ct-full-community-
> 22.bin.lede.018
> >>   define Download/ath10k-firmware-qca988x-ct
> >> $(call Download/ct-firmware,QCA988X,) @@ -132,6 +139,13 @@ define
> >> Download/ath10k-firmware-qca99x0-ct-full-htt
> >>   endef
> >>   $(eval $(call Download,ath10k-firmware-qca99x0-ct-full-htt))
> >>
> >> +QCA99X0_FIRMWARE_FILE_CT_HTT:=firmware-5-ct-htt-mgt-
> community-12.bin
> >> +-lede.018 define Download/ath10k-firmware-qca99x0-ct-htt
> >> +  $(call Download/ct-firmware-htt,QCA99X0,ath10k-10-4b)
> >> +
> >>
> +HASH:=4d4f74afca487d452f244cd48304cf9710d8941eb97a6346a949ed6b687
> 7d6
> >> +57
> >> +endef
> >> +$(eval $(call Download,ath10k-firmware-qca99x0-ct-htt))
> >> +
> >>
> >>   QCA9984_FIRMWARE_FILE_CT:=firmware-5-ct-full-community-12.bin-
> lede.018
> >>   define Download/ath10k-firmware-qca9984-ct
> >> @@ -147,6 +161,13 @@ define Download/ath10k-firmware-qca9984-ct-
> full-htt
> >>   endef
> >>   $(eval $(call Download,ath10k-firmware-qca9984-ct-full-htt))
> >>
> >> +QCA9984_FIRMWARE_FILE_CT_HTT:=firmware-5-ct-htt-mgt-
> community-12.bin
> >> +-lede.018 define Download/ath10k-firmware-qca9984-ct-htt
> >> +  $(call Download/ct-firmware-htt,QCA9984,ath10k-9984-10-4b)
> >> +
> >>
> +HASH:=ee593fb5724d75c372de02ac7894e1630ee9f909fcb2e2bbf17aadef67c
> b9d
> >> +43
> >> +endef
> >> +$(eval $(call Download,ath10k-firmware-qca9984-ct-htt))
> >> +
> >>
> >>   QCA4019_FIRMWARE_FILE_CT:=firmware-5-ct-full-community-12.bin-
> lede.018
> >>   define Download/ath10k-firmware-qca4019-ct
> >> @@ -162,6 +183,13 @@ define Download/ath10k-firmware-qca4019-ct-
> full-htt
> >>   endef
> >>   $(eval $(call Download,ath10k-firmware-qca4019-ct-full-htt))
> >>
> >> +QCA4019_FIRMWARE_FILE_CT_HTT:=firmware-5-ct-htt-mgt-
> community-12.bin
> >> +-lede.018 define Download/ath10k-firmware-qca4019-ct-htt
> >> +  $(call Download/ct-firmware-htt,QCA4019,ath10k-4019-10-4b)
> >> +
> >>
> +HASH:=51fe06f66365771647d16039cca8b541de3d642c45271977a4cfd433c2c5
> d4
> >> +5b
> >> +endef
> >> +$(eval $(call Download,ath10k-firmware-qca4019-ct-htt))
> >> +
> >>
> >>   QCA9888_FIRMWARE_FILE_CT:=firmware-5-ct-full-community-12.bin-
> lede.018
> >>   define Download/ath10k-firmware-qca9888-ct
> >> @@ -177,6 +205,13 @@ define Download/ath10k-firmware-qca9888-ct-
> full-htt
> >>   endef
> >>   $(eval $(call 

Re: [PATCH 19.07 7/8] ath10k-ct-firmware: add htt-mgt variants

2020-09-03 Thread Ben Greear

On 9/3/20 10:14 AM, Baptiste Jonglez wrote:

Adrian pointed out a possible issue with these backpots: combining patches
5/8 and 7/8 basically mean that a different firmware variant will be
distributed in "ath10k-firmware-*-ct-htt" packages.

Currently in 19.07 the ath10k-firmware-*-ct-htt packages bundle this
firmware variant: firmware-{2,5}-ct-full-htt-mgt-community

With patch 5/8 and 7/8, the same ath10k-firmware-*-ct-htt packages would
instead bundle this firmware variant: firmware-{2,5}-ct-htt-mgt-community

The description of this new firmware variant is copied below:

 The non-full one (hence forth 'diet') compiles out a lot of firmware
 features that ath10k does not use. This saves a lot of resources and
 lets one configure more stations/vdevs/etc using fwcfg.

These HTT firmwares are not used in default openwrt images, but they could
be used downstream: it does not seem wise to distribute a different
firmware variant under the same package name.


Those compiled out features are not used by any ath10k driver as far as I know.
If the driver doesn't use it, I don't see how anything else could...

Its still worth testing, but I think that diet variant is probably the best 
choice.

Thanks,
Ben



I will send a v2 fixing this.

On 25-08-20, Baptiste Jonglez wrote:

From: Álvaro Fernández Rojas 

For wave-2, there is now a new variant: htt-mgt-community (vs the old
full-htt-mgt-community).

The non-full one (hence forth 'diet') compiles out a lot of firmware features
that ath10k does not use. This saves a lot of resources and lets one
configure more stations/vdevs/etc using fwcfg.

Signed-off-by: Álvaro Fernández Rojas 
(cherry picked from commit a882bfce052e78bd344dcbd36efb32acf1340d7a)
---
  package/firmware/ath10k-ct-firmware/Makefile | 155 ++-
  1 file changed, 154 insertions(+), 1 deletion(-)

diff --git a/package/firmware/ath10k-ct-firmware/Makefile 
b/package/firmware/ath10k-ct-firmware/Makefile
index 6a35e9c75c..18370b7d85 100644
--- a/package/firmware/ath10k-ct-firmware/Makefile
+++ b/package/firmware/ath10k-ct-firmware/Makefile
@@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
  
  PKG_NAME:=ath10k-ct-firmware

  PKG_VERSION:=2020-04-24
-PKG_RELEASE:=1
+PKG_RELEASE:=2
  
  include $(INCLUDE_DIR)/package.mk
  
@@ -75,6 +75,7 @@ $(eval $(call Download,qca9888-board2))
  
  CT_FIRMWARE_FILE = $(1)-$($(1)_FIRMWARE_FILE_CT)

  CT_FIRMWARE_FILE_FULL_HTT = $(1)-$($(1)_FIRMWARE_FILE_CT_FULL_HTT)
+CT_FIRMWARE_FILE_HTT = $(1)-$($(1)_FIRMWARE_FILE_CT_HTT)
  
  define Download/ct-firmware

URL:=https://www.candelatech.com/downloads/$(2)
@@ -88,6 +89,12 @@ define Download/ct-firmware-full-htt
URL_FILE:=$($(1)_FIRMWARE_FILE_CT_FULL_HTT)
  endef
  
+define Download/ct-firmware-htt

+  URL:=https://www.candelatech.com/downloads/$(2)
+  FILE:=$(call CT_FIRMWARE_FILE_HTT,$(1))
+  URL_FILE:=$($(1)_FIRMWARE_FILE_CT_HTT)
+endef
+
  QCA988X_FIRMWARE_FILE_CT:=firmware-2-ct-full-community-22.bin.lede.018
  define Download/ath10k-firmware-qca988x-ct
$(call Download/ct-firmware,QCA988X,)
@@ -132,6 +139,13 @@ define Download/ath10k-firmware-qca99x0-ct-full-htt
  endef
  $(eval $(call Download,ath10k-firmware-qca99x0-ct-full-htt))
  
+QCA99X0_FIRMWARE_FILE_CT_HTT:=firmware-5-ct-htt-mgt-community-12.bin-lede.018

+define Download/ath10k-firmware-qca99x0-ct-htt
+  $(call Download/ct-firmware-htt,QCA99X0,ath10k-10-4b)
+  HASH:=4d4f74afca487d452f244cd48304cf9710d8941eb97a6346a949ed6b6877d657
+endef
+$(eval $(call Download,ath10k-firmware-qca99x0-ct-htt))
+
  
  QCA9984_FIRMWARE_FILE_CT:=firmware-5-ct-full-community-12.bin-lede.018

  define Download/ath10k-firmware-qca9984-ct
@@ -147,6 +161,13 @@ define Download/ath10k-firmware-qca9984-ct-full-htt
  endef
  $(eval $(call Download,ath10k-firmware-qca9984-ct-full-htt))
  
+QCA9984_FIRMWARE_FILE_CT_HTT:=firmware-5-ct-htt-mgt-community-12.bin-lede.018

+define Download/ath10k-firmware-qca9984-ct-htt
+  $(call Download/ct-firmware-htt,QCA9984,ath10k-9984-10-4b)
+  HASH:=ee593fb5724d75c372de02ac7894e1630ee9f909fcb2e2bbf17aadef67cb9d43
+endef
+$(eval $(call Download,ath10k-firmware-qca9984-ct-htt))
+
  
  QCA4019_FIRMWARE_FILE_CT:=firmware-5-ct-full-community-12.bin-lede.018

  define Download/ath10k-firmware-qca4019-ct
@@ -162,6 +183,13 @@ define Download/ath10k-firmware-qca4019-ct-full-htt
  endef
  $(eval $(call Download,ath10k-firmware-qca4019-ct-full-htt))
  
+QCA4019_FIRMWARE_FILE_CT_HTT:=firmware-5-ct-htt-mgt-community-12.bin-lede.018

+define Download/ath10k-firmware-qca4019-ct-htt
+  $(call Download/ct-firmware-htt,QCA4019,ath10k-4019-10-4b)
+  HASH:=51fe06f66365771647d16039cca8b541de3d642c45271977a4cfd433c2c5d45b
+endef
+$(eval $(call Download,ath10k-firmware-qca4019-ct-htt))
+
  
  QCA9888_FIRMWARE_FILE_CT:=firmware-5-ct-full-community-12.bin-lede.018

  define Download/ath10k-firmware-qca9888-ct
@@ -177,6 +205,13 @@ define Download/ath10k-firmware-qca9888-ct-full-htt
  endef
  $(eval $(call 

Re: [PATCH 19.07 7/8] ath10k-ct-firmware: add htt-mgt variants

2020-09-03 Thread Baptiste Jonglez
Adrian pointed out a possible issue with these backpots: combining patches
5/8 and 7/8 basically mean that a different firmware variant will be
distributed in "ath10k-firmware-*-ct-htt" packages.

Currently in 19.07 the ath10k-firmware-*-ct-htt packages bundle this
firmware variant: firmware-{2,5}-ct-full-htt-mgt-community

With patch 5/8 and 7/8, the same ath10k-firmware-*-ct-htt packages would
instead bundle this firmware variant: firmware-{2,5}-ct-htt-mgt-community

The description of this new firmware variant is copied below:

The non-full one (hence forth 'diet') compiles out a lot of firmware
features that ath10k does not use. This saves a lot of resources and
lets one configure more stations/vdevs/etc using fwcfg.

These HTT firmwares are not used in default openwrt images, but they could
be used downstream: it does not seem wise to distribute a different
firmware variant under the same package name.

I will send a v2 fixing this.

On 25-08-20, Baptiste Jonglez wrote:
> From: Álvaro Fernández Rojas 
> 
> For wave-2, there is now a new variant: htt-mgt-community (vs the old
> full-htt-mgt-community).
> 
> The non-full one (hence forth 'diet') compiles out a lot of firmware features
> that ath10k does not use. This saves a lot of resources and lets one
> configure more stations/vdevs/etc using fwcfg.
> 
> Signed-off-by: Álvaro Fernández Rojas 
> (cherry picked from commit a882bfce052e78bd344dcbd36efb32acf1340d7a)
> ---
>  package/firmware/ath10k-ct-firmware/Makefile | 155 ++-
>  1 file changed, 154 insertions(+), 1 deletion(-)
> 
> diff --git a/package/firmware/ath10k-ct-firmware/Makefile 
> b/package/firmware/ath10k-ct-firmware/Makefile
> index 6a35e9c75c..18370b7d85 100644
> --- a/package/firmware/ath10k-ct-firmware/Makefile
> +++ b/package/firmware/ath10k-ct-firmware/Makefile
> @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
>  
>  PKG_NAME:=ath10k-ct-firmware
>  PKG_VERSION:=2020-04-24
> -PKG_RELEASE:=1
> +PKG_RELEASE:=2
>  
>  include $(INCLUDE_DIR)/package.mk
>  
> @@ -75,6 +75,7 @@ $(eval $(call Download,qca9888-board2))
>  
>  CT_FIRMWARE_FILE = $(1)-$($(1)_FIRMWARE_FILE_CT)
>  CT_FIRMWARE_FILE_FULL_HTT = $(1)-$($(1)_FIRMWARE_FILE_CT_FULL_HTT)
> +CT_FIRMWARE_FILE_HTT = $(1)-$($(1)_FIRMWARE_FILE_CT_HTT)
>  
>  define Download/ct-firmware
>URL:=https://www.candelatech.com/downloads/$(2)
> @@ -88,6 +89,12 @@ define Download/ct-firmware-full-htt
>URL_FILE:=$($(1)_FIRMWARE_FILE_CT_FULL_HTT)
>  endef
>  
> +define Download/ct-firmware-htt
> +  URL:=https://www.candelatech.com/downloads/$(2)
> +  FILE:=$(call CT_FIRMWARE_FILE_HTT,$(1))
> +  URL_FILE:=$($(1)_FIRMWARE_FILE_CT_HTT)
> +endef
> +
>  QCA988X_FIRMWARE_FILE_CT:=firmware-2-ct-full-community-22.bin.lede.018
>  define Download/ath10k-firmware-qca988x-ct
>$(call Download/ct-firmware,QCA988X,)
> @@ -132,6 +139,13 @@ define Download/ath10k-firmware-qca99x0-ct-full-htt
>  endef
>  $(eval $(call Download,ath10k-firmware-qca99x0-ct-full-htt))
>  
> +QCA99X0_FIRMWARE_FILE_CT_HTT:=firmware-5-ct-htt-mgt-community-12.bin-lede.018
> +define Download/ath10k-firmware-qca99x0-ct-htt
> +  $(call Download/ct-firmware-htt,QCA99X0,ath10k-10-4b)
> +  HASH:=4d4f74afca487d452f244cd48304cf9710d8941eb97a6346a949ed6b6877d657
> +endef
> +$(eval $(call Download,ath10k-firmware-qca99x0-ct-htt))
> +
>  
>  QCA9984_FIRMWARE_FILE_CT:=firmware-5-ct-full-community-12.bin-lede.018
>  define Download/ath10k-firmware-qca9984-ct
> @@ -147,6 +161,13 @@ define Download/ath10k-firmware-qca9984-ct-full-htt
>  endef
>  $(eval $(call Download,ath10k-firmware-qca9984-ct-full-htt))
>  
> +QCA9984_FIRMWARE_FILE_CT_HTT:=firmware-5-ct-htt-mgt-community-12.bin-lede.018
> +define Download/ath10k-firmware-qca9984-ct-htt
> +  $(call Download/ct-firmware-htt,QCA9984,ath10k-9984-10-4b)
> +  HASH:=ee593fb5724d75c372de02ac7894e1630ee9f909fcb2e2bbf17aadef67cb9d43
> +endef
> +$(eval $(call Download,ath10k-firmware-qca9984-ct-htt))
> +
>  
>  QCA4019_FIRMWARE_FILE_CT:=firmware-5-ct-full-community-12.bin-lede.018
>  define Download/ath10k-firmware-qca4019-ct
> @@ -162,6 +183,13 @@ define Download/ath10k-firmware-qca4019-ct-full-htt
>  endef
>  $(eval $(call Download,ath10k-firmware-qca4019-ct-full-htt))
>  
> +QCA4019_FIRMWARE_FILE_CT_HTT:=firmware-5-ct-htt-mgt-community-12.bin-lede.018
> +define Download/ath10k-firmware-qca4019-ct-htt
> +  $(call Download/ct-firmware-htt,QCA4019,ath10k-4019-10-4b)
> +  HASH:=51fe06f66365771647d16039cca8b541de3d642c45271977a4cfd433c2c5d45b
> +endef
> +$(eval $(call Download,ath10k-firmware-qca4019-ct-htt))
> +
>  
>  QCA9888_FIRMWARE_FILE_CT:=firmware-5-ct-full-community-12.bin-lede.018
>  define Download/ath10k-firmware-qca9888-ct
> @@ -177,6 +205,13 @@ define Download/ath10k-firmware-qca9888-ct-full-htt
>  endef
>  $(eval $(call Download,ath10k-firmware-qca9888-ct-full-htt))
>  
> +QCA9888_FIRMWARE_FILE_CT_HTT:=firmware-5-ct-htt-mgt-community-12.bin-lede.018
> +define Download/ath10k-firmware-qca9888-ct-htt
> +  $(call 

Re: [PATCH v2 1/2] rules.mk: remove redundant -I/-L

2020-09-03 Thread Andre Heider

Hi Jo,

On 26/08/2020 08:15, Andre Heider wrote:

$STAGING_DIR/usr/{include,lib} are already added using the gcc specs file, see
scripts/patch-specs.sh

$STAGING_DIR/lib is unused and seems to be a leftover from
1f0063b5 "rules.mk: remove "$(STAGING_DIR)/include""

Signed-off-by: Andre Heider 


do these two patches look acceptable now?

Thanks,
Andre


---
  rules.mk | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rules.mk b/rules.mk
index 45d96d6be4..a6615647f9 100644
--- a/rules.mk
+++ b/rules.mk
@@ -174,8 +174,8 @@ TARGET_CFLAGS:=$(TARGET_OPTIMIZATION)$(if $(CONFIG_DEBUG), 
-g3) $(call qstrip,$(
  TARGET_CXXFLAGS = $(TARGET_CFLAGS)
  TARGET_ASFLAGS_DEFAULT = $(TARGET_CFLAGS)
  TARGET_ASFLAGS = $(TARGET_ASFLAGS_DEFAULT)
-TARGET_CPPFLAGS:=-I$(STAGING_DIR)/usr/include
-TARGET_LDFLAGS:=-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib
+TARGET_CPPFLAGS:=
+TARGET_LDFLAGS:=
  ifneq ($(CONFIG_EXTERNAL_TOOLCHAIN),)
  LIBGCC_S_PATH=$(realpath $(wildcard $(call 
qstrip,$(CONFIG_LIBGCC_ROOT_DIR))/$(call qstrip,$(CONFIG_LIBGCC_FILE_SPEC
  LIBGCC_S=$(if $(LIBGCC_S_PATH),-L$(dir $(LIBGCC_S_PATH)) -lgcc_s)




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


RE: [PATCH] scripts: add size_compare.sh

2020-09-03 Thread Adrian Schmutzler
> -Original Message-
> From: openwrt-devel [mailto:openwrt-devel-boun...@lists.openwrt.org]
> On Behalf Of Paul Spooren
> Sent: Freitag, 31. Juli 2020 05:15
> To: openwrt-devel@lists.openwrt.org
> Cc: freif...@adrianschmutzler.de; Paul Spooren 
> Subject: [PATCH] scripts: add size_compare.sh
> 
> As package size changes are a continuous topic on the mailing list this 
> scripts
> helps developers to compare their local package modifications against latest
> upstream.
> 
> The script downloads the latest package indexes based on env variables or
> the `.config` file. The script compares the actual installed size
> (data.tar.gz) or the IPK package size.

Just gave this a quick try, and generally it looks good.

However, I got 82 packages listed for " Compare packages of 
ath79/generic/mips_24kc", but only 66 were in the final comparison.

Will check the code in detail later. A few comment below.

> 
> An example output is found below:
> 
> ```
> user@dawn:~/src/openwrt/openwrt$ ./scripts/size_compare.sh Compare
> packages of ath79/tiny/mips_24kc:
> dropbear busybox iw ubus
> 
> Checking installed size
> 
> Fetching latest package indexes...
>   % Total% Received % Xferd  Average Speed   TimeTime Time  
> Current
>  Dload  Upload   Total   SpentLeft  Speed
> 100 80634  100 806340 0  33499  0  0:00:02  0:00:02 --:--:-- 33485
>   % Total% Received % Xferd  Average Speed   TimeTime Time  
> Current
>  Dload  Upload   Total   SpentLeft  Speed
> 100 54082  100 540820 0  24252  0  0:00:02  0:00:02 --:--:-- 24252
> 
> Comparing package sizes...
> ChangeLocal   Package
> 611B  208715B busybox
> 39B   5612B   ubus
> -42B  34940B  iw
> -14916B   89265B  dropbear
> ```
> 
> I plan to integrate this script into the CI so we have a summary how sizes
> change over different architectures.
> 
> Signed-off-by: Paul Spooren 
> ---
>  scripts/size_compare.sh | 117
> 
>  1 file changed, 117 insertions(+)
>  create mode 100755 scripts/size_compare.sh
> 
> diff --git a/scripts/size_compare.sh b/scripts/size_compare.sh new file mode
> 100755 index 00..b310a085a4
> --- /dev/null
> +++ b/scripts/size_compare.sh
> @@ -0,0 +1,117 @@
> +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2020 Paul
> +Spooren  # ### ### size_compare - compare size of
> +OpenWrt packages against upstream ### ### The script compares locally
> +compiled package with the package indexes ### available upstream. This
> +way the storage impact of optimizations or ### feature modifiactions is
> +easy to see.
> +###
> +### If no environmental variables are set the scritp reads the current
> +### .config file. The evaluated env variables are the following:
> +###
> +###   TARGET SUBTARGET ARCH PACKAGES BIN_DIR BASE_URL
> CHECK_INSTALLED
> +###
> +### Usage:
> +###   ./scripts/size_compare.sh
> +###
> +### Options:
> +###   -p --package-size  Check IPK package size and not installed size
> +###   -h --help  This message
> +
> +CONFIG_TARGET=$(sed -n 's/^CONFIG_TARGET_BOARD="\(.*\)"$/\1/p'
> .config)
> +CONFIG_SUBTARGET=$(sed -n
> 's/^CONFIG_TARGET_SUBTARGET="\(.*\)"$/\1/p'
> +.config) CONFIG_ARCH=$(sed -n
> +'s/^CONFIG_TARGET_ARCH_PACKAGES="\(.*\)"$/\1/p' .config)
> +CONFIG_PACKAGES=$(sed -n 's/^CONFIG_PACKAGE_\(.*\)=y$/\1/p'
> .config |
> +tr '\n' ' ') CONFIG_BIN_DIR=$(sed -n
> +'s/^CONFIG_BINARY_DIR="\(.*\)"$/\1/p' .config)
> +
> +TARGET=${TARGET:-$CONFIG_TARGET}
> +SUBTARGET=${SUBTARGET:-$CONFIG_SUBTARGET}
> +ARCH=${ARCH:-$CONFIG_ARCH}
> +PACKAGES=${PACKAGES:-$CONFIG_PACKAGES}
> +BIN_DIR=${CONFIG_BIN_DIR:-./bin}
> +BASE_URL="${BASE_URL:-https://downloads.openwrt.org/snapshots};
> +CHECK_INSTALLED="${CHECK_INSTALLED:-y}"
> +
> +TARGET_URL="$BASE_URL/targets/$TARGET/$SUBTARGET/packages/Pack
> ages.gz"
> +PACKAGES_URL="$BASE_URL/packages/$ARCH/base/Packages.gz"
> +
> +help() {
> +sed -rn 's/^### ?//;T;p' "$0"
> +}
> +
> +package_size () {
> + FOUND_PACKAGE=
> + if [ -z "$CHECK_INSTALLED" ]; then
> + SEARCH_PATTERN="Size"
> + else
> + SEARCH_PATTERN="Installed-Size"
> + fi
> + while IFS= read -r line; do
> + if [ "$line" = "Package: $2" ]; then
> + FOUND_PACKAGE=y
> + fi
> + if [ -n "$FOUND_PACKAGE" ]; then
> + case $line in
> + "$SEARCH_PATTERN"*)
> + echo "$line" | cut -d ' ' -f 2
> + break
> + ;;
> + esac
> + fi
> + done < "$1"
> +}
> +
> +compare_sizes () {
> + for PACKAGE in $PACKAGES; do
> + if [ "$PACKAGE" = "libc" ]; then
> + continue
> + fi
> + PACKAGE_FILE=$(find "$BIN_DIR/packages/$ARCH/"
> 

MR24 wifi broken by recent commit

2020-09-03 Thread Russell Senior


commit 9153955095f01a7ac5f2659a671f0229cbad3507
Author: Christian Lamparter 
Date:   Wed Aug 12 18:26:43 2020 +0200

apm821xx: MR24: enumerate PCIe in device-tree

This patch adds the pcie-switch and bridge configuration for
the Meraki MR24.

Signed-off-by: Christian Lamparter 

The symptom is client devices can't see the beacons. Wifi ifaces appear,
can scan and hear other networks, but clients can't see the MR24's
SSIDs. Reverting the commit above and it works normally again.


-- 
Russell Senior, President
russ...@personaltelco.net

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


Re:

2020-09-03 Thread Paweł Dembicki
On 03.09.2020 at 03:35 Raylynn Knight via openwrt-devel
 wrote:

>
> Since I chose the ZyXel NSA320 as my first device I think it best to follow 
> your example for consistency on the ZyXel NAS devices.  My follow up support 
> will likely be for the 3 different Netgear NAS devices I have.
>

If you have NETGEAR ReadyNAS Duo v2, please look my and test PR:
https://github.com/openwrt/openwrt/pull/3371

Pawel Dembicki

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