- gerrit-log - lists.osmocom.org

Change in docker-playground[master]: ttcn3-ggsn-tests-ogs: Set correct DNS address to get ping working

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/27094 ) Change subject: ttcn3-ggsn-tests-ogs: Set correct DNS address to get ping working ...................................................................... ttcn3-ggsn-tests-ogs: Set correct DNS address to get ping working The DNS address provided is used by the test to ping. In osmo-ggsn, we configured the DNS to be the shared address between GTPC and GTPU. In open5gs, the addresses are different. Hence, let's pass the GTPU address instead of the GTPC address to make the setup easier (no need to have proper routing working between UPFD and SMFD containers). Change-Id: I2a452ad871612d1c88b94579dadbe62b718b1475 --- M ttcn3-ggsn-test/ogs/smfd.yaml 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/94/27094/1 diff --git a/ttcn3-ggsn-test/ogs/smfd.yaml b/ttcn3-ggsn-test/ogs/smfd.yaml index 1bdf03b..2e1fc08 100644 --- a/ttcn3-ggsn-test/ogs/smfd.yaml +++ b/ttcn3-ggsn-test/ogs/smfd.yaml @@ -349,7 +349,7 @@ dnn: inet46 dns: - - 172.18.3.201 + - 172.18.3.222 - 8.8.8.8 - fd02:db8:3::201 - 2001:4860:4860::8844 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27094 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I2a452ad871612d1c88b94579dadbe62b718b1475 Gerrit-Change-Number: 27094 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 4 months

1
0
0 0

Change in docker-playground[master]: ttcn3-ggsn-tests-ogs: use correct DNS addresses

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/27095 ) Change subject: ttcn3-ggsn-tests-ogs: use correct DNS addresses ...................................................................... ttcn3-ggsn-tests-ogs: use correct DNS addresses The DNS addresses are used to ping them from the subscriber. Let's set up the UPF container ones instead of the SMF container ones, in order to simplify routing not related to the test. Change-Id: Ia1045d86d6f07d41054f14be0b6efdf9c7169af2 --- M ttcn3-ggsn-test/ogs/GGSN_Tests.cfg M ttcn3-ggsn-test/ogs/smfd.yaml 2 files changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/95/27095/1 diff --git a/ttcn3-ggsn-test/ogs/GGSN_Tests.cfg b/ttcn3-ggsn-test/ogs/GGSN_Tests.cfg index 6471dc9..f05ddaf 100644 --- a/ttcn3-ggsn-test/ogs/GGSN_Tests.cfg +++ b/ttcn3-ggsn-test/ogs/GGSN_Tests.cfg @@ -16,8 +16,8 @@ GGSN_Tests.m_ggsn_ip_gtpc := "172.18.3.201" GGSN_Tests.m_ggsn_ip_gtpu := "172.18.3.222" # GGSN announced DNS address -GGSN_Tests.m_ggsn_ip4_dns1 := "172.18.3.201" -GGSN_Tests.m_ggsn_ip6_dns1 := "fd02:db8:3::201" +GGSN_Tests.m_ggsn_ip4_dns1 := "172.18.3.222" +GGSN_Tests.m_ggsn_ip6_dns1 := "fd02:db8:3::222" GGSN_Tests.m_ggsn_impl := GGSN_IMPL_OPEN5GS [EXECUTE] diff --git a/ttcn3-ggsn-test/ogs/smfd.yaml b/ttcn3-ggsn-test/ogs/smfd.yaml index 2e1fc08..a0be176 100644 --- a/ttcn3-ggsn-test/ogs/smfd.yaml +++ b/ttcn3-ggsn-test/ogs/smfd.yaml @@ -351,7 +351,7 @@ dns: - 172.18.3.222 - 8.8.8.8 - - fd02:db8:3::201 + - fd02:db8:3::222 - 2001:4860:4860::8844 mtu: 1400 freeDiameter: /data/freediameter.conf -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27095 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ia1045d86d6f07d41054f14be0b6efdf9c7169af2 Gerrit-Change-Number: 27095 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 4 months

1
0
0 0

Change in docker-playground[master]: ttcn3-ggsn-test-ogs: Configure correct GTP-U GGSN address

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/27083 ) Change subject: ttcn3-ggsn-test-ogs: Configure correct GTP-U GGSN address ...................................................................... ttcn3-ggsn-test-ogs: Configure correct GTP-U GGSN address Change-Id: Id42b591ba03f451e89b0e332edcf8f2cded9f444 --- M ttcn3-ggsn-test/ogs/GGSN_Tests.cfg 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved; Verified diff --git a/ttcn3-ggsn-test/ogs/GGSN_Tests.cfg b/ttcn3-ggsn-test/ogs/GGSN_Tests.cfg index ccbda8d..6471dc9 100644 --- a/ttcn3-ggsn-test/ogs/GGSN_Tests.cfg +++ b/ttcn3-ggsn-test/ogs/GGSN_Tests.cfg @@ -14,7 +14,7 @@ GGSN_Tests.m_bind_ip_gtpu := "172.18.3.202" # GGSN IP address GGSN_Tests.m_ggsn_ip_gtpc := "172.18.3.201" -GGSN_Tests.m_ggsn_ip_gtpu := "172.18.3.201" +GGSN_Tests.m_ggsn_ip_gtpu := "172.18.3.222" # GGSN announced DNS address GGSN_Tests.m_ggsn_ip4_dns1 := "172.18.3.201" GGSN_Tests.m_ggsn_ip6_dns1 := "fd02:db8:3::201" -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27083 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Id42b591ba03f451e89b0e332edcf8f2cded9f444 Gerrit-Change-Number: 27083 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

