Federico Vaga authored 8 years ago and Adam Wujek committed 8 years ago

Today it is not really important to do this because all our modules are
within the project itself. But, at somepoint, we may use submodules
in order to integrate drivers from external sources; so, we need to export
our default values because we will not have control over the other projects

Signed-off-by: Federico Vaga <federico.vaga@cern.ch>

Federico Vaga authored 8 years ago and Adam Wujek committed 8 years ago

Signed-off-by: Federico Vaga <federico.vaga@cern.ch>

Federico Vaga authored 8 years ago and Adam Wujek committed 8 years ago

Signed-off-by: Federico Vaga <federico.vaga@cern.ch>

Federico Vaga authored 8 years ago and Adam Wujek committed 8 years ago

We want '/dev/shm' to be empty at boot time. It may happen that
while working with rootfs over NFS this directory is not empty.

With this patch we remove all files from this directory because
they should not be there at all.

What if I put something there on purpose? When using tmpfs,
files in '/dev/shm' will be automatically removed on shutdown.
We are keeping the same behavior. Put your own development files
in '/dev/shm' after the execution of this script by copying them
from another location.

Again, if we use rootfs over NFS and if tmpfs does not work then
the system will use the NFS and the system should continue to work.
In this case the performances will be much worst

Signed-off-by: Federico Vaga <federico.vaga@cern.ch>

Federico Vaga authored 8 years ago and Adam Wujek committed 8 years ago

Signed-off-by: Federico Vaga <federico.vaga@cern.ch>

Federico Vaga authored 8 years ago and Adam Wujek committed 8 years ago

Signed-off-by: Federico Vaga <federico.vaga@cern.ch>

Federico Vaga authored 8 years ago and Adam Wujek committed 8 years ago

This way, next time we want to update the kernel we have just to change
the version without touching too much the code

Signed-off-by: Federico Vaga <federico.vaga@cern.ch>

Federico Vaga authored 8 years ago and Adam Wujek committed 8 years ago

The kernel version is hardcoded here. Take it at runtime by using
`uname -r`. This will reduce incompatibilities on kernel updates

Signed-off-by: Federico Vaga <federico.vaga@cern.ch>

Complement of a commit:
02bb6153

 rootfs: use /etc/ppsi.conf not /wr/etc/ppsi.conf

Signed-off-by: Adam Wujek <adam.wujek@cern.ch>

Signed-off-by: Alessandro Rubini <rubini@gnudd.com>

Make clear what kind of resolution get_monotonic_tics function returns (micro
seconds).

Signed-off-by: Adam Wujek <adam.wujek@cern.ch>

Fix the bug introduced by a commit:
291a32c7

 userspace/wrsw_hal: use get_monotonic_* instead of clock_gettime

get_monotonic_tics() return a value in us resolution, so to get ms it has to be
divided by 1000, not multiplied.

Signed-off-by: Adam Wujek <adam.wujek@cern.ch>

--Read DOM (Diagnostic Monitoring data) data from SFPs
--Fix the write to SFPs eeprom
--store DOM data in the HAL's shmem

Signed-off-by: Adam Wujek <adam.wujek@cern.ch>

Paul Boven authored 8 years ago and Adam Wujek committed 8 years ago

The SFP documentation "INF-8047.pdf" states:
"The serial interface uses the 2-wire serial CMOS E2PROM protocol defined for
the ATMEL AT24C01A/02/04 family of components."

Upon reading that datasheet, some important details stand out:
1) The eeprom can only write in pages, with pages being 8 or 16 bytes. Assuming
   the smallest device, you can only write 8 bytes at a time. To be safe, I'm
   assuming a pagesize of 8 bytes.

   This explains why we only saw stuff change in the first 8 bytes, I guess.

2) A write needs to be preceded by the byte address which is a single byte for
   these devices, and then up to 8 (or 16) data bytes to be written at that
   location. If there are more bytes, or if the data wraps around the page
   binary, it will still only end up on the page belonging to that first
   address.

