Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
OpenXG-RAN
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
spbro
OpenXG-RAN
Commits
06ccfdfc
Commit
06ccfdfc
authored
Oct 13, 2022
by
Robert Schmidt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove ADRV9371_ZC706 driver leftovers
parent
37e60219
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
2 additions
and
185 deletions
+2
-185
cmake_targets/build_oai
cmake_targets/build_oai
+2
-18
sdr/ADRV9371_ZC706/SYRTEM_IQ_QuickStart.readme
sdr/ADRV9371_ZC706/SYRTEM_IQ_QuickStart.readme
+0
-136
sdr/ADRV9371_ZC706/SYRTEM_IQ_uninstall_previous_SW.sh
sdr/ADRV9371_ZC706/SYRTEM_IQ_uninstall_previous_SW.sh
+0
-28
sdr/COMMON/common_lib.c
sdr/COMMON/common_lib.c
+0
-1
sdr/COMMON/common_lib.h
sdr/COMMON/common_lib.h
+0
-2
No files found.
cmake_targets/build_oai
View file @
06ccfdfc
...
@@ -109,7 +109,7 @@ Options:
...
@@ -109,7 +109,7 @@ Options:
--UE-gen-nvram [output path]
--UE-gen-nvram [output path]
Specify gen_nvram_path (default
\"
$gen_nvram_path
\"
)
Specify gen_nvram_path (default
\"
$gen_nvram_path
\"
)
-w | --hardware
-w | --hardware
USRP, BLADERF, LMSSDR, IRIS,
ADRV9371_ZC706,
SIMU, AW2SORI, None (Default)
USRP, BLADERF, LMSSDR, IRIS, SIMU, AW2SORI, None (Default)
Adds this RF board support (in external packages installation and in compilation)
Adds this RF board support (in external packages installation and in compilation)
-t | --transport
-t | --transport
Selects the transport protocol type, options: None, Ethernet, benetel4g, benetel5g
Selects the transport protocol type, options: None, Ethernet, benetel4g, benetel5g
...
@@ -286,7 +286,7 @@ function main() {
...
@@ -286,7 +286,7 @@ function main() {
-w
|
--hardware
)
-w
|
--hardware
)
# Use OAI_USRP as the key word USRP is used inside UHD driver
# Use OAI_USRP as the key word USRP is used inside UHD driver
case
"
$2
"
in
case
"
$2
"
in
"USRP"
|
"BLADERF"
|
"LMSSDR"
|
"IRIS"
|
"
ADRV9371_ZC706"
|
"
SIMU"
|
"AW2SORI"
)
"USRP"
|
"BLADERF"
|
"LMSSDR"
|
"IRIS"
|
"SIMU"
|
"AW2SORI"
)
HW
=
"OAI_"
$2
HW
=
"OAI_"
$2
;;
;;
"None"
)
"None"
)
...
@@ -499,10 +499,6 @@ function main() {
...
@@ -499,10 +499,6 @@ function main() {
install_usrp_uhd_driver
$UHD_IMAGES_DIR
install_usrp_uhd_driver
$UHD_IMAGES_DIR
fi
fi
fi
fi
# if [ "$HW" == "OAI_ADRV9371_ZC706" ] ; then
# echo_info "\nInstalling packages for ADRV9371_ZC706 support"
# check_install_libiio_driver
# fi
if
[
"
$HW
"
==
"OAI_BLADERF"
]
;
then
if
[
"
$HW
"
==
"OAI_BLADERF"
]
;
then
echo_info
"installing packages for BLADERF support"
echo_info
"installing packages for BLADERF support"
check_install_bladerf_driver
check_install_bladerf_driver
...
@@ -706,18 +702,6 @@ function main() {
...
@@ -706,18 +702,6 @@ function main() {
ln
-s
liboai_irisdevif.so liboai_device.so
ln
-s
liboai_irisdevif.so liboai_device.so
echo_info
"liboai_device.so is linked to IRIS device library"
echo_info
"liboai_device.so is linked to IRIS device library"
elif
[
"
$HW
"
==
"OAI_ADRV9371_ZC706"
]
;
then
SYRIQ_KVER
=
$(
uname
-r
)
SYRIQ_KMAJ
=
$(
echo
$SYRIQ_KVER
|
sed
-e
's/^\([0-9][0-9]*\)\.[0-9][0-9]*\.[0-9][0-9]*.*/\1/'
)
SYRIQ_KMIN
=
$(
echo
$SYRIQ_KVER
|
sed
-e
's/^[0-9][0-9]*\.\([0-9][0-9]*\)\.[0-9][0-9]*.*/\1/'
)
# echo $SYRIQ_KMAJ$SYRIQ_KMIN
if
[
"
$SYRIQ_KMAJ$SYRIQ_KMIN
"
==
"319"
]
||
[
"
$SYRIQ_KMAJ$SYRIQ_KMIN
"
==
"410"
]
||
[
"
$SYRIQ_KMAJ$SYRIQ_KMIN
"
==
"415"
]
;
then
# echo "Kernel $SYRIQ_KMAJ.$SYRIQ_KMIN detected"
ln
-sf
/usr/local/lib/syriq/libadrv9371zc706.so liboai_device.so
else
echo_error
"== FAILED == Unexpected Kernel
$SYRIQ_KMAJ
.
$SYRIQ_KMIN
"
fi
echo_info
"liboai_device.so is linked to ADRV9371_ZC706 device library for Kernel
$SYRIQ_KMAJ
.
$SYRIQ_KMIN
"
elif
[
"
$HW
"
==
"OAI_AW2SORI"
]
;
then
elif
[
"
$HW
"
==
"OAI_AW2SORI"
]
;
then
compilations
$BUILD_DIR
aw2sori_transpro
compilations
$BUILD_DIR
aw2sori_transpro
...
...
sdr/ADRV9371_ZC706/SYRTEM_IQ_QuickStart.readme
deleted
100755 → 0
View file @
37e60219
/* ********** ********** ********** ********** ********** ********** ********** */
Requirements:
-------------
- Previous kernel module/libraries shall be uninstalled !!!
- cf. command line below "SYRTEM_IQ_uninstall_previous_SW.sh"
./SYRTEM_IQ_unload_previous_SW.sh
- You shall have SYRIQ1.4.6nr.tar.gz
- Ubuntu kernel version is restricted to:
- Kernel 4.15.0-20-lowlatency (Ubuntu 18.04)
- Kernel 4.10.0-42-lowlatency (Ubuntu 17.04)
- Kernel 3.19.0-61-lowlatency (Ubuntu 14.04)
- ADRV9371+ZC706 PCIe board shall be switched on
- PC shall be reboot once ADRV9371+ZC706 PCIe board is switched on
mkdir eur_oai_develop-nr
cd eur_oai_develop-nr
git clone https://gitlab.eurecom.fr/oai/openairinterface5g.git
cd openairinterface5g
git checkout 375-syrtem-sdr-platform
or
git checkout develop-nr (after merge request accepted)
./sdr/ADRV9371_ZC706/SYRTEM_IQ_uninstall_previous_SW.sh
-> Reading package lists... Done
-> Building dependency tree
-> Reading state information... Done
-> linux-headers-4.15.0-20-lowlatency is already the newest version (4.15.0-20.21).
-> 0 upgraded, 0 newly installed, 0 to remove and 327 not upgraded.
-> Previous SYRIQ is loaded!
-> previous SYRIQ is unloaded!
-> previous SYRIQ is uninstall!
-> Previous SYRIQ uninstallation is done
/* ********** ********** ********** ********** ********** ********** ********** */
UE:
---
configuration:
--------------
sudo apt update
sudo apt-get update
tar -xvzf SYRIQ1.4.6nr.tar.gz
./SYRIQplatformR1.4.6nr_install.sh
sudo reboot
sudo lspci -vv | grep Xilinx
sudo lspci -vv -s 02:00.0 | grep LnkSta
sudo lspci -vv -s 03:00.0 | grep LnkSta
sudo lspci -vv -s 02:00.0 | grep Interr
sudo lspci -vv -s 03:00.0 | grep Interr
sudo gedit /usr/local/etc/syriq/cpu-irq.sh
echo '1' > /proc/irq/49/smp_affinity_list
echo '5' > /proc/irq/48/smp_affinity_list
gedit oaienv
export IIOD_REMOTE=192.168.1.11
compilation:
------------
sudo cset shield --reset
cd eur_oai_develop-nr/openairinterface5g/
source oaienv
sudo -E ./cmake_targets/build_oai -c --nrUE -w ADRV9371_ZC706 -I
sudo -E ./cmake_targets/build_oai -c --nrUE -w ADRV9371_ZC706
run:
----
source oaienv
sudo -E /usr/local/etc/syriq/cpu-irq.sh
sudo -E cset shield -e ./cmake_targets/ran_build/nr-uesoftmodem -- --numerology 1 -r 106 -C 3510000000 --loop-memory --rf-config-file /usr/local/etc/syriq/ue.band22.tm1.PRB100.NR40.dat
/* ********** ********** ********** ********** ********** ********** ********** */
gNB:
----
configuration:
--------------
sudo apt update
sudo apt-get update
tar -xvzf SYRIQ1.4.6nr.tar.gz
./SYRIQplatformR1.4.6nr_install.sh
sudo reboot
sudo lspci -vv | grep Xilinx
sudo lspci -vv -s 02:00.0 | grep LnkSta
sudo lspci -vv -s 02:00.0 | grep Interr
sudo gedit /usr/local/etc/syriq/cpu-irq.sh
echo '1' > /proc/irq/46/smp_affinity_list
gedit oaienv
export IIOD_REMOTE=192.168.1.21
compilation:
------------
sudo cset shield --reset
cd eur_oai_develop-nr/openairinterface5g/
source oaienv
sudo -E ./cmake_targets/build_oai -c --gNB -w ADRV9371_ZC706 -I --enable-cpu-affinity
/* CPU available shall be mapped on CPU2 to get_nprocs() number with hyperthreading disabled */
/* because : */
/* - cset shield leave CPU0 for system */
/* - CPU1 is reserved for HwRxTx thread for I/Q acquisition ! */
/* Note: "/usr/local/etc/syriq/cpu-irq.sh" shall be changed if more than 8 cores are used */
/* ie. "cset shield --force --kthread on -c 1-7" where "-c 1-7" reserves CPU1 to CPU7 for application (CPU0 is for system) */
sudo -E ./cmake_targets/build_oai -c --gNB -w ADRV9371_ZC706 --enable-cpu-affinity
run:
----
source oaienv
sudo -E /usr/local/etc/syriq/cpu-irq.sh
sudo -E cset shield -e ./cmake_targets/ran_build/build/nr-softmodem -- -O $OPENAIR_DIR/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band22.tm1.106PRB.adrv9371zc706.conf --rf-config-file /usr/local/etc/syriq/gnb.band22.tm1.PRB100.NR40_hwgain15.dat
sdr/ADRV9371_ZC706/SYRTEM_IQ_uninstall_previous_SW.sh
deleted
100755 → 0
View file @
37e60219
# Previous SYRIQ uninstall
#!/bin/sh
MODULE
=
"riffa"
KERNEL_VERSION
=
$(
uname
-r
)
RHR
=
/etc/redhat-release
sudo
apt-get
install
-y
linux-headers-
`
uname
-r
`
if
lsmod |
grep
"
$MODULE
"
&> /dev/null
;
then
echo
"Previous SYRIQ is loaded!"
sudo
rmmod
$MODULE
echo
" -> previous SYRIQ is unloaded!"
sudo rm
-f
/usr/local/lib/libriffa.so
*
sudo rm
-f
/usr/local/include/riffa.h
sudo rm
-f
/usr/local/include/riffa_driver.h
sudo rm
-f
/etc/ld.so.conf.d/riffa.conf
sudo rm
-rf
/lib/modules/
$KERNEL_VERSION
/kernel/drivers/riffa
sudo rm
-f
/etc/udev/rules.d/99-riffa.rules
sudo sed
-i
'/riffa/d'
/etc/modules
sudo
ldconfig
sudo
depmod
echo
" -> previous SYRIQ is uninstall!"
echo
"Previous SYRIQ uninstallation is done"
exit
0
else
echo
"Previous SYRIQ is not loaded!"
exit
1
fi
sdr/COMMON/common_lib.c
View file @
06ccfdfc
...
@@ -53,7 +53,6 @@ const char* devtype_names[MAX_RF_DEV_TYPE] = {
...
@@ -53,7 +53,6 @@ const char* devtype_names[MAX_RF_DEV_TYPE] = {
"LMSSDR"
,
"LMSSDR"
,
"IRIS"
,
"IRIS"
,
"No HW"
,
"No HW"
,
"ADRV9371_ZC706"
,
"UEDv2"
,
"UEDv2"
,
"RFSIMULATOR"
"RFSIMULATOR"
};
};
...
...
sdr/COMMON/common_lib.h
View file @
06ccfdfc
...
@@ -99,8 +99,6 @@ typedef enum {
...
@@ -99,8 +99,6 @@ typedef enum {
IRIS_DEV
,
IRIS_DEV
,
/*!\brief device is NONE*/
/*!\brief device is NONE*/
NONE_DEV
,
NONE_DEV
,
/*!\brief device is ADRV9371_ZC706 */
ADRV9371_ZC706_DEV
,
/*!\brief device is UEDv2 */
/*!\brief device is UEDv2 */
UEDv2_DEV
,
UEDv2_DEV
,
RFSIMULATOR
,
RFSIMULATOR
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment