Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fc5019c5 authored by Cornelia Huck's avatar Cornelia Huck Committed by Martin Schwidefsky
Browse files

[S390] cio: Fix some coding style issues in cmf. 



Fix some formatting and correct a comment.

Signed-off-by: default avatarCornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
parent fbf9772b

drivers/s390/cio/cmf.c

+77 −64
Original line number Diff line number Diff line
@@ -45,7 +45,8 @@ 
#include "ioasm.h"

#include "chsc.h"



/* parameter to enable cmf during boot, possible uses are:

/*

 * parameter to enable cmf during boot, possible uses are:

 *  "s390cmf" -- enable cmf and allocate 2 MB of ram so measuring can be

 *               used on any subchannel

 *  "s390cmf=<num>" -- enable cmf and allocate enough memory to measure
@@ -84,6 +85,7 @@ enum cmb_format { 
	CMF_EXTENDED,

	CMF_AUTODETECT = -1,

};



/**

 * format - actual format for all measurement blocks

 *
@@ -130,9 +132,11 @@ struct cmb_data { 
	unsigned long long last_update;  /* when last_block was updated */

};



/* our user interface is designed in terms of nanoseconds,

/*

 * Our user interface is designed in terms of nanoseconds,

 * while the hardware measures total times in its own

 * unit.*/

 * unit.

 */

static inline u64 time_to_nsec(u32 value)

{

	return ((u64)value) * 128000ull;
@@ -159,12 +163,13 @@ static inline u64 time_to_avg_nsec(u32 value, u32 count) 
	return ret;

}



/* activate or deactivate the channel monitor. When area is NULL,

/*

 * Activate or deactivate the channel monitor. When area is NULL,

 * the monitor is deactivated. The channel monitor needs to

 * be active in order to measure subchannels, which also need

 * to be enabled. */

static inline void

cmf_activate(void *area, unsigned int onoff)

 * to be enabled.

 */

static inline void cmf_activate(void *area, unsigned int onoff)

{

	register void * __gpr2 asm("2");

	register long __gpr1 asm("1");
@@ -175,8 +180,8 @@ cmf_activate(void *area, unsigned int onoff) 
	asm("schm" : : "d" (__gpr2), "d" (__gpr1) );

}



static int

set_schib(struct ccw_device *cdev, u32 mme, int mbfc, unsigned long address)

static int set_schib(struct ccw_device *cdev, u32 mme, int mbfc,

		     unsigned long address)

