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

Merge branch 's390-qeth-next' 



Julian Wiedmann says:

====================
s390/qeth: updates 2019-06-11

please apply the following patch series for qeth to net-next.
This brings all sorts of cleanups and minor improvements,
primarily for the control IO path.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 11817aa6 d9b9f40b

drivers/s390/net/qeth_core.h

+21 −6
Original line number Diff line number Diff line
@@ -537,8 +537,6 @@ enum qeth_channel_states { 
	CH_STATE_DOWN,

	CH_STATE_HALTED,

	CH_STATE_STOPPED,

	CH_STATE_RCD,

	CH_STATE_RCD_DONE,

};

/**

 * card state machine
@@ -560,6 +558,7 @@ enum qeth_prot_versions { 
enum qeth_cmd_buffer_state {

	BUF_STATE_FREE,

	BUF_STATE_LOCKED,

	BUF_STATE_MALLOC,

};



enum qeth_cq {
@@ -579,16 +578,22 @@ struct qeth_channel; 


struct qeth_cmd_buffer {

	enum qeth_cmd_buffer_state state;

	unsigned int length;

	refcount_t ref_count;

	struct qeth_channel *channel;

	struct qeth_reply *reply;

	long timeout;

	unsigned char *data;

	void (*finalize)(struct qeth_card *card, struct qeth_cmd_buffer *iob,

			 unsigned int length);

	void (*callback)(struct qeth_card *card, struct qeth_channel *channel,

			 struct qeth_cmd_buffer *iob);

	void (*callback)(struct qeth_card *card, struct qeth_cmd_buffer *iob);

};



static inline void qeth_get_cmd(struct qeth_cmd_buffer *iob)

{

	refcount_inc(&iob->ref_count);

}



static inline struct qeth_ipa_cmd *__ipa_cmd(struct qeth_cmd_buffer *iob)

{

	return (struct qeth_ipa_cmd *)(iob->data + IPA_PDU_HEADER_SIZE);
@@ -609,6 +614,13 @@ struct qeth_channel { 
	int io_buf_no;

};



static inline struct ccw1 *__ccw_from_cmd(struct qeth_cmd_buffer *iob)

{

	if (iob->state != BUF_STATE_MALLOC)

		return iob->channel->ccw;

	return (struct ccw1 *)(iob->data + ALIGN(iob->length, 8));

}



static inline bool qeth_trylock_channel(struct qeth_channel *channel)

{

	return atomic_cmpxchg(&channel->irq_pending, 0, 1) == 0;
@@ -665,6 +677,7 @@ struct qeth_card_info { 
	__u16 func_level;

	char mcl_level[QETH_MCL_LENGTH + 1];

	u8 open_when_online:1;

	u8 use_v1_blkt:1;

	u8 is_vm_nic:1;

	int mac_bits;

	enum qeth_card_types type;
@@ -764,6 +777,7 @@ struct qeth_card { 
	enum qeth_card_states state;

	spinlock_t lock;

	struct ccwgroup_device *gdev;

	struct qeth_cmd_buffer *read_cmd;

	struct qeth_channel read;

	struct qeth_channel write;

	struct qeth_channel data;
@@ -994,10 +1008,11 @@ void qeth_drain_output_queues(struct qeth_card *card); 
void qeth_setadp_promisc_mode(struct qeth_card *);

int qeth_setadpparms_change_macaddr(struct qeth_card *);

void qeth_tx_timeout(struct net_device *);

void qeth_release_buffer(struct qeth_channel *, struct qeth_cmd_buffer *);

void qeth_release_buffer(struct qeth_cmd_buffer *iob);

void qeth_notify_reply(struct qeth_reply *reply, int reason);

void qeth_prepare_ipa_cmd(struct qeth_card *card, struct qeth_cmd_buffer *iob,

			  u16 cmd_length);

struct qeth_cmd_buffer *qeth_wait_for_buffer(struct qeth_channel *);

struct qeth_cmd_buffer *qeth_get_buffer(struct qeth_channel *channel);

int qeth_query_switch_attributes(struct qeth_card *card,

				  struct qeth_switch_info *sw_info);

int qeth_query_card_info(struct qeth_card *card,

drivers/s390/net/qeth_core_main.c

+289 −325

File changed.

Preview size limit exceeded, changes collapsed.

drivers/s390/net/qeth_core_mpc.h

+0 −2
Original line number Diff line number Diff line
@@ -31,14 +31,12 @@ extern unsigned char IPA_PDU_HEADER[]; 


#define QETH_CLEAR_CHANNEL_PARM	-10

#define QETH_HALT_CHANNEL_PARM	-11

#define QETH_RCD_PARM -12



static inline bool qeth_intparm_is_iob(unsigned long intparm)

{

	switch (intparm) {

	case QETH_CLEAR_CHANNEL_PARM:

	case QETH_HALT_CHANNEL_PARM:

	case QETH_RCD_PARM:

	case 0:

		return false;

	}

drivers/s390/net/qeth_l2_main.c

+24 −59
Original line number Diff line number Diff line
@@ -274,8 +274,7 @@ static int qeth_l2_vlan_rx_kill_vid(struct net_device *dev, 


static void qeth_l2_stop_card(struct qeth_card *card)

{

	QETH_DBF_TEXT(SETUP , 2, "stopcard");

	QETH_DBF_HEX(SETUP, 2, &card, sizeof(void *));

	QETH_CARD_TEXT(card, 2, "stopcard");



	qeth_set_allowed_threads(card, 0, 1);
@@ -292,11 +291,8 @@ static void qeth_l2_stop_card(struct qeth_card *card) 
		qeth_clear_working_pool_list(card);

		card->state = CARD_STATE_DOWN;

	}

	if (card->state == CARD_STATE_DOWN) {

		qeth_clear_cmd_buffers(&card->read);

		qeth_clear_cmd_buffers(&card->write);

	}



	qeth_clear_cmd_buffers(&card->write);

	flush_workqueue(card->event_wq);

	card->info.mac_bits &= ~QETH_LAYER2_MAC_REGISTERED;

}
@@ -354,8 +350,7 @@ static int qeth_l2_request_initial_mac(struct qeth_card *card) 
{

	int rc = 0;



	QETH_DBF_TEXT(SETUP, 2, "l2reqmac");

	QETH_DBF_TEXT_(SETUP, 2, "doL2%s", CARD_BUS_ID(card));

	QETH_CARD_TEXT(card, 2, "l2reqmac");



	if (MACHINE_IS_VM) {

		rc = qeth_vm_request_mac(card);
@@ -363,7 +358,7 @@ static int qeth_l2_request_initial_mac(struct qeth_card *card) 
			goto out;

		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);

		QETH_CARD_TEXT_(card, 2, "err%04x", rc);

		/* fall back to alternative mechanism: */

	}
