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

s390/cio: Helper functions to read CSSID, IID, and CHID 



Add helper functions to expose Channel Subsystem ID (CSSID), MIF Image Id
(IID), Channel ID (CHID) and Channel Path ID (CHPID).
These values are required by the qeth driver's exploitation of network-
address-change-notifications to determine which entries belong to this
interface.

Store the Partition identifier in System log, as this may be used to map
a Linux view to a Hardware view for debugging purpose.

Signed-off-by: default avatarAlexandra Winter <wintera@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 4fea49a7

arch/s390/include/asm/ccwdev.h

+4 −0
Original line number Diff line number Diff line
@@ -240,4 +240,8 @@ 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, u8 oc,

		    struct chsc_pnso_resume_token resume_token, int cnc);

int ccw_device_get_cssid(struct ccw_device *cdev, u8 *cssid);

int ccw_device_get_iid(struct ccw_device *cdev, u8 *iid);

int ccw_device_get_chpid(struct ccw_device *cdev, int chp_idx, u8 *chpid);

int ccw_device_get_chid(struct ccw_device *cdev, int chp_idx, u16 *chid);

#endif /* _S390_CCWDEV_H_ */

drivers/s390/cio/chsc.c

+7 −4
Original line number Diff line number Diff line
@@ -1116,7 +1116,7 @@ int chsc_enable_facility(int operation_code) 
	return ret;

}



int __init chsc_get_cssid(int idx)

int __init chsc_get_cssid_iid(int idx, u8 *cssid, u8 *iid)

{

	struct {

		struct chsc_header request;
@@ -1127,7 +1127,8 @@ int __init chsc_get_cssid(int idx) 
		u32 reserved2[3];

		struct {

			u8 cssid;

			u32 : 24;

			u8 iid;

			u32 : 16;

		} list[0];

	} *sdcal_area;

	int ret;
@@ -1153,8 +1154,10 @@ int __init chsc_get_cssid(int idx) 
	}



	if ((addr_t) &sdcal_area->list[idx] <

	    (addr_t) &sdcal_area->response + sdcal_area->response.length)

		ret = sdcal_area->list[idx].cssid;

	    (addr_t) &sdcal_area->response + sdcal_area->response.length) {

		*cssid = sdcal_area->list[idx].cssid;

		*iid = sdcal_area->list[idx].iid;

	}

	else

		ret = -ENODEV;

exit:

drivers/s390/cio/chsc.h

+1 −1
Original line number Diff line number Diff line
@@ -208,7 +208,7 @@ 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,

	      u8 oc, struct chsc_pnso_resume_token resume_token, int cnc);



int __init chsc_get_cssid(int idx);

int __init chsc_get_cssid_iid(int idx, u8 *cssid, u8 *iid);



#ifdef CONFIG_SCM_BUS

int scm_update_information(void);

drivers/s390/cio/css.c

+8 −3
Original line number Diff line number Diff line
@@ -854,7 +854,7 @@ css_generate_pgid(struct channel_subsystem *css, u32 tod_high) 
	if (css_general_characteristics.mcss) {

		css->global_pgid.pgid_high.ext_cssid.version = 0x80;

		css->global_pgid.pgid_high.ext_cssid.cssid =

			(css->cssid < 0) ? 0 : css->cssid;

			css->id_valid ? css->cssid : 0;

	} else {

		css->global_pgid.pgid_high.cpu_addr = stap();

	}
@@ -877,7 +877,7 @@ static ssize_t real_cssid_show(struct device *dev, struct device_attribute *a, 
{

	struct channel_subsystem *css = to_css(dev);



	if (css->cssid < 0)

	if (!css->id_valid)

		return -EINVAL;



	return sprintf(buf, "%x\n", css->cssid);
@@ -975,7 +975,12 @@ static int __init setup_css(int nr) 
	css->device.dma_mask = &css->device.coherent_dma_mask;



	mutex_init(&css->mutex);

	css->cssid = chsc_get_cssid(nr);

	ret = chsc_get_cssid_iid(nr, &css->cssid, &css->iid);

	if (!ret) {

		css->id_valid = true;

		pr_info("Partition identifier %01x.%01x\n", css->cssid,

			css->iid);

	}

	css_generate_pgid(css, (u32) (get_tod_clock() >> 32));



	ret = device_register(&css->device);

drivers/s390/cio/css.h

+3 −1
Original line number Diff line number Diff line
@@ -115,7 +115,9 @@ extern int for_each_subchannel(int(*fn)(struct subchannel_id, void *), void *); 
void css_update_ssd_info(struct subchannel *sch);



struct channel_subsystem {

	int cssid;

	u8 cssid;

	u8 iid;

	bool id_valid; /* cssid,iid */

	struct channel_path *chps[__MAX_CHPID + 1];

	struct device device;

	struct pgid global_pgid;

CRA Git | Maintained and supported by SUSTech CRA and CCSE