Commit 21ddaa53 authored by Christof Schmitt's avatar Christof Schmitt Committed by James Bottomley

[SCSI] zfcp: Remove PCI flag

The usage of the PCI flag to trigger interrupts is optional. Even
without setting the flag, qdio still receives interrupts to continue
working on the queue.  Remove the PCI flag from zfcp, it is not
necessary.
Acked-by: default avatarSwen Schillig <swen@vnet.ibm.com>
Signed-off-by: default avatarChristof Schmitt <christof.schmitt@de.ibm.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@HansenPartnership.com>
parent 5ffd51a5
...@@ -443,8 +443,6 @@ struct zfcp_adapter { ...@@ -443,8 +443,6 @@ struct zfcp_adapter {
spinlock_t req_list_lock; /* request list lock */ spinlock_t req_list_lock; /* request list lock */
struct zfcp_qdio_queue req_q; /* request queue */ struct zfcp_qdio_queue req_q; /* request queue */
spinlock_t req_q_lock; /* for operations on queue */ spinlock_t req_q_lock; /* for operations on queue */
int req_q_pci_batch; /* SBALs since PCI indication
was last set */
ktime_t req_q_time; /* time of last fill level change */ ktime_t req_q_time; /* time of last fill level change */
u64 req_q_util; /* for accounting */ u64 req_q_util; /* for accounting */
spinlock_t qdio_stat_lock; spinlock_t qdio_stat_lock;
......
...@@ -11,9 +11,6 @@ ...@@ -11,9 +11,6 @@
#include "zfcp_ext.h" #include "zfcp_ext.h"
/* FIXME(tune): free space should be one max. SBAL chain plus what? */
#define ZFCP_QDIO_PCI_INTERVAL (QDIO_MAX_BUFFERS_PER_Q \
- (FSF_MAX_SBALS_PER_REQ + 4))
#define QBUFF_PER_PAGE (PAGE_SIZE / sizeof(struct qdio_buffer)) #define QBUFF_PER_PAGE (PAGE_SIZE / sizeof(struct qdio_buffer))
static int zfcp_qdio_buffers_enqueue(struct qdio_buffer **sbal) static int zfcp_qdio_buffers_enqueue(struct qdio_buffer **sbal)
...@@ -364,23 +361,12 @@ int zfcp_qdio_send(struct zfcp_fsf_req *fsf_req) ...@@ -364,23 +361,12 @@ int zfcp_qdio_send(struct zfcp_fsf_req *fsf_req)
struct zfcp_qdio_queue *req_q = &adapter->req_q; struct zfcp_qdio_queue *req_q = &adapter->req_q;
int first = fsf_req->sbal_first; int first = fsf_req->sbal_first;
int count = fsf_req->sbal_number; int count = fsf_req->sbal_number;
int retval, pci, pci_batch; int retval;
struct qdio_buffer_element *sbale; unsigned int qdio_flags = QDIO_FLAG_SYNC_OUTPUT;
/* acknowledgements for transferred buffers */
pci_batch = adapter->req_q_pci_batch + count;
if (unlikely(pci_batch >= ZFCP_QDIO_PCI_INTERVAL)) {
pci_batch %= ZFCP_QDIO_PCI_INTERVAL;
pci = first + count - (pci_batch + 1);
pci %= QDIO_MAX_BUFFERS_PER_Q;
sbale = zfcp_qdio_sbale(req_q, pci, 0);
sbale->flags |= SBAL_FLAGS0_PCI;
}
zfcp_qdio_account(adapter); zfcp_qdio_account(adapter);
retval = do_QDIO(adapter->ccw_device, QDIO_FLAG_SYNC_OUTPUT, 0, first, retval = do_QDIO(adapter->ccw_device, qdio_flags, 0, first, count);
count);
if (unlikely(retval)) { if (unlikely(retval)) {
zfcp_qdio_zero_sbals(req_q->sbal, first, count); zfcp_qdio_zero_sbals(req_q->sbal, first, count);
return retval; return retval;
...@@ -390,7 +376,6 @@ int zfcp_qdio_send(struct zfcp_fsf_req *fsf_req) ...@@ -390,7 +376,6 @@ int zfcp_qdio_send(struct zfcp_fsf_req *fsf_req)
atomic_sub(count, &req_q->count); atomic_sub(count, &req_q->count);
req_q->first += count; req_q->first += count;
req_q->first %= QDIO_MAX_BUFFERS_PER_Q; req_q->first %= QDIO_MAX_BUFFERS_PER_Q;
adapter->req_q_pci_batch = pci_batch;
return 0; return 0;
} }
...@@ -461,7 +446,6 @@ void zfcp_qdio_close(struct zfcp_adapter *adapter) ...@@ -461,7 +446,6 @@ void zfcp_qdio_close(struct zfcp_adapter *adapter)
} }
req_q->first = 0; req_q->first = 0;
atomic_set(&req_q->count, 0); atomic_set(&req_q->count, 0);
adapter->req_q_pci_batch = 0;
adapter->resp_q.first = 0; adapter->resp_q.first = 0;
atomic_set(&adapter->resp_q.count, 0); atomic_set(&adapter->resp_q.count, 0);
} }
...@@ -499,7 +483,6 @@ int zfcp_qdio_open(struct zfcp_adapter *adapter) ...@@ -499,7 +483,6 @@ int zfcp_qdio_open(struct zfcp_adapter *adapter)
/* set index of first avalable SBALS / number of available SBALS */ /* set index of first avalable SBALS / number of available SBALS */
adapter->req_q.first = 0; adapter->req_q.first = 0;
atomic_set(&adapter->req_q.count, QDIO_MAX_BUFFERS_PER_Q); atomic_set(&adapter->req_q.count, QDIO_MAX_BUFFERS_PER_Q);
adapter->req_q_pci_batch = 0;
return 0; return 0;
......
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