subject:"Additional media options for ix\(4\) \[again\]"

Re: Additional media options for ix(4) [again]

2017-10-10 Thread Martin Pieuchot

On 16/08/17(Wed) 15:55, Mike Belopuhov wrote:
> Hi,
> 
> I haven't gotten any feedback on the following diff
> but I think there's still hope.  Please test.
> 
> Original mail:
> 
> I won't mind some broad testing of the following diff
> which adds some additional media options to ix(4) from
> FreeBSD and includes a fix for changing media from
> Masanobu SAITOH.
> 
> The fix makes sure that when the media operation speed
> is selected manually, the device doesn't additionally
> advertise other (slower) modes.

Time to get this broadly tested by committing it?

> diff --git sys/dev/pci/if_ix.c sys/dev/pci/if_ix.c
> index 339ba2bc4f1..8fca8742f7f 100644
> --- sys/dev/pci/if_ix.c
> +++ sys/dev/pci/if_ix.c
> @@ -1028,62 +1028,115 @@ ixgbe_intr(void *arg)
>   *  This routine is called whenever the user queries the status of
>   *  the interface using ifconfig.
>   *
>   **/
>  void
> -ixgbe_media_status(struct ifnet * ifp, struct ifmediareq *ifmr)
> +ixgbe_media_status(struct ifnet *ifp, struct ifmediareq *ifmr)
>  {
>   struct ix_softc *sc = ifp->if_softc;
> + int layer;
> +
> + layer = sc->hw.mac.ops.get_supported_physical_layer(>hw);
>  
>   ifmr->ifm_active = IFM_ETHER;
>   ifmr->ifm_status = IFM_AVALID;
>  
>   INIT_DEBUGOUT("ixgbe_media_status: begin");
>   ixgbe_update_link_status(sc);
>  
> - if (LINK_STATE_IS_UP(ifp->if_link_state)) {
> - ifmr->ifm_status |= IFM_ACTIVE;
> + if (!LINK_STATE_IS_UP(ifp->if_link_state))
> + return;
> +
> + ifmr->ifm_status |= IFM_ACTIVE;
>  
> + if (layer & IXGBE_PHYSICAL_LAYER_10GBASE_T ||
> + layer & IXGBE_PHYSICAL_LAYER_1000BASE_T ||
> + layer & IXGBE_PHYSICAL_LAYER_100BASE_TX)
>   switch (sc->link_speed) {
> + case IXGBE_LINK_SPEED_10GB_FULL:
> + ifmr->ifm_active |= IFM_10G_T | IFM_FDX;
> + break;
> + case IXGBE_LINK_SPEED_1GB_FULL:
> + ifmr->ifm_active |= IFM_1000_T | IFM_FDX;
> + break;
>   case IXGBE_LINK_SPEED_100_FULL:
>   ifmr->ifm_active |= IFM_100_TX | IFM_FDX;
>   break;
> + }
> + if (layer & IXGBE_PHYSICAL_LAYER_SFP_PLUS_CU ||
> + layer & IXGBE_PHYSICAL_LAYER_SFP_ACTIVE_DA)
> + switch (sc->link_speed) {
> + case IXGBE_LINK_SPEED_10GB_FULL:
> + ifmr->ifm_active |= IFM_10G_SFP_CU | IFM_FDX;
> + break;
> + }
> + if (layer & IXGBE_PHYSICAL_LAYER_10GBASE_LR)
> + switch (sc->link_speed) {
> + case IXGBE_LINK_SPEED_10GB_FULL:
> + ifmr->ifm_active |= IFM_10G_LR | IFM_FDX;
> + break;
>   case IXGBE_LINK_SPEED_1GB_FULL:
> - switch (sc->optics) {
> - case IFM_10G_SR: /* multi-speed fiber */
> - ifmr->ifm_active |= IFM_1000_SX | IFM_FDX;
> - break;
> - case IFM_10G_LR: /* multi-speed fiber */
> - ifmr->ifm_active |= IFM_1000_LX | IFM_FDX;
> - break;
> - default:
> - ifmr->ifm_active |= sc->optics | IFM_FDX;
> - break;
> - }
> + ifmr->ifm_active |= IFM_1000_LX | IFM_FDX;
>   break;
> + }
> + if (layer & IXGBE_PHYSICAL_LAYER_10GBASE_LRM)
> + switch (sc->link_speed) {
>   case IXGBE_LINK_SPEED_10GB_FULL:
> - ifmr->ifm_active |= sc->optics | IFM_FDX;
> + ifmr->ifm_active |= IFM_10G_LRM | IFM_FDX;
> + break;
> + case IXGBE_LINK_SPEED_1GB_FULL:
> + ifmr->ifm_active |= IFM_1000_LX | IFM_FDX;
>   break;
>   }
> -
> - switch (sc->hw.fc.current_mode) {
> - case ixgbe_fc_tx_pause:
> - ifmr->ifm_active |= IFM_FLOW | IFM_ETH_TXPAUSE;
> + if (layer & IXGBE_PHYSICAL_LAYER_10GBASE_SR ||
> + layer & IXGBE_PHYSICAL_LAYER_1000BASE_SX)
> + switch (sc->link_speed) {
> + case IXGBE_LINK_SPEED_10GB_FULL:
> + ifmr->ifm_active |= IFM_10G_SR | IFM_FDX;
> + break;
> + case IXGBE_LINK_SPEED_1GB_FULL:
> + ifmr->ifm_active |= IFM_1000_SX | IFM_FDX;
>   break;
> - case ixgbe_fc_rx_pause:
> - ifmr->ifm_active |= IFM_FLOW | IFM_ETH_RXPAUSE;
> + }
> + if (layer & IXGBE_PHYSICAL_LAYER_10GBASE_CX4)
> + switch (sc->link_speed) {
> + case IXGBE_LINK_SPEED_10GB_FULL:
> +

Additional media options for ix(4) [again]

2017-08-16 Thread Mike Belopuhov

Hi,

I haven't gotten any feedback on the following diff
but I think there's still hope.  Please test.

Original mail:

I won't mind some broad testing of the following diff
which adds some additional media options to ix(4) from
FreeBSD and includes a fix for changing media from
Masanobu SAITOH.

The fix makes sure that when the media operation speed
is selected manually, the device doesn't additionally
advertise other (slower) modes.


diff --git sys/dev/pci/if_ix.c sys/dev/pci/if_ix.c
index 339ba2bc4f1..8fca8742f7f 100644
--- sys/dev/pci/if_ix.c
+++ sys/dev/pci/if_ix.c
@@ -1028,62 +1028,115 @@ ixgbe_intr(void *arg)
  *  This routine is called whenever the user queries the status of
  *  the interface using ifconfig.
  *
  **/
 void
-ixgbe_media_status(struct ifnet * ifp, struct ifmediareq *ifmr)
+ixgbe_media_status(struct ifnet *ifp, struct ifmediareq *ifmr)
 {
struct ix_softc *sc = ifp->if_softc;
+   int layer;
+
+   layer = sc->hw.mac.ops.get_supported_physical_layer(>hw);
 
ifmr->ifm_active = IFM_ETHER;
ifmr->ifm_status = IFM_AVALID;
 
INIT_DEBUGOUT("ixgbe_media_status: begin");
ixgbe_update_link_status(sc);
 
-   if (LINK_STATE_IS_UP(ifp->if_link_state)) {
-   ifmr->ifm_status |= IFM_ACTIVE;
+   if (!LINK_STATE_IS_UP(ifp->if_link_state))
+   return;
+
+   ifmr->ifm_status |= IFM_ACTIVE;
 
+   if (layer & IXGBE_PHYSICAL_LAYER_10GBASE_T ||
+   layer & IXGBE_PHYSICAL_LAYER_1000BASE_T ||
+   layer & IXGBE_PHYSICAL_LAYER_100BASE_TX)
switch (sc->link_speed) {
+   case IXGBE_LINK_SPEED_10GB_FULL:
+   ifmr->ifm_active |= IFM_10G_T | IFM_FDX;
+   break;
+   case IXGBE_LINK_SPEED_1GB_FULL:
+   ifmr->ifm_active |= IFM_1000_T | IFM_FDX;
+   break;
case IXGBE_LINK_SPEED_100_FULL:
ifmr->ifm_active |= IFM_100_TX | IFM_FDX;
break;
+   }
+   if (layer & IXGBE_PHYSICAL_LAYER_SFP_PLUS_CU ||
+   layer & IXGBE_PHYSICAL_LAYER_SFP_ACTIVE_DA)
+   switch (sc->link_speed) {
+   case IXGBE_LINK_SPEED_10GB_FULL:
+   ifmr->ifm_active |= IFM_10G_SFP_CU | IFM_FDX;
+   break;
+   }
+   if (layer & IXGBE_PHYSICAL_LAYER_10GBASE_LR)
+   switch (sc->link_speed) {
+   case IXGBE_LINK_SPEED_10GB_FULL:
+   ifmr->ifm_active |= IFM_10G_LR | IFM_FDX;
+   break;
case IXGBE_LINK_SPEED_1GB_FULL:
-   switch (sc->optics) {
-   case IFM_10G_SR: /* multi-speed fiber */
-   ifmr->ifm_active |= IFM_1000_SX | IFM_FDX;
-   break;
-   case IFM_10G_LR: /* multi-speed fiber */
-   ifmr->ifm_active |= IFM_1000_LX | IFM_FDX;
-   break;
-   default:
-   ifmr->ifm_active |= sc->optics | IFM_FDX;
-   break;
-   }
+   ifmr->ifm_active |= IFM_1000_LX | IFM_FDX;
break;
+   }
+   if (layer & IXGBE_PHYSICAL_LAYER_10GBASE_LRM)
+   switch (sc->link_speed) {
case IXGBE_LINK_SPEED_10GB_FULL:
-   ifmr->ifm_active |= sc->optics | IFM_FDX;
+   ifmr->ifm_active |= IFM_10G_LRM | IFM_FDX;
+   break;
+   case IXGBE_LINK_SPEED_1GB_FULL:
+   ifmr->ifm_active |= IFM_1000_LX | IFM_FDX;
break;
}
-
-   switch (sc->hw.fc.current_mode) {
-   case ixgbe_fc_tx_pause:
-   ifmr->ifm_active |= IFM_FLOW | IFM_ETH_TXPAUSE;
+   if (layer & IXGBE_PHYSICAL_LAYER_10GBASE_SR ||
+   layer & IXGBE_PHYSICAL_LAYER_1000BASE_SX)
+   switch (sc->link_speed) {
+   case IXGBE_LINK_SPEED_10GB_FULL:
+   ifmr->ifm_active |= IFM_10G_SR | IFM_FDX;
+   break;
+   case IXGBE_LINK_SPEED_1GB_FULL:
+   ifmr->ifm_active |= IFM_1000_SX | IFM_FDX;
break;
-   case ixgbe_fc_rx_pause:
-   ifmr->ifm_active |= IFM_FLOW | IFM_ETH_RXPAUSE;
+   }
+   if (layer & IXGBE_PHYSICAL_LAYER_10GBASE_CX4)
+   switch (sc->link_speed) {
+   case IXGBE_LINK_SPEED_10GB_FULL:
+   ifmr->ifm_active |= IFM_10G_CX4 | IFM_FDX;
break;
-   case ixgbe_fc_full:
-   ifmr->ifm_active |= IFM_FLOW |

Re: Additional media options for ix(4) [again]

Additional media options for ix(4) [again]

2 matches

Site Navigation

Mail list logo

Footer information