3) After writing, you need to poll the eeprom to see if it has finished writing
   the byte. At the moment, I'm not doing that yet, instead I'm doing a 10ms
   wait which seems sufficient.

Signed-off-by: Paul Boven <boven@jive.eu>
Acked-by: Adam Wujek <adam.wujek@cern.ch>

Kconfig:
--add CONFIG_READ_SFP_DIAG_ENABLE
libwr:
--add the function shw_sfp_update_dom to update only needed values in the future
--increase HAL_SHMEM_VERSION due to the changes in structures
wrs_dump_shmem
--add new fields
HAL:
--read DOM (Diagnostic Monitoring data) from SFP's eeprom at plug and once
  per second
PPSI:
--uplift hal shmem header
wrs_sfp_dump:
--support reading SFP's DOM from HAL

Signed-off-by: Adam Wujek <adam.wujek@cern.ch>

Signed-off-by: Adam Wujek <adam.wujek@cern.ch>

It fixes the bug described in the commit:
userspace/ppsi: uplift ppsi with compliance

(problem with "Support E2E build without P2P. Saves 5kB in wrpc-sw")

Signed-off-by: Adam Wujek <adam.wujek@cern.ch>

Signed-off-by: Adam Wujek <adam.wujek@cern.ch>

This commit includes the commit in ppsi
"Support E2E build without P2P. Saves 5kB in wrpc-sw"
However when the option "Avoid building P2P code" is not enabled in
the ppsi's dot-config then I'm getting zeros in the wr_mon or the ppsi exits
with the message:
ERROR: failure in "clock_settime": Invalid argument

Signed-off-by: Adam Wujek <adam.wujek@cern.ch>

Such error was printed to the syslog

Signed-off-by: Adam Wujek <adam.wujek@cern.ch>

Signed-off-by: Adam Wujek <adam.wujek@cern.ch>

It might be usefull to know whether caller wanted to lock or unlock the shmem
and which shmem.

Signed-off-by: Adam Wujek <adam.wujek@cern.ch>

In shared memory functions take as parameters pinters to structures instead
of void pointers. By this compiler will warn when wrong type of pointer is
passed. For example when pointer to the data in shmem is passed instead of
pointer to the header.

Signed-off-by: Adam Wujek <adam.wujek@cern.ch>

Signed-off-by: Adam Wujek <adam.wujek@cern.ch>

Update callers of wrs_shm_get_and_check to recognize return value
WRS_SHM_INCONSISTENT_DATA. Update to use defined values instead of numbers.

Update:
--snmpd
--tools/rtu_stat
--tools/wr_mon
--tools/wr_phytool
--tools/wrs_sfp_dump
--tools/wrs_vlans
--wrs_watchdog
--wrsw_rtud

Signed-off-by: Adam Wujek <adam.wujek@cern.ch>

Check the consistency of shmem during opening with wrs_shm_get_and_check.
It was possible that sequence number was increased during the opening, but it
was interpreted as version error.

Add defines describing different return errors.

This change is backward compatible.

Signed-off-by: Adam Wujek <adam.wujek@cern.ch>

Keep explicitly lock bit in the sequence variable as a LSB bit.
This solution is backward compatible. The difference is only when shmem is
lock twice. Before it was treated as unlocked, now still as a lock.

Signed-off-by: Adam Wujek <adam.wujek@cern.ch>

Print error message when shmem is locked or unlocked multiple times.
To be precise it will print error only on even locks or unlocks.

Move the increment of sequence before checking the flags to simplify further
if-conditions.

Signed-off-by: Adam Wujek <adam.wujek@cern.ch>

Remove excessive locks from the function delete_htab_entry.
Function rtu_fd_commit is always guarded with shmem lock. The function
rtu_fd_commit calls rtu_hw_commit, which calls delete_htab_entry. By this
function wrs_shm_write with a parameter WRS_SHM_WRITE_BEGIN was called twice
before it was called twice with a parameter WRS_SHM_WRITE_END.

