June 2023 - gerrit-log - lists.osmocom.org

[S] Change in osmo-ttcn3-hacks[master]: Add templates for talker / listener detection to RSL_Types
by laforge 06 Jun '23

06 Jun '23

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33143 ) Change subject: Add templates for talker / listener detection to RSL_Types ...................................................................... Add templates for talker / listener detection to RSL_Types Change-Id: Ibc936417fedf7dc663c6b7243090a91fc55c06a2 --- M library/RSL_Types.ttcn 1 file changed, 45 insertions(+), 0 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/library/RSL_Types.ttcn b/library/RSL_Types.ttcn index 08e49b5..64025a5 100644 --- a/library/RSL_Types.ttcn +++ b/library/RSL_Types.ttcn @@ -2036,6 +2036,42 @@ } } + /* 8.4.21 BTS -> BSC */ + template (value) RSL_Message ts_RSL_TALKER_DET(template (value) RslChannelNr chan_nr) := { + msg_disc := ts_RSL_MsgDisc(RSL_MDISC_DCHAN, false), + msg_type := RSL_MT_TALKER_DET, + ies := { + t_RSL_IE(RSL_IE_CHAN_NR, RSL_IE_Body:{chan_nr := chan_nr}) + } + } + template RSL_Message tr_RSL_TALKER_DET(template RslChannelNr chan_nr, + template uint8_t acc_delay := ?) := { + msg_disc := tr_RSL_MsgDisc(RSL_MDISC_DCHAN, false), + msg_type := RSL_MT_TALKER_DET, + ies := { + tr_RSL_IE(RSL_IE_Body:{chan_nr := chan_nr}), + tr_RSL_IE(RSL_IE_Body:{access_delay := acc_delay}) + } + } + + /* 8.4.22 BTS -> BSC */ + template (value) RSL_Message ts_RSL_LISTENER_DET(template (value) RslChannelNr chan_nr) := { + msg_disc := ts_RSL_MsgDisc(RSL_MDISC_DCHAN, false), + msg_type := RSL_MT_LISTENER_DET, + ies := { + t_RSL_IE(RSL_IE_CHAN_NR, RSL_IE_Body:{chan_nr := chan_nr}) + } + } + template RSL_Message tr_RSL_LISTENER_DET(template RslChannelNr chan_nr, + template uint8_t acc_delay := ?) := { + msg_disc := tr_RSL_MsgDisc(RSL_MDISC_DCHAN, false), + msg_type := RSL_MT_LISTENER_DET, + ies := { + tr_RSL_IE(RSL_IE_Body:{chan_nr := chan_nr}), + tr_RSL_IE(RSL_IE_Body:{access_delay := acc_delay}) + } + } + /* COMMON CHANNEL MANAGEMENT MESSAGES */ -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33143 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ibc936417fedf7dc663c6b7243090a91fc55c06a2 Gerrit-Change-Number: 33143 Gerrit-PatchSet: 3 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in dahdi-linux[master]: Fix jenkins.sh failure for kernels >= 6.3.0
by laforge 06 Jun '23

06 Jun '23

