Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

mdio-tools: update to 1.2.0

Browse source 
Update the mdio-netlink kmod and userspace mdio-tools to version 1.2.0.
This allows dropping the time64 musl patch which was upstreamed.

[v1.2.0] - 2022-09-15
---------------------

- mdio: A new addressing mode "mmd-c22": Used to access MMDs attached
  to MDIO controllers without Clause 45 support by using registers 13
  and 14 in the device's Clause 22 register space
- mdio: Pretty print gigabit link capability information from a PHY's
  extended status register
- mdio: Pretty print lots of status information from MMDs (C45 PHYs)
- mvls: Decode priority override information of ATU entries

- mvls: Table listings now always prints out the device information,
  even on single chip systems.

Signed-off-by: Robert Marko <robimarko@gmail.com>
This commit is contained in:
Robert Marko 2022-09-19 19:50:16 +02:00
parent fab89d120f
commit ddf1bccc76
3 changed files with 5 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
kernel/mdio-netlink/Makefile
View file

@ -6,8 +6,8 @@ PKG_RELEASE:=1
PKG_SOURCE_URL:=https://github.com/wkz/mdio-tools
PKG_SOURCE_PROTO:=git
PKG_SOURCE_VERSION:=1.1.1
PKG_MIRROR_HASH:=050d7386ed086b2ef3f028b3409ebabfdc51bd5a4c5a1d64afa29a0ceebf4771
PKG_SOURCE_VERSION:=1.2.0
PKG_MIRROR_HASH:=5dd21c47d12b5d81dd0783d874480172d00027c4a8902839fa9fc16718092c79
PKG_LICENSE:=GPL-2.0-only
PKG_LICENSE_FILES:=COPYING

6
net/mdio-tools/Makefile
View file

@ -1,12 +1,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=mdio-tools
PKG_RELEASE:=2
PKG_RELEASE:=1
PKG_SOURCE_URL:=https://github.com/wkz/mdio-tools
PKG_SOURCE_PROTO:=git
PKG_SOURCE_VERSION:=1.1.1
PKG_MIRROR_HASH:=aec5a5d8031de166a5ff38dc5442cfbf5de002b11c0a256ea4a03ae047040d03
PKG_SOURCE_VERSION:=1.2.0
PKG_MIRROR_HASH:=396fd48662e0f4182b9c9db6e34d71dafd9e557d5021e8dc28edfc99d6ebc387
PKG_FIXUP:=autoreconf

47
net/mdio-tools/patches/0001-mdio-bench-make-time_t-prints-portable.patch
View file

@ -1,47 +0,0 @@
From 7da5b168152987806e295ed3b7e97b77ffa93cb9 Mon Sep 17 00:00:00 2001
From: Robert Marko <robert.marko@sartura.hr>
Date: Tue, 7 Jun 2022 13:34:40 +0200
Subject: [PATCH] mdio: bench: make time_t prints portable
Using %ld to print time_t will work fine on 64 bit platforms, however
now musl libc defines time_t to be 64 even on 32bit platforms.
This will make the compilation fail with:
mdio.c: In function 'mdio_common_bench_cb':
mdio.c:555:27: error: format '%ld' expects argument of type 'long int', but argument 2 has type 'time_t' {aka 'long long int'} [-Werror=format=]
555 | printf("%ld.%2.2lds\n", end.tv_sec, end.tv_nsec / 10000000);
| ~~^ ~~~~~~~~~~
| | |
| long int time_t {aka long long int}
| %lld
So, replace the %ld in prints with the PRId64 from inttypes.h and cast
tv_sec and tv_nsec to int64_t.
This makes it compile and work on 32 bit ARMv7 fine.
Signed-off-by: Robert Marko <robert.marko@sartura.hr>
---
src/mdio/mdio.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
--- a/src/mdio/mdio.c
+++ b/src/mdio/mdio.c
@@ -552,13 +552,13 @@ int mdio_common_bench_cb(uint32_t *data,
printf("Performed 1000 reads in ");
if (end.tv_sec)
- printf("%ld.%2.2lds\n", end.tv_sec, end.tv_nsec / 10000000);
+ printf("%"PRId64".%2.2"PRId64"s\n", (int64_t)end.tv_sec, (int64_t)end.tv_nsec / 10000000);
else if (end.tv_nsec > 1000000)
- printf("%ldms\n", end.tv_nsec / 1000000);
+ printf("%"PRId64"ms\n", (int64_t)end.tv_nsec / 1000000);
else if (end.tv_nsec > 1000)
- printf("%ldus\n", end.tv_nsec / 1000);
+ printf("%"PRId64"us\n", (int64_t)end.tv_nsec / 1000);
else
- printf("%ldns\n", end.tv_nsec);
+ printf("%"PRId64"ns\n", (int64_t)end.tv_nsec);
return err;
}