3 years, 4 months

1
0
0 0

Change in docker-playground[master]: ttcn3-ggsn-test-ogs: Configure correct GTP-U GGSN address

by laforge

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/27083 ) Change subject: ttcn3-ggsn-test-ogs: Configure correct GTP-U GGSN address ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27083 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Id42b591ba03f451e89b0e332edcf8f2cded9f444 Gerrit-Change-Number: 27083 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 08 Feb 2022 16:41:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 4 months

1
0
0 0

Change in dahdi-linux[master]: icE1usb: update ice1usb_proto.h to firmware 0.2-8

by laforge

Attention is currently required from: tnt. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/dahdi-linux/+/26967 ) Change subject: icE1usb: update ice1usb_proto.h to firmware 0.2-8 ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/dahdi-linux/+/26967 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: dahdi-linux Gerrit-Branch: master Gerrit-Change-Id: I1423531470a1c9165d713108fb6a87ff47ff6e29 Gerrit-Change-Number: 26967 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-Attention: tnt <tnt(a)246tNt.com> Gerrit-Comment-Date: Tue, 08 Feb 2022 16:40:53 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 4 months

1
0
0 0

Change in dahdi-linux[master]: icE1usb: update ice1usb_proto.h to firmware 0.2-8

by laforge

Attention is currently required from: tnt. Hello tnt, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/dahdi-linux/+/26967 to look at the new patch set (#2). Change subject: icE1usb: update ice1usb_proto.h to firmware 0.2-8 ...................................................................... icE1usb: update ice1usb_proto.h to firmware 0.2-8 git revision cac342af6bccc9820a8617f900afaf663ad608ed of https://git.osmocom.org/osmo-e1-hardware Change-Id: I1423531470a1c9165d713108fb6a87ff47ff6e29 --- M drivers/dahdi/icE1usb/icE1usb.c M drivers/dahdi/icE1usb/ice1usb_proto.h 2 files changed, 51 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/dahdi-linux refs/changes/67/26967/2 -- To view, visit https://gerrit.osmocom.org/c/dahdi-linux/+/26967 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: dahdi-linux Gerrit-Branch: master Gerrit-Change-Id: I1423531470a1c9165d713108fb6a87ff47ff6e29 Gerrit-Change-Number: 26967 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-Attention: tnt <tnt(a)246tNt.com> Gerrit-MessageType: newpatchset

3 years, 4 months

1
0
0 0

Change in dahdi-linux[master]: icE1usb: GPSDO status support in sysfs

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/dahdi-linux/+/27093 ) Change subject: icE1usb: GPSDO status support in sysfs ...................................................................... icE1usb: GPSDO status support in sysfs * ability to read GPSDO related bits via sysfs and ioctl * ability to set GPSDO mode via sysfs * show firmware build during driver start and expose it to sysfs Change-Id: I7bc7daa4738b1db37fdd67945d7e976e2581b417 --- M drivers/dahdi/icE1usb/icE1usb.c 1 file changed, 380 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/dahdi-linux refs/changes/93/27093/1 diff --git a/drivers/dahdi/icE1usb/icE1usb.c b/drivers/dahdi/icE1usb/icE1usb.c index 87a7422..4ce29c6 100644 --- a/drivers/dahdi/icE1usb/icE1usb.c +++ b/drivers/dahdi/icE1usb/icE1usb.c @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-2.0-or-later /* Osmocom icE1usb driver - * Copyright (C) 2020 by Harald Welte <laforge(a)osmocom.org> + * Copyright (C) 2020-2022 by Harald Welte <laforge(a)osmocom.org> * inspired by osmo-e1d by Sylvain Munaut */ /* The Osmocom icE1usb is a modern, software-defined open hardware and @@ -52,15 +52,39 @@ #define ieu_err(x, fmt, args ...) \ dev_err(&((x)->usb_intf->dev), fmt, ## args) +static const struct usb_device_id ice1usb_products[] = { + { + USB_DEVICE(0x1d50, 0x6145), + }, + {} +}; + /*********************************************************************** * data structures ***********************************************************************/ +/* per-device global state */ +struct ice1usb_gpsdo { + /* USB device we operate on */ + struct usb_device *usb_dev; + struct usb_interface *usb_intf; + + struct e1usb_gpsdo_status gpsdo_status; + char fw_build[128]; + + /* is the device still present (true) or already absent/unplugged (false) */ + bool present; + /* spinlock protecting concurrent access to fc, {read,write}chunk_idx, ... */ + spinlock_t lock; +}; + + enum ice1usb_flags { ICE1USB_ISOC_RUNNING, ICE1USB_IRQ_RUNNING, }; +/* per-interface state */ struct ice1usb { /* USB device and interface we operate on */ struct usb_device *usb_dev; @@ -197,11 +221,13 @@ } #define USB_RT_VEND_IF (USB_TYPE_VENDOR | USB_RECIP_INTERFACE) +#define USB_RT_VEND_DEV (USB_TYPE_VENDOR | USB_RECIP_DEVICE) /* synchronous request, may block up to 1s, only called from process context! */ static int ice1usb_tx_config(struct ice1usb *ieu) { int rc; + uint8_t if_num = ieu->usb_intf->cur_altsetting->desc.bInterfaceNumber; ieu_info(ieu, "TX-CONFIG (crc4=%s, timing=%s, ext_loopback=%s, tx_yellow_alarm=%u)\n", tx_mode_str(ieu->cfg.tx.mode), tx_timing_str(ieu->cfg.tx.timing), @@ -209,7 +235,7 @@ rc = usb_control_msg(ieu->usb_dev, usb_sndctrlpipe(ieu->usb_dev, 0), ICE1USB_INTF_SET_TX_CFG, USB_RT_VEND_IF, - 0, 0, &ieu->cfg.tx, sizeof(ieu->cfg.tx), + 0, if_num, &ieu->cfg.tx, sizeof(ieu->cfg.tx), USB_CTRL_SET_TIMEOUT); if (rc < 0) return rc; @@ -849,7 +875,327 @@ }; /*********************************************************************** - * kernel USB integration / probing +* USB GPSDO driver (sysfs files) - NOT _interface_ driver +***********************************************************************/ + +static void ice1usb_gpsdo_free(struct ice1usb_gpsdo *e1d) +{ + usb_put_dev(e1d->usb_dev); + kfree(e1d); +} + +/* The GPS-DO exists only once for the entire USB device, while all the E1 related + * bits exist once per USB interface! */ + +/* update our internal, cached GPS-DO state */ +static int e1u_update_gpsdo(struct ice1usb_gpsdo *e1d) +{ + uint8_t if_num = e1d->usb_intf->cur_altsetting->desc.bInterfaceNumber; + int rc; + + rc = usb_control_msg(e1d->usb_dev, usb_rcvctrlpipe(e1d->usb_dev, 0), + ICE1USB_INTF_GET_GPSDO_STATUS, USB_DIR_IN | USB_RT_VEND_IF, + 0, if_num, &e1d->gpsdo_status, sizeof(e1d->gpsdo_status), + USB_CTRL_SET_TIMEOUT); + if (rc < 0) { + dev_err(&e1d->usb_intf->dev, "Error during GPSDO CTRL GET transfer: %d\n", rc); + return rc; + } + if (rc != sizeof(e1d->gpsdo_status)) { + dev_err(&e1d->usb_dev->dev, "Short read during GPSDO CTRL GET transfer: %d\n", rc); + return -EIO; + } + + return 0; +} + +static const char *gpsdo_mode_str(enum ice1usb_gpsdo_mode mode) +{ + switch (mode) { + case ICE1USB_GPSDO_MODE_DISABLED: + return "disabled"; + case ICE1USB_GPSDO_MODE_AUTO: + return "auto"; + default: + return "invalid"; + } +} + +static const char *gpsdo_antenna_state_str(enum ice1usb_gpsdo_antenna_state st) +{ + switch (st) { + case ICE1USB_GPSDO_ANT_UNKNOWN: + return "unknown"; + case ICE1USB_GPSDO_ANT_OK: + return "ok"; + case ICE1USB_GPSDO_ANT_OPEN: + return "open"; + case ICE1USB_GPSDO_ANT_SHORT: + return "short"; + default: + return "invalid"; + } +} + +static const char *gpsdo_state_str(enum ice1usb_gpsdo_state st) +{ + switch (st) { + case ICE1USB_GPSDO_STATE_DISABLED: + return "disabled"; + case ICE1USB_GPSDO_STATE_CALIBRATE: + return "calibrate"; + case ICE1USB_GPSDO_STATE_HOLD_OVER: + return "hold_over"; + case ICE1USB_GPSDO_STATE_TUNE_COARSE: + return "tune_coarse"; + case ICE1USB_GPSDO_STATE_TUNE_FINE: + return "tune_fine"; + default: + return "invalid"; + } +} + + +static ssize_t e1u_gpsdo_mode_show(struct device *dev, struct device_attribute *attr, + char *buf) +{ + struct ice1usb_gpsdo *e1d = dev_get_drvdata(dev); + int rc = e1u_update_gpsdo(e1d); + if (rc < 0) + return rc; + return sprintf(buf, "%s\n", gpsdo_mode_str(e1d->gpsdo_status.mode)); +} + +static ssize_t e1u_gpsdo_mode_store(struct device *dev, struct device_attribute *attr, + const char *buf, size_t count) +{ + struct ice1usb_gpsdo *e1d = dev_get_drvdata(dev); + uint8_t if_num = e1d->usb_intf->cur_altsetting->desc.bInterfaceNumber; + uint16_t imode; + int rc; + + if (!strcmp(buf, "disabled")) + imode = ICE1USB_GPSDO_MODE_DISABLED; + else if (!strcmp(buf, "auto")) + imode = ICE1USB_GPSDO_MODE_AUTO; + else + return -EINVAL; + + rc = usb_control_msg(e1d->usb_dev, usb_sndctrlpipe(e1d->usb_dev, 0), + ICE1USB_INTF_SET_GPSDO_MODE, USB_RT_VEND_IF, + imode, if_num, NULL, 0, USB_CTRL_SET_TIMEOUT); + if (rc < 0) { + dev_err(&e1d->usb_intf->dev, "Error during GPSDO CTRL SET transfer: %d\n", rc); + return -EIO; + } + e1d->gpsdo_status.mode = imode; + + return count; +} + +static DEVICE_ATTR(gpsdo_mode, 0644, e1u_gpsdo_mode_show, e1u_gpsdo_mode_store); + +static ssize_t e1u_gpsdo_ant_state_show(struct device *dev, + struct device_attribute *attr, char *buf) +{ + struct ice1usb_gpsdo *e1d = dev_get_drvdata(dev); + int rc = e1u_update_gpsdo(e1d); + if (rc < 0) + return rc; + return sprintf(buf, "%s\n", gpsdo_antenna_state_str(e1d->gpsdo_status.antenna_state)); +} + +static DEVICE_ATTR(gpsdo_antenna_state, 0444, e1u_gpsdo_ant_state_show, NULL); + +static ssize_t e1u_gpsdo_state_show(struct device *dev, + struct device_attribute *attr, char *buf) +{ + struct ice1usb_gpsdo *e1d = dev_get_drvdata(dev); + int rc = e1u_update_gpsdo(e1d); + if (rc < 0) + return rc; + return sprintf(buf, "%s\n", gpsdo_state_str(e1d->gpsdo_status.state)); +} + +static DEVICE_ATTR(gpsdo_state, 0444, e1u_gpsdo_state_show, NULL); + +static ssize_t e1u_gpsdo_valid_fix_show(struct device *dev, + struct device_attribute *attr, char *buf) +{ + struct ice1usb_gpsdo *e1d = dev_get_drvdata(dev); + int rc = e1u_update_gpsdo(e1d); + if (rc < 0) + return rc; + return sprintf(buf, "%u\n", e1d->gpsdo_status.valid_fix); +} + +static DEVICE_ATTR(gpsdo_valid_fix, 0444, e1u_gpsdo_valid_fix_show, NULL); + + +static ssize_t e1u_gpsdo_tune_coarse_show(struct device *dev, + struct device_attribute *attr, char *buf) +{ + struct ice1usb_gpsdo *e1d = dev_get_drvdata(dev); + int rc = e1u_update_gpsdo(e1d); + if (rc < 0) + return rc; + return sprintf(buf, "%u\n", e1d->gpsdo_status.tune.coarse); +} + +/* TODO: set tuning */ +static DEVICE_ATTR(gpsdo_tune_coarse, 0444, e1u_gpsdo_tune_coarse_show, NULL); + + +static ssize_t e1u_gpsdo_tune_fine_show(struct device *dev, + struct device_attribute *attr, char *buf) +{ + struct ice1usb_gpsdo *e1d = dev_get_drvdata(dev); + int rc = e1u_update_gpsdo(e1d); + if (rc < 0) + return rc; + return sprintf(buf, "%u\n", e1d->gpsdo_status.tune.fine); +} + +/* TODO: set tuning */ +static DEVICE_ATTR(gpsdo_tune_fine, 0444, e1u_gpsdo_tune_fine_show, NULL); + +static ssize_t e1u_gpsdo_freq_est_show(struct device *dev, + struct device_attribute *attr, char *buf) +{ + struct ice1usb_gpsdo *e1d = dev_get_drvdata(dev); + int rc = e1u_update_gpsdo(e1d); + if (rc < 0) + return rc; + return sprintf(buf, "%u\n", e1d->gpsdo_status.freq_est); +} + +static DEVICE_ATTR(gpsdo_freq_est, 0444, e1u_gpsdo_freq_est_show, NULL); + +static ssize_t e1u_fw_build_show(struct device *dev, + struct device_attribute *attr, char *buf) +{ + struct ice1usb_gpsdo *e1d = dev_get_drvdata(dev); + + return sprintf(buf, "%s\n", e1d->fw_build); +} + +static DEVICE_ATTR(fw_build, 0444, e1u_fw_build_show, NULL); + +static void create_sysfs_files(struct ice1usb_gpsdo *e1d) +{ + device_create_file(&e1d->usb_intf->dev, &dev_attr_gpsdo_mode); + device_create_file(&e1d->usb_intf->dev, &dev_attr_gpsdo_antenna_state); + device_create_file(&e1d->usb_intf->dev, &dev_attr_gpsdo_state); + device_create_file(&e1d->usb_intf->dev, &dev_attr_gpsdo_valid_fix); + device_create_file(&e1d->usb_intf->dev, &dev_attr_gpsdo_tune_coarse); + device_create_file(&e1d->usb_intf->dev, &dev_attr_gpsdo_tune_fine); + device_create_file(&e1d->usb_intf->dev, &dev_attr_gpsdo_freq_est); + device_create_file(&e1d->usb_intf->dev, &dev_attr_fw_build); +} + +static void remove_sysfs_files(struct ice1usb_gpsdo *e1d) +{ + device_remove_file(&e1d->usb_intf->dev, &dev_attr_gpsdo_mode); + device_remove_file(&e1d->usb_intf->dev, &dev_attr_gpsdo_antenna_state); + device_remove_file(&e1d->usb_intf->dev, &dev_attr_gpsdo_state); + device_remove_file(&e1d->usb_intf->dev, &dev_attr_gpsdo_valid_fix); + device_remove_file(&e1d->usb_intf->dev, &dev_attr_gpsdo_tune_coarse); + device_remove_file(&e1d->usb_intf->dev, &dev_attr_gpsdo_tune_fine); + device_remove_file(&e1d->usb_intf->dev, &dev_attr_gpsdo_freq_est); + device_remove_file(&e1d->usb_intf->dev, &dev_attr_fw_build); +} + +static int ice1usb_gpsdo_probe(struct usb_interface *intf, const struct usb_device_id *prod) +{ + struct usb_device *usb_dev = usb_get_dev(interface_to_usbdev(intf)); + const struct usb_interface_descriptor *ifdesc = &intf->altsetting->desc; + struct ice1usb_gpsdo *e1d; + int ret = -ENODEV; + int rc; + + dev_dbg(&intf->dev, "entering %s", __FUNCTION__); + + if (ifdesc->bInterfaceClass != 0xff || ifdesc->bInterfaceSubClass != 0xE1) { + dev_dbg(&intf->dev, "Unsupported Interface Class/SubClass %02x/%02x", + ifdesc->bInterfaceClass, ifdesc->bInterfaceSubClass); + ret = -ENODEV; + goto error; + } + + /* we only support protocol 0 so far */ + if (ifdesc->bInterfaceProtocol != 0xd0) { + ret = -ENODEV; + goto error; + } + + e1d = kzalloc(sizeof(*e1d), GFP_KERNEL); + if (!e1d) { + dev_err(&intf->dev, "Out of memory\n"); + ret = -ENOMEM; + goto error; + } + + e1d->usb_dev = usb_dev; + e1d->usb_intf = intf; + e1d->present = true; + spin_lock_init(&e1d->lock); + + usb_set_intfdata(intf, e1d); + + /* obtain firmware build information */ + e1d->fw_build[0] = '\0'; + rc = usb_control_msg(e1d->usb_dev, usb_rcvctrlpipe(e1d->usb_dev, 0), + ICE1USB_DEV_GET_FW_BUILD, USB_DIR_IN | USB_RT_VEND_DEV, + 0, 0, e1d->fw_build, sizeof(e1d->fw_build), USB_CTRL_SET_TIMEOUT); + if (rc < 0) { + dev_err(&e1d->usb_intf->dev, "Error during FW BUILD CTRL GET transfer: %d\n", rc); + ret = rc; + goto error_free; + } + e1d->fw_build[sizeof(e1d->fw_build)-1] = '\0'; + dev_info(&e1d->usb_intf->dev, "icE1usb firmware build: '%s'\n", e1d->fw_build); + + create_sysfs_files(e1d); + + return 0; + +error_free: + usb_set_intfdata(intf, NULL); + kfree(e1d); +error: + usb_put_dev(usb_dev); + return ret; +} + +static void ice1usb_gpsdo_disconnect(struct usb_interface *intf) +{ + struct ice1usb_gpsdo *e1d = usb_get_intfdata(intf); + + dev_dbg(&intf->dev, "entering %s", __FUNCTION__); + + if (!e1d) + return; + + /* avoid any shutdown code from submitting further I/O */ + e1d->present = false; + + remove_sysfs_files(e1d); + + usb_set_intfdata(intf, NULL); + + ice1usb_gpsdo_free(e1d); +} + + +static struct usb_driver ice1usb_gpsdo_driver = { + .name = "icE1usb-GPSDO", + .id_table = ice1usb_products, + .probe = ice1usb_gpsdo_probe, + .disconnect = ice1usb_gpsdo_disconnect, +}; + +/*********************************************************************** + * kernel USB integration / probing ***********************************************************************/ /* does the given altsetting contain an EP with wMaxPacketSize == 0 ? */ @@ -989,6 +1335,10 @@ return -ENODEV; } + /* we only support protocol 0 so far */ + if (ifdesc->bInterfaceProtocol != 0x00) + return -ENODEV; + ieu = kzalloc(sizeof(*ieu), GFP_KERNEL); if (!ieu) { dev_err(&intf->dev, "Out of memory\n"); @@ -1119,13 +1469,6 @@ } #endif -static const struct usb_device_id ice1usb_products[] = { - { - USB_DEVICE(0x1d50, 0x6145), - }, - {} -}; - static struct usb_driver ice1usb_driver = { .name = "icE1usb", .id_table = ice1usb_products, @@ -1135,7 +1478,33 @@ //.resume = ice1usb_resume, }; -module_usb_driver(ice1usb_driver); + +/* cannot use module_usb_driver() as we have both E1 and GPS-DO drivers */ +static int __init __ice1usb_init(void) +{ + int rc; + + rc = usb_register_driver(&ice1usb_gpsdo_driver, THIS_MODULE, KBUILD_MODNAME); + if (rc < 0) + return rc; + + rc = usb_register_driver(&ice1usb_driver, THIS_MODULE, KBUILD_MODNAME); + if (rc < 0) { + usb_deregister(&ice1usb_gpsdo_driver); + return rc; + } + + return rc; +} + +static void __exit __ice1usb_exit(void) +{ + usb_deregister(&ice1usb_gpsdo_driver); + usb_deregister(&ice1usb_driver); +} + +module_init(__ice1usb_init); +module_exit(__ice1usb_exit); MODULE_AUTHOR("Harald Welte <laforge(a)osmocom.org>"); MODULE_DESCRIPTION("Osmocom icE1usb USB E1 interface"); -- To view, visit https://gerrit.osmocom.org/c/dahdi-linux/+/27093 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: dahdi-linux Gerrit-Branch: master Gerrit-Change-Id: I7bc7daa4738b1db37fdd67945d7e976e2581b417 Gerrit-Change-Number: 27093 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

