Merge branch 's390-qeth-next' (5416953f) · Commits · 戴 / test

drivers/s390/net/qeth_core.h

+19 −3

Original line number	Diff line number	Diff line
		@@ -182,6 +182,21 @@ struct qeth_sbp_info {
		__u32 reflect_promisc_primary:1;
		};

		struct qeth_vnicc_info {
		/* supported/currently configured VNICCs; updated in IPA exchanges */
		u32 sup_chars;
		u32 cur_chars;
		/* supported commands: bitmasks which VNICCs support respective cmd */
		u32 set_char_sup;
		u32 getset_timeout_sup;
		/* timeout value for the learning characteristic */
		u32 learning_timeout;
		/* characteristics wanted/configured by user */
		u32 wanted_chars;
		/* has user explicitly enabled rx_bcast while online? */
		bool rx_bcast_enabled;
		};

		static inline int qeth_is_ipa_supported(struct qeth_ipa_info *ipa,
		enum qeth_ipa_funcs func)
		{
		@@ -673,6 +688,7 @@ struct qeth_card_options {
		struct qeth_routing_info route6;
		struct qeth_ipa_info ipa6;
		struct qeth_sbp_info sbp; /* SETBRIDGEPORT options */
		struct qeth_vnicc_info vnicc; /* VNICC options */
		int fake_broadcast;
		int layer2;
		int performance_stats;
		@@ -946,13 +962,13 @@ int qeth_get_priority_queue(struct qeth_card , struct sk_buff , int, int);
		int qeth_get_elements_no(struct qeth_card card, struct sk_buff skb,
		int extra_elems, int data_offset);
		int qeth_get_elements_for_frags(struct sk_buff *);
		int qeth_do_send_packet_fast(struct qeth_card *card,
		struct qeth_qdio_out_q queue, struct sk_buff skb,
		int qeth_do_send_packet_fast(struct qeth_qdio_out_q queue, struct sk_buff skb,
		struct qeth_hdr *hdr, unsigned int offset,
		unsigned int hd_len);
		int qeth_do_send_packet(struct qeth_card card, struct qeth_qdio_out_q queue,
		struct sk_buff skb, struct qeth_hdr hdr,
		unsigned int hd_len, unsigned int offset, int elements);
		unsigned int offset, unsigned int hd_len,
		int elements_needed);
		int qeth_do_ioctl(struct net_device dev, struct ifreq rq, int cmd);
		int qeth_core_get_sset_count(struct net_device *, int);
		void qeth_core_get_ethtool_stats(struct net_device *,

drivers/s390/net/qeth_core_main.c

+5 −18

Original line number	Diff line number	Diff line
		@@ -4040,35 +4040,23 @@ static int qeth_fill_buffer(struct qeth_qdio_out_q *queue,
		return flush_cnt;
		}

		int qeth_do_send_packet_fast(struct qeth_card *card,
		struct qeth_qdio_out_q queue, struct sk_buff skb,
		int qeth_do_send_packet_fast(struct qeth_qdio_out_q queue, struct sk_buff skb,
		struct qeth_hdr *hdr, unsigned int offset,
		unsigned int hd_len)
		{
		struct qeth_qdio_out_buffer *buffer;
		int index;
		int index = queue->next_buf_to_fill;
		struct qeth_qdio_out_buffer *buffer = queue->bufs[index];

		/* spin until we get the queue ... */
		while (atomic_cmpxchg(&queue->state, QETH_OUT_Q_UNLOCKED,
		QETH_OUT_Q_LOCKED) != QETH_OUT_Q_UNLOCKED);
		/* ... now we've got the queue */
		index = queue->next_buf_to_fill;
		buffer = queue->bufs[queue->next_buf_to_fill];
		/*
		* check if buffer is empty to make sure that we do not 'overtake'
		* ourselves and try to fill a buffer that is already primed
		*/
		if (atomic_read(&buffer->state) != QETH_QDIO_BUF_EMPTY)
		goto out;
		queue->next_buf_to_fill = (queue->next_buf_to_fill + 1) %
		QDIO_MAX_BUFFERS_PER_Q;
		atomic_set(&queue->state, QETH_OUT_Q_UNLOCKED);
		return -EBUSY;
		queue->next_buf_to_fill = (index + 1) % QDIO_MAX_BUFFERS_PER_Q;
		qeth_fill_buffer(queue, buffer, skb, hdr, offset, hd_len);
		qeth_flush_buffers(queue, index, 1);
		return 0;
		out:
		atomic_set(&queue->state, QETH_OUT_Q_UNLOCKED);
		return -EBUSY;
		}
		EXPORT_SYMBOL_GPL(qeth_do_send_packet_fast);

		@@ -4923,7 +4911,6 @@ static void qeth_qdio_establish_cq(struct qeth_card *card,
		if (card->options.cq == QETH_CQ_ENABLED) {
		int offset = QDIO_MAX_BUFFERS_PER_Q *
		(card->qdio.no_in_queues - 1);
		i = QDIO_MAX_BUFFERS_PER_Q * (card->qdio.no_in_queues - 1);
		for (i = 0; i < QDIO_MAX_BUFFERS_PER_Q; ++i) {
		in_sbal_ptrs[offset + i] = (struct qdio_buffer *)
		virt_to_phys(card->qdio.c_q->bufs[i].buffer);

drivers/s390/net/qeth_core_mpc.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -167,7 +167,7 @@ static struct ipa_rc_msg qeth_ipa_rc_msg[] = {
		{IPA_RC_IP_TABLE_FULL, "Add Addr IP Table Full - ipv6"},
		{IPA_RC_UNKNOWN_ERROR, "IPA command failed - reason unknown"},
		{IPA_RC_UNSUPPORTED_COMMAND, "Command not supported"},
		{IPA_RC_TRACE_ALREADY_ACTIVE, "trace already active"},
		{IPA_RC_VNICC_OOSEQ, "Command issued out of sequence"},
		{IPA_RC_INVALID_FORMAT, "invalid format or length"},
		{IPA_RC_DUP_IPV6_REMOTE, "ipv6 address already registered remote"},
		{IPA_RC_SBP_IQD_NOT_CONFIGURED, "Not configured for bridgeport"},
		@@ -193,6 +193,7 @@ static struct ipa_rc_msg qeth_ipa_rc_msg[] = {
		{IPA_RC_L2_INVALID_VLAN_ID, "L2 invalid vlan id"},
		{IPA_RC_L2_DUP_VLAN_ID, "L2 duplicate vlan id"},
		{IPA_RC_L2_VLAN_ID_NOT_FOUND, "L2 vlan id not found"},
		{IPA_RC_VNICC_VNICBP, "VNIC is BridgePort"},
		{IPA_RC_SBP_OSA_NOT_CONFIGURED, "Not configured for bridgeport"},
		{IPA_RC_SBP_OSA_OS_MISMATCH, "OS mismatch"},
		{IPA_RC_SBP_OSA_ANO_DEV_PRIMARY, "Primary bridgeport exists already"},
		@@ -253,6 +254,7 @@ static struct ipa_cmd_names qeth_ipa_cmd_names[] = {
		{IPA_CMD_DELGMAC, "delgmac"},
		{IPA_CMD_SETVLAN, "setvlan"},
		{IPA_CMD_DELVLAN, "delvlan"},
		{IPA_CMD_VNICC, "vnic_characteristics"},
		{IPA_CMD_SETBRIDGEPORT_OSA, "set_bridge_port(osa)"},
		{IPA_CMD_SETCCID, "setccid"},
		{IPA_CMD_DELCCID, "delccid"},

drivers/s390/net/qeth_core_mpc.h

+72 −0

Original line number	Diff line number	Diff line
		@@ -90,6 +90,7 @@ enum qeth_ipa_cmds {
		IPA_CMD_DELGMAC = 0x24,
		IPA_CMD_SETVLAN = 0x25,
		IPA_CMD_DELVLAN = 0x26,
		IPA_CMD_VNICC = 0x2a,
		IPA_CMD_SETBRIDGEPORT_OSA = 0x2b,
		IPA_CMD_SETCCID = 0x41,
		IPA_CMD_DELCCID = 0x42,
		@@ -165,6 +166,8 @@ enum qeth_ipa_return_codes {
		IPA_RC_L2_INVALID_VLAN_ID = 0x2015,
		IPA_RC_L2_DUP_VLAN_ID = 0x2016,
		IPA_RC_L2_VLAN_ID_NOT_FOUND = 0x2017,
		IPA_RC_L2_VLAN_ID_NOT_ALLOWED = 0x2050,
		IPA_RC_VNICC_VNICBP = 0x20B0,
		IPA_RC_SBP_OSA_NOT_CONFIGURED = 0x2B0C,
		IPA_RC_SBP_OSA_OS_MISMATCH = 0x2B10,
		IPA_RC_SBP_OSA_ANO_DEV_PRIMARY = 0x2B14,
		@@ -197,6 +200,9 @@ enum qeth_ipa_return_codes {
		IPA_RC_ENOMEM = 0xfffe,
		IPA_RC_FFFF = 0xffff
		};
		/* for VNIC Characteristics */
		#define IPA_RC_VNICC_OOSEQ 0x0005

		/* for SET_DIAGNOSTIC_ASSIST */
		#define IPA_RC_INVALID_SUBCMD IPA_RC_IP_TABLE_FULL
		#define IPA_RC_HARDWARE_AUTH_ERROR IPA_RC_UNKNOWN_ERROR
		@@ -551,6 +557,71 @@ struct qeth_ipacmd_diagass {
		__u8 cdata[64];
		} __attribute__ ((packed));

		/* VNIC Characteristics IPA Command: *****************************************/
		/* IPA commands/sub commands for VNICC */
		#define IPA_VNICC_QUERY_CHARS 0x00000000L
		#define IPA_VNICC_QUERY_CMDS 0x00000001L
		#define IPA_VNICC_ENABLE 0x00000002L
		#define IPA_VNICC_DISABLE 0x00000004L
		#define IPA_VNICC_SET_TIMEOUT 0x00000008L
		#define IPA_VNICC_GET_TIMEOUT 0x00000010L

		/* VNICC flags */
		#define QETH_VNICC_FLOODING 0x80000000
		#define QETH_VNICC_MCAST_FLOODING 0x40000000
		#define QETH_VNICC_LEARNING 0x20000000
		#define QETH_VNICC_TAKEOVER_SETVMAC 0x10000000
		#define QETH_VNICC_TAKEOVER_LEARNING 0x08000000
		#define QETH_VNICC_BRIDGE_INVISIBLE 0x04000000
		#define QETH_VNICC_RX_BCAST 0x02000000

		/* VNICC default values */
		#define QETH_VNICC_ALL 0xff000000
		#define QETH_VNICC_DEFAULT QETH_VNICC_RX_BCAST
		/* default VNICC timeout in seconds */
		#define QETH_VNICC_DEFAULT_TIMEOUT 600

		/* VNICC header */
		struct qeth_ipacmd_vnicc_hdr {
		u32 sup;
		u32 cur;
		};

		/* VNICC sub command header */
		struct qeth_vnicc_sub_hdr {
		u16 data_length;
		u16 reserved;
		u32 sub_command;
		};

		/* query supported commands for VNIC characteristic */
		struct qeth_vnicc_query_cmds {
		u32 vnic_char;
		u32 sup_cmds;
		};

		/* enable/disable VNIC characteristic */
		struct qeth_vnicc_set_char {
		u32 vnic_char;
		};

		/* get/set timeout for VNIC characteristic */
		struct qeth_vnicc_getset_timeout {
		u32 vnic_char;
		u32 timeout;
		};

		/* complete VNICC IPA command message */
		struct qeth_ipacmd_vnicc {
		struct qeth_ipacmd_vnicc_hdr hdr;
		struct qeth_vnicc_sub_hdr sub_hdr;
		union {
		struct qeth_vnicc_query_cmds query_cmds;
		struct qeth_vnicc_set_char set_char;
		struct qeth_vnicc_getset_timeout getset_timeout;
		};
		};

		/* SETBRIDGEPORT IPA Command: *********************************************/
		enum qeth_ipa_sbp_cmd {
		IPA_SBP_QUERY_COMMANDS_SUPPORTED = 0x00000000L,
		@@ -692,6 +763,7 @@ struct qeth_ipa_cmd {
		struct qeth_ipacmd_diagass diagass;
		struct qeth_ipacmd_setbridgeport sbp;
		struct qeth_ipacmd_addr_change addrchange;
		struct qeth_ipacmd_vnicc vnicc;
		} data;
		} __attribute__ ((packed));

drivers/s390/net/qeth_l2.h

+6 −0

Original line number	Diff line number	Diff line
		@@ -14,6 +14,12 @@ int qeth_l2_create_device_attributes(struct device *);
		void qeth_l2_remove_device_attributes(struct device *);
		void qeth_l2_setup_bridgeport_attrs(struct qeth_card *card);

		int qeth_l2_vnicc_set_state(struct qeth_card *card, u32 vnicc, bool state);
		int qeth_l2_vnicc_get_state(struct qeth_card card, u32 vnicc, bool state);
		int qeth_l2_vnicc_set_timeout(struct qeth_card *card, u32 timeout);
		int qeth_l2_vnicc_get_timeout(struct qeth_card card, u32 timeout);
		bool qeth_l2_vnicc_is_in_use(struct qeth_card *card);

		struct qeth_mac {
		u8 mac_addr[OSA_ADDR_LEN];
		u8 is_uc:1;

Admin message