@@ -373,7 +368,7 @@ static int qeth_l2_request_initial_mac(struct qeth_card *card) 
			goto out;

		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);

		QETH_CARD_TEXT_(card, 2, "1err%04x", rc);

		/* fall back once more: */

	}
@@ -383,7 +378,7 @@ static int qeth_l2_request_initial_mac(struct qeth_card *card) 
	eth_hw_addr_random(card->dev);



out:

	QETH_DBF_HEX(SETUP, 2, card->dev->dev_addr, card->dev->addr_len);

	QETH_CARD_HEX(card, 2, card->dev->dev_addr, card->dev->addr_len);

	return 0;

}
@@ -467,7 +462,7 @@ static void qeth_promisc_to_bridge(struct qeth_card *card) 
		role = QETH_SBP_ROLE_NONE;



	rc = qeth_bridgeport_setrole(card, role);

	QETH_DBF_TEXT_(SETUP, 2, "bpm%c%04x",

	QETH_CARD_TEXT_(card, 2, "bpm%c%04x",

			(promisc_mode == SET_PROMISC_MODE_ON) ? '+' : '-', rc);

	if (!rc) {

		card->options.sbp.role = role;
@@ -796,12 +791,11 @@ static int qeth_l2_set_online(struct ccwgroup_device *gdev) 


	mutex_lock(&card->discipline_mutex);

	mutex_lock(&card->conf_mutex);

	QETH_DBF_TEXT(SETUP, 2, "setonlin");

	QETH_DBF_HEX(SETUP, 2, &card, sizeof(void *));

	QETH_CARD_TEXT(card, 2, "setonlin");



	rc = qeth_core_hardsetup_card(card, &carrier_ok);

	if (rc) {

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

		QETH_CARD_TEXT_(card, 2, "2err%04x", rc);

		rc = -ENODEV;

		goto out_remove;

	}
@@ -832,7 +826,7 @@ static int qeth_l2_set_online(struct ccwgroup_device *gdev) 
	qeth_print_status_message(card);



	/* softsetup */

	QETH_DBF_TEXT(SETUP, 2, "softsetp");

	QETH_CARD_TEXT(card, 2, "softsetp");



	if (IS_OSD(card) || IS_OSX(card)) {

		rc = qeth_l2_start_ipassists(card);
@@ -842,7 +836,7 @@ static int qeth_l2_set_online(struct ccwgroup_device *gdev) 


	rc = qeth_init_qdio_queues(card);

	if (rc) {

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

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

		rc = -ENODEV;

		goto out_remove;

	}
@@ -882,7 +876,6 @@ out_remove: 
	ccw_device_set_offline(CARD_WDEV(card));

	ccw_device_set_offline(CARD_RDEV(card));

	qdio_free(CARD_DDEV(card));

	card->state = CARD_STATE_DOWN;



	mutex_unlock(&card->conf_mutex);

	mutex_unlock(&card->discipline_mutex);
@@ -897,8 +890,7 @@ static int __qeth_l2_set_offline(struct ccwgroup_device *cgdev, 


	mutex_lock(&card->discipline_mutex);

	mutex_lock(&card->conf_mutex);

	QETH_DBF_TEXT(SETUP, 3, "setoffl");

	QETH_DBF_HEX(SETUP, 3, &card, sizeof(void *));

	QETH_CARD_TEXT(card, 3, "setoffl");



	if ((!recovery_mode && card->info.hwtrap) || card->info.hwtrap == 2) {

		qeth_hw_trap(card, QETH_DIAGS_TRAP_DISARM);
@@ -919,7 +911,7 @@ static int __qeth_l2_set_offline(struct ccwgroup_device *cgdev, 
	if (!rc)

		rc = (rc2) ? rc2 : rc3;

	if (rc)

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

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

	qdio_free(CARD_DDEV(card));



	/* let user_space know that device is offline */
@@ -1036,42 +1028,11 @@ struct qeth_discipline qeth_l2_discipline = { 
};

EXPORT_SYMBOL_GPL(qeth_l2_discipline);



static int qeth_osn_send_control_data(struct qeth_card *card, int len,

static void qeth_osn_assist_cb(struct qeth_card *card,

			       struct qeth_cmd_buffer *iob)

{

	struct qeth_channel *channel = iob->channel;

	int rc = 0;



	QETH_CARD_TEXT(card, 5, "osndctrd");



	wait_event(card->wait_q, qeth_trylock_channel(channel));

	iob->finalize(card, iob, len);

	QETH_DBF_HEX(CTRL, 2, iob->data, min(len, QETH_DBF_CTRL_LEN));

	QETH_CARD_TEXT(card, 6, "osnoirqp");

	spin_lock_irq(get_ccwdev_lock(channel->ccwdev));

	rc = ccw_device_start_timeout(channel->ccwdev, channel->ccw,

				      (addr_t) iob, 0, 0, iob->timeout);

	spin_unlock_irq(get_ccwdev_lock(channel->ccwdev));

	if (rc) {

		QETH_DBF_MESSAGE(2, "qeth_osn_send_control_data: "

			   "ccw_device_start rc = %i\n", rc);

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

		qeth_release_buffer(channel, iob);

		atomic_set(&channel->irq_pending, 0);

		wake_up(&card->wait_q);

	}

	return rc;

}



static int qeth_osn_send_ipa_cmd(struct qeth_card *card,

				 struct qeth_cmd_buffer *iob)

{

	u16 length;



	QETH_CARD_TEXT(card, 4, "osndipa");



	memcpy(&length, QETH_IPA_PDU_LEN_TOTAL(iob->data), 2);

	return qeth_osn_send_control_data(card, length, iob);

	qeth_notify_reply(iob->reply, 0);

	qeth_release_buffer(iob);

}



int qeth_osn_assist(struct net_device *dev, void *data, int data_len)
@@ -1087,10 +1048,14 @@ int qeth_osn_assist(struct net_device *dev, void *data, int data_len) 
	QETH_CARD_TEXT(card, 2, "osnsdmc");

	if (!qeth_card_hw_is_reachable(card))

		return -ENODEV;

	iob = qeth_wait_for_buffer(&card->write);

	iob = qeth_get_buffer(&card->write);

	if (!iob)

		return -ENOMEM;



	qeth_prepare_ipa_cmd(card, iob, (u16) data_len);

	memcpy(__ipa_cmd(iob), data, data_len);

	return qeth_osn_send_ipa_cmd(card, iob);

	iob->callback = qeth_osn_assist_cb;

	return qeth_send_ipa_cmd(card, iob, NULL, NULL);

}

EXPORT_SYMBOL(qeth_osn_assist);
@@ -1845,7 +1810,7 @@ static int qeth_l2_vnicc_request(struct qeth_card *card, 
		req->getset_timeout.vnic_char = cbctl->param.vnic_char;

		break;

	default:

		qeth_release_buffer(iob->channel, iob);

		qeth_release_buffer(iob);

		return -EOPNOTSUPP;

	}

drivers/s390/net/qeth_l3_main.c

+17 −24
Original line number Diff line number Diff line
@@ -742,7 +742,7 @@ static int qeth_l3_setadapter_parms(struct qeth_card *card) 
{

	int rc = 0;



	QETH_DBF_TEXT(SETUP, 2, "setadprm");

	QETH_CARD_TEXT(card, 2, "setadprm");



	if (qeth_adp_supported(card, IPA_SETADP_ALTER_MAC_ADDRESS)) {

		rc = qeth_setadpparms_change_macaddr(card);
@@ -979,7 +979,7 @@ static int qeth_l3_iqd_read_initial_mac(struct qeth_card *card) 
	struct qeth_cmd_buffer *iob;

	struct qeth_ipa_cmd *cmd;



	QETH_DBF_TEXT(SETUP, 2, "hsrmac");

	QETH_CARD_TEXT(card, 2, "hsrmac");



	iob = qeth_get_ipacmd_buffer(card, IPA_CMD_CREATE_ADDR,

				     QETH_PROT_IPV6);
@@ -1017,7 +1017,7 @@ static int qeth_l3_get_unique_id(struct qeth_card *card) 
	struct qeth_cmd_buffer *iob;

	struct qeth_ipa_cmd *cmd;



	QETH_DBF_TEXT(SETUP, 2, "guniqeid");

	QETH_CARD_TEXT(card, 2, "guniqeid");



	if (!qeth_is_supported(card, IPA_IPV6)) {

		card->info.unique_id =  UNIQUE_ID_IF_CREATE_ADDR_FAILED |
@@ -1044,7 +1044,7 @@ qeth_diags_trace_cb(struct qeth_card *card, struct qeth_reply *reply, 
	struct qeth_ipa_cmd	   *cmd;

	__u16 rc;



	QETH_DBF_TEXT(SETUP, 2, "diastrcb");

	QETH_CARD_TEXT(card, 2, "diastrcb");



	cmd = (struct qeth_ipa_cmd *)data;

	rc = cmd->hdr.return_code;
@@ -1100,7 +1100,7 @@ qeth_diags_trace(struct qeth_card *card, enum qeth_diags_trace_cmds diags_cmd) 
	struct qeth_cmd_buffer *iob;

	struct qeth_ipa_cmd    *cmd;



	QETH_DBF_TEXT(SETUP, 2, "diagtrac");

	QETH_CARD_TEXT(card, 2, "diagtrac");



	iob = qeth_get_ipacmd_buffer(card, IPA_CMD_SET_DIAG_ASS, 0);

	if (!iob)
@@ -1413,8 +1413,7 @@ static int qeth_l3_process_inbound_buffer(struct qeth_card *card, 


static void qeth_l3_stop_card(struct qeth_card *card)

{

	QETH_DBF_TEXT(SETUP, 2, "stopcard");

	QETH_DBF_HEX(SETUP, 2, &card, sizeof(void *));

	QETH_CARD_TEXT(card, 2, "stopcard");



	qeth_set_allowed_threads(card, 0, 1);
@@ -1436,11 +1435,8 @@ static void qeth_l3_stop_card(struct qeth_card *card) 
		qeth_clear_working_pool_list(card);

		card->state = CARD_STATE_DOWN;

	}

	if (card->state == CARD_STATE_DOWN) {

		qeth_clear_cmd_buffers(&card->read);

		qeth_clear_cmd_buffers(&card->write);

	}



	qeth_clear_cmd_buffers(&card->write);

	flush_workqueue(card->event_wq);

}
@@ -2337,12 +2333,11 @@ static int qeth_l3_set_online(struct ccwgroup_device *gdev) 


	mutex_lock(&card->discipline_mutex);

	mutex_lock(&card->conf_mutex);

	QETH_DBF_TEXT(SETUP, 2, "setonlin");

	QETH_DBF_HEX(SETUP, 2, &card, sizeof(void *));

	QETH_CARD_TEXT(card, 2, "setonlin");



	rc = qeth_core_hardsetup_card(card, &carrier_ok);

	if (rc) {

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

		QETH_CARD_TEXT_(card, 2, "2err%04x", rc);

		rc = -ENODEV;

		goto out_remove;

	}
@@ -2358,28 +2353,28 @@ static int qeth_l3_set_online(struct ccwgroup_device *gdev) 
	qeth_print_status_message(card);



	/* softsetup */

	QETH_DBF_TEXT(SETUP, 2, "softsetp");

	QETH_CARD_TEXT(card, 2, "softsetp");



	rc = qeth_l3_setadapter_parms(card);

	if (rc)

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

		QETH_CARD_TEXT_(card, 2, "2err%04x", rc);

	if (!card->options.sniffer) {

		rc = qeth_l3_start_ipassists(card);

		if (rc) {

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

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

			goto out_remove;

		}

		rc = qeth_l3_setrouting_v4(card);

		if (rc)

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

			QETH_CARD_TEXT_(card, 2, "4err%04x", rc);

		rc = qeth_l3_setrouting_v6(card);

		if (rc)

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

			QETH_CARD_TEXT_(card, 2, "5err%04x", rc);

	}



	rc = qeth_init_qdio_queues(card);

	if (rc) {

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

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

		rc = -ENODEV;

		goto out_remove;

	}
@@ -2420,7 +2415,6 @@ out_remove: 
	ccw_device_set_offline(CARD_WDEV(card));

	ccw_device_set_offline(CARD_RDEV(card));

	qdio_free(CARD_DDEV(card));

	card->state = CARD_STATE_DOWN;



	mutex_unlock(&card->conf_mutex);

	mutex_unlock(&card->discipline_mutex);
@@ -2435,8 +2429,7 @@ static int __qeth_l3_set_offline(struct ccwgroup_device *cgdev, 


	mutex_lock(&card->discipline_mutex);

	mutex_lock(&card->conf_mutex);

	QETH_DBF_TEXT(SETUP, 3, "setoffl");

	QETH_DBF_HEX(SETUP, 3, &card, sizeof(void *));

	QETH_CARD_TEXT(card, 3, "setoffl");



	if ((!recovery_mode && card->info.hwtrap) || card->info.hwtrap == 2) {

		qeth_hw_trap(card, QETH_DIAGS_TRAP_DISARM);
@@ -2462,7 +2455,7 @@ static int __qeth_l3_set_offline(struct ccwgroup_device *cgdev, 
	if (!rc)

		rc = (rc2) ? rc2 : rc3;

	if (rc)

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

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

	qdio_free(CARD_DDEV(card));



	/* let user_space know that device is offline */

CRA Git | Maintained and supported by SUSTech CRA and CCSE