genwqe: Make defines uppercase
This is a clean-up patch, no functional changes intended. It makes all defines uppercase, following a "tradition" that helps to make code clearer. Signed-off-by: Guilherme G. Piccoli <gpiccoli@linux.vnet.ibm.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
07864a1779
commit
9d14e76618
|
@ -153,11 +153,11 @@ static struct genwqe_dev *genwqe_dev_alloc(void)
|
|||
cd->card_state = GENWQE_CARD_UNUSED;
|
||||
spin_lock_init(&cd->print_lock);
|
||||
|
||||
cd->ddcb_software_timeout = genwqe_ddcb_software_timeout;
|
||||
cd->kill_timeout = genwqe_kill_timeout;
|
||||
cd->ddcb_software_timeout = GENWQE_DDCB_SOFTWARE_TIMEOUT;
|
||||
cd->kill_timeout = GENWQE_KILL_TIMEOUT;
|
||||
|
||||
for (j = 0; j < GENWQE_MAX_VFS; j++)
|
||||
cd->vf_jobtimeout_msec[j] = genwqe_vf_jobtimeout_msec;
|
||||
cd->vf_jobtimeout_msec[j] = GENWQE_VF_JOBTIMEOUT_MSEC;
|
||||
|
||||
genwqe_devices[i] = cd;
|
||||
return cd;
|
||||
|
@ -324,11 +324,11 @@ static bool genwqe_setup_pf_jtimer(struct genwqe_dev *cd)
|
|||
u32 T = genwqe_T_psec(cd);
|
||||
u64 x;
|
||||
|
||||
if (genwqe_pf_jobtimeout_msec == 0)
|
||||
if (GENWQE_PF_JOBTIMEOUT_MSEC == 0)
|
||||
return false;
|
||||
|
||||
/* PF: large value needed, flash update 2sec per block */
|
||||
x = ilog2(genwqe_pf_jobtimeout_msec *
|
||||
x = ilog2(GENWQE_PF_JOBTIMEOUT_MSEC *
|
||||
16000000000uL/(T * 15)) - 10;
|
||||
|
||||
genwqe_write_vreg(cd, IO_SLC_VF_APPJOB_TIMEOUT,
|
||||
|
@ -904,7 +904,7 @@ static int genwqe_reload_bistream(struct genwqe_dev *cd)
|
|||
* b) a critical GFIR occured
|
||||
*
|
||||
* Informational GFIRs are checked and potentially printed in
|
||||
* health_check_interval seconds.
|
||||
* GENWQE_HEALTH_CHECK_INTERVAL seconds.
|
||||
*/
|
||||
static int genwqe_health_thread(void *data)
|
||||
{
|
||||
|
@ -918,7 +918,7 @@ static int genwqe_health_thread(void *data)
|
|||
rc = wait_event_interruptible_timeout(cd->health_waitq,
|
||||
(genwqe_health_check_cond(cd, &gfir) ||
|
||||
(should_stop = kthread_should_stop())),
|
||||
genwqe_health_check_interval * HZ);
|
||||
GENWQE_HEALTH_CHECK_INTERVAL * HZ);
|
||||
|
||||
if (should_stop)
|
||||
break;
|
||||
|
@ -1028,7 +1028,7 @@ static int genwqe_health_check_start(struct genwqe_dev *cd)
|
|||
{
|
||||
int rc;
|
||||
|
||||
if (genwqe_health_check_interval <= 0)
|
||||
if (GENWQE_HEALTH_CHECK_INTERVAL <= 0)
|
||||
return 0; /* valid for disabling the service */
|
||||
|
||||
/* moved before request_irq() */
|
||||
|
|
|
@ -47,13 +47,13 @@
|
|||
#define GENWQE_CARD_NO_MAX (16 * GENWQE_MAX_FUNCS)
|
||||
|
||||
/* Compile parameters, some of them appear in debugfs for later adjustment */
|
||||
#define genwqe_ddcb_max 32 /* DDCBs on the work-queue */
|
||||
#define genwqe_polling_enabled 0 /* in case of irqs not working */
|
||||
#define genwqe_ddcb_software_timeout 10 /* timeout per DDCB in seconds */
|
||||
#define genwqe_kill_timeout 8 /* time until process gets killed */
|
||||
#define genwqe_vf_jobtimeout_msec 250 /* 250 msec */
|
||||
#define genwqe_pf_jobtimeout_msec 8000 /* 8 sec should be ok */
|
||||
#define genwqe_health_check_interval 4 /* <= 0: disabled */
|
||||
#define GENWQE_DDCB_MAX 32 /* DDCBs on the work-queue */
|
||||
#define GENWQE_POLLING_ENABLED 0 /* in case of irqs not working */
|
||||
#define GENWQE_DDCB_SOFTWARE_TIMEOUT 10 /* timeout per DDCB in seconds */
|
||||
#define GENWQE_KILL_TIMEOUT 8 /* time until process gets killed */
|
||||
#define GENWQE_VF_JOBTIMEOUT_MSEC 250 /* 250 msec */
|
||||
#define GENWQE_PF_JOBTIMEOUT_MSEC 8000 /* 8 sec should be ok */
|
||||
#define GENWQE_HEALTH_CHECK_INTERVAL 4 /* <= 0: disabled */
|
||||
|
||||
/* Sysfs attribute groups used when we create the genwqe device */
|
||||
extern const struct attribute_group *genwqe_attribute_groups[];
|
||||
|
|
|
@ -500,7 +500,7 @@ int __genwqe_wait_ddcb(struct genwqe_dev *cd, struct ddcb_requ *req)
|
|||
|
||||
rc = wait_event_interruptible_timeout(queue->ddcb_waitqs[ddcb_no],
|
||||
ddcb_requ_finished(cd, req),
|
||||
genwqe_ddcb_software_timeout * HZ);
|
||||
GENWQE_DDCB_SOFTWARE_TIMEOUT * HZ);
|
||||
|
||||
/*
|
||||
* We need to distinguish 3 cases here:
|
||||
|
@ -633,7 +633,7 @@ int __genwqe_purge_ddcb(struct genwqe_dev *cd, struct ddcb_requ *req)
|
|||
__be32 old, new;
|
||||
|
||||
/* unsigned long flags; */
|
||||
if (genwqe_ddcb_software_timeout <= 0) {
|
||||
if (GENWQE_DDCB_SOFTWARE_TIMEOUT <= 0) {
|
||||
dev_err(&pci_dev->dev,
|
||||
"[%s] err: software timeout is not set!\n", __func__);
|
||||
return -EFAULT;
|
||||
|
@ -641,7 +641,7 @@ int __genwqe_purge_ddcb(struct genwqe_dev *cd, struct ddcb_requ *req)
|
|||
|
||||
pddcb = &queue->ddcb_vaddr[req->num];
|
||||
|
||||
for (t = 0; t < genwqe_ddcb_software_timeout * 10; t++) {
|
||||
for (t = 0; t < GENWQE_DDCB_SOFTWARE_TIMEOUT * 10; t++) {
|
||||
|
||||
spin_lock_irqsave(&queue->ddcb_lock, flags);
|
||||
|
||||
|
@ -718,7 +718,7 @@ go_home:
|
|||
|
||||
dev_err(&pci_dev->dev,
|
||||
"[%s] err: DDCB#%d not purged and not completed after %d seconds QSTAT=%016llx!!\n",
|
||||
__func__, req->num, genwqe_ddcb_software_timeout,
|
||||
__func__, req->num, GENWQE_DDCB_SOFTWARE_TIMEOUT,
|
||||
queue_status);
|
||||
|
||||
print_ddcb_info(cd, req->queue);
|
||||
|
@ -778,7 +778,7 @@ int __genwqe_enqueue_ddcb(struct genwqe_dev *cd, struct ddcb_requ *req,
|
|||
/* FIXME circumvention to improve performance when no irq is
|
||||
* there.
|
||||
*/
|
||||
if (genwqe_polling_enabled)
|
||||
if (GENWQE_POLLING_ENABLED)
|
||||
genwqe_check_ddcb_queue(cd, queue);
|
||||
|
||||
/*
|
||||
|
@ -878,7 +878,7 @@ int __genwqe_enqueue_ddcb(struct genwqe_dev *cd, struct ddcb_requ *req,
|
|||
pddcb->icrc_hsi_shi_32 = cpu_to_be32((u32)icrc << 16);
|
||||
|
||||
/* enable DDCB completion irq */
|
||||
if (!genwqe_polling_enabled)
|
||||
if (!GENWQE_POLLING_ENABLED)
|
||||
pddcb->icrc_hsi_shi_32 |= DDCB_INTR_BE32;
|
||||
|
||||
dev_dbg(&pci_dev->dev, "INPUT DDCB#%d\n", req->num);
|
||||
|
@ -1028,10 +1028,10 @@ static int setup_ddcb_queue(struct genwqe_dev *cd, struct ddcb_queue *queue)
|
|||
unsigned int queue_size;
|
||||
struct pci_dev *pci_dev = cd->pci_dev;
|
||||
|
||||
if (genwqe_ddcb_max < 2)
|
||||
if (GENWQE_DDCB_MAX < 2)
|
||||
return -EINVAL;
|
||||
|
||||
queue_size = roundup(genwqe_ddcb_max * sizeof(struct ddcb), PAGE_SIZE);
|
||||
queue_size = roundup(GENWQE_DDCB_MAX * sizeof(struct ddcb), PAGE_SIZE);
|
||||
|
||||
queue->ddcbs_in_flight = 0; /* statistics */
|
||||
queue->ddcbs_max_in_flight = 0;
|
||||
|
@ -1040,7 +1040,7 @@ static int setup_ddcb_queue(struct genwqe_dev *cd, struct ddcb_queue *queue)
|
|||
queue->wait_on_busy = 0;
|
||||
|
||||
queue->ddcb_seq = 0x100; /* start sequence number */
|
||||
queue->ddcb_max = genwqe_ddcb_max; /* module parameter */
|
||||
queue->ddcb_max = GENWQE_DDCB_MAX;
|
||||
queue->ddcb_vaddr = __genwqe_alloc_consistent(cd, queue_size,
|
||||
&queue->ddcb_daddr);
|
||||
if (queue->ddcb_vaddr == NULL) {
|
||||
|
@ -1194,7 +1194,7 @@ static int genwqe_card_thread(void *data)
|
|||
|
||||
genwqe_check_ddcb_queue(cd, &cd->queue);
|
||||
|
||||
if (genwqe_polling_enabled) {
|
||||
if (GENWQE_POLLING_ENABLED) {
|
||||
rc = wait_event_interruptible_timeout(
|
||||
cd->queue_waitq,
|
||||
genwqe_ddcbs_in_flight(cd) ||
|
||||
|
@ -1340,7 +1340,7 @@ static int queue_wake_up_all(struct genwqe_dev *cd)
|
|||
int genwqe_finish_queue(struct genwqe_dev *cd)
|
||||
{
|
||||
int i, rc = 0, in_flight;
|
||||
int waitmax = genwqe_ddcb_software_timeout;
|
||||
int waitmax = GENWQE_DDCB_SOFTWARE_TIMEOUT;
|
||||
struct pci_dev *pci_dev = cd->pci_dev;
|
||||
struct ddcb_queue *queue = &cd->queue;
|
||||
|
||||
|
|
|
@ -198,7 +198,7 @@ static int genwqe_jtimer_show(struct seq_file *s, void *unused)
|
|||
|
||||
jtimer = genwqe_read_vreg(cd, IO_SLC_VF_APPJOB_TIMEOUT, 0);
|
||||
seq_printf(s, " PF 0x%016llx %d msec\n", jtimer,
|
||||
genwqe_pf_jobtimeout_msec);
|
||||
GENWQE_PF_JOBTIMEOUT_MSEC);
|
||||
|
||||
for (vf_num = 0; vf_num < cd->num_vfs; vf_num++) {
|
||||
jtimer = genwqe_read_vreg(cd, IO_SLC_VF_APPJOB_TIMEOUT,
|
||||
|
|
|
@ -1342,7 +1342,7 @@ static int genwqe_inform_and_stop_processes(struct genwqe_dev *cd)
|
|||
rc = genwqe_kill_fasync(cd, SIGIO);
|
||||
if (rc > 0) {
|
||||
/* give kill_timeout seconds to close file descriptors ... */
|
||||
for (i = 0; (i < genwqe_kill_timeout) &&
|
||||
for (i = 0; (i < GENWQE_KILL_TIMEOUT) &&
|
||||
genwqe_open_files(cd); i++) {
|
||||
dev_info(&pci_dev->dev, " %d sec ...", i);
|
||||
|
||||
|
@ -1360,7 +1360,7 @@ static int genwqe_inform_and_stop_processes(struct genwqe_dev *cd)
|
|||
rc = genwqe_force_sig(cd, SIGKILL); /* force terminate */
|
||||
if (rc) {
|
||||
/* Give kill_timout more seconds to end processes */
|
||||
for (i = 0; (i < genwqe_kill_timeout) &&
|
||||
for (i = 0; (i < GENWQE_KILL_TIMEOUT) &&
|
||||
genwqe_open_files(cd); i++) {
|
||||
dev_warn(&pci_dev->dev, " %d sec ...", i);
|
||||
|
||||
|
|
Loading…
Reference in a new issue