xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

s390/cio: use basic blocks for cmf inline assemblies

Browse Source 
Use only simple inline assemblies which consist of a single basic
block if the register asm construct is being used.

Otherwise gcc would generate broken code if the compiler option
--sanitize-coverage=trace-pc would be used.

Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Acked-by: Sebastian Ott <sebott@linux.vnet.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
This commit is contained in:
Heiko Carstens
2016-06-20 14:03:38 +02:00
committed by Martin Schwidefsky
parent 7b411ac6b7
commit 7b4ff87cbf
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/s390/cio/cmf.c
View File

@@ -164,6 +164,9 @@ static inline u64 time_to_avg_nsec(u32 value, u32 count)
return ret; return ret;
} }
#define CMF_OFF 0
#define CMF_ON 2
/* /*
* 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
@@ -176,7 +179,7 @@ static inline void cmf_activate(void *area, unsigned int onoff)
register long __gpr1 asm("1"); register long __gpr1 asm("1");
__gpr2 = area; __gpr2 = area;
__gpr1 = onoff ? 2 : 0; __gpr1 = onoff;
/* activate channel measurement */ /* activate channel measurement */
asm("schm" : : "d" (__gpr2), "d" (__gpr1) ); asm("schm" : : "d" (__gpr2), "d" (__gpr1) );
} }
@@ -587,7 +590,7 @@ static int alloc_cmb(struct ccw_device *cdev)
/* everything ok */ /* everything ok */
memset(mem, 0, size); memset(mem, 0, size);
cmb_area.mem = mem; cmb_area.mem = mem;
cmf_activate(cmb_area.mem, 1); cmf_activate(cmb_area.mem, CMF_ON);
} }
} }
@@ -621,7 +624,7 @@ static void free_cmb(struct ccw_device *cdev)
if (list_empty(&cmb_area.list)) { if (list_empty(&cmb_area.list)) {
ssize_t size; ssize_t size;
size = sizeof(struct cmb) * cmb_area.num_channels; size = sizeof(struct cmb) * cmb_area.num_channels;
cmf_activate(NULL, 0); cmf_activate(NULL, CMF_OFF);
free_pages((unsigned long)cmb_area.mem, get_order(size)); free_pages((unsigned long)cmb_area.mem, get_order(size));
cmb_area.mem = NULL; cmb_area.mem = NULL;
} }
@@ -830,7 +833,7 @@ static int alloc_cmbe(struct ccw_device *cdev)
/* activate global measurement if this is the first channel */ /* activate global measurement if this is the first channel */
if (list_empty(&cmb_area.list)) if (list_empty(&cmb_area.list))
cmf_activate(NULL, 1); cmf_activate(NULL, CMF_ON);
list_add_tail(&cdev->private->cmb_list, &cmb_area.list); list_add_tail(&cdev->private->cmb_list, &cmb_area.list);
spin_unlock_irq(cdev->ccwlock); spin_unlock_irq(cdev->ccwlock);
@@ -867,7 +870,7 @@ static void free_cmbe(struct ccw_device *cdev)
/* deactivate global measurement if this is the last channel */ /* deactivate global measurement if this is the last channel */
list_del_init(&cdev->private->cmb_list); list_del_init(&cdev->private->cmb_list);
if (list_empty(&cmb_area.list)) if (list_empty(&cmb_area.list))
cmf_activate(NULL, 0); cmf_activate(NULL, CMF_OFF);
spin_unlock_irq(cdev->ccwlock); spin_unlock_irq(cdev->ccwlock);
spin_unlock(&cmb_area.lock); spin_unlock(&cmb_area.lock);
} }
@@ -1321,7 +1324,7 @@ void cmf_reactivate(void)
{ {
spin_lock(&cmb_area.lock); spin_lock(&cmb_area.lock);
if (!list_empty(&cmb_area.list)) if (!list_empty(&cmb_area.list))
cmf_activate(cmb_area.mem, 1); cmf_activate(cmb_area.mem, CMF_ON);
spin_unlock(&cmb_area.lock); spin_unlock(&cmb_area.lock);
} }