DELL S6000 CPLD driver update to recover if mux is hung during i2c operation #2858
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
dgsudharsan
changed the title
lguohan
approved these changes
May 9, 2019
MichelMoriniaux
pushed a commit
to criteo-forks/sonic-buildimage
that referenced
this pull request
May 28, 2019
…ring i2c operation (sonic-net#2858)
lixiaoyuner
pushed a commit
to lixiaoyuner/sonic-buildimage
that referenced
this pull request
Feb 6, 2024
…sonic-buildimage into internal 1. Resolve conflicts (introduced by this public PR: [sonic-net#16947](sonic-net#16947)) in `dockers/docker-dhcp-relay/Dockerfile.j2`: ``` <<<<<<< HEAD RUN apt-get install -y dnsmasq gcc python3-dev RUN pip3 install psutil RUN apt-get purge -y gcc python3-dev ======= {% if docker_dhcp_relay_whls.strip() %} # Copy locally-built Python wheel dependencies {{ copy_files("python-wheels/", docker_dhcp_relay_whls.split(' '), "/python-wheels/") }} # Install locally-built Python wheel dependencies {{ install_python_wheels(docker_dhcp_relay_whls.split(' ')) }} {% endif %} >>>>>>> 274d320 ``` Accepted both changes, after resolved: ``` RUN apt-get install -y dnsmasq gcc python3-dev RUN pip3 install psutil RUN apt-get purge -y gcc python3-dev {% if docker_dhcp_relay_whls.strip() %} # Copy locally-built Python wheel dependencies {{ copy_files("python-wheels/", docker_dhcp_relay_whls.split(' '), "/python-wheels/") }} # Install locally-built Python wheel dependencies {{ install_python_wheels(docker_dhcp_relay_whls.split(' ')) }} {% endif %} ``` 2. Because dnsmasq (used for ipv4 dhcp_server previously) exist in internal repo but not exist in public master repo, which would cause new added test case added by [sonic-net#16947](sonic-net#16947) in sonic-config-engine would fail. Also, we expect that dnsmasq is not running if "dhcp_server" feature is enabled. So I **add support for new added test case** and **modify template to avoid run dnsmasq when dhcp_server feature is enabled** in below commit:  Related work items: sonic-net#350, sonic-net#803, sonic-net#2858, sonic-net#16945, sonic-net#16996, sonic-net#17047, sonic-net#17053, sonic-net#17056, sonic-net#17057, sonic-net#17068
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
- What I did
Updated S6000 CPLD driver to recover if the mux is hung during i2c operation
- How I did it
When i2c read or write fails, the mux is reset using GPIO 10 pin and the operation is tried again.
- How to verify it
Simulated the mux reset and i2c operations. The hung scenario cannot be created in a normal setup. However the code was modified in a way to try mux reset even for successful reads to check if there are any impacts due to reset. The mux reset doesn't cause any issues or have side effects.
- Description for the changelog
S6000 CPLD driver update to recover if the mux is hung during i2c operation
- A picture of a cute animal (not mandatory but encouraged)