Commit 4fea49a7 authored by Alexandra Winter's avatar Alexandra Winter Committed by David S. Miller
Browse files

s390/cio: Add new Operation Code OC3 to PNSO 



Add support for operation code 3 (OC3) of the
Perform-Network-Subchannel-Operations (PNSO) function
of the Channel-Subsystem-Call (CHSC) instruction.

PNSO provides 2 operation codes:
OC0 - BRIDGE_INFO
OC3 - ADDR_INFO (new)

Extend the function calls to *pnso* to pass the OC and
add new response code 0108.

Support for OC3 is indicated by a flag in the css_general_characteristics.

Signed-off-by: default avatarAlexandra Winter <wintera@linux.ibm.com>
Reviewed-by: default avatarJulian Wiedmann <jwi@linux.ibm.com>
Reviewed-by: default avatarPeter Oberparleiter <oberpar@linux.ibm.com>
Reviewed-by: default avatarVineeth Vijayan <vneethv@linux.ibm.com>
Signed-off-by: default avatarJulian Wiedmann <jwi@linux.ibm.com>
Acked-by: default avatarHeiko Carstens <hca@linux.ibm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent afb83012

arch/s390/include/asm/ccwdev.h

+2 −3
Original line number Diff line number Diff line
@@ -238,7 +238,6 @@ 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);

		    struct chsc_pnso_area *pnso_area, u8 oc,

		    struct chsc_pnso_resume_token resume_token, int cnc);

#endif /* _S390_CCWDEV_H_ */

arch/s390/include/asm/chsc.h

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


#include <uapi/asm/chsc.h>



/**

 * Operation codes for CHSC PNSO:

 *    PNSO_OC_NET_BRIDGE_INFO - only addresses that are visible to a bridgeport

 *    PNSO_OC_NET_ADDR_INFO   - all addresses

 */

#define PNSO_OC_NET_BRIDGE_INFO		0

#define PNSO_OC_NET_ADDR_INFO		3

/**

 * struct chsc_pnso_naid_l2 - network address information descriptor

 * @nit:  Network interface token

arch/s390/include/asm/css_chars.h

+3 −1
Original line number Diff line number Diff line
@@ -36,7 +36,9 @@ struct css_general_char { 
	u64 alt_ssi : 1; /* bit 108 */

	u64 : 1;

	u64 narf : 1;	 /* bit 110 */

	u64 : 12;

	u64 : 5;

	u64 enarf: 1;	 /* bit 116 */

	u64 : 6;

	u64 util_str : 1;/* bit 123 */

} __packed;

drivers/s390/cio/chsc.c

+6 −5
Original line number Diff line number Diff line
@@ -65,6 +65,8 @@ int chsc_error_from_response(int response) 
	case 0x0100:

	case 0x0102:

		return -ENOMEM;

	case 0x0108:		/* "HW limit exceeded" for the op 0x003d */

		return -EUSERS;

	default:

		return -EIO;

	}
@@ -1340,6 +1342,7 @@ EXPORT_SYMBOL_GPL(chsc_scm_info); 
 * chsc_pnso() - Perform Network-Subchannel Operation

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

 * @pnso_area:		request and response block for the operation

 * @oc:			Operation Code

 * @resume_token:	resume token for multiblock response

 * @cnc:		Boolean change-notification control

 *
@@ -1347,10 +1350,8 @@ EXPORT_SYMBOL_GPL(chsc_scm_info); 
 *

 * Returns 0 on success.

 */

int chsc_pnso(struct subchannel_id schid,

	      struct chsc_pnso_area *pnso_area,

	      struct chsc_pnso_resume_token resume_token,

	      int cnc)

int chsc_pnso(struct subchannel_id schid, struct chsc_pnso_area *pnso_area,

	      u8 oc, struct chsc_pnso_resume_token resume_token, int cnc)

{

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

	pnso_area->request.length = 0x0030;
@@ -1359,7 +1360,7 @@ int chsc_pnso(struct subchannel_id schid, 
	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->oc	 = oc;

	pnso_area->resume_token = resume_token;

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

	if (chsc(pnso_area))

drivers/s390/cio/chsc.h

+2 −4
Original line number Diff line number Diff line
@@ -205,10 +205,8 @@ struct chsc_scm_info { 


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



int chsc_pnso(struct subchannel_id schid,

	      struct chsc_pnso_area *pnso_area,

	      struct chsc_pnso_resume_token resume_token,

	      int cnc);

int chsc_pnso(struct subchannel_id schid, struct chsc_pnso_area *pnso_area,

	      u8 oc, struct chsc_pnso_resume_token resume_token, int cnc);



int __init chsc_get_cssid(int idx);