3 years, 4 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: bsc vamos: ensure lchan state in some places

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27087 ) Change subject: bsc vamos: ensure lchan state in some places ...................................................................... bsc vamos: ensure lchan state in some places Change-Id: I5979516cf2b2e1adf5269acd0b8e7adb5e6a1ac5 --- M bsc/BSC_Tests_VAMOS.ttcn 1 file changed, 16 insertions(+), 10 deletions(-) Approvals: laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/bsc/BSC_Tests_VAMOS.ttcn b/bsc/BSC_Tests_VAMOS.ttcn index 5caeeed..1958dc5 100644 --- a/bsc/BSC_Tests_VAMOS.ttcn +++ b/bsc/BSC_Tests_VAMOS.ttcn @@ -83,7 +83,7 @@ const integer NUM_BTS := 3; const integer NUM_MSC := 3; -private function f_rsl_chan_nr_to_subslot(RslChannelNr chan_nr) +private function f_rsl_chan_nr_to_subslot(RslChannelNr chan_nr, boolean use_vamos_subslot_nr := false) return integer { var integer subslot; @@ -97,12 +97,19 @@ subslot := chan_nr.u.lm.sub_chan; } case (t_RslChanNr_Osmo_VAMOS_Bm(?)) { - /* TCH/F, always subslot 0 */ - subslot := 0; + /* TCH/F shadow */ + if (use_vamos_subslot_nr) { + subslot := 1; + } else { + subslot := 0; + } } case (t_RslChanNr_Osmo_VAMOS_Lm(?, ?)) { - /* TCH/H */ + /* TCH/H shadow */ subslot := chan_nr.u.lm.sub_chan; + if (use_vamos_subslot_nr) { + subslot := subslot + 2; + } } case else { setverdict(fail, "unsupported RslChannelNr type in f_rsl_chan_nr_to_subslot()"); @@ -201,10 +208,10 @@ } } -private function f_lchan_str(integer bts_nr, integer trx_nr, RslChannelNr chan_nr) +private function f_lchan_str(integer bts_nr, integer trx_nr, RslChannelNr chan_nr, boolean use_vamos_subslot_nr := false) return charstring { - var integer subslot := f_rsl_chan_nr_to_subslot(chan_nr); + var integer subslot := f_rsl_chan_nr_to_subslot(chan_nr, use_vamos_subslot_nr := use_vamos_subslot_nr); return "lchan " & int2str(bts_nr) & " " & int2str(trx_nr) & " " & int2str(chan_nr.tn) & " " & int2str(subslot); } @@ -217,7 +224,7 @@ private function f_lchan_ensure_established(TELNETasp_PT vty, integer bts_nr, integer trx_nr, RslChannelNr chan_nr) { - var charstring lchan_str := f_lchan_str(bts_nr, trx_nr, chan_nr); + var charstring lchan_str := f_lchan_str(bts_nr, trx_nr, chan_nr, use_vamos_subslot_nr := true); var charstring lchan_info := f_vty_transceive_ret(vty, "show " & lchan_str); if (f_strstr(lchan_info, "State: ESTABLISHED") < 0) { log("'show lchan' replied: ", lchan_info); @@ -465,7 +472,7 @@ setverdict(pass); f_sleep(1.0); - f_vty_transceive(BSCVTY, "show lchan summary"); + f_lchan_ensure_established(BSCVTY, 0, 0, g_chan_nr); f_verify_dtap(); } @@ -575,8 +582,7 @@ setverdict(pass); f_sleep(1.0); - f_vty_transceive(BSCVTY, "show lchan summary"); - + f_lchan_ensure_established(BSCVTY, 0, 0, g_chan_nr); f_verify_dtap(); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27087 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: I5979516cf2b2e1adf5269acd0b8e7adb5e6a1ac5 Gerrit-Change-Number: 27087 Gerrit-PatchSet: 3 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 4 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: BSC_Tests_VAMOS: fix TC_vamos_multiplex_tch_h_tch_h_tch_h_tch_h

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27086 ) Change subject: BSC_Tests_VAMOS: fix TC_vamos_multiplex_tch_h_tch_h_tch_h_tch_h ...................................................................... BSC_Tests_VAMOS: fix TC_vamos_multiplex_tch_h_tch_h_tch_h_tch_h Properly clean up conns in the end. Use COORD and new COORD2 ports to daisy-chain coordination between the four components. Related: OS#5444 Change-Id: I3b1dfc3b11e990893cbf182fb9f8840e198eb8aa --- M bsc/BSC_Tests_VAMOS.ttcn M bsc/MSC_ConnectionHandler.ttcn 2 files changed, 45 insertions(+), 6 deletions(-) Approvals: laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/bsc/BSC_Tests_VAMOS.ttcn b/bsc/BSC_Tests_VAMOS.ttcn index 9a53200..5caeeed 100644 --- a/bsc/BSC_Tests_VAMOS.ttcn +++ b/bsc/BSC_Tests_VAMOS.ttcn @@ -677,19 +677,52 @@ f_shutdown_helper(); } +const charstring DONE := "DONE"; + +/* + * f1 f2 f3 f4 + * COORD <--> COORD | COORD2 <--> COORD | COORD2 <--> COORD + * ---DONE-----> ---DONE-----> ---DONE-----> + * <----DONE---- <----DONE---- <----DONE---- + */ + /* First, primary lchan of TC_vamos_multiplex_tch_h_tch_h_tch_h_tch_h() */ private function f_TC_vamos_multiplex_tch_h_tch_h1(charstring id) runs on MSC_ConnHdlr { f_est_lchan_and_mode_modify_to_vamos(); f_logp(BSCVTY, "f_est_lchan_and_mode_modify_to_vamos done"); + COORD.send(DONE); + COORD.receive(DONE); + f_perform_clear(RSL); } /* Second, VAMOS shadow lchan of TC_vamos_multiplex_tch_h_tch_h_tch_h_tch_h() */ private function f_TC_vamos_multiplex_tch_h_tch_h2(charstring id) runs on MSC_ConnHdlr { + f_sleep(1.0); + COORD.receive(DONE); f_est_and_reassign_to_secondary_lchan(valueof(t_RslChanNr_Osmo_VAMOS_Lm(5, 0))); + COORD2.send(DONE); + COORD2.receive(DONE) + COORD.send(DONE); + f_perform_clear(RSL); +} + +private function f_TC_vamos_multiplex_tch_h_tch_h3(charstring id) runs on MSC_ConnHdlr { + f_sleep(1.0); + COORD.receive(DONE); + f_est_lchan_and_mode_modify_to_vamos(); + f_logp(BSCVTY, "f_est_lchan_and_mode_modify_to_vamos done"); + COORD2.send(DONE); + COORD2.receive(DONE); + COORD.send(DONE); + f_perform_clear(RSL); } private function f_TC_vamos_multiplex_tch_h_tch_h4(charstring id) runs on MSC_ConnHdlr { + f_sleep(1.0); + COORD.receive(DONE); f_est_and_reassign_to_secondary_lchan(valueof(t_RslChanNr_Osmo_VAMOS_Lm(5, 1))); + COORD.send(DONE); + f_perform_clear(RSL); } /* Establish a primary lchan and modify it to VAMOS speech mode. Then establish @@ -725,17 +758,22 @@ pars4.ass_codec_list := valueof(ts_BSSMAP_IE_CodecList({ts_CodecHR})); vc_conn1 := f_start_handler(refers(f_TC_vamos_multiplex_tch_h_tch_h1), pars1); - vc_conn1.done; - vc_conn2 := f_start_handler(refers(f_TC_vamos_multiplex_tch_h_tch_h2), pars2); - vc_conn2.done; /* Also fill up the second subslot of the TCH/H timeslot */ - vc_conn3 := f_start_handler(refers(f_TC_vamos_multiplex_tch_h_tch_h1), pars3); - vc_conn3.done; - + vc_conn3 := f_start_handler(refers(f_TC_vamos_multiplex_tch_h_tch_h3), pars3); vc_conn4 := f_start_handler(refers(f_TC_vamos_multiplex_tch_h_tch_h4), pars4); + + /* see diagram above (search for "---DONE") */ + connect(vc_conn1:COORD, vc_conn2:COORD); + connect(vc_conn2:COORD2, vc_conn3:COORD); + connect(vc_conn3:COORD2, vc_conn4:COORD); + + vc_conn1.done; + vc_conn2.done; + vc_conn3.done; vc_conn4.done; + f_shutdown_helper(); } diff --git a/bsc/MSC_ConnectionHandler.ttcn b/bsc/MSC_ConnectionHandler.ttcn index 4aeb539..109194b 100644 --- a/bsc/MSC_ConnectionHandler.ttcn +++ b/bsc/MSC_ConnectionHandler.ttcn @@ -447,6 +447,7 @@ port RAN_PROC_PT RAN; port TELNETasp_PT BSCVTY; port Coord_PT COORD; + port Coord_PT COORD2; /* Proxy MGCP-over-IPA and MGCP-over-UDP */ port IPA_MGCP_PT MGCP_MSC_CLIENT; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27086 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: I3b1dfc3b11e990893cbf182fb9f8840e198eb8aa Gerrit-Change-Number: 27086 Gerrit-PatchSet: 3 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 4 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: BSC_Tests_VAMOS: fix TC_vamos_multiplex_tch_f_tch_f

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27080 ) Change subject: BSC_Tests_VAMOS: fix TC_vamos_multiplex_tch_f_tch_f ...................................................................... BSC_Tests_VAMOS: fix TC_vamos_multiplex_tch_f_tch_f Properly clean up conns. To know when the multiplex is ready, use the COORD port to tell the other component. Related: OS#5444 Change-Id: I82b7eccd2ae30fdc3794ea9dad5d2d8f875d702d --- M bsc/BSC_Tests_VAMOS.ttcn 1 file changed, 17 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/bsc/BSC_Tests_VAMOS.ttcn b/bsc/BSC_Tests_VAMOS.ttcn index ca722e7..9a53200 100644 --- a/bsc/BSC_Tests_VAMOS.ttcn +++ b/bsc/BSC_Tests_VAMOS.ttcn @@ -626,15 +626,27 @@ f_shutdown_helper(); } +const charstring PRIMARY_LCHAN_DONE := "PRIMARY_LCHAN_DONE"; +const charstring MULTIPLEX_DONE := "MULTIPLEX_DONE"; + /* First, primary lchan of TC_vamos_multiplex_tch_f_tch_f() */ private function f_TC_vamos_multiplex_tch_f_tch_f1(charstring id) runs on MSC_ConnHdlr { f_est_lchan_and_mode_modify_to_vamos(); + f_sleep(1.0); + COORD.send(PRIMARY_LCHAN_DONE); f_logp(BSCVTY, "f_est_lchan_and_mode_modify_to_vamos done"); + COORD.receive(MULTIPLEX_DONE); + f_perform_clear(RSL); } /* Second, VAMOS shadow lchan of TC_vamos_multiplex_tch_f_tch_f() */ private function f_TC_vamos_multiplex_tch_f_tch_f2(charstring id) runs on MSC_ConnHdlr { + f_sleep(1.0); + COORD.receive(PRIMARY_LCHAN_DONE); f_est_and_reassign_to_secondary_lchan(valueof(t_RslChanNr_Osmo_VAMOS_Bm(1))); + f_sleep(1.0); + COORD.send(MULTIPLEX_DONE); + f_perform_clear(RSL); } /* Establish a primary lchan and modify it to VAMOS speech mode. Then establish @@ -654,11 +666,14 @@ pars1.ass_codec_list := valueof(ts_BSSMAP_IE_CodecList({ts_CodecFR})); pars2.ass_codec_list := valueof(ts_BSSMAP_IE_CodecList({ts_CodecFR})); - vc_conn1 := f_start_handler(refers(f_TC_vamos_multiplex_tch_f_tch_f1), pars1); - vc_conn1.done; + vc_conn1 := f_start_handler(refers(f_TC_vamos_multiplex_tch_f_tch_f1), pars1); vc_conn2 := f_start_handler(refers(f_TC_vamos_multiplex_tch_f_tch_f2), pars2); + connect(vc_conn1:COORD, vc_conn2:COORD); + + vc_conn1.done; vc_conn2.done; + f_shutdown_helper(); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27080 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: I82b7eccd2ae30fdc3794ea9dad5d2d8f875d702d Gerrit-Change-Number: 27080 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 4 months

1
0
0 0

2025

2024

2023

2022

gerrit-log