Attention is currently required from: pespin.
Hoernchen has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/34462?usp=email )
Change subject: ms: adjust ts advance
......................................................................
Patch Set 1:
(3 comments)
Commit Message:
https://gerrit.osmocom.org/c/osmo-trx/+/34462/comment/343d85ff_51c206e8
PS1, Line 15: The mobile app does not care, and will happily work even with fn+3.
> you mean tn+3 here?
no, actual frame advance, 3 frames in advance.
Patchset:
PS1:
> So if I understand correctly this adds a let's say ~0. […]
well this is my attempt to get your gprs side to give me tx bursts much earlier, because right now they arrive very late. 2ts advance just is a value that appears to "work", while 1fn breaks it.
I need tx bursts as soon as possible, and I'm currently getting bursts 0 ts in advance, with only the rx/tx offset of 3ts so save me, and if those bursts are just slightly delayed it's too late.
File Transceiver52M/ms/ms_upper.cpp:
https://gerrit.osmocom.org/c/osmo-trx/+/34462/comment/a3dfff55_0e1bc47b
PS1, Line 261: burstTime.incTN(2);
> just to make sure, incTN(2) on FN=X TN=7 ends up with FN=X+1 TN=1, right?
yes, that is what the magic gsmtime class does.
--
To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/34462?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-trx
Gerrit-Branch: master
Gerrit-Change-Id: I46b3ea6b0094026bd50709739df464438f9e54c4
Gerrit-Change-Number: 34462
Gerrit-PatchSet: 1
Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Wed, 20 Sep 2023 14:16:33 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: comment
Attention is currently required from: Hoernchen.
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/34462?usp=email )
Change subject: ms: adjust ts advance
......................................................................
Patch Set 1:
(1 comment)
File Transceiver52M/ms/ms_upper.cpp:
https://gerrit.osmocom.org/c/osmo-trx/+/34462/comment/0928018f_c2f04310
PS1, Line 261: burstTime.incTN(2);
just to make sure, incTN(2) on FN=X TN=7 ends up with FN=X+1 TN=1, right?
--
To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/34462?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-trx
Gerrit-Branch: master
Gerrit-Change-Id: I46b3ea6b0094026bd50709739df464438f9e54c4
Gerrit-Change-Number: 34462
Gerrit-PatchSet: 1
Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-CC: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de>
Gerrit-Comment-Date: Wed, 20 Sep 2023 14:05:24 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
Attention is currently required from: Hoernchen.
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/34462?usp=email )
Change subject: ms: adjust ts advance
......................................................................
Patch Set 1:
(2 comments)
Commit Message:
https://gerrit.osmocom.org/c/osmo-trx/+/34462/comment/cdbd0fd9_2e4a10fe
PS1, Line 15: The mobile app does not care, and will happily work even with fn+3.
you mean tn+3 here?
Patchset:
PS1:
So if I understand correctly this adds a let's say ~0.5 fn-advance? aka advances 3 TN the uplink from the downlink?
That may pose a problem if a TBF is changed from let's say TN7 to TN2, we may work incorrectly there due to 1 FN in upper layers, but I guess we can live with that for now.
--
To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/34462?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-trx
Gerrit-Branch: master
Gerrit-Change-Id: I46b3ea6b0094026bd50709739df464438f9e54c4
Gerrit-Change-Number: 34462
Gerrit-PatchSet: 1
Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-CC: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de>
Gerrit-Comment-Date: Wed, 20 Sep 2023 14:04:18 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
Hoernchen has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-trx/+/34462?usp=email )
Change subject: ms: adjust ts advance
......................................................................
ms: adjust ts advance
..and fix the delay warning.
I'd rather have a proper fn advance of 1, but that breaks gprs, but just
slightly increasing the ts number is sufficient to fix issues with late
tx bursts that then get silently dropped by the sdr.
The mobile app does not care, and will happily work even with fn+3.
Change-Id: I46b3ea6b0094026bd50709739df464438f9e54c4
---
M Transceiver52M/ms/ms.cpp
M Transceiver52M/ms/ms_upper.cpp
2 files changed, 19 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/62/34462/1
diff --git a/Transceiver52M/ms/ms.cpp b/Transceiver52M/ms/ms.cpp
index ca41144..b8710a6 100644
--- a/Transceiver52M/ms/ms.cpp
+++ b/Transceiver52M/ms/ms.cpp
@@ -130,7 +130,7 @@
tosend.decTN(-diff_tn);
// in theory fn equal and tn+3 equal is also a problem...
- if (diff_fn < 0 || (diff_fn == 0 && (now_time.TN() - target_tn < 1))) {
+ if (diff_fn < 0 || (diff_fn == 0 && (target_tn-now_time.TN() < 3))) {
std::cerr << "## TX too late?! fn DIFF:" << diff_fn << " tn LOCAL: " << now_time.TN()
<< " tn OTHER: " << target_tn << std::endl;
return;
diff --git a/Transceiver52M/ms/ms_upper.cpp b/Transceiver52M/ms/ms_upper.cpp
index 63c222f..db15226 100644
--- a/Transceiver52M/ms/ms_upper.cpp
+++ b/Transceiver52M/ms/ms_upper.cpp
@@ -258,6 +258,7 @@
trxcon_phyif_handle_burst_ind(g_trxcon, &bi);
}
+ burstTime.incTN(2);
struct trxcon_phyif_rts_ind rts {
static_cast<uint32_t>(burstTime.FN()), static_cast<uint8_t>(burstTime.TN())
};
--
To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/34462?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-trx
Gerrit-Branch: master
Gerrit-Change-Id: I46b3ea6b0094026bd50709739df464438f9e54c4
Gerrit-Change-Number: 34462
Gerrit-PatchSet: 1
Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de>
Gerrit-MessageType: newchange
pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/34458?usp=email )
Change subject: hnbgw_cn: Remove assert hit due to wrong assumption
......................................................................
hnbgw_cn: Remove assert hit due to wrong assumption
The HNBGW in correctly assumes that no ss7->sccp instance is allocated
until the same function calls osmo_sccp_simple_client_on_ss7_id().
This assumption is wrong, since ss7 may create its own ss7->sccp
instance internally as a result of vty configuration, eg. when "sccp
max-optional-data 124" is placed in osmo-hnbgw.cfg file.
In this scenario, simply removing the assert is enough, since
osmo_sccp_simple_client_on_ss7_id() just calls osmo_ss7_ensure_sccp(),
the same that the libmoso-sccp code called to allocate the pointer.
Related: SYS#6566
Fixes: f3caea850bc892551cd09bbaf49f798c172590c4
Change-Id: I1221c165156e9625324cf0080836a8ed2bad4e9c
---
M src/osmo-hnbgw/hnbgw_cn.c
1 file changed, 22 insertions(+), 5 deletions(-)
Approvals:
osmith: Looks good to me, approved
Jenkins Builder: Verified
pespin: Verified
fixeria: Looks good to me, but someone else must approve
diff --git a/src/osmo-hnbgw/hnbgw_cn.c b/src/osmo-hnbgw/hnbgw_cn.c
index b95cf28..31bf192 100644
--- a/src/osmo-hnbgw/hnbgw_cn.c
+++ b/src/osmo-hnbgw/hnbgw_cn.c
@@ -849,11 +849,7 @@
return 0;
}
/* else cnlink->hnbgw_sccp_user stays NULL and is set up below. */
- LOG_CNLINK(cnlink, DCN, LOGL_DEBUG, "cs7 instance %u has no SCCP instance yet\n", ss7->cfg.id);
-
- /* All SCCP instances should originate from this function. So if there is no hnbgw_sccp_user for the cs7
- * instance, then the cs7 instance should not have an SCCP instance yet. */
- OSMO_ASSERT(!ss7->sccp);
+ LOG_CNLINK(cnlink, DCN, LOGL_DEBUG, "cs7 instance %u has no configured SCCP instance yet\n", ss7->cfg.id);
}
/* No SCCP instance yet for this ss7. Create it. If no address name is given that resolves to a
--
To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/34458?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-hnbgw
Gerrit-Branch: master
Gerrit-Change-Id: I1221c165156e9625324cf0080836a8ed2bad4e9c
Gerrit-Change-Number: 34458
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: merged