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

Commit b8a5d06a authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 's390-qeth-fixes' 



Julian Wiedmann says:

====================
s390/qeth: fixes 2018-11-02

please apply one round of qeth fixes for -net.

Patch 1 is rather large and removes a use-after-free hazard from many of our
debug trace entries.
Patch 2 is yet another fix-up for the L3 subdriver's new IP address management
code.
Patch 3 and 4 resolve some fallout from the recent changes wrt how/when qeth
allocates its net_device.
Patch 5 makes sure we don't set reserved bits when building HW commands from
user-provided data.
And finally, patch 6 allows ethtool to play nice with new HW.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 265ad063 54e049c2

drivers/s390/net/qeth_core.h

+20 −7
Original line number Diff line number Diff line
@@ -87,6 +87,18 @@ struct qeth_dbf_info { 
#define SENSE_RESETTING_EVENT_BYTE 1

#define SENSE_RESETTING_EVENT_FLAG 0x80



static inline u32 qeth_get_device_id(struct ccw_device *cdev)

{

	struct ccw_dev_id dev_id;

	u32 id;



	ccw_device_get_id(cdev, &dev_id);

	id = dev_id.devno;

	id |= (u32) (dev_id.ssid << 16);



	return id;

}



/*

 * Common IO related definitions

 */
@@ -97,7 +109,8 @@ struct qeth_dbf_info { 
#define CARD_RDEV_ID(card) dev_name(&card->read.ccwdev->dev)

#define CARD_WDEV_ID(card) dev_name(&card->write.ccwdev->dev)

#define CARD_DDEV_ID(card) dev_name(&card->data.ccwdev->dev)

#define CHANNEL_ID(channel) dev_name(&channel->ccwdev->dev)

#define CCW_DEVID(cdev)		(qeth_get_device_id(cdev))

#define CARD_DEVID(card)	(CCW_DEVID(CARD_RDEV(card)))



/**

 * card stuff
@@ -830,6 +843,11 @@ struct qeth_trap_id { 
/*some helper functions*/

#define QETH_CARD_IFNAME(card) (((card)->dev)? (card)->dev->name : "")



static inline bool qeth_netdev_is_registered(struct net_device *dev)

{

	return dev->netdev_ops != NULL;

}



static inline void qeth_scrub_qdio_buffer(struct qdio_buffer *buf,

					  unsigned int elements)

{
@@ -973,7 +991,7 @@ int qeth_wait_for_threads(struct qeth_card *, unsigned long); 
int qeth_do_run_thread(struct qeth_card *, unsigned long);

void qeth_clear_thread_start_bit(struct qeth_card *, unsigned long);

void qeth_clear_thread_running_bit(struct qeth_card *, unsigned long);

int qeth_core_hardsetup_card(struct qeth_card *);

int qeth_core_hardsetup_card(struct qeth_card *card, bool *carrier_ok);

void qeth_print_status_message(struct qeth_card *);

int qeth_init_qdio_queues(struct qeth_card *);

int qeth_send_ipa_cmd(struct qeth_card *, struct qeth_cmd_buffer *,
@@ -1028,11 +1046,6 @@ int qeth_configure_cq(struct qeth_card *, enum qeth_cq); 
int qeth_hw_trap(struct qeth_card *, enum qeth_diags_trap_action);

void qeth_trace_features(struct qeth_card *);

void qeth_close_dev(struct qeth_card *);

int qeth_send_setassparms(struct qeth_card *, struct qeth_cmd_buffer *, __u16,

			  long,

			  int (*reply_cb)(struct qeth_card *,

					  struct qeth_reply *, unsigned long),

			  void *);

int qeth_setassparms_cb(struct qeth_card *, struct qeth_reply *, unsigned long);

struct qeth_cmd_buffer *qeth_get_setassparms_cmd(struct qeth_card *,

						 enum qeth_ipa_funcs,

drivers/s390/net/qeth_core_main.c

+92 −80
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:
@@ -554,8 +556,8 @@ static int __qeth_issue_next_read(struct qeth_card *card) 
	if (!iob) {

		dev_warn(&card->gdev->dev, "The qeth device driver "

			"failed to recover an error on the device\n");

		QETH_DBF_MESSAGE(2, "%s issue_next_read failed: no iob "

			"available\n", dev_name(&card->gdev->dev));

		QETH_DBF_MESSAGE(2, "issue_next_read on device %x failed: no iob available\n",

				 CARD_DEVID(card));

		return -ENOMEM;

	}

	qeth_setup_ccw(channel->ccw, CCW_CMD_READ, QETH_BUFSIZE, iob->data);
@@ -563,8 +565,8 @@ static int __qeth_issue_next_read(struct qeth_card *card) 
	rc = ccw_device_start(channel->ccwdev, channel->ccw,

			      (addr_t) iob, 0, 0);

	if (rc) {

		QETH_DBF_MESSAGE(2, "%s error in starting next read ccw! "

			"rc=%i\n", dev_name(&card->gdev->dev), rc);

		QETH_DBF_MESSAGE(2, "error %i on device %x when starting next read ccw!\n",

				 rc, CARD_DEVID(card));

		atomic_set(&channel->irq_pending, 0);

		card->read_or_write_problem = 1;

		qeth_schedule_recovery(card);
@@ -613,16 +615,14 @@ static void qeth_issue_ipa_msg(struct qeth_ipa_cmd *cmd, int rc, 
	const char *ipa_name;

	int com = cmd->hdr.command;

	ipa_name = qeth_get_ipa_cmd_name(com);



	if (rc)

		QETH_DBF_MESSAGE(2, "IPA: %s(x%X) for %s/%s returned "

				"x%X \"%s\"\n",

				ipa_name, com, dev_name(&card->gdev->dev),

				QETH_CARD_IFNAME(card), rc,

		QETH_DBF_MESSAGE(2, "IPA: %s(%#x) for device %x returned %#x \"%s\"\n",

				 ipa_name, com, CARD_DEVID(card), rc,

				 qeth_get_ipa_msg(rc));

	else

		QETH_DBF_MESSAGE(5, "IPA: %s(x%X) for %s/%s succeeded\n",

				ipa_name, com, dev_name(&card->gdev->dev),

				QETH_CARD_IFNAME(card));

		QETH_DBF_MESSAGE(5, "IPA: %s(%#x) for device %x succeeded\n",

				 ipa_name, com, CARD_DEVID(card));

}



static struct qeth_ipa_cmd *qeth_check_ipa_data(struct qeth_card *card,
@@ -711,7 +711,7 @@ static int qeth_check_idx_response(struct qeth_card *card, 


	QETH_DBF_HEX(CTRL, 2, buffer, QETH_DBF_CTRL_LEN);

	if ((buffer[2] & 0xc0) == 0xc0) {

		QETH_DBF_MESSAGE(2, "received an IDX TERMINATE with cause code %#02x\n",

		QETH_DBF_MESSAGE(2, "received an IDX TERMINATE with cause code %#04x\n",

				 buffer[4]);

		QETH_CARD_TEXT(card, 2, "ckidxres");

		QETH_CARD_TEXT(card, 2, " idxterm");
@@ -972,8 +972,8 @@ static int qeth_get_problem(struct qeth_card *card, struct ccw_device *cdev, 
		QETH_CARD_TEXT(card, 2, "CGENCHK");

		dev_warn(&cdev->dev, "The qeth device driver "

			"failed to recover an error on the device\n");

		QETH_DBF_MESSAGE(2, "%s check on device dstat=x%x, cstat=x%x\n",

			dev_name(&cdev->dev), dstat, cstat);

		QETH_DBF_MESSAGE(2, "check on channel %x with dstat=%#x, cstat=%#x\n",

				 CCW_DEVID(cdev), dstat, cstat);

		print_hex_dump(KERN_WARNING, "qeth: irb ", DUMP_PREFIX_OFFSET,

				16, 1, irb, 64, 1);

		return 1;
@@ -1013,8 +1013,8 @@ static long qeth_check_irb_error(struct qeth_card *card, 


	switch (PTR_ERR(irb)) {

	case -EIO:

		QETH_DBF_MESSAGE(2, "%s i/o-error on device\n",

			dev_name(&cdev->dev));

		QETH_DBF_MESSAGE(2, "i/o-error on channel %x\n",

				 CCW_DEVID(cdev));

		QETH_CARD_TEXT(card, 2, "ckirberr");

		QETH_CARD_TEXT_(card, 2, "  rc%d", -EIO);

		break;
@@ -1031,8 +1031,8 @@ static long qeth_check_irb_error(struct qeth_card *card, 
		}

		break;

	default:

		QETH_DBF_MESSAGE(2, "%s unknown error %ld on device\n",

			dev_name(&cdev->dev), PTR_ERR(irb));

		QETH_DBF_MESSAGE(2, "unknown error %ld on channel %x\n",

				 PTR_ERR(irb), CCW_DEVID(cdev));

		QETH_CARD_TEXT(card, 2, "ckirberr");

		QETH_CARD_TEXT(card, 2, "  rc???");

	}
@@ -1114,9 +1114,9 @@ static void qeth_irq(struct ccw_device *cdev, unsigned long intparm, 
			dev_warn(&channel->ccwdev->dev,

				"The qeth device driver failed to recover "

				"an error on the device\n");

			QETH_DBF_MESSAGE(2, "%s sense data available. cstat "

				"0x%X dstat 0x%X\n",

				dev_name(&channel->ccwdev->dev), cstat, dstat);

			QETH_DBF_MESSAGE(2, "sense data available on channel %x: cstat %#X dstat %#X\n",

					 CCW_DEVID(channel->ccwdev), cstat,

					 dstat);

			print_hex_dump(KERN_WARNING, "qeth: irb ",

				DUMP_PREFIX_OFFSET, 16, 1, irb, 32, 1);

			print_hex_dump(KERN_WARNING, "qeth: sense data ",
@@ -1890,8 +1890,8 @@ static int qeth_idx_activate_channel(struct qeth_card *card, 
	if (channel->state != CH_STATE_ACTIVATING) {

		dev_warn(&channel->ccwdev->dev, "The qeth device driver"

			" failed to recover an error on the device\n");

		QETH_DBF_MESSAGE(2, "%s IDX activate timed out\n",

			dev_name(&channel->ccwdev->dev));

		QETH_DBF_MESSAGE(2, "IDX activate timed out on channel %x\n",

				 CCW_DEVID(channel->ccwdev));

		QETH_DBF_TEXT_(SETUP, 2, "2err%d", -ETIME);

		return -ETIME;

	}
@@ -1926,16 +1926,14 @@ static void qeth_idx_write_cb(struct qeth_card *card, 
				"The adapter is used exclusively by another "

				"host\n");

		else

			QETH_DBF_MESSAGE(2, "%s IDX_ACTIVATE on write channel:"

				" negative reply\n",

				dev_name(&channel->ccwdev->dev));

			QETH_DBF_MESSAGE(2, "IDX_ACTIVATE on channel %x: negative reply\n",

					 CCW_DEVID(channel->ccwdev));

		goto out;

	}

	memcpy(&temp, QETH_IDX_ACT_FUNC_LEVEL(iob->data), 2);

	if ((temp & ~0x0100) != qeth_peer_func_level(card->info.func_level)) {

		QETH_DBF_MESSAGE(2, "%s IDX_ACTIVATE on write channel: "

			"function level mismatch (sent: 0x%x, received: "

			"0x%x)\n", dev_name(&channel->ccwdev->dev),

		QETH_DBF_MESSAGE(2, "IDX_ACTIVATE on channel %x: function level mismatch (sent: %#x, received: %#x)\n",

				 CCW_DEVID(channel->ccwdev),

				 card->info.func_level, temp);

		goto out;

	}
@@ -1973,9 +1971,8 @@ static void qeth_idx_read_cb(struct qeth_card *card, 
				"insufficient authorization\n");

			break;

		default:

			QETH_DBF_MESSAGE(2, "%s IDX_ACTIVATE on read channel:"

				" negative reply\n",

				dev_name(&channel->ccwdev->dev));

			QETH_DBF_MESSAGE(2, "IDX_ACTIVATE on channel %x: negative reply\n",

					 CCW_DEVID(channel->ccwdev));

		}

		QETH_CARD_TEXT_(card, 2, "idxread%c",

			QETH_IDX_ACT_CAUSE_CODE(iob->data));
@@ -1984,9 +1981,8 @@ static void qeth_idx_read_cb(struct qeth_card *card, 


	memcpy(&temp, QETH_IDX_ACT_FUNC_LEVEL(iob->data), 2);

	if (temp != qeth_peer_func_level(card->info.func_level)) {

		QETH_DBF_MESSAGE(2, "%s IDX_ACTIVATE on read channel: function "

			"level mismatch (sent: 0x%x, received: 0x%x)\n",

			dev_name(&channel->ccwdev->dev),

		QETH_DBF_MESSAGE(2, "IDX_ACTIVATE on channel %x: function level mismatch (sent: %#x, received: %#x)\n",

				 CCW_DEVID(channel->ccwdev),

				 card->info.func_level, temp);

		goto out;

	}
@@ -2096,9 +2092,8 @@ int qeth_send_control_data(struct qeth_card *card, int len, 
				      (addr_t) iob, 0, 0, event_timeout);

	spin_unlock_irq(get_ccwdev_lock(channel->ccwdev));

	if (rc) {

		QETH_DBF_MESSAGE(2, "%s qeth_send_control_data: "

			"ccw_device_start rc = %i\n",

			dev_name(&channel->ccwdev->dev), rc);

		QETH_DBF_MESSAGE(2, "qeth_send_control_data on device %x: ccw_device_start rc = %i\n",

				 CARD_DEVID(card), rc);

		QETH_CARD_TEXT_(card, 2, " err%d", rc);

		spin_lock_irq(&card->lock);

		list_del_init(&reply->list);
@@ -2853,8 +2848,8 @@ struct qeth_cmd_buffer *qeth_get_ipacmd_buffer(struct qeth_card *card, 
	} else {

		dev_warn(&card->gdev->dev,

			 "The qeth driver ran out of channel command buffers\n");

		QETH_DBF_MESSAGE(1, "%s The qeth driver ran out of channel command buffers",

				 dev_name(&card->gdev->dev));

		QETH_DBF_MESSAGE(1, "device %x ran out of channel command buffers",

				 CARD_DEVID(card));

	}



	return iob;
@@ -2989,9 +2984,8 @@ static int qeth_query_ipassists_cb(struct qeth_card *card, 
		return 0;

	default:

		if (cmd->hdr.return_code) {

			QETH_DBF_MESSAGE(1, "%s IPA_CMD_QIPASSIST: Unhandled "

						"rc=%d\n",

						dev_name(&card->gdev->dev),

			QETH_DBF_MESSAGE(1, "IPA_CMD_QIPASSIST on device %x: Unhandled rc=%#x\n",

					 CARD_DEVID(card),

					 cmd->hdr.return_code);

			return 0;

		}
@@ -3004,8 +2998,8 @@ static int qeth_query_ipassists_cb(struct qeth_card *card, 
		card->options.ipa6.supported_funcs = cmd->hdr.ipa_supported;

		card->options.ipa6.enabled_funcs = cmd->hdr.ipa_enabled;

	} else

		QETH_DBF_MESSAGE(1, "%s IPA_CMD_QIPASSIST: Flawed LIC detected"

					"\n", dev_name(&card->gdev->dev));

		QETH_DBF_MESSAGE(1, "IPA_CMD_QIPASSIST on device %x: Flawed LIC detected\n",

				 CARD_DEVID(card));

	return 0;

}
@@ -4297,9 +4291,8 @@ static int qeth_setadpparms_set_access_ctrl_cb(struct qeth_card *card, 
		cmd->data.setadapterparms.hdr.return_code);

	if (cmd->data.setadapterparms.hdr.return_code !=

						SET_ACCESS_CTRL_RC_SUCCESS)

		QETH_DBF_MESSAGE(3, "ERR:SET_ACCESS_CTRL(%s,%d)==%d\n",

				card->gdev->dev.kobj.name,

				access_ctrl_req->subcmd_code,

		QETH_DBF_MESSAGE(3, "ERR:SET_ACCESS_CTRL(%#x) on device %x: %#x\n",

				 access_ctrl_req->subcmd_code, CARD_DEVID(card),

				 cmd->data.setadapterparms.hdr.return_code);

	switch (cmd->data.setadapterparms.hdr.return_code) {

	case SET_ACCESS_CTRL_RC_SUCCESS:
@@ -4312,14 +4305,14 @@ static int qeth_setadpparms_set_access_ctrl_cb(struct qeth_card *card, 
		}

		break;

	case SET_ACCESS_CTRL_RC_ALREADY_NOT_ISOLATED:

		QETH_DBF_MESSAGE(2, "%s QDIO data connection isolation already "

				"deactivated\n", dev_name(&card->gdev->dev));

		QETH_DBF_MESSAGE(2, "QDIO data connection isolation on device %x already deactivated\n",

				 CARD_DEVID(card));

		if (fallback)

			card->options.isolation = card->options.prev_isolation;

		break;

	case SET_ACCESS_CTRL_RC_ALREADY_ISOLATED:

		QETH_DBF_MESSAGE(2, "%s QDIO data connection isolation already"

				" activated\n", dev_name(&card->gdev->dev));

		QETH_DBF_MESSAGE(2, "QDIO data connection isolation on device %x already activated\n",

				 CARD_DEVID(card));

		if (fallback)

			card->options.isolation = card->options.prev_isolation;

		break;
@@ -4405,10 +4398,8 @@ int qeth_set_access_ctrl_online(struct qeth_card *card, int fallback) 
		rc = qeth_setadpparms_set_access_ctrl(card,

			card->options.isolation, fallback);

		if (rc) {

			QETH_DBF_MESSAGE(3,

				"IPA(SET_ACCESS_CTRL,%s,%d) sent failed\n",

				card->gdev->dev.kobj.name,

				rc);

			QETH_DBF_MESSAGE(3, "IPA(SET_ACCESS_CTRL(%d) on device %x: sent failed\n",

					 rc, CARD_DEVID(card));

			rc = -EOPNOTSUPP;

		}

	} else if (card->options.isolation != ISOLATION_MODE_NONE) {
@@ -4443,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 */
@@ -4634,8 +4626,8 @@ static int qeth_snmp_command(struct qeth_card *card, char __user *udata) 
	rc = qeth_send_ipa_snmp_cmd(card, iob, QETH_SETADP_BASE_LEN + req_len,

				    qeth_snmp_command_cb, (void *)&qinfo);

	if (rc)

		QETH_DBF_MESSAGE(2, "SNMP command failed on %s: (0x%x)\n",

			   QETH_CARD_IFNAME(card), rc);

		QETH_DBF_MESSAGE(2, "SNMP command failed on device %x: (%#x)\n",

				 CARD_DEVID(card), rc);

	else {

		if (copy_to_user(udata, qinfo.udata, qinfo.udata_len))

			rc = -EFAULT;
@@ -4869,8 +4861,8 @@ static void qeth_determine_capabilities(struct qeth_card *card) 


	rc = qeth_read_conf_data(card, (void **) &prcd, &length);

	if (rc) {

		QETH_DBF_MESSAGE(2, "%s qeth_read_conf_data returned %i\n",

			dev_name(&card->gdev->dev), rc);

		QETH_DBF_MESSAGE(2, "qeth_read_conf_data on device %x returned %i\n",

				 CARD_DEVID(card), rc);

		QETH_DBF_TEXT_(SETUP, 2, "5err%d", rc);

		goto out_offline;

	}
@@ -5086,7 +5078,7 @@ static struct ccw_driver qeth_ccw_driver = { 
	.remove = ccwgroup_remove_ccwdev,

};



int qeth_core_hardsetup_card(struct qeth_card *card)

int qeth_core_hardsetup_card(struct qeth_card *card, bool *carrier_ok)

{

	int retries = 3;

	int rc;
@@ -5096,8 +5088,8 @@ int qeth_core_hardsetup_card(struct qeth_card *card) 
	qeth_update_from_chp_desc(card);

retry:

	if (retries < 3)

		QETH_DBF_MESSAGE(2, "%s Retrying to do IDX activates.\n",

			dev_name(&card->gdev->dev));

		QETH_DBF_MESSAGE(2, "Retrying to do IDX activates on device %x.\n",

				 CARD_DEVID(card));

	rc = qeth_qdio_clear_card(card, card->info.type != QETH_CARD_TYPE_IQD);

	ccw_device_set_offline(CARD_DDEV(card));

	ccw_device_set_offline(CARD_WDEV(card));
@@ -5161,13 +5153,20 @@ int qeth_core_hardsetup_card(struct qeth_card *card) 
		if (rc == IPA_RC_LAN_OFFLINE) {

			dev_warn(&card->gdev->dev,

				"The LAN is offline\n");

			netif_carrier_off(card->dev);

			*carrier_ok = false;

		} else {

			rc = -ENODEV;

			goto out;

		}

	} else {

		*carrier_ok = true;

	}



	if (qeth_netdev_is_registered(card->dev)) {

		if (*carrier_ok)

			netif_carrier_on(card->dev);

		else

			netif_carrier_off(card->dev);

	}



	card->options.ipa4.supported_funcs = 0;
@@ -5201,8 +5200,8 @@ int qeth_core_hardsetup_card(struct qeth_card *card) 
out:

	dev_warn(&card->gdev->dev, "The qeth device driver failed to recover "

		"an error on the device\n");

	QETH_DBF_MESSAGE(2, "%s Initialization in hardsetup failed! rc=%d\n",

		dev_name(&card->gdev->dev), rc);

	QETH_DBF_MESSAGE(2, "Initialization for device %x failed in hardsetup! rc=%d\n",

			 CARD_DEVID(card), rc);

	return rc;

}

EXPORT_SYMBOL_GPL(qeth_core_hardsetup_card);
@@ -5481,10 +5480,11 @@ struct qeth_cmd_buffer *qeth_get_setassparms_cmd(struct qeth_card *card, 
}

EXPORT_SYMBOL_GPL(qeth_get_setassparms_cmd);



int qeth_send_setassparms(struct qeth_card *card,

			  struct qeth_cmd_buffer *iob, __u16 len, long data,

			  int (*reply_cb)(struct qeth_card *,

					  struct qeth_reply *, unsigned long),

static int qeth_send_setassparms(struct qeth_card *card,

				 struct qeth_cmd_buffer *iob, u16 len,

				 long data, int (*reply_cb)(struct qeth_card *,

							    struct qeth_reply *,

							    unsigned long),

				 void *reply_param)

{

	int rc;
@@ -5501,7 +5501,6 @@ int qeth_send_setassparms(struct qeth_card *card, 
	rc = qeth_send_ipa_cmd(card, iob, reply_cb, reply_param);

	return rc;

}

EXPORT_SYMBOL_GPL(qeth_send_setassparms);



int qeth_send_simple_setassparms_prot(struct qeth_card *card,

				      enum qeth_ipa_funcs ipa_func,
@@ -6170,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);
@@ -6254,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;
@@ -6320,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

+3 −1
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 ***************************************************/
@@ -436,7 +438,7 @@ struct qeth_ipacmd_setassparms { 
		__u32 flags_32bit;

		struct qeth_ipa_caps caps;

		struct qeth_checksum_cmd chksum;

		struct qeth_arp_cache_entry add_arp_entry;

		struct qeth_arp_cache_entry arp_entry;

		struct qeth_arp_query_data query_arp;

		struct qeth_tso_start_data tso;

		__u8 ip[16];

drivers/s390/net/qeth_l2_main.c

+22 −17
Original line number Diff line number Diff line
@@ -146,11 +146,11 @@ static int qeth_l2_write_mac(struct qeth_card *card, u8 *mac) 
	QETH_CARD_TEXT(card, 2, "L2Wmac");

	rc = qeth_l2_send_setdelmac(card, mac, cmd);

	if (rc == -EEXIST)

		QETH_DBF_MESSAGE(2, "MAC %pM already registered on %s\n",

				 mac, QETH_CARD_IFNAME(card));

		QETH_DBF_MESSAGE(2, "MAC already registered on device %x\n",

				 CARD_DEVID(card));

	else if (rc)

		QETH_DBF_MESSAGE(2, "Failed to register MAC %pM on %s: %d\n",

				 mac, QETH_CARD_IFNAME(card), rc);

		QETH_DBF_MESSAGE(2, "Failed to register MAC on device %x: %d\n",

				 CARD_DEVID(card), rc);

	return rc;

}
@@ -163,8 +163,8 @@ static int qeth_l2_remove_mac(struct qeth_card *card, u8 *mac) 
	QETH_CARD_TEXT(card, 2, "L2Rmac");

	rc = qeth_l2_send_setdelmac(card, mac, cmd);

	if (rc)

		QETH_DBF_MESSAGE(2, "Failed to delete MAC %pM on %s: %d\n",

				 mac, QETH_CARD_IFNAME(card), rc);

		QETH_DBF_MESSAGE(2, "Failed to delete MAC on device %u: %d\n",

				 CARD_DEVID(card), rc);

	return rc;

}
@@ -260,9 +260,9 @@ static int qeth_l2_send_setdelvlan_cb(struct qeth_card *card, 


	QETH_CARD_TEXT(card, 2, "L2sdvcb");

	if (cmd->hdr.return_code) {

		QETH_DBF_MESSAGE(2, "Error in processing VLAN %i on %s: 0x%x.\n",

		QETH_DBF_MESSAGE(2, "Error in processing VLAN %u on device %x: %#x.\n",

				 cmd->data.setdelvlan.vlan_id,

				 QETH_CARD_IFNAME(card), cmd->hdr.return_code);

				 CARD_DEVID(card), cmd->hdr.return_code);

		QETH_CARD_TEXT_(card, 2, "L2VL%4x", cmd->hdr.command);

		QETH_CARD_TEXT_(card, 2, "err%d", cmd->hdr.return_code);

	}
@@ -455,8 +455,8 @@ static int qeth_l2_request_initial_mac(struct qeth_card *card) 
		rc = qeth_vm_request_mac(card);

		if (!rc)

			goto out;

		QETH_DBF_MESSAGE(2, "z/VM MAC Service failed on device %s: x%x\n",

				 CARD_BUS_ID(card), rc);

		QETH_DBF_MESSAGE(2, "z/VM MAC Service failed on device %x: %#x\n",

				 CARD_DEVID(card), rc);

		QETH_DBF_TEXT_(SETUP, 2, "err%04x", rc);

		/* fall back to alternative mechanism: */

	}
@@ -468,8 +468,8 @@ static int qeth_l2_request_initial_mac(struct qeth_card *card) 
		rc = qeth_setadpparms_change_macaddr(card);

		if (!rc)

			goto out;

		QETH_DBF_MESSAGE(2, "READ_MAC Assist failed on device %s: x%x\n",

				 CARD_BUS_ID(card), rc);

		QETH_DBF_MESSAGE(2, "READ_MAC Assist failed on device %x: %#x\n",

				 CARD_DEVID(card), rc);

		QETH_DBF_TEXT_(SETUP, 2, "1err%04x", rc);

		/* fall back once more: */

	}
@@ -826,6 +826,7 @@ static void qeth_l2_remove_device(struct ccwgroup_device *cgdev) 


	if (cgdev->state == CCWGROUP_ONLINE)

		qeth_l2_set_offline(cgdev);

	if (qeth_netdev_is_registered(card->dev))

		unregister_netdev(card->dev);

}
@@ -862,11 +863,11 @@ static const struct net_device_ops qeth_l2_netdev_ops = { 
	.ndo_set_features	= qeth_set_features

};



static int qeth_l2_setup_netdev(struct qeth_card *card)

static int qeth_l2_setup_netdev(struct qeth_card *card, bool carrier_ok)

{

	int rc;



	if (card->dev->netdev_ops)

	if (qeth_netdev_is_registered(card->dev))

		return 0;



	card->dev->priv_flags |= IFF_UNICAST_FLT;
@@ -919,6 +920,9 @@ static int qeth_l2_setup_netdev(struct qeth_card *card) 
	qeth_l2_request_initial_mac(card);

	netif_napi_add(card->dev, &card->napi, qeth_poll, QETH_NAPI_WEIGHT);

	rc = register_netdev(card->dev);

	if (!rc && carrier_ok)

		netif_carrier_on(card->dev);



	if (rc)

		card->dev->netdev_ops = NULL;

	return rc;
@@ -949,6 +953,7 @@ static int __qeth_l2_set_online(struct ccwgroup_device *gdev, int recovery_mode) 
	struct qeth_card *card = dev_get_drvdata(&gdev->dev);

	int rc = 0;

	enum qeth_card_states recover_flag;

	bool carrier_ok;



	mutex_lock(&card->discipline_mutex);

	mutex_lock(&card->conf_mutex);
@@ -956,7 +961,7 @@ static int __qeth_l2_set_online(struct ccwgroup_device *gdev, int recovery_mode) 
	QETH_DBF_HEX(SETUP, 2, &card, sizeof(void *));



	recover_flag = card->state;

	rc = qeth_core_hardsetup_card(card);

	rc = qeth_core_hardsetup_card(card, &carrier_ok);

	if (rc) {

		QETH_DBF_TEXT_(SETUP, 2, "2err%04x", rc);

		rc = -ENODEV;
@@ -967,7 +972,7 @@ static int __qeth_l2_set_online(struct ccwgroup_device *gdev, int recovery_mode) 
		dev_info(&card->gdev->dev,

		"The device represents a Bridge Capable Port\n");



	rc = qeth_l2_setup_netdev(card);

	rc = qeth_l2_setup_netdev(card, carrier_ok);

	if (rc)

		goto out_remove;

drivers/s390/net/qeth_l3_main.c

+70 −137

File changed.

Preview size limit exceeded, changes collapsed.