Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

blacklist gpio_ich driver to avoid conflict with dell_ich kernel module #2357

Merged
merged 1 commit into from
Dec 6, 2018
Merged

blacklist gpio_ich driver to avoid conflict with dell_ich kernel module #2357

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions device/dell/x86_64-dell_s6100_c2538-r0/installer.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
CONSOLE_PORT=0x2f8
CONSOLE_DEV=1
ONIE_PLATFORM_EXTRA_CMDLINE_LINUX="module_blacklist=gpio_ich"
5 changes: 5 additions & 0 deletions device/dell/x86_64-dell_s6100_c2538-r0/plugins/sfputil.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,6 +236,11 @@ def __init__(self):
self.port_to_eeprom_mapping[port_num] =\
"No IOM"

self.oir_fd = open(self.OIR_FD_PATH, "r")
self.epoll = select.epoll()
if self.oir_fd != -1:
self.epoll.register(self.oir_fd.fileno(), select.EPOLLIN)

SfpUtilBase.__init__(self)

def __del__(self):
Expand Down
1 change: 1 addition & 0 deletions device/dell/x86_64-dell_z9100_c2538-r0/installer.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
CONSOLE_PORT=0x2f8
CONSOLE_DEV=1
ONIE_PLATFORM_EXTRA_CMDLINE_LINUX="module_blacklist=gpio_ich"