aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/infiniband
diff options
context:
space:
mode:
authorDave Olson <dave.olson@qlogic.com>2008-01-07 00:02:34 -0500
committerRoland Dreier <rolandd@cisco.com>2008-01-25 17:15:38 -0500
commit9e2ef36b5a83b3c8ec1153382559dff410cc4341 (patch)
treef075e20c043c46afbab0320b5a92bac24592bd58 /drivers/infiniband
parent3029fcc3d44530601f19fd8f551ac195d3a918d7 (diff)
IB/ipath: Clean up some comments
Signed-off-by: Dave Olson <dave.olson@qlogic.com> Signed-off-by: Roland Dreier <rolandd@cisco.com>
Diffstat (limited to 'drivers/infiniband')
-rw-r--r--drivers/infiniband/hw/ipath/ipath_driver.c2
-rw-r--r--drivers/infiniband/hw/ipath/ipath_file_ops.c5
-rw-r--r--drivers/infiniband/hw/ipath/ipath_iba6110.c3
-rw-r--r--drivers/infiniband/hw/ipath/ipath_iba6120.c2
-rw-r--r--drivers/infiniband/hw/ipath/ipath_keys.c5
-rw-r--r--drivers/infiniband/hw/ipath/ipath_verbs.c7
6 files changed, 11 insertions, 13 deletions
diff --git a/drivers/infiniband/hw/ipath/ipath_driver.c b/drivers/infiniband/hw/ipath/ipath_driver.c
index 7c69090f6bd6..f130652cfaa3 100644
--- a/drivers/infiniband/hw/ipath/ipath_driver.c
+++ b/drivers/infiniband/hw/ipath/ipath_driver.c
@@ -1196,7 +1196,7 @@ reloop:
1196 be32_to_cpu(hdr->bth[0]) & 0xff); 1196 be32_to_cpu(hdr->bth[0]) & 0xff);
1197 else { 1197 else {
1198 /* 1198 /*
1199 * error packet, type of error unknown. 1199 * error packet, type of error unknown.
1200 * Probably type 3, but we don't know, so don't 1200 * Probably type 3, but we don't know, so don't
1201 * even try to print the opcode, etc. 1201 * even try to print the opcode, etc.
1202 */ 1202 */
diff --git a/drivers/infiniband/hw/ipath/ipath_file_ops.c b/drivers/infiniband/hw/ipath/ipath_file_ops.c
index 2a75faf1d108..9e5714d68ee1 100644
--- a/drivers/infiniband/hw/ipath/ipath_file_ops.c
+++ b/drivers/infiniband/hw/ipath/ipath_file_ops.c
@@ -1050,11 +1050,6 @@ static int mmap_piobufs(struct vm_area_struct *vma,
1050 1050
1051 phys = dd->ipath_physaddr + piobufs; 1051 phys = dd->ipath_physaddr + piobufs;
1052 1052
1053 /*
1054 * Don't mark this as non-cached, or we don't get the
1055 * write combining behavior we want on the PIO buffers!
1056 */
1057
1058#if defined(__powerpc__) 1053#if defined(__powerpc__)
1059 /* There isn't a generic way to specify writethrough mappings */ 1054 /* There isn't a generic way to specify writethrough mappings */
1060 pgprot_val(vma->vm_page_prot) |= _PAGE_NO_CACHE; 1055 pgprot_val(vma->vm_page_prot) |= _PAGE_NO_CACHE;
diff --git a/drivers/infiniband/hw/ipath/ipath_iba6110.c b/drivers/infiniband/hw/ipath/ipath_iba6110.c
index ce858797e299..dffb6826579a 100644
--- a/drivers/infiniband/hw/ipath/ipath_iba6110.c
+++ b/drivers/infiniband/hw/ipath/ipath_iba6110.c
@@ -1022,7 +1022,8 @@ static int ipath_setup_ht_config(struct ipath_devdata *dd,
1022 do { 1022 do {
1023 u8 cap_type; 1023 u8 cap_type;
1024 1024
1025 /* the HT capability type byte is 3 bytes after the 1025 /*
1026 * The HT capability type byte is 3 bytes after the
1026 * capability byte. 1027 * capability byte.
1027 */ 1028 */
1028 if (pci_read_config_byte(pdev, pos + 3, &cap_type)) { 1029 if (pci_read_config_byte(pdev, pos + 3, &cap_type)) {
diff --git a/drivers/infiniband/hw/ipath/ipath_iba6120.c b/drivers/infiniband/hw/ipath/ipath_iba6120.c
index 97ae11793973..66925b255ccd 100644
--- a/drivers/infiniband/hw/ipath/ipath_iba6120.c
+++ b/drivers/infiniband/hw/ipath/ipath_iba6120.c
@@ -535,7 +535,7 @@ static void ipath_pe_handle_hwerrors(struct ipath_devdata *dd, char *msg,
535 535
536 if (hwerrs & INFINIPATH_HWE_SERDESPLLFAILED) { 536 if (hwerrs & INFINIPATH_HWE_SERDESPLLFAILED) {
537 /* 537 /*
538 * If it occurs, it is left masked since the eternal 538 * If it occurs, it is left masked since the external
539 * interface is unused 539 * interface is unused
540 */ 540 */
541 dd->ipath_hwerrmask &= ~INFINIPATH_HWE_SERDESPLLFAILED; 541 dd->ipath_hwerrmask &= ~INFINIPATH_HWE_SERDESPLLFAILED;
diff --git a/drivers/infiniband/hw/ipath/ipath_keys.c b/drivers/infiniband/hw/ipath/ipath_keys.c
index 85a4aefc6c03..8f32b17a5eed 100644
--- a/drivers/infiniband/hw/ipath/ipath_keys.c
+++ b/drivers/infiniband/hw/ipath/ipath_keys.c
@@ -128,9 +128,8 @@ int ipath_lkey_ok(struct ipath_qp *qp, struct ipath_sge *isge,
128 int ret; 128 int ret;
129 129
130 /* 130 /*
131 * We use LKEY == zero to mean a physical kmalloc() address. 131 * We use LKEY == zero for kernel virtual addresses
132 * This is a bit of a hack since we rely on dma_map_single() 132 * (see ipath_get_dma_mr and ipath_dma.c).
133 * being reversible by calling bus_to_virt().
134 */ 133 */
135 if (sge->lkey == 0) { 134 if (sge->lkey == 0) {
136 struct ipath_pd *pd = to_ipd(qp->ibqp.pd); 135 struct ipath_pd *pd = to_ipd(qp->ibqp.pd);
diff --git a/drivers/infiniband/hw/ipath/ipath_verbs.c b/drivers/infiniband/hw/ipath/ipath_verbs.c
index a2baa618daf2..904ff1571ba6 100644
--- a/drivers/infiniband/hw/ipath/ipath_verbs.c
+++ b/drivers/infiniband/hw/ipath/ipath_verbs.c
@@ -943,7 +943,7 @@ bail:
943 * ipath_verbs_send - send a packet 943 * ipath_verbs_send - send a packet
944 * @qp: the QP to send on 944 * @qp: the QP to send on
945 * @hdr: the packet header 945 * @hdr: the packet header
946 * @hdrwords: the number of words in the header 946 * @hdrwords: the number of 32-bit words in the header
947 * @ss: the SGE to send 947 * @ss: the SGE to send
948 * @len: the length of the packet in bytes 948 * @len: the length of the packet in bytes
949 */ 949 */
@@ -955,7 +955,10 @@ int ipath_verbs_send(struct ipath_qp *qp, struct ipath_ib_header *hdr,
955 int ret; 955 int ret;
956 u32 dwords = (len + 3) >> 2; 956 u32 dwords = (len + 3) >> 2;
957 957
958 /* +1 is for the qword padding of pbc */ 958 /*
959 * Calculate the send buffer trigger address.
960 * The +1 counts for the pbc control dword following the pbc length.
961 */
959 plen = hdrwords + dwords + 1; 962 plen = hdrwords + dwords + 1;
960 963
961 /* Drop non-VL15 packets if we are not in the active state */ 964 /* Drop non-VL15 packets if we are not in the active state */