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

Merge branch 's390-qeth-next' 



Julian Wiedmann says:

====================
s390/qeth: updates 2018-03-09

here is the current pile of qeth patches for net-next. Just the usual
small updates and clean ups. Please apply.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents f5426250 b1d5e36b

drivers/s390/net/qeth_core.h

+0 −8
Original line number Diff line number Diff line
@@ -233,8 +233,6 @@ static inline int qeth_is_ipa_enabled(struct qeth_ipa_info *ipa, 
#define QETH_IDX_FUNC_LEVEL_OSD		 0x0101

#define QETH_IDX_FUNC_LEVEL_IQD		 0x4108



#define QETH_REAL_CARD		1

#define QETH_VLAN_CARD		2

#define QETH_BUFSIZE		4096



/**
@@ -556,12 +554,6 @@ enum qeth_prot_versions { 
	QETH_PROT_IPV6 = 0x0006,

};



enum qeth_ip_types {

	QETH_IP_TYPE_NORMAL,

	QETH_IP_TYPE_VIPA,

	QETH_IP_TYPE_RXIP,

};



enum qeth_cmd_buffer_state {

	BUF_STATE_FREE,

	BUF_STATE_LOCKED,

drivers/s390/net/qeth_core_main.c

+18 −22
Original line number Diff line number Diff line
@@ -708,11 +708,8 @@ 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 0x%02x%s\n",

			   buffer[4],

			   ((buffer[4] == 0x22) ?

			    " -- try another portname" : ""));

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

				 buffer[4]);

		QETH_CARD_TEXT(card, 2, "ckidxres");

		QETH_CARD_TEXT(card, 2, " idxterm");

		QETH_CARD_TEXT_(card, 2, "  rc%d", -EIO);
@@ -2838,7 +2835,8 @@ static int qeth_init_input_buffer(struct qeth_card *card, 
	int i;



	if ((card->options.cq == QETH_CQ_ENABLED) && (!buf->rx_skb)) {

		buf->rx_skb = dev_alloc_skb(QETH_RX_PULL_LEN + ETH_HLEN);

		buf->rx_skb = netdev_alloc_skb(card->dev,

					       QETH_RX_PULL_LEN + ETH_HLEN);

		if (!buf->rx_skb)

			return 1;

	}
@@ -2875,8 +2873,8 @@ int qeth_init_qdio_queues(struct qeth_card *card) 
	QETH_DBF_TEXT(SETUP, 2, "initqdqs");



	/* inbound queue */

	qdio_reset_buffers(card->qdio.in_q->qdio_bufs,

			   QDIO_MAX_BUFFERS_PER_Q);

	qdio_reset_buffers(card->qdio.in_q->qdio_bufs, QDIO_MAX_BUFFERS_PER_Q);

	memset(&card->rx, 0, sizeof(struct qeth_rx));

	qeth_initialize_working_pool_list(card);

	/*give only as many buffers to hardware as we have buffer pool entries*/

	for (i = 0; i < card->qdio.in_buf_pool.buf_count - 1; ++i)
@@ -2951,12 +2949,10 @@ struct qeth_cmd_buffer *qeth_get_ipacmd_buffer(struct qeth_card *card, 
		enum qeth_ipa_cmds ipacmd, enum qeth_prot_versions prot)

{

	struct qeth_cmd_buffer *iob;

	struct qeth_ipa_cmd *cmd;



	iob = qeth_get_buffer(&card->write);

	if (iob) {

		cmd = (struct qeth_ipa_cmd *)(iob->data+IPA_PDU_HEADER_SIZE);

		qeth_fill_ipacmd_header(card, cmd, ipacmd, prot);

		qeth_fill_ipacmd_header(card, __ipa_cmd(iob), ipacmd, prot);

	} else {

		dev_warn(&card->gdev->dev,

			 "The qeth driver ran out of channel command buffers\n");
@@ -3067,7 +3063,7 @@ static struct qeth_cmd_buffer *qeth_get_adapter_cmd(struct qeth_card *card, 
	iob = qeth_get_ipacmd_buffer(card, IPA_CMD_SETADAPTERPARMS,

				     QETH_PROT_IPV4);

	if (iob) {

		cmd = (struct qeth_ipa_cmd *)(iob->data+IPA_PDU_HEADER_SIZE);

		cmd = __ipa_cmd(iob);

		cmd->data.setadapterparms.hdr.cmdlength = cmdlen;

		cmd->data.setadapterparms.hdr.command_code = command;

		cmd->data.setadapterparms.hdr.used_total = 1;
@@ -3209,7 +3205,7 @@ static int qeth_query_setdiagass(struct qeth_card *card) 
	iob = qeth_get_ipacmd_buffer(card, IPA_CMD_SET_DIAG_ASS, 0);

	if (!iob)

		return -ENOMEM;

	cmd = (struct qeth_ipa_cmd *)(iob->data+IPA_PDU_HEADER_SIZE);

	cmd = __ipa_cmd(iob);

	cmd->data.diagass.subcmd_len = 16;

	cmd->data.diagass.subcmd = QETH_DIAGS_CMD_QUERY;

	return qeth_send_ipa_cmd(card, iob, qeth_query_setdiagass_cb, NULL);
@@ -3262,7 +3258,7 @@ int qeth_hw_trap(struct qeth_card *card, enum qeth_diags_trap_action action) 
	iob = qeth_get_ipacmd_buffer(card, IPA_CMD_SET_DIAG_ASS, 0);

	if (!iob)

		return -ENOMEM;

	cmd = (struct qeth_ipa_cmd *)(iob->data+IPA_PDU_HEADER_SIZE);

	cmd = __ipa_cmd(iob);

	cmd->data.diagass.subcmd_len = 80;

	cmd->data.diagass.subcmd = QETH_DIAGS_CMD_TRAP;

	cmd->data.diagass.type = 1;
@@ -4240,7 +4236,7 @@ void qeth_setadp_promisc_mode(struct qeth_card *card) 
			sizeof(struct qeth_ipacmd_setadpparms_hdr) + 8);

	if (!iob)

		return;

	cmd = (struct qeth_ipa_cmd *)(iob->data + IPA_PDU_HEADER_SIZE);

	cmd = __ipa_cmd(iob);

	cmd->data.setadapterparms.data.mode = mode;

	qeth_send_ipa_cmd(card, iob, qeth_setadp_promisc_mode_cb, NULL);

}
@@ -4307,7 +4303,7 @@ int qeth_setadpparms_change_macaddr(struct qeth_card *card) 
				   sizeof(struct qeth_change_addr));

	if (!iob)

		return -ENOMEM;

	cmd = (struct qeth_ipa_cmd *)(iob->data+IPA_PDU_HEADER_SIZE);

	cmd = __ipa_cmd(iob);

	cmd->data.setadapterparms.data.change_addr.cmd = CHANGE_ADDR_READ_MAC;

	cmd->data.setadapterparms.data.change_addr.addr_size = ETH_ALEN;

	ether_addr_copy(cmd->data.setadapterparms.data.change_addr.addr,
@@ -4422,7 +4418,7 @@ static int qeth_setadpparms_set_access_ctrl(struct qeth_card *card, 
				   sizeof(struct qeth_set_access_ctrl));

	if (!iob)

		return -ENOMEM;

	cmd = (struct qeth_ipa_cmd *)(iob->data+IPA_PDU_HEADER_SIZE);

	cmd = __ipa_cmd(iob);

	access_ctrl_req = &cmd->data.setadapterparms.data.set_access_ctrl;

	access_ctrl_req->subcmd_code = isolation;
@@ -4668,7 +4664,7 @@ static int qeth_snmp_command(struct qeth_card *card, char __user *udata) 
		rc = -ENOMEM;

		goto out;

	}

	cmd = (struct qeth_ipa_cmd *)(iob->data+IPA_PDU_HEADER_SIZE);

	cmd = __ipa_cmd(iob);

	memcpy(&cmd->data.setadapterparms.data.snmp, &ureq->cmd, req_len);

	rc = qeth_send_ipa_snmp_cmd(card, iob, QETH_SETADP_BASE_LEN + req_len,

				    qeth_snmp_command_cb, (void *)&qinfo);
@@ -4753,7 +4749,7 @@ static int qeth_query_oat_command(struct qeth_card *card, char __user *udata) 
		rc = -ENOMEM;

		goto out_free;

	}

	cmd = (struct qeth_ipa_cmd *)(iob->data+IPA_PDU_HEADER_SIZE);

	cmd = __ipa_cmd(iob);

	oat_req = &cmd->data.setadapterparms.data.query_oat;

	oat_req->subcmd_code = oat_data.command;
@@ -5330,7 +5326,7 @@ struct sk_buff *qeth_core_get_next_skb(struct qeth_card *card, 
	} else {

		unsigned int linear = (use_rx_sg) ? QETH_RX_PULL_LEN : skb_len;



		skb = dev_alloc_skb(linear + headroom);

		skb = napi_alloc_skb(&card->napi, linear + headroom);

	}

	if (!skb)

		goto no_mem;
@@ -5494,7 +5490,7 @@ struct qeth_cmd_buffer *qeth_get_setassparms_cmd(struct qeth_card *card, 
	iob = qeth_get_ipacmd_buffer(card, IPA_CMD_SETASSPARMS, prot);



	if (iob) {

		cmd = (struct qeth_ipa_cmd *)(iob->data+IPA_PDU_HEADER_SIZE);

		cmd = __ipa_cmd(iob);

		cmd->data.setassparms.hdr.assist_no = ipa_func;

		cmd->data.setassparms.hdr.length = 8 + len;

		cmd->data.setassparms.hdr.command_code = cmd_code;
@@ -5517,7 +5513,7 @@ int qeth_send_setassparms(struct qeth_card *card, 


	QETH_CARD_TEXT(card, 4, "sendassp");



	cmd = (struct qeth_ipa_cmd *)(iob->data+IPA_PDU_HEADER_SIZE);

	cmd = __ipa_cmd(iob);

	if (len <= sizeof(__u32))

		cmd->data.setassparms.data.flags_32bit = (__u32) data;

	else   /* (len > sizeof(__u32)) */

drivers/s390/net/qeth_l2_main.c

+16 −18
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ static int qeth_l2_send_setdelmac(struct qeth_card *card, __u8 *mac, 
	iob = qeth_get_ipacmd_buffer(card, ipacmd, QETH_PROT_IPV4);

	if (!iob)

		return -ENOMEM;

	cmd = (struct qeth_ipa_cmd *)(iob->data+IPA_PDU_HEADER_SIZE);

	cmd = __ipa_cmd(iob);

	cmd->data.setdelmac.mac_length = ETH_ALEN;

	ether_addr_copy(cmd->data.setdelmac.mac, mac);

	return qeth_setdelmac_makerc(card, qeth_send_ipa_cmd(card, iob,
@@ -305,7 +305,7 @@ static int qeth_l2_send_setdelvlan(struct qeth_card *card, __u16 i, 
	iob = qeth_get_ipacmd_buffer(card, ipacmd, QETH_PROT_IPV4);

	if (!iob)

		return -ENOMEM;

	cmd = (struct qeth_ipa_cmd *)(iob->data+IPA_PDU_HEADER_SIZE);

	cmd = __ipa_cmd(iob);

	cmd->data.setdelvlan.vlan_id = i;

	return qeth_setdelvlan_makerc(card, qeth_send_ipa_cmd(card, iob,

					    qeth_l2_send_setdelvlan_cb, NULL));
@@ -437,10 +437,8 @@ static int qeth_l2_process_inbound_buffer(struct qeth_card *card, 
			*done = 1;

			break;

		}

		skb->dev = card->dev;

		switch (hdr->hdr.l2.id) {

		case QETH_HEADER_TYPE_LAYER2:

			skb->pkt_type = PACKET_HOST;

			skb->protocol = eth_type_trans(skb, skb->dev);

			if ((card->dev->features & NETIF_F_RXCSUM)

			   && ((hdr->hdr.l2.flags[1] &
@@ -975,6 +973,7 @@ static int qeth_l2_setup_netdev(struct qeth_card *card) 
		return -ENODEV;



	card->dev->ml_priv = card;

	card->dev->priv_flags |= IFF_UNICAST_FLT;

	card->dev->watchdog_timeo = QETH_TX_TIMEOUT;

	card->dev->mtu = card->info.initial_mtu;

	card->dev->min_mtu = 64;
@@ -991,9 +990,16 @@ static int qeth_l2_setup_netdev(struct qeth_card *card) 
		card->dev->features |= NETIF_F_VLAN_CHALLENGED;

	else

		card->dev->features |= NETIF_F_HW_VLAN_CTAG_FILTER;



	if (card->info.type != QETH_CARD_TYPE_OSN &&

	    card->info.type != QETH_CARD_TYPE_IQD) {

		card->dev->priv_flags &= ~IFF_TX_SKB_SHARING;

		card->dev->needed_headroom = sizeof(struct qeth_hdr);

		card->dev->hw_features |= NETIF_F_SG;

		card->dev->vlan_features |= NETIF_F_SG;

	}



	if (card->info.type == QETH_CARD_TYPE_OSD && !card->info.guestlan) {

		card->dev->hw_features = NETIF_F_SG;

		card->dev->vlan_features = NETIF_F_SG;

		card->dev->features |= NETIF_F_SG;

		/* OSA 3S and earlier has no RX/TX support */

		if (qeth_is_supported(card, IPA_OUTBOUND_CHECKSUM)) {
@@ -1005,11 +1011,6 @@ static int qeth_l2_setup_netdev(struct qeth_card *card) 
			card->dev->vlan_features |= NETIF_F_RXCSUM;

		}

	}

	if (card->info.type != QETH_CARD_TYPE_OSN &&

	    card->info.type != QETH_CARD_TYPE_IQD) {

		card->dev->priv_flags &= ~IFF_TX_SKB_SHARING;

		card->dev->needed_headroom = sizeof(struct qeth_hdr);

	}



	card->info.broadcast_capable = 1;

	qeth_l2_request_initial_mac(card);
@@ -1086,7 +1087,6 @@ static int __qeth_l2_set_online(struct ccwgroup_device *gdev, int recovery_mode) 
	qeth_l2_setup_bridgeport_attrs(card);



	card->state = CARD_STATE_HARDSETUP;

	memset(&card->rx, 0, sizeof(struct qeth_rx));

	qeth_print_status_message(card);



	/* softsetup */
@@ -1374,7 +1374,6 @@ int qeth_osn_assist(struct net_device *dev, void *data, int data_len) 
{

	struct qeth_cmd_buffer *iob;

	struct qeth_card *card;

	int rc;



	if (!dev)

		return -ENODEV;
@@ -1385,9 +1384,8 @@ int qeth_osn_assist(struct net_device *dev, void *data, int data_len) 
	if (!qeth_card_hw_is_reachable(card))

		return -ENODEV;

	iob = qeth_wait_for_buffer(&card->write);

	memcpy(iob->data+IPA_PDU_HEADER_SIZE, data, data_len);

	rc = qeth_osn_send_ipa_cmd(card, iob, data_len);

	return rc;

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

	return qeth_osn_send_ipa_cmd(card, iob, data_len);

}

EXPORT_SYMBOL(qeth_osn_assist);
@@ -1764,7 +1762,7 @@ static struct qeth_cmd_buffer *qeth_sbp_build_cmd(struct qeth_card *card, 
	iob = qeth_get_ipacmd_buffer(card, ipa_cmd, 0);

	if (!iob)

		return iob;

	cmd = (struct qeth_ipa_cmd *)(iob->data+IPA_PDU_HEADER_SIZE);

	cmd = __ipa_cmd(iob);

	cmd->data.sbp.hdr.cmdlength = sizeof(struct qeth_ipacmd_sbp_hdr) +

				      cmd_length;

	cmd->data.sbp.hdr.command_code = sbp_cmd;
@@ -2129,7 +2127,7 @@ static int qeth_l2_vnicc_request(struct qeth_card *card, 
		return -ENOMEM;



	/* create header for request */

	cmd = (struct qeth_ipa_cmd *)(iob->data + IPA_PDU_HEADER_SIZE);

	cmd = __ipa_cmd(iob);

	req = &cmd->data.vnicc;



	/* create sub command header for request */

drivers/s390/net/qeth_l3.h

+22 −12
Original line number Diff line number Diff line
@@ -15,21 +15,26 @@ 


#define QETH_SNIFF_AVAIL	0x0008



enum qeth_ip_types {

	QETH_IP_TYPE_NORMAL,

	QETH_IP_TYPE_VIPA,

	QETH_IP_TYPE_RXIP,

};



struct qeth_ipaddr {

	struct hlist_node hnode;

	enum qeth_ip_types type;

	enum qeth_ipa_setdelip_flags set_flags;

	enum qeth_ipa_setdelip_flags del_flags;

	unsigned char mac[ETH_ALEN];

	u8 is_multicast:1;

	u8 in_progress:1;

	u8 disp_flag:2;

	u8 ipato:1;			/* ucast only */



	/* is changed only for normal ip addresses

	 * for non-normal addresses it always is  1

	 */

	int  ref_counter;

	enum qeth_prot_versions proto;

	unsigned char mac[ETH_ALEN];

	union {

		struct {

			unsigned int addr;
@@ -42,6 +47,16 @@ struct qeth_ipaddr { 
	} u;

};



static inline void qeth_l3_init_ipaddr(struct qeth_ipaddr *addr,

				       enum qeth_ip_types type,

				       enum qeth_prot_versions proto)

{

	memset(addr, 0, sizeof(*addr));

	addr->type = type;

	addr->proto = proto;

	addr->disp_flag = QETH_DISP_ADDR_DO_NOTHING;

}



static inline bool qeth_l3_addr_match_ip(struct qeth_ipaddr *a1,

					 struct qeth_ipaddr *a2)

{
@@ -109,15 +124,10 @@ int qeth_l3_add_ipato_entry(struct qeth_card *, struct qeth_ipato_entry *); 
int qeth_l3_del_ipato_entry(struct qeth_card *card,

			    enum qeth_prot_versions proto, u8 *addr,

			    int mask_bits);

int qeth_l3_add_vipa(struct qeth_card *, enum qeth_prot_versions, const u8 *);

int qeth_l3_del_vipa(struct qeth_card *card, enum qeth_prot_versions proto,

		     const u8 *addr);

int qeth_l3_add_rxip(struct qeth_card *, enum qeth_prot_versions, const u8 *);

int qeth_l3_del_rxip(struct qeth_card *card, enum qeth_prot_versions proto,

		     const u8 *addr);

void qeth_l3_update_ipato(struct qeth_card *card);

struct qeth_ipaddr *qeth_l3_get_addr_buffer(enum qeth_prot_versions);

int qeth_l3_add_ip(struct qeth_card *, struct qeth_ipaddr *);

int qeth_l3_delete_ip(struct qeth_card *, struct qeth_ipaddr *);

int qeth_l3_modify_hsuid(struct qeth_card *card, bool add);

int qeth_l3_modify_rxip_vipa(struct qeth_card *card, bool add, const u8 *ip,

			     enum qeth_ip_types type,

			     enum qeth_prot_versions proto);



#endif /* __QETH_L3_H__ */

drivers/s390/net/qeth_l3_main.c

+130 −289

File changed.

Preview size limit exceeded, changes collapsed.