Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 54e049c2 authored by Julian Wiedmann's avatar Julian Wiedmann Committed by David S. Miller
Browse files

s390/qeth: report 25Gbit link speed 



This adds the various identifiers for 25Gbit cards, and wires them up
into sysfs and ethtool.

Signed-off-by: default avatarJulian Wiedmann <jwi@linux.ibm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 125d7d30

drivers/s390/net/qeth_core_main.c

+18 −2
Original line number Diff line number Diff line
@@ -167,6 +167,8 @@ const char *qeth_get_cardname_short(struct qeth_card *card) 
				return "OSD_1000";

			case QETH_LINK_TYPE_10GBIT_ETH:

				return "OSD_10GIG";

			case QETH_LINK_TYPE_25GBIT_ETH:

				return "OSD_25GIG";

			case QETH_LINK_TYPE_LANE_ETH100:

				return "OSD_FE_LANE";

			case QETH_LINK_TYPE_LANE_TR:
@@ -4432,7 +4434,8 @@ static int qeth_mdio_read(struct net_device *dev, int phy_id, int regnum) 
		rc = BMCR_FULLDPLX;

		if ((card->info.link_type != QETH_LINK_TYPE_GBIT_ETH) &&

		    (card->info.link_type != QETH_LINK_TYPE_OSN) &&

		    (card->info.link_type != QETH_LINK_TYPE_10GBIT_ETH))

		    (card->info.link_type != QETH_LINK_TYPE_10GBIT_ETH) &&

		    (card->info.link_type != QETH_LINK_TYPE_25GBIT_ETH))

			rc |= BMCR_SPEED100;

		break;

	case MII_BMSR: /* Basic mode status register */
@@ -6166,8 +6169,14 @@ static void qeth_set_cmd_adv_sup(struct ethtool_link_ksettings *cmd, 
		WARN_ON_ONCE(1);

	}



	/* fallthrough from high to low, to select all legal speeds: */

	/* partially does fall through, to also select lower speeds */

	switch (maxspeed) {

	case SPEED_25000:

		ethtool_link_ksettings_add_link_mode(cmd, supported,

						     25000baseSR_Full);

		ethtool_link_ksettings_add_link_mode(cmd, advertising,

						     25000baseSR_Full);

		break;

	case SPEED_10000:

		ethtool_link_ksettings_add_link_mode(cmd, supported,

						     10000baseT_Full);
@@ -6250,6 +6259,10 @@ int qeth_core_ethtool_get_link_ksettings(struct net_device *netdev, 
		cmd->base.speed = SPEED_10000;

		cmd->base.port = PORT_FIBRE;

		break;

	case QETH_LINK_TYPE_25GBIT_ETH:

		cmd->base.speed = SPEED_25000;

		cmd->base.port = PORT_FIBRE;

		break;

	default:

		cmd->base.speed = SPEED_10;

		cmd->base.port = PORT_TP;
@@ -6316,6 +6329,9 @@ int qeth_core_ethtool_get_link_ksettings(struct net_device *netdev, 
	case CARD_INFO_PORTS_10G:

		cmd->base.speed = SPEED_10000;

		break;

	case CARD_INFO_PORTS_25G:

		cmd->base.speed = SPEED_25000;

		break;

	}



	return 0;

drivers/s390/net/qeth_core_mpc.h

+2 −0
Original line number Diff line number Diff line
@@ -90,6 +90,7 @@ enum qeth_link_types { 
	QETH_LINK_TYPE_GBIT_ETH     = 0x03,

	QETH_LINK_TYPE_OSN          = 0x04,

	QETH_LINK_TYPE_10GBIT_ETH   = 0x10,

	QETH_LINK_TYPE_25GBIT_ETH   = 0x12,

	QETH_LINK_TYPE_LANE_ETH100  = 0x81,

	QETH_LINK_TYPE_LANE_TR      = 0x82,

	QETH_LINK_TYPE_LANE_ETH1000 = 0x83,
@@ -347,6 +348,7 @@ enum qeth_card_info_port_speed { 
	CARD_INFO_PORTS_100M		= 0x00000006,

	CARD_INFO_PORTS_1G		= 0x00000007,

	CARD_INFO_PORTS_10G		= 0x00000008,

	CARD_INFO_PORTS_25G		= 0x0000000A,

};



/* (SET)DELIP(M) IPA stuff ***************************************************/