Skip to content

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

[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
Hide whitespace changes
Inline Side-by-side
Showing with 81 additions and 68 deletions
drivers/s390/cio/cmf.c
View file @ fc5019c5
...@@ -45,7 +45,8 @@ ...@@ -45,7 +45,8 @@
#include "ioasm.h" #include "ioasm.h"
#include "chsc.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 * "s390cmf" -- enable cmf and allocate 2 MB of ram so measuring can be
* used on any subchannel * used on any subchannel
* "s390cmf=<num>" -- enable cmf and allocate enough memory to measure * "s390cmf=<num>" -- enable cmf and allocate enough memory to measure
...@@ -84,6 +85,7 @@ enum cmb_format { ...@@ -84,6 +85,7 @@ enum cmb_format {
CMF_EXTENDED, CMF_EXTENDED,
CMF_AUTODETECT = -1, CMF_AUTODETECT = -1,
}; };
/** /**
* format - actual format for all measurement blocks * format - actual format for all measurement blocks
* *
...@@ -111,13 +113,13 @@ module_param(format, bool, 0444); ...@@ -111,13 +113,13 @@ module_param(format, bool, 0444);
* @align: align an allocated block so that the hardware can use it * @align: align an allocated block so that the hardware can use it
*/ */
struct cmb_operations { struct cmb_operations {
int (*alloc) (struct ccw_device*); int (*alloc) (struct ccw_device *);
void(*free) (struct ccw_device*); void (*free) (struct ccw_device *);
int (*set) (struct ccw_device*, u32); int (*set) (struct ccw_device *, u32);
u64 (*read) (struct ccw_device*, int); u64 (*read) (struct ccw_device *, int);
int (*readall)(struct ccw_device*, struct cmbdata *); int (*readall)(struct ccw_device *, struct cmbdata *);
void (*reset) (struct ccw_device*); void (*reset) (struct ccw_device *);
void * (*align) (void *); void *(*align) (void *);
struct attribute_group *attr_group; struct attribute_group *attr_group;
}; };
...@@ -130,9 +132,11 @@ struct cmb_data { ...@@ -130,9 +132,11 @@ struct cmb_data {
unsigned long long last_update; /* when last_block was updated */ 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 * while the hardware measures total times in its own
* unit.*/ * unit.
*/
static inline u64 time_to_nsec(u32 value) static inline u64 time_to_nsec(u32 value)
{ {
return ((u64)value) * 128000ull; return ((u64)value) * 128000ull;
...@@ -159,12 +163,13 @@ static inline u64 time_to_avg_nsec(u32 value, u32 count) ...@@ -159,12 +163,13 @@ static inline u64 time_to_avg_nsec(u32 value, u32 count)
return ret; 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 * the monitor is deactivated. The channel monitor needs to
* be active in order to measure subchannels, which also need * be active in order to measure subchannels, which also need
* to be enabled. */ * to be enabled.
static inline void */
cmf_activate(void *area, unsigned int onoff) static inline void cmf_activate(void *area, unsigned int onoff)
{ {
register void * __gpr2 asm("2"); register void * __gpr2 asm("2");
register long __gpr1 asm("1"); register long __gpr1 asm("1");
...@@ -175,8 +180,8 @@ cmf_activate(void *area, unsigned int onoff) ...@@ -175,8 +180,8 @@ cmf_activate(void *area, unsigned int onoff)
asm("schm" : : "d" (__gpr2), "d" (__gpr1) ); asm("schm" : : "d" (__gpr2), "d" (__gpr1) );
} }
static int static int set_schib(struct ccw_device *cdev, u32 mme, int mbfc,
set_schib(struct ccw_device *cdev, u32 mme, int mbfc, unsigned long address) unsigned long address)
{ {
int ret; int ret;
int retry; int retry;
...@@ -484,15 +489,14 @@ static struct cmb_area cmb_area = { ...@@ -484,15 +489,14 @@ static struct cmb_area cmb_area = {
/* ****** old style CMB handling ********/ /* ****** old style CMB handling ********/
/** int maxchannels /*
*
* Basic channel measurement blocks are allocated in one contiguous * Basic channel measurement blocks are allocated in one contiguous
* block of memory, which can not be moved as long as any channel * block of memory, which can not be moved as long as any channel
* is active. Therefore, a maximum number of subchannels needs to * is active. Therefore, a maximum number of subchannels needs to
* be defined somewhere. This is a module parameter, defaulting to * be defined somewhere. This is a module parameter, defaulting to
* a resonable value of 1024, or 32 kb of memory. * a resonable value of 1024, or 32 kb of memory.
* Current kernels don't allow kmalloc with more than 128kb, so the * 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); module_param_named(maxchannels, cmb_area.num_channels, uint, 0444);
...@@ -516,8 +520,9 @@ struct cmb { ...@@ -516,8 +520,9 @@ struct cmb {
u32 reserved[2]; 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, static int alloc_cmb_single(struct ccw_device *cdev,
struct cmb_data *cmb_data) struct cmb_data *cmb_data)
...@@ -532,9 +537,11 @@ static int alloc_cmb_single(struct ccw_device *cdev, ...@@ -532,9 +537,11 @@ static int alloc_cmb_single(struct ccw_device *cdev,
goto out; goto out;
} }
/* find first unused cmb in cmb_area.mem. /*
* this is a little tricky: cmb_area.list * Find first unused cmb in cmb_area.mem.
* remains sorted by ->cmb->hw_data pointers */ * This is a little tricky: cmb_area.list
* remains sorted by ->cmb->hw_data pointers.
*/
cmb = cmb_area.mem; cmb = cmb_area.mem;
list_for_each_entry(node, &cmb_area.list, cmb_list) { list_for_each_entry(node, &cmb_area.list, cmb_list) {
struct cmb_data *data; struct cmb_data *data;
...@@ -558,8 +565,7 @@ static int alloc_cmb_single(struct ccw_device *cdev, ...@@ -558,8 +565,7 @@ static int alloc_cmb_single(struct ccw_device *cdev,
return ret; return ret;
} }
static int static int alloc_cmb(struct ccw_device *cdev)
alloc_cmb (struct ccw_device *cdev)
{ {
int ret; int ret;
struct cmb *mem; struct cmb *mem;
...@@ -670,7 +676,7 @@ static int set_cmb(struct ccw_device *cdev, u32 mme) ...@@ -670,7 +676,7 @@ static int set_cmb(struct ccw_device *cdev, u32 mme)
return set_schib_wait(cdev, mme, 0, offset); return set_schib_wait(cdev, mme, 0, offset);
} }
static u64 read_cmb (struct ccw_device *cdev, int index) static u64 read_cmb(struct ccw_device *cdev, int index)
{ {
struct cmb *cmb; struct cmb *cmb;
u32 val; u32 val;
...@@ -720,7 +726,7 @@ static u64 read_cmb (struct ccw_device *cdev, int index) ...@@ -720,7 +726,7 @@ static u64 read_cmb (struct ccw_device *cdev, int index)
return ret; return ret;
} }
static int readall_cmb (struct ccw_device *cdev, struct cmbdata *data) static int readall_cmb(struct ccw_device *cdev, struct cmbdata *data)
{ {
struct cmb *cmb; struct cmb *cmb;
struct cmb_data *cmb_data; struct cmb_data *cmb_data;
...@@ -816,10 +822,12 @@ struct cmbe { ...@@ -816,10 +822,12 @@ struct cmbe {
u32 reserved[7]; 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 * 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) */
static inline struct cmbe *cmbe_align(struct cmbe *c)
{ {
unsigned long addr; unsigned long addr;
addr = ((unsigned long)c + sizeof (struct cmbe) - sizeof(long)) & addr = ((unsigned long)c + sizeof (struct cmbe) - sizeof(long)) &
...@@ -827,7 +835,7 @@ static inline struct cmbe* cmbe_align(struct cmbe *c) ...@@ -827,7 +835,7 @@ static inline struct cmbe* cmbe_align(struct cmbe *c)
return (struct cmbe*)addr; return (struct cmbe*)addr;
} }
static int alloc_cmbe (struct ccw_device *cdev) static int alloc_cmbe(struct ccw_device *cdev)
{ {
struct cmbe *cmbe; struct cmbe *cmbe;
struct cmb_data *cmb_data; struct cmb_data *cmb_data;
...@@ -873,7 +881,7 @@ static int alloc_cmbe (struct ccw_device *cdev) ...@@ -873,7 +881,7 @@ static int alloc_cmbe (struct ccw_device *cdev)
return ret; return ret;
} }
static void free_cmbe (struct ccw_device *cdev) static void free_cmbe(struct ccw_device *cdev)
{ {
struct cmb_data *cmb_data; struct cmb_data *cmb_data;
...@@ -912,7 +920,7 @@ static int set_cmbe(struct ccw_device *cdev, u32 mme) ...@@ -912,7 +920,7 @@ static int set_cmbe(struct ccw_device *cdev, u32 mme)
} }
static u64 read_cmbe (struct ccw_device *cdev, int index) static u64 read_cmbe(struct ccw_device *cdev, int index)
{ {
struct cmbe *cmb; struct cmbe *cmb;
struct cmb_data *cmb_data; struct cmb_data *cmb_data;
...@@ -970,7 +978,7 @@ static u64 read_cmbe (struct ccw_device *cdev, int index) ...@@ -970,7 +978,7 @@ static u64 read_cmbe (struct ccw_device *cdev, int index)
return ret; return ret;
} }
static int readall_cmbe (struct ccw_device *cdev, struct cmbdata *data) static int readall_cmbe(struct ccw_device *cdev, struct cmbdata *data)
{ {
struct cmbe *cmb; struct cmbe *cmb;
struct cmb_data *cmb_data; struct cmb_data *cmb_data;
...@@ -1049,15 +1057,15 @@ static struct cmb_operations cmbops_extended = { ...@@ -1049,15 +1057,15 @@ static struct cmb_operations cmbops_extended = {
}; };
static ssize_t static ssize_t cmb_show_attr(struct device *dev, char *buf, enum cmb_index idx)
cmb_show_attr(struct device *dev, char *buf, enum cmb_index idx)
{ {
return sprintf(buf, "%lld\n", return sprintf(buf, "%lld\n",
(unsigned long long) cmf_read(to_ccwdev(dev), idx)); (unsigned long long) cmf_read(to_ccwdev(dev), idx));
} }
static ssize_t static ssize_t cmb_show_avg_sample_interval(struct device *dev,
cmb_show_avg_sample_interval(struct device *dev, struct device_attribute *attr, char *buf) struct device_attribute *attr,
char *buf)
{ {
struct ccw_device *cdev; struct ccw_device *cdev;
long interval; long interval;
...@@ -1079,8 +1087,9 @@ cmb_show_avg_sample_interval(struct device *dev, struct device_attribute *attr, ...@@ -1079,8 +1087,9 @@ cmb_show_avg_sample_interval(struct device *dev, struct device_attribute *attr,
return sprintf(buf, "%ld\n", interval); return sprintf(buf, "%ld\n", interval);
} }
static ssize_t static ssize_t cmb_show_avg_utilization(struct device *dev,
cmb_show_avg_utilization(struct device *dev, struct device_attribute *attr, char *buf) struct device_attribute *attr,
char *buf)
{ {
struct cmbdata data; struct cmbdata data;
u64 utilization; u64 utilization;
...@@ -1112,14 +1121,16 @@ cmb_show_avg_utilization(struct device *dev, struct device_attribute *attr, char ...@@ -1112,14 +1121,16 @@ cmb_show_avg_utilization(struct device *dev, struct device_attribute *attr, char
} }
#define cmf_attr(name) \ #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, \
{ return cmb_show_attr((dev), buf, cmb_ ## name); } \ struct device_attribute *attr, char *buf) \
static DEVICE_ATTR(name, 0444, show_ ## name, NULL); { return cmb_show_attr((dev), buf, cmb_##name); } \
static DEVICE_ATTR(name, 0444, show_##name, NULL);
#define cmf_attr_avg(name) \ #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, \
{ return cmb_show_attr((dev), buf, cmb_ ## name); } \ struct device_attribute *attr, char *buf) \
static DEVICE_ATTR(avg_ ## name, 0444, show_avg_ ## name, NULL); { return cmb_show_attr((dev), buf, cmb_##name); } \
static DEVICE_ATTR(avg_##name, 0444, show_avg_##name, NULL);
cmf_attr(ssch_rsch_count); cmf_attr(ssch_rsch_count);
cmf_attr(sample_count); cmf_attr(sample_count);
...@@ -1131,7 +1142,8 @@ cmf_attr_avg(device_active_only_time); ...@@ -1131,7 +1142,8 @@ cmf_attr_avg(device_active_only_time);
cmf_attr_avg(device_busy_time); cmf_attr_avg(device_busy_time);
cmf_attr_avg(initial_command_response_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 DEVICE_ATTR(avg_utilization, 0444, cmb_show_avg_utilization, NULL);
static struct attribute *cmf_attributes[] = { static struct attribute *cmf_attributes[] = {
...@@ -1172,12 +1184,16 @@ static struct attribute_group cmf_attr_group_ext = { ...@@ -1172,12 +1184,16 @@ static struct attribute_group cmf_attr_group_ext = {
.attrs = cmf_attributes_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); 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; struct ccw_device *cdev;
int ret; int ret;
...@@ -1203,8 +1219,7 @@ static ssize_t cmb_enable_store(struct device *dev, struct device_attribute *att ...@@ -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); DEVICE_ATTR(cmb_enable, 0644, cmb_enable_show, cmb_enable_store);
/* enable_cmf/disable_cmf: module interface for cmf (de)activation */ /* enable_cmf/disable_cmf: module interface for cmf (de)activation */
int int enable_cmf(struct ccw_device *cdev)
enable_cmf(struct ccw_device *cdev)
{ {
int ret; int ret;
...@@ -1225,8 +1240,7 @@ enable_cmf(struct ccw_device *cdev) ...@@ -1225,8 +1240,7 @@ enable_cmf(struct ccw_device *cdev)
return ret; return ret;
} }
int int disable_cmf(struct ccw_device *cdev)
disable_cmf(struct ccw_device *cdev)
{ {
int ret; int ret;
...@@ -1238,14 +1252,12 @@ disable_cmf(struct ccw_device *cdev) ...@@ -1238,14 +1252,12 @@ disable_cmf(struct ccw_device *cdev)
return ret; return ret;
} }
u64 u64 cmf_read(struct ccw_device *cdev, int index)
cmf_read(struct ccw_device *cdev, int index)
{ {
return cmbops->read(cdev, index); return cmbops->read(cdev, index);
} }
int int cmf_readall(struct ccw_device *cdev, struct cmbdata *data)
cmf_readall(struct ccw_device *cdev, struct cmbdata *data)
{ {
return cmbops->readall(cdev, data); return cmbops->readall(cdev, data);
} }
...@@ -1257,15 +1269,16 @@ int cmf_reenable(struct ccw_device *cdev) ...@@ -1257,15 +1269,16 @@ int cmf_reenable(struct ccw_device *cdev)
return cmbops->set(cdev, 2); return cmbops->set(cdev, 2);
} }
static int __init static int __init init_cmf(void)
init_cmf(void)
{ {
char *format_string; char *format_string;
char *detect_string = "parameter"; 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 (format == CMF_AUTODETECT) {
if (!css_characteristics_avail || if (!css_characteristics_avail ||
!css_general_characteristics.ext_mb) { !css_general_characteristics.ext_mb) {
...@@ -1284,7 +1297,7 @@ init_cmf(void) ...@@ -1284,7 +1297,7 @@ init_cmf(void)
cmbops = &cmbops_basic; cmbops = &cmbops_basic;
break; break;
case CMF_EXTENDED: case CMF_EXTENDED:
format_string = "extended"; format_string = "extended";
cmbops = &cmbops_extended; cmbops = &cmbops_extended;
break; break;
default: default:
......
include/asm-s390/cmb.h
View file @ fc5019c5
...@@ -41,11 +41,11 @@ struct cmbdata { ...@@ -41,11 +41,11 @@ struct cmbdata {
}; };
/* enable channel measurement */ /* enable channel measurement */
#define BIODASDCMFENABLE _IO(DASD_IOCTL_LETTER,32) #define BIODASDCMFENABLE _IO(DASD_IOCTL_LETTER, 32)
/* enable channel measurement */ /* enable channel measurement */
#define BIODASDCMFDISABLE _IO(DASD_IOCTL_LETTER,33) #define BIODASDCMFDISABLE _IO(DASD_IOCTL_LETTER, 33)
/* read channel measurement data */ /* read channel measurement data */
#define BIODASDREADALLCMB _IOWR(DASD_IOCTL_LETTER,33,struct cmbdata) #define BIODASDREADALLCMB _IOWR(DASD_IOCTL_LETTER, 33, struct cmbdata)
#ifdef __KERNEL__ #ifdef __KERNEL__
struct ccw_device; struct ccw_device;
...@@ -87,7 +87,7 @@ extern u64 cmf_read(struct ccw_device *cdev, int index); ...@@ -87,7 +87,7 @@ extern u64 cmf_read(struct ccw_device *cdev, int index);
* Context: * Context:
* any * any
**/ **/
extern int cmf_readall(struct ccw_device *cdev, struct cmbdata*data); extern int cmf_readall(struct ccw_device *cdev, struct cmbdata *data);
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
#endif /* S390_CMB_H */ #endif /* S390_CMB_H */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7