{

	int ret;

	int retry;
@@ -484,15 +489,14 @@ static struct cmb_area cmb_area = { 


/* ****** old style CMB handling ********/



/** int maxchannels

 *

/*

 * Basic channel measurement blocks are allocated in one contiguous

 * block of memory, which can not be moved as long as any channel

 * is active. Therefore, a maximum number of subchannels needs to

 * be defined somewhere. This is a module parameter, defaulting to

 * a resonable value of 1024, or 32 kb of memory.

 * Current kernels don't allow kmalloc with more than 128kb, so the

 * maximum is 4096

 * maximum is 4096.

 */



module_param_named(maxchannels, cmb_area.num_channels, uint, 0444);
@@ -516,8 +520,9 @@ struct cmb { 
	u32 reserved[2];

};



/* insert a single device into the cmb_area list

 * called with cmb_area.lock held from alloc_cmb

/*

 * Insert a single device into the cmb_area list.

 * Called with cmb_area.lock held from alloc_cmb.

 */

static int alloc_cmb_single(struct ccw_device *cdev,

			    struct cmb_data *cmb_data)
@@ -532,9 +537,11 @@ static int alloc_cmb_single(struct ccw_device *cdev, 
		goto out;

	}



	/* find first unused cmb in cmb_area.mem.

	 * this is a little tricky: cmb_area.list

	 * remains sorted by ->cmb->hw_data pointers */

	/*

	 * Find first unused cmb in cmb_area.mem.

	 * This is a little tricky: cmb_area.list

	 * remains sorted by ->cmb->hw_data pointers.

	 */

	cmb = cmb_area.mem;

	list_for_each_entry(node, &cmb_area.list, cmb_list) {

		struct cmb_data *data;
@@ -558,8 +565,7 @@ static int alloc_cmb_single(struct ccw_device *cdev, 
	return ret;

}



static int

alloc_cmb (struct ccw_device *cdev)

static int alloc_cmb(struct ccw_device *cdev)

{

	int ret;

	struct cmb *mem;
@@ -816,9 +822,11 @@ struct cmbe { 
	u32 reserved[7];

};



/* kmalloc only guarantees 8 byte alignment, but we need cmbe

/*

 * kmalloc only guarantees 8 byte alignment, but we need cmbe

 * pointers to be naturally aligned. Make sure to allocate

 * enough space for two cmbes */

 * enough space for two cmbes.

 */

static inline struct cmbe *cmbe_align(struct cmbe *c)

{

	unsigned long addr;
@@ -1049,15 +1057,15 @@ static struct cmb_operations cmbops_extended = { 
};





static ssize_t

cmb_show_attr(struct device *dev, char *buf, enum cmb_index idx)

static ssize_t cmb_show_attr(struct device *dev, char *buf, enum cmb_index idx)

{

	return sprintf(buf, "%lld\n",

		(unsigned long long) cmf_read(to_ccwdev(dev), idx));

}



static ssize_t

cmb_show_avg_sample_interval(struct device *dev, struct device_attribute *attr, char *buf)

static ssize_t cmb_show_avg_sample_interval(struct device *dev,

					    struct device_attribute *attr,

					    char *buf)

{

	struct ccw_device *cdev;

	long interval;
@@ -1079,8 +1087,9 @@ cmb_show_avg_sample_interval(struct device *dev, struct device_attribute *attr, 
	return sprintf(buf, "%ld\n", interval);

}



static ssize_t

cmb_show_avg_utilization(struct device *dev, struct device_attribute *attr, char *buf)

static ssize_t cmb_show_avg_utilization(struct device *dev,

					struct device_attribute *attr,

					char *buf)

{

	struct cmbdata data;

	u64 utilization;
@@ -1112,12 +1121,14 @@ cmb_show_avg_utilization(struct device *dev, struct device_attribute *attr, char 
}



#define cmf_attr(name) \

static ssize_t show_ ## name (struct device * dev, struct device_attribute *attr, char * buf) \

static ssize_t show_##name(struct device *dev, \

			   struct device_attribute *attr, char *buf)	\

{ return cmb_show_attr((dev), buf, cmb_##name); } \

static DEVICE_ATTR(name, 0444, show_##name, NULL);



#define cmf_attr_avg(name) \

static ssize_t show_avg_ ## name (struct device * dev, struct device_attribute *attr, char * buf) \

static ssize_t show_avg_##name(struct device *dev, \

			       struct device_attribute *attr, char *buf) \

{ return cmb_show_attr((dev), buf, cmb_##name); } \

static DEVICE_ATTR(avg_##name, 0444, show_avg_##name, NULL);
@@ -1131,7 +1142,8 @@ cmf_attr_avg(device_active_only_time); 
cmf_attr_avg(device_busy_time);

cmf_attr_avg(initial_command_response_time);



static DEVICE_ATTR(avg_sample_interval, 0444, cmb_show_avg_sample_interval, NULL);

static DEVICE_ATTR(avg_sample_interval, 0444, cmb_show_avg_sample_interval,

		   NULL);

static DEVICE_ATTR(avg_utilization, 0444, cmb_show_avg_utilization, NULL);



static struct attribute *cmf_attributes[] = {
@@ -1172,12 +1184,16 @@ static struct attribute_group cmf_attr_group_ext = { 
	.attrs = cmf_attributes_ext,

};



static ssize_t cmb_enable_show(struct device *dev, struct device_attribute *attr, char *buf)

static ssize_t cmb_enable_show(struct device *dev,

			       struct device_attribute *attr,

			       char *buf)

{

	return sprintf(buf, "%d\n", to_ccwdev(dev)->private->cmb ? 1 : 0);

}



static ssize_t cmb_enable_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t c)

static ssize_t cmb_enable_store(struct device *dev,

				struct device_attribute *attr, const char *buf,

				size_t c)

{

	struct ccw_device *cdev;

	int ret;
@@ -1203,8 +1219,7 @@ static ssize_t cmb_enable_store(struct device *dev, struct device_attribute *att 
DEVICE_ATTR(cmb_enable, 0644, cmb_enable_show, cmb_enable_store);



/* enable_cmf/disable_cmf: module interface for cmf (de)activation */

int

enable_cmf(struct ccw_device *cdev)

int enable_cmf(struct ccw_device *cdev)

{

	int ret;
@@ -1225,8 +1240,7 @@ enable_cmf(struct ccw_device *cdev) 
	return ret;

}



int

disable_cmf(struct ccw_device *cdev)

int disable_cmf(struct ccw_device *cdev)

{

	int ret;
@@ -1238,14 +1252,12 @@ disable_cmf(struct ccw_device *cdev) 
	return ret;

}



u64

cmf_read(struct ccw_device *cdev, int index)

u64 cmf_read(struct ccw_device *cdev, int index)

{

	return cmbops->read(cdev, index);

}



int

cmf_readall(struct ccw_device *cdev, struct cmbdata *data)

int cmf_readall(struct ccw_device *cdev, struct cmbdata *data)

{

	return cmbops->readall(cdev, data);

}
@@ -1257,15 +1269,16 @@ int cmf_reenable(struct ccw_device *cdev) 
	return cmbops->set(cdev, 2);

}



static int __init

init_cmf(void)

static int __init init_cmf(void)

{

	char *format_string;

	char *detect_string = "parameter";



	/* We cannot really autoprobe this. If the user did not give a parameter,

	   see if we are running on z990 or up, otherwise fall back to basic mode. */



	/*

	 * If the user did not give a parameter, see if we are running on a

	 * machine supporting extended measurement blocks, otherwise fall back

	 * to basic mode.

	 */

	if (format == CMF_AUTODETECT) {

		if (!css_characteristics_avail ||

		    !css_general_characteristics.ext_mb) {

include/asm-s390/cmb.h

+4 −4

File changed.

Contains only whitespace changes.