Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nforce: sync with FreeBSD 11.1.

Browse Source
This commit is contained in:
Jérôme Duval 2018-05-26 13:51:27 +02:00
parent 2df44799a5
commit 57aac99526
5 changed files with 213 additions and 220 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/add-ons/kernel/drivers/network/nforce/dev/mii/Jamfile
View File

@ -1,7 +1,7 @@
SubDir HAIKU_TOP src add-ons kernel drivers network nforce dev mii ;
UseHeaders [ FDirName $(SUBDIR) .. .. ] : true ;
UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ] : true ;
UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd11_network compat ] : true ;
UsePrivateHeaders net ;
UsePrivateKernelHeaders ;
@ -17,5 +17,5 @@ KernelStaticLibrary nforce_mii.a
ObjectHdrs [ FGristFiles ciphy$(SUFOBJ) ]
: [ FDirName $(TARGET_COMMON_DEBUG_OBJECT_DIR_$(TARGET_PACKAGING_ARCH)) libs
compat freebsd_network ] ;
Includes [ FGristFiles ciphy.c ] : <src!libs!compat!freebsd_network>miidevs.h ;
compat freebsd11_network ] ;
Includes [ FGristFiles ciphy.c ] : <src!libs!compat!freebsd11_network>miidevs.h ;

19
src/add-ons/kernel/drivers/network/nforce/dev/mii/ciphy.c
View File

@ -91,8 +91,10 @@ static const struct mii_phydesc ciphys[] = {
MII_PHY_DESC(xxCICADA, CS8201B),
MII_PHY_DESC(xxCICADA, CS8204),
MII_PHY_DESC(xxCICADA, VSC8211),
MII_PHY_DESC(xxCICADA, VSC8221),
MII_PHY_DESC(xxCICADA, CS8244),
MII_PHY_DESC(xxVITESSE, VSC8601),
MII_PHY_DESC(xxVITESSE, VSC8641),
MII_PHY_END
};
@ -129,12 +131,6 @@ ciphy_service(struct mii_softc *sc, struct mii_data *mii, int cmd)
break;
case MII_MEDIACHG:
/*
* If the interface is not up, don't do anything.
*/
if ((mii->mii_ifp->if_flags & IFF_UP) == 0)
break;
ciphy_fixup(sc); /* XXX hardware bug work-around */
switch (IFM_SUBTYPE(ife->ifm_media)) {
@ -184,12 +180,6 @@ setit:
break;
case MII_TICK:
/*
* Is the interface even up?
*/
if ((mii->mii_ifp->if_flags & IFF_UP) == 0)
return (0);
/*
* Only used for autonegotiation.
*/
@ -313,8 +303,7 @@ ciphy_fixup(struct mii_softc *sc)
status = PHY_READ(sc, CIPHY_MII_AUXCSR);
speed = status & CIPHY_AUXCSR_SPEED;
if (strcmp(device_get_name(device_get_parent(sc->mii_dev)),
"nfe") == 0) {
if (mii_phy_mac_match(sc, "nfe")) {
/* need to set for 2.5V RGMII for NVIDIA adapters */
val = PHY_READ(sc, CIPHY_MII_ECTL1);
val &= ~(CIPHY_ECTL1_IOVOL | CIPHY_ECTL1_INTSEL);
@ -368,8 +357,10 @@ ciphy_fixup(struct mii_softc *sc)
break;
case MII_MODEL_xxCICADA_VSC8211:
case MII_MODEL_xxCICADA_VSC8221:
case MII_MODEL_xxCICADA_CS8244:
case MII_MODEL_xxVITESSE_VSC8601:
case MII_MODEL_xxVITESSE_VSC8641:
break;
default:
device_printf(sc->mii_dev, "unknown CICADA PHY model %x\n",

6
src/add-ons/kernel/drivers/network/nforce/dev/mii/ukphy.c
View File

@ -140,12 +140,6 @@ ukphy_service(struct mii_softc *sc, struct mii_data *mii, int cmd)
break;
case MII_MEDIACHG:
/*
* If the interface is not up, don't do anything.
*/
if ((mii->mii_ifp->if_flags & IFF_UP) == 0)
break;
mii_phy_setmedia(sc);
break;

4
src/add-ons/kernel/drivers/network/nforce/dev/nfe/Jamfile
View File

@ -1,7 +1,7 @@
SubDir HAIKU_TOP src add-ons kernel drivers network nforce dev nfe ;
UseHeaders [ FDirName $(SUBDIR) .. .. ] : true ;
UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ] : true ;
UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd11_network compat ] : true ;
UsePrivateHeaders net ;
UsePrivateKernelHeaders ;
@ -12,5 +12,5 @@ KernelAddon nforce :
if_nfe.c
glue.c
: libfreebsd_network.a nforce_mii.a
: nforce_mii.a libfreebsd11_network.a
;

398
src/add-ons/kernel/drivers/network/nforce/dev/nfe/if_nfe.c
View File

File diff suppressed because it is too large Load Diff