aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--drivers/staging/slicoss/slicoss.c39
1 files changed, 26 insertions, 13 deletions
diff --git a/drivers/staging/slicoss/slicoss.c b/drivers/staging/slicoss/slicoss.c
index cff7cbea526b..42d62ef56cb8 100644
--- a/drivers/staging/slicoss/slicoss.c
+++ b/drivers/staging/slicoss/slicoss.c
@@ -498,12 +498,14 @@ static int slic_card_download(struct adapter *adapter)
498 slic_reg32_write(&slic_regs->slic_wcs, 498 slic_reg32_write(&slic_regs->slic_wcs,
499 baseaddress + codeaddr, FLUSH); 499 baseaddress + codeaddr, FLUSH);
500 /* Write out instruction to low addr */ 500 /* Write out instruction to low addr */
501 slic_reg32_write(&slic_regs->slic_wcs, instruction, FLUSH); 501 slic_reg32_write(&slic_regs->slic_wcs,
502 instruction, FLUSH);
502 instruction = *(u32 *)(fw->data + index); 503 instruction = *(u32 *)(fw->data + index);
503 index += 4; 504 index += 4;
504 505
505 /* Write out instruction to high addr */ 506 /* Write out instruction to high addr */
506 slic_reg32_write(&slic_regs->slic_wcs, instruction, FLUSH); 507 slic_reg32_write(&slic_regs->slic_wcs,
508 instruction, FLUSH);
507 instruction = *(u32 *)(fw->data + index); 509 instruction = *(u32 *)(fw->data + index);
508 index += 4; 510 index += 4;
509 } 511 }
@@ -1532,14 +1534,18 @@ retry_rcvqfill:
1532 dev_err(dev, "%s: LOW 32bits PHYSICAL ADDRESS == 0\n", 1534 dev_err(dev, "%s: LOW 32bits PHYSICAL ADDRESS == 0\n",
1533 __func__); 1535 __func__);
1534 dev_err(dev, "skb[%p] PROBLEM\n", skb); 1536 dev_err(dev, "skb[%p] PROBLEM\n", skb);
1535 dev_err(dev, " skbdata[%p]\n", skb->data); 1537 dev_err(dev, " skbdata[%p]\n",
1538 skb->data);
1536 dev_err(dev, " skblen[%x]\n", skb->len); 1539 dev_err(dev, " skblen[%x]\n", skb->len);
1537 dev_err(dev, " paddr[%p]\n", paddr); 1540 dev_err(dev, " paddr[%p]\n", paddr);
1538 dev_err(dev, " paddrl[%x]\n", paddrl); 1541 dev_err(dev, " paddrl[%x]\n", paddrl);
1539 dev_err(dev, " paddrh[%x]\n", paddrh); 1542 dev_err(dev, " paddrh[%x]\n", paddrh);
1540 dev_err(dev, " rcvq->head[%p]\n", rcvq->head); 1543 dev_err(dev, " rcvq->head[%p]\n",
1541 dev_err(dev, " rcvq->tail[%p]\n", rcvq->tail); 1544 rcvq->head);
1542 dev_err(dev, " rcvq->count[%x]\n", rcvq->count); 1545 dev_err(dev, " rcvq->tail[%p]\n",
1546 rcvq->tail);
1547 dev_err(dev, " rcvq->count[%x]\n",
1548 rcvq->count);
1543 dev_err(dev, "SKIP THIS SKB!!!!!!!!\n"); 1549 dev_err(dev, "SKIP THIS SKB!!!!!!!!\n");
1544 goto retry_rcvqfill; 1550 goto retry_rcvqfill;
1545 } 1551 }
@@ -1548,14 +1554,18 @@ retry_rcvqfill:
1548 dev_err(dev, "%s: LOW 32bits PHYSICAL ADDRESS == 0\n", 1554 dev_err(dev, "%s: LOW 32bits PHYSICAL ADDRESS == 0\n",
1549 __func__); 1555 __func__);
1550 dev_err(dev, "skb[%p] PROBLEM\n", skb); 1556 dev_err(dev, "skb[%p] PROBLEM\n", skb);
1551 dev_err(dev, " skbdata[%p]\n", skb->data); 1557 dev_err(dev, " skbdata[%p]\n",
1558 skb->data);
1552 dev_err(dev, " skblen[%x]\n", skb->len); 1559 dev_err(dev, " skblen[%x]\n", skb->len);
1553 dev_err(dev, " paddr[%p]\n", paddr); 1560 dev_err(dev, " paddr[%p]\n", paddr);
1554 dev_err(dev, " paddrl[%x]\n", paddrl); 1561 dev_err(dev, " paddrl[%x]\n", paddrl);
1555 dev_err(dev, " paddrh[%x]\n", paddrh); 1562 dev_err(dev, " paddrh[%x]\n", paddrh);
1556 dev_err(dev, " rcvq->head[%p]\n", rcvq->head); 1563 dev_err(dev, " rcvq->head[%p]\n",
1557 dev_err(dev, " rcvq->tail[%p]\n", rcvq->tail); 1564 rcvq->head);
1558 dev_err(dev, " rcvq->count[%x]\n", rcvq->count); 1565 dev_err(dev, " rcvq->tail[%p]\n",
1566 rcvq->tail);
1567 dev_err(dev, " rcvq->count[%x]\n",
1568 rcvq->count);
1559 dev_err(dev, "GIVE TO CARD ANYWAY\n"); 1569 dev_err(dev, "GIVE TO CARD ANYWAY\n");
1560 } 1570 }
1561#endif 1571#endif
@@ -1884,7 +1894,8 @@ static void slic_xmit_fail(struct adapter *adapter,
1884 break; 1894 break;
1885 case XMIT_FAIL_HOSTCMD_FAIL: 1895 case XMIT_FAIL_HOSTCMD_FAIL:
1886 dev_err(&adapter->netdev->dev, 1896 dev_err(&adapter->netdev->dev,
1887 "xmit_start skb[%p] type[%x] No host commands available\n", skb, skb->pkt_type); 1897 "xmit_start skb[%p] type[%x] No host commands available\n",
1898 skb, skb->pkt_type);
1888 break; 1899 break;
1889 } 1900 }
1890 } 1901 }
@@ -2096,7 +2107,8 @@ static void slic_interrupt_card_up(u32 isr, struct adapter *adapter,
2096 } 2107 }
2097 } else if (isr & ISR_XDROP) { 2108 } else if (isr & ISR_XDROP) {
2098 dev_err(&dev->dev, 2109 dev_err(&dev->dev,
2099 "isr & ISR_ERR [%x] ISR_XDROP\n", isr); 2110 "isr & ISR_ERR [%x] ISR_XDROP\n",
2111 isr);
2100 } else { 2112 } else {
2101 dev_err(&dev->dev, 2113 dev_err(&dev->dev,
2102 "isr & ISR_ERR [%x]\n", 2114 "isr & ISR_ERR [%x]\n",
@@ -2340,7 +2352,8 @@ static int slic_if_init(struct adapter *adapter)
2340 SLIC_GET_ADDR_LOW(&pshmem->isr), FLUSH); 2352 SLIC_GET_ADDR_LOW(&pshmem->isr), FLUSH);
2341#else 2353#else
2342 slic_reg32_write(&slic_regs->slic_addr_upper, 0, DONT_FLUSH); 2354 slic_reg32_write(&slic_regs->slic_addr_upper, 0, DONT_FLUSH);
2343 slic_reg32_write(&slic_regs->slic_isp, (u32)&pshmem->isr, FLUSH); 2355 slic_reg32_write(&slic_regs->slic_isp, (u32)&pshmem->isr,
2356 FLUSH);
2344#endif 2357#endif
2345 spin_unlock_irqrestore(&adapter->bit64reglock.lock, 2358 spin_unlock_irqrestore(&adapter->bit64reglock.lock,
2346 adapter->bit64reglock.flags); 2359 adapter->bit64reglock.flags);
generated by cgit v1.2.2 (git 2.25.0) at 2025-05-31 07:21:06 -0400