Signed-off-by: Adam Wujek <adam.wujek@cern.ch>

Lock HAL's shmem on write to let a reader know about potential inconsistent
data

List below indicates which functions requires a lock (marked as "UPDATE").
minipc:
--halexp_lock_cmd:
  --hal_port_enable_tracking - not
  --hal_port_start_lock - UPDATE
  --hal_port_check_lock - not
--halexp_pps_cmd
  --rts_adjust_phase - not
  --shw_pps_gen_adjust - not
  --shw_pps_gen_busy - not
  --hal_port_pshifter_busy - not
  --shw_pps_gen_enable_output - not

hal_port_update_all:
--poll_rts_state - not
--hal_port_poll_sfp:
  --shw_sfp_module_scan - not
  --hal_port_insert_sfp - UPDATE
  --hal_port_remove_sfp - UPDATE
--hal_port_fsm - UPDATE

Signed-off-by: Adam Wujek <adam.wujek@cern.ch>

Signed-off-by: Adam Wujek <adam.wujek@cern.ch>

Signed-off-by: Adam Wujek <adam.wujek@cern.ch>

By default, on the startup the VLAN with VID0 is created with the mask
0xffffffff. It is used to pass all the traffic between ports. However, when
VLANs configuration is read from the dot-config now it also remove this VLAN.
We cannot relay on how the system was configured before.
If such configuration is needed it can be configured in the
CONFIG_VLANS_VLAN0000 config option.

Signed-off-by: Adam Wujek <adam.wujek@cern.ch>

We cannot relay on the previous configuration. So clear, then apply new.

Signed-off-by: Adam Wujek <adam.wujek@cern.ch>

--Change parameter --pumask to --puntag; "mask" part is misleading, since full
  mask is not supported.
--use "pmode" rather "pmode"
--improve help message
--support -1 for pprio to disable fix priority
--support -1 for rprio to disable fix priority
--change VLANS_PORTXX_UMASK_ALL and VLANS_PORTXX_UMASK_NONE into
  VLANS_PORTXX_UNTAG_ALL and VLANS_PORTXX_UNTAG_NONE

Signed-off-by: Adam Wujek <adam.wujek@cern.ch>

--Add new SNMP objects indicating the status of scripts run at boot
  --wrsAuxClkSetStatus
  --wrsThrottlingSetStatus
  --wrsVlansSetStatus
--Update wrsBootSuccessful to take into account status of objects above
--Update corresponding scripts to save status information at the execution:
  --etc/init.d/vlan.sh
  --etc/init.d/wrs_auxclk.sh
  --etc/init.d/wrs_throttling.sh
--Update MIB
--Update wrs-user-manual
--Update wrs_failures

Signed-off-by: Adam Wujek <adam.wujek@cern.ch>

Add to Kconfig:
--RTU_HP_MASK_ENABLE
--RTU_HP_MASK_VAL

Update wrs_vlans:
--add parameter --hpmask
--read RTU_HP_MASK_* from dot-config
--print hpmask with plist

add a new minipc call rtud_export_hp_mask for HP mask

Update wrs-user-manual
Update wrs-developer-manual
Update webinterface

Signed-off-by: Adam Wujek <adam.wujek@cern.ch>

remove --debug flag
support -v/-q flags for more/less verbose output

Signed-off-by: Adam Wujek <adam.wujek@cern.ch>

It was not possible to pass parameters when vid 0 was the first one specified
wrs1#wrs_vlans --rvid 0 --rdrop 1 --rvid 1 --rdrop 1
wrs_vlans: missing "--rvid <vid>" before rtu cmd
However, it was possible if any other vid was specified before:
wrs1#wrs_vlans --rvid 1 --rdrop 1 --rvid 0 --rdrop 1

Signed-off-by: Adam Wujek <adam.wujek@cern.ch>