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

Fixed bug in intel 10M/100M/1G NIC driver. #52

Closed
wants to merge 2 commits into from
Closed

Fixed bug in intel 10M/100M/1G NIC driver. #52

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2de4c44
Fixed bug in intel 10M/100M/1G NIC driver. bit CTRL_ASDE is reserved …
olivernie Apr 26, 2016
5425c7d
Merge branch 'master' into master
olivernie Jul 4, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 3 additions & 6 deletions src/drivers/net/intel.c
View file
Open in desktop
Expand Up @@ -295,12 +295,9 @@ static int intel_reset ( struct intel_nic *intel ) {
mdelay ( INTEL_RESET_DELAY_MS );

/* Set a sensible default configuration */
ctrl |= ( INTEL_CTRL_SLU | INTEL_CTRL_ASDE );
if(intel->flags & INTEL_NO_CTRL_ASDE)
{
/* Oliver Nie: CTRL_ASDE is reserved bit and must be set to 0b according intel 82576EB datasheet. */
ctrl &= ~(INTEL_CTRL_ASDE);
}
if ( ! ( intel->flags & INTEL_NO_ASDE ) )
ctrl |= INTEL_CTRL_ASDE;
ctrl |= INTEL_CTRL_SLU;
ctrl &= ~( INTEL_CTRL_LRST | INTEL_CTRL_FRCSPD | INTEL_CTRL_FRCDPLX );
writel ( ctrl, intel->regs + INTEL_CTRL );
mdelay ( INTEL_RESET_DELAY_MS );
Expand Down
6 changes: 4 additions & 2 deletions src/drivers/net/intel.h
View file
Open in desktop
Expand Up @@ -310,8 +310,10 @@ enum intel_flags {
INTEL_VMWARE = 0x0002,
/** PHY reset is broken */
INTEL_NO_PHY_RST = 0x0004,
/** no CTRL.ASDE bit */
INTEL_NO_CTRL_ASDE = 0x0005,
/** ASDE is broken */
INTEL_NO_ASDE = 0x0008,
/** Reset may cause a complete device hang */
INTEL_RST_HANG = 0x0010,
};

/** The i219 has a seriously broken reset mechanism */
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.