Commit a0138f59 authored by Alexandra Winter's avatar Alexandra Winter Committed by Vasily Gorbik
Browse files

s390/cio, s390/qeth: cleanup PNSO CHSC 



CHSC3D (PNSO - perform network subchannel operation) is used for
OC0 (Store-network-bridging-information) as well as for
OC3 (Store-network-address-information). So common fields are renamed
from *brinfo* to *pnso*.
Also *_bridge_host_* is changed into *_addr_change_*, e.g.
qeth_bridge_host_event to qeth_addr_change_event, for the
same reasons.
The keywords in the card traces are changed accordingly.

Remove unused L3 types, as PNSO will only return Layer2 entries.

Make PNSO CHSC implementation more consistent with existing API usage:
Add new function ccw_device_pnso() to drivers/s390/cio/device_ops.c and
the function declaration to arch/s390/include/asm/ccwdev.h, which takes
a struct ccw_device * as parameter instead of schid and calls
chsc_pnso().

PNSO CHSC has no strict relationship to qdio. So move the calling
function from qdio to qeth_l2 and move the necessary structures to a
new file arch/s390/include/asm/chsc.h.

Do response code evaluation only in chsc_error_from_response() and
use return code in all other places. qeth_anset_makerc() was meant to
evaluate the PNSO response code, but never did, because pnso_rc was
already non-zero.

Indentation was corrected in some places.

Signed-off-by: default avatarAlexandra Winter <wintera@linux.ibm.com>
Reviewed-by: default avatarPeter Oberparleiter <oberpar@linux.ibm.com>
Reviewed-by: default avatarVineeth Vijayan <vneethv@linux.ibm.com>
Reviewed-by: default avatarJulian Wiedmann <jwi@linux.ibm.com>
Signed-off-by: default avatarVasily Gorbik <gor@linux.ibm.com>
parent cafebf86

arch/s390/include/asm/ccwdev.h

+5 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 


#include <linux/device.h>

#include <linux/mod_devicetable.h>

#include <asm/chsc.h>

#include <asm/fcx.h>

#include <asm/irq.h>

#include <asm/schid.h>
@@ -236,4 +237,8 @@ extern void ccw_device_get_schid(struct ccw_device *, struct subchannel_id *); 


struct channel_path_desc_fmt0 *ccw_device_get_chp_desc(struct ccw_device *, int);

u8 *ccw_device_get_util_str(struct ccw_device *cdev, int chp_idx);

int ccw_device_pnso(struct ccw_device *cdev,

		    struct chsc_pnso_area *pnso_area,

		    struct chsc_pnso_resume_token resume_token,

		    int cnc);

#endif /* _S390_CCWDEV_H_ */

arch/s390/include/asm/chsc.h

0 → 100644
+62 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

/*

 * Copyright IBM Corp. 2020

 *

 * Author(s): Alexandra Winter <wintera@linux.ibm.com>

 *

 * Interface for Channel Subsystem Call

 */

#ifndef _ASM_S390_CHSC_H

#define _ASM_S390_CHSC_H



#include <uapi/asm/chsc.h>



/**

 * struct chsc_pnso_naid_l2 - network address information descriptor

 * @nit:  Network interface token

 * @addr_lnid: network address and logical network id (VLAN ID)

 */

struct chsc_pnso_naid_l2 {

	u64 nit;

	struct { u8 mac[6]; u16 lnid; } addr_lnid;

} __packed;



struct chsc_pnso_resume_token {

	u64 t1;

	u64 t2;

} __packed;



struct chsc_pnso_naihdr {

	struct chsc_pnso_resume_token resume_token;

	u32:32;

	u32 instance;

	u32:24;

	u8 naids;

	u32 reserved[3];

} __packed;



struct chsc_pnso_area {

	struct chsc_header request;

	u8:2;

	u8 m:1;

	u8:5;

	u8:2;

	u8 ssid:2;

	u8 fmt:4;

	u16 sch;

	u8:8;

	u8 cssid;

	u16:16;

	u8 oc;

	u32:24;

	struct chsc_pnso_resume_token resume_token;

	u32 n:1;

	u32:31;

	u32 reserved[3];

	struct chsc_header response;

	u32:32;

	struct chsc_pnso_naihdr naihdr;

	struct chsc_pnso_naid_l2 entries[0];

} __packed __aligned(PAGE_SIZE);



#endif /* _ASM_S390_CHSC_H */

arch/s390/include/asm/qdio.h

+0 −33
Original line number Diff line number Diff line
@@ -365,34 +365,6 @@ struct qdio_initialize { 
	struct qdio_outbuf_state *output_sbal_state_array;

};



/**

 * enum qdio_brinfo_entry_type - type of address entry for qdio_brinfo_desc()

 * @l3_ipv6_addr: entry contains IPv6 address

 * @l3_ipv4_addr: entry contains IPv4 address

 * @l2_addr_lnid: entry contains MAC address and VLAN ID

 */

enum qdio_brinfo_entry_type {l3_ipv6_addr, l3_ipv4_addr, l2_addr_lnid};



/**

 * struct qdio_brinfo_entry_XXX - Address entry for qdio_brinfo_desc()

 * @nit:  Network interface token

 * @addr: Address of one of the three types

 *

 * The struct is passed to the callback function by qdio_brinfo_desc()

 */

struct qdio_brinfo_entry_l3_ipv6 {

	u64 nit;

	struct { unsigned char _s6_addr[16]; } addr;

} __packed;

struct qdio_brinfo_entry_l3_ipv4 {

	u64 nit;

	struct { uint32_t _s_addr; } addr;

} __packed;

struct qdio_brinfo_entry_l2 {

	u64 nit;