laforge has submitted this change. ( https://gerrit.osmocom.org/c/dahdi-linux/+/33188 ) Change subject: Fix jenkins.sh failure for kernels >= 6.3.0 ...................................................................... Fix jenkins.sh failure for kernels >= 6.3.0 In >= 6.3.0 the default for how modules are built in absence of vmlinux.o or Module.symvers due to a change of the modpost execution. See linux kernel git commit 5573b4daa26a0cf15aa0fecd7f1be16e0b6157bc As our build verification *just* builds the dahdi modules without building the entire kernel, we need to enforce the legacy behaviour by adding KBUILD_MODPOST_WARN=1 to the command line. Change-Id: I7206f1daed8ff1e7fcd4894bc24e5ef4d4590358 --- M contrib/jenkins.sh 1 file changed, 19 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved; Verified diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index eeb3fbc..6a39daf 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -29,4 +29,4 @@ git log -1 --pretty="%t - %s" make -j "$JOBS" modules_prepare -make -j "$JOBS" -C "$TOPDIR" KSRC="$KSRC" +make -j "$JOBS" -C "$TOPDIR" KSRC="$KSRC" KBUILD_MODPOST_WARN=1 -- To view, visit https://gerrit.osmocom.org/c/dahdi-linux/+/33188 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: dahdi-linux Gerrit-Branch: master Gerrit-Change-Id: I7206f1daed8ff1e7fcd4894bc24e5ef4d4590358 Gerrit-Change-Number: 33188 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

1 0

[S] Change in dahdi-linux[master]: kernel 6.4 API change in DEFINE_SEMAPHORE
by laforge 06 Jun '23

06 Jun '23

laforge has submitted this change. ( https://gerrit.osmocom.org/c/dahdi-linux/+/33181 ) Change subject: kernel 6.4 API change in DEFINE_SEMAPHORE ...................................................................... kernel 6.4 API change in DEFINE_SEMAPHORE This works around build failures with kernel >= v6.4-rc1 where the DEFINE_SEMAPHORE macro is adjusted in upstream kernel commit 48380368dec14859723b9e3fbd43e042638d9a76 Change-Id: I752c903c8a0345af6e51a996d064c9d629578ab4 --- M include/dahdi/kernel.h 1 file changed, 19 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved; Verified diff --git a/include/dahdi/kernel.h b/include/dahdi/kernel.h index f04f324..0df4f5e 100644 --- a/include/dahdi/kernel.h +++ b/include/dahdi/kernel.h @@ -1551,10 +1551,16 @@ #define DEFINE_SPINLOCK(x) spinlock_t x = SPIN_LOCK_UNLOCKED #endif +#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 4, 0) #ifndef DEFINE_SEMAPHORE #define DEFINE_SEMAPHORE(name) \ struct semaphore name = __SEMAPHORE_INITIALIZER(name, 1) #endif +#else /* 6.4.0, speficcally 48380368dec14859723b9e3fbd43e042638d9a76 */ +#undef DEFINE_SEMAPHORE +#define DEFINE_SEMAPHORE(name) \ + struct semaphore name = __SEMAPHORE_INITIALIZER(name, 1) +#endif #ifndef DEFINE_MUTEX struct mutex { -- To view, visit https://gerrit.osmocom.org/c/dahdi-linux/+/33181 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: dahdi-linux Gerrit-Branch: master Gerrit-Change-Id: I752c903c8a0345af6e51a996d064c9d629578ab4 Gerrit-Change-Number: 33181 Gerrit-PatchSet: 5 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

1 0

[S] Change in dahdi-linux[master]: compatibility with class_create API change in 6.4-rc1
by laforge 06 Jun '23

06 Jun '23

laforge has submitted this change. ( https://gerrit.osmocom.org/c/dahdi-linux/+/33185 ) Change subject: compatibility with class_create API change in 6.4-rc1 ...................................................................... compatibility with class_create API change in 6.4-rc1 Linux kernel 6.4-rc1 has an API change for the class_create() function. See upstream kernel git commit 1aaba11da9aa7d7d6b52a74d45b31cac118295a1 Change-Id: I5f7d25aa7516c470b943b9e8dfba20ca4206e378 --- M drivers/dahdi/dahdi-sysfs-chan.c 1 file changed, 18 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/drivers/dahdi/dahdi-sysfs-chan.c b/drivers/dahdi/dahdi-sysfs-chan.c index 8682ea3..fcfb7ba 100644 --- a/drivers/dahdi/dahdi-sysfs-chan.c +++ b/drivers/dahdi/dahdi-sysfs-chan.c @@ -483,7 +483,12 @@ } should_cleanup.channel_driver = 1; +/* see linux kernel commit 1aaba11da9aa7d7d6b52a74d45b31cac118295a1 */ +#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 4, 0) + dahdi_class = class_create("dahdi"); +#else dahdi_class = class_create(THIS_MODULE, "dahdi"); +#endif if (IS_ERR(dahdi_class)) { res = PTR_ERR(dahdi_class); dahdi_err("%s: class_create(dahi_chan) failed. Error: %d\n", -- To view, visit https://gerrit.osmocom.org/c/dahdi-linux/+/33185 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: dahdi-linux Gerrit-Branch: master Gerrit-Change-Id: I5f7d25aa7516c470b943b9e8dfba20ca4206e378 Gerrit-Change-Number: 33185 Gerrit-PatchSet: 4 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

1 0

[M] Change in dahdi-linux[master]: Support kernel >= 6.3.0 (bus_type.uevent() const struct device)
by laforge 06 Jun '23

06 Jun '23

laforge has submitted this change. ( https://gerrit.osmocom.org/c/dahdi-linux/+/33184 ) Change subject: Support kernel >= 6.3.0 (bus_type.uevent() const struct device) ...................................................................... Support kernel >= 6.3.0 (bus_type.uevent() const struct device) linux kernel commit 2a81ada32f0e584fc0c943e0d3a8c9f4fae411d6 modifies the struct bus_type.uevent() argument from 'struct device *' to 'const struct device *'. Let's adjust our code to support that. Change-Id: I0c416d8fa8d7d0081fdfec6325971d6de9f8d239 --- M drivers/dahdi/dahdi-sysfs.c M drivers/dahdi/xpp/xbus-sysfs.c M include/dahdi/kernel.h 3 files changed, 39 insertions(+), 17 deletions(-) Approvals: laforge: Looks good to me, approved; Verified diff --git a/drivers/dahdi/dahdi-sysfs.c b/drivers/dahdi/dahdi-sysfs.c index ca29ddb..14a6d74 100644 --- a/drivers/dahdi/dahdi-sysfs.c +++ b/drivers/dahdi/dahdi-sysfs.c @@ -47,7 +47,7 @@ return 1; } -static inline struct dahdi_span *dev_to_span(struct device *dev) +static inline struct dahdi_span *dev_to_span(const struct device *dev) { return dev_get_drvdata(dev); } @@ -68,7 +68,7 @@ return err; \ } while (0) -static int span_uevent(struct device *dev, struct kobj_uevent_env *kenv) +static int span_uevent(UEVENT_CONST struct device *dev, struct kobj_uevent_env *kenv) { struct dahdi_span *span; @@ -415,7 +415,7 @@ unsigned int clean_chardev:1; } should_cleanup; -static inline struct dahdi_device *to_ddev(struct device *dev) +static inline const struct dahdi_device *to_ddev(const struct device *dev) { return container_of(dev, struct dahdi_device, dev); } @@ -438,9 +438,9 @@ return err; \ } while (0) -static int device_uevent(struct device *dev, struct kobj_uevent_env *kenv) +static int device_uevent(UEVENT_CONST struct device *dev, struct kobj_uevent_env *kenv) { - struct dahdi_device *ddev; + const struct dahdi_device *ddev; if (!dev) return -ENODEV; @@ -456,7 +456,7 @@ manufacturer_show(struct device *dev, struct device_attribute *attr, char *buf) { - struct dahdi_device *ddev = to_ddev(dev); + const struct dahdi_device *ddev = to_ddev(dev); return sprintf(buf, "%s\n", ddev->manufacturer); } @@ -464,7 +464,7 @@ type_show(struct device *dev, struct device_attribute *attr, char *buf) { - struct dahdi_device *ddev = to_ddev(dev); + const struct dahdi_device *ddev = to_ddev(dev); return sprintf(buf, "%s\n", ddev->devicetype); } @@ -472,7 +472,7 @@ span_count_show(struct device *dev, struct device_attribute *attr, char *buf) { - struct dahdi_device *ddev = to_ddev(dev); + const struct dahdi_device *ddev = to_ddev(dev); unsigned int count = 0; struct list_head *pos; @@ -486,7 +486,7 @@ hardware_id_show(struct device *dev, struct device_attribute *attr, char *buf) { - struct dahdi_device *ddev = to_ddev(dev); + const struct dahdi_device *ddev = to_ddev(dev); return sprintf(buf, "%s\n", (ddev->hardware_id) ? ddev->hardware_id : ""); @@ -496,7 +496,7 @@ location_show(struct device *dev, struct device_attribute *attr, char *buf) { - struct dahdi_device *ddev = to_ddev(dev); + const struct dahdi_device *ddev = to_ddev(dev); return sprintf(buf, "%s\n", (ddev->location) ? ddev->location : ""); @@ -506,7 +506,7 @@ auto_assign_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) { - struct dahdi_device *ddev = to_ddev(dev); + struct dahdi_device *ddev = (struct dahdi_device *) to_ddev(dev); dahdi_assign_device_spans(ddev); return count; } @@ -520,7 +520,7 @@ unsigned int local_span_number; unsigned int desired_spanno; unsigned int desired_basechanno; - struct dahdi_device *const ddev = to_ddev(dev); + struct dahdi_device *const ddev = (struct dahdi_device *const) to_ddev(dev); ret = sscanf(buf, "%u:%u:%u", &local_span_number, &desired_spanno, &desired_basechanno); @@ -553,7 +553,7 @@ int ret; unsigned int local_span_number; struct dahdi_span *span; - struct dahdi_device *const ddev = to_ddev(dev); + struct dahdi_device *const ddev = (struct dahdi_device *const) to_ddev(dev); ret = sscanf(buf, "%u", &local_span_number); if (ret != 1) @@ -578,7 +578,7 @@ dahdi_spantype_show(struct device *dev, struct device_attribute *attr, char *buf) { - struct dahdi_device *ddev = to_ddev(dev); + const struct dahdi_device *ddev = to_ddev(dev); int count = 0; ssize_t total = 0; struct dahdi_span *span; @@ -598,7 +598,7 @@ dahdi_spantype_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) { - struct dahdi_device *const ddev = to_ddev(dev); + struct dahdi_device *const ddev = (struct dahdi_device *const) to_ddev(dev); int ret; struct dahdi_span *span = NULL; struct dahdi_span *cur; @@ -652,7 +652,7 @@ dahdi_registration_time_show(struct device *dev, struct device_attribute *attr, char *buf) { - struct dahdi_device *ddev = to_ddev(dev); + const struct dahdi_device *ddev = to_ddev(dev); int count = 0; struct timespec64 ts = ktime_to_timespec64(ddev->registration_time); diff --git a/drivers/dahdi/xpp/xbus-sysfs.c b/drivers/dahdi/xpp/xbus-sysfs.c index d8c11dc..34cab65 100644 --- a/drivers/dahdi/xpp/xbus-sysfs.c +++ b/drivers/dahdi/xpp/xbus-sysfs.c @@ -418,7 +418,7 @@ return err; \ } while (0) -static int astribank_uevent(struct device *dev, struct kobj_uevent_env *kenv) +static int astribank_uevent(UEVENT_CONST struct device *dev, struct kobj_uevent_env *kenv) { xbus_t *xbus; extern char *initdir; diff --git a/include/dahdi/kernel.h b/include/dahdi/kernel.h index 778c2b2..f04f324 100644 --- a/include/dahdi/kernel.h +++ b/include/dahdi/kernel.h @@ -1683,4 +1683,13 @@ #endif /* DAHDI_PRINK_MACROS_USE_debug */ + +/* work-around kernel API change from "struct device *dev" to "const struct device *dev" + * as implemented in 2a81ada32f0e584fc0c943e0d3a8c9f4fae411d6 */ +#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 3, 0) +#define UEVENT_CONST const +#else +#define UEVENT_CONST +#endif + #endif /* _DAHDI_KERNEL_H */ -- To view, visit https://gerrit.osmocom.org/c/dahdi-linux/+/33184 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: dahdi-linux Gerrit-Branch: master Gerrit-Change-Id: I0c416d8fa8d7d0081fdfec6325971d6de9f8d239 Gerrit-Change-Number: 33184 Gerrit-PatchSet: 3 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

1 0

[S] Change in dahdi-linux[master]: compatibility with class_create API change in 6.4-rc1
by laforge 06 Jun '23

06 Jun '23

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/dahdi-linux/+/33185 ) Change subject: compatibility with class_create API change in 6.4-rc1 ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/dahdi-linux/+/33185 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: dahdi-linux Gerrit-Branch: master Gerrit-Change-Id: I5f7d25aa7516c470b943b9e8dfba20ca4206e378 Gerrit-Change-Number: 33185 Gerrit-PatchSet: 4 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Tue, 06 Jun 2023 12:56:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in dahdi-linux[master]: kernel 6.4 API change in DEFINE_SEMAPHORE
by laforge 06 Jun '23

06 Jun '23

laforge has removed a vote from this change. ( https://gerrit.osmocom.org/c/dahdi-linux/+/33181 ) Change subject: kernel 6.4 API change in DEFINE_SEMAPHORE ...................................................................... Removed Verified-1 by Jenkins Builder (1000002) -- To view, visit https://gerrit.osmocom.org/c/dahdi-linux/+/33181 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: dahdi-linux Gerrit-Branch: master Gerrit-Change-Id: I752c903c8a0345af6e51a996d064c9d629578ab4 Gerrit-Change-Number: 33181 Gerrit-PatchSet: 5 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: deleteVote

1 0

[S] Change in dahdi-linux[master]: kernel 6.4 API change in DEFINE_SEMAPHORE
by laforge 06 Jun '23

06 Jun '23

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/dahdi-linux/+/33181 ) Change subject: kernel 6.4 API change in DEFINE_SEMAPHORE ...................................................................... Patch Set 5: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/dahdi-linux/+/33181 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: dahdi-linux Gerrit-Branch: master Gerrit-Change-Id: I752c903c8a0345af6e51a996d064c9d629578ab4 Gerrit-Change-Number: 33181 Gerrit-PatchSet: 5 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Tue, 06 Jun 2023 12:56:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in dahdi-linux[master]: Fix jenkins.sh failure for kernels >= 6.3.0
by laforge 06 Jun '23

06 Jun '23

laforge has removed a vote from this change. ( https://gerrit.osmocom.org/c/dahdi-linux/+/33188 ) Change subject: Fix jenkins.sh failure for kernels >= 6.3.0 ...................................................................... Removed -Verified by Jenkins Builder (1000002) -- To view, visit https://gerrit.osmocom.org/c/dahdi-linux/+/33188 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: dahdi-linux Gerrit-Branch: master Gerrit-Change-Id: I7206f1daed8ff1e7fcd4894bc24e5ef4d4590358 Gerrit-Change-Number: 33188 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: deleteVote

1 0

[S] Change in dahdi-linux[master]: Fix jenkins.sh failure for kernels >= 6.3.0
by laforge 06 Jun '23

06 Jun '23

laforge has removed a vote from this change. ( https://gerrit.osmocom.org/c/dahdi-linux/+/33188 ) Change subject: Fix jenkins.sh failure for kernels >= 6.3.0 ...................................................................... Removed Verified-1 by Jenkins Builder (1000002) -- To view, visit https://gerrit.osmocom.org/c/dahdi-linux/+/33188 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: dahdi-linux Gerrit-Branch: master Gerrit-Change-Id: I7206f1daed8ff1e7fcd4894bc24e5ef4d4590358 Gerrit-Change-Number: 33188 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: deleteVote

1 0