	struct { u8 mac[6]; u16 lnid; } addr_lnid;

} __packed;



#define QDIO_STATE_INACTIVE		0x00000002 /* after qdio_cleanup */

#define QDIO_STATE_ESTABLISHED		0x00000004 /* after qdio_establish */

#define QDIO_STATE_ACTIVE		0x00000008 /* after qdio_activate */
@@ -423,10 +395,5 @@ extern int qdio_inspect_queue(struct ccw_device *cdev, unsigned int nr, 
extern int qdio_shutdown(struct ccw_device *, int);

extern int qdio_free(struct ccw_device *);

extern int qdio_get_ssqd_desc(struct ccw_device *, struct qdio_ssqd_desc *);

extern int qdio_pnso_brinfo(struct subchannel_id schid,

		int cnc, u16 *response,

		void (*cb)(void *priv, enum qdio_brinfo_entry_type type,

				void *entry),

		void *priv);



#endif /* __QDIO_H__ */

drivers/s390/cio/chsc.c

+20 −20
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ int chsc_error_from_response(int response) 
	case 0x0104:

		return -EINVAL;

	case 0x0004:

	case 0x0106:		/* "Wrong Channel Parm" for the op 0x003d */

		return -EOPNOTSUPP;

	case 0x000b:

	case 0x0107:		/* "Channel busy" for the op 0x003d */
@@ -1336,36 +1337,35 @@ out: 
EXPORT_SYMBOL_GPL(chsc_scm_info);



/**

 * chsc_pnso_brinfo() - Perform Network-Subchannel Operation, Bridge Info.

 * chsc_pnso() - Perform Network-Subchannel Operation

 * @schid:		id of the subchannel on which PNSO is performed

 * @brinfo_area:	request and response block for the operation

 * @pnso_area:		request and response block for the operation

 * @resume_token:	resume token for multiblock response

 * @cnc:		Boolean change-notification control

 *

 * brinfo_area must be allocated by the caller with get_zeroed_page(GFP_KERNEL)

 * pnso_area must be allocated by the caller with get_zeroed_page(GFP_KERNEL)

 *

 * Returns 0 on success.

 */

int chsc_pnso_brinfo(struct subchannel_id schid,

		struct chsc_pnso_area *brinfo_area,

		struct chsc_brinfo_resume_token resume_token,

int chsc_pnso(struct subchannel_id schid,

	      struct chsc_pnso_area *pnso_area,

	      struct chsc_pnso_resume_token resume_token,

	      int cnc)

{

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

	brinfo_area->request.length = 0x0030;

	brinfo_area->request.code = 0x003d; /* network-subchannel operation */

	brinfo_area->m	   = schid.m;

	brinfo_area->ssid  = schid.ssid;

	brinfo_area->sch   = schid.sch_no;

	brinfo_area->cssid = schid.cssid;

	brinfo_area->oc    = 0; /* Store-network-bridging-information list */

	brinfo_area->resume_token = resume_token;

	brinfo_area->n	   = (cnc != 0);

	if (chsc(brinfo_area))

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

	pnso_area->request.length = 0x0030;

	pnso_area->request.code = 0x003d; /* network-subchannel operation */

	pnso_area->m	   = schid.m;

	pnso_area->ssid  = schid.ssid;

	pnso_area->sch	 = schid.sch_no;

	pnso_area->cssid = schid.cssid;

	pnso_area->oc	 = 0; /* Store-network-bridging-information list */

	pnso_area->resume_token = resume_token;

	pnso_area->n	   = (cnc != 0);

	if (chsc(pnso_area))

		return -EIO;

	return chsc_error_from_response(brinfo_area->response.code);

	return chsc_error_from_response(pnso_area->response.code);

}

EXPORT_SYMBOL_GPL(chsc_pnso_brinfo);



int chsc_sgib(u32 origin)

{

drivers/s390/cio/chsc.h

+4 −46
Original line number Diff line number Diff line
@@ -205,51 +205,9 @@ struct chsc_scm_info { 


int chsc_scm_info(struct chsc_scm_info *scm_area, u64 token);



struct chsc_brinfo_resume_token {

	u64 t1;

	u64 t2;

} __packed;



struct chsc_brinfo_naihdr {

	struct chsc_brinfo_resume_token resume_token;

	u32:32;

	u32 instance;

	u32:24;

	u8 naids;

	u32 reserved[3];

} __packed;



struct chsc_pnso_area {

	struct chsc_header request;

	u8:2;

	u8 m:1;

	u8:5;

	u8:2;

	u8 ssid:2;

	u8 fmt:4;

	u16 sch;

	u8:8;

	u8 cssid;

	u16:16;

	u8 oc;

	u32:24;

	struct chsc_brinfo_resume_token resume_token;

	u32 n:1;

	u32:31;

	u32 reserved[3];

	struct chsc_header response;

	u32:32;

	struct chsc_brinfo_naihdr naihdr;

	union {

		struct qdio_brinfo_entry_l3_ipv6 l3_ipv6[0];

		struct qdio_brinfo_entry_l3_ipv4 l3_ipv4[0];

		struct qdio_brinfo_entry_l2	 l2[0];

	} entries;

} __packed __aligned(PAGE_SIZE);



int chsc_pnso_brinfo(struct subchannel_id schid,

		struct chsc_pnso_area *brinfo_area,

		struct chsc_brinfo_resume_token resume_token,

int chsc_pnso(struct subchannel_id schid,

	      struct chsc_pnso_area *pnso_area,

	      struct chsc_pnso_resume_token resume_token,

	      int cnc);



int __init chsc_get_cssid(int idx);

CRA Git | Maintained and supported by SUSTech CRA and CCSE