tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

Pull SCSI fixes from James Bottomley:
"Four small fixes, three in drivers with the core one adding a batch
indicator (for drivers which use it) to the error handler"

* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
scsi: ufs: core: Let the sq_lock protect sq_tail_slot access
scsi: ufs: qcom: Return ufs_qcom_clk_scale_*() errors in ufs_qcom_clk_scale_notify()
scsi: core: Always send batch on reset or error handling command
scsi: bnx2fc: Fix skb double free in bnx2fc_rcv()

Linus Torvalds f969c914 4b2ee6d2

+11 -9
unified split
+3 -6
drivers/scsi/bnx2fc/bnx2fc_fcoe.c
··· 429 struct fcoe_ctlr *ctlr; 430 struct fcoe_rcv_info *fr; 431 struct fcoe_percpu_s *bg; 432 - struct sk_buff *tmp_skb; 433 434 interface = container_of(ptype, struct bnx2fc_interface, 435 fcoe_packet_type); ··· 440 goto err; 441 } 442 443 - tmp_skb = skb_share_check(skb, GFP_ATOMIC); 444 - if (!tmp_skb) 445 - goto err; 446 - 447 - skb = tmp_skb; 448 449 if (unlikely(eth_hdr(skb)->h_proto != htons(ETH_P_FCOE))) { 450 printk(KERN_ERR PFX "bnx2fc_rcv: Wrong FC type frame\n");
··· 429 struct fcoe_ctlr *ctlr; 430 struct fcoe_rcv_info *fr; 431 struct fcoe_percpu_s *bg; 432 433 interface = container_of(ptype, struct bnx2fc_interface, 434 fcoe_packet_type); ··· 441 goto err; 442 } 443 444 + skb = skb_share_check(skb, GFP_ATOMIC); 445 + if (!skb) 446 + return -1; 447 448 if (unlikely(eth_hdr(skb)->h_proto != htons(ETH_P_FCOE))) { 449 printk(KERN_ERR PFX "bnx2fc_rcv: Wrong FC type frame\n");
+2
drivers/scsi/scsi_error.c
··· 1152 1153 scsi_log_send(scmd); 1154 scmd->submitter = SUBMITTED_BY_SCSI_ERROR_HANDLER; 1155 1156 /* 1157 * Lock sdev->state_mutex to avoid that scsi_device_quiesce() can ··· 2460 scsi_init_command(dev, scmd); 2461 2462 scmd->submitter = SUBMITTED_BY_SCSI_RESET_IOCTL; 2463 memset(&scmd->sdb, 0, sizeof(scmd->sdb)); 2464 2465 scmd->cmd_len = 0;
··· 1152 1153 scsi_log_send(scmd); 1154 scmd->submitter = SUBMITTED_BY_SCSI_ERROR_HANDLER; 1155 + scmd->flags |= SCMD_LAST; 1156 1157 /* 1158 * Lock sdev->state_mutex to avoid that scsi_device_quiesce() can ··· 2459 scsi_init_command(dev, scmd); 2460 2461 scmd->submitter = SUBMITTED_BY_SCSI_RESET_IOCTL; 2462 + scmd->flags |= SCMD_LAST; 2463 memset(&scmd->sdb, 0, sizeof(scmd->sdb)); 2464 2465 scmd->cmd_len = 0;
+2 -1
drivers/ufs/core/ufshcd.c
··· 2274 if (is_mcq_enabled(hba)) { 2275 int utrd_size = sizeof(struct utp_transfer_req_desc); 2276 struct utp_transfer_req_desc *src = lrbp->utr_descriptor_ptr; 2277 - struct utp_transfer_req_desc *dest = hwq->sqe_base_addr + hwq->sq_tail_slot; 2278 2279 spin_lock(&hwq->sq_lock); 2280 memcpy(dest, src, utrd_size); 2281 ufshcd_inc_sq_tail(hwq); 2282 spin_unlock(&hwq->sq_lock);
··· 2274 if (is_mcq_enabled(hba)) { 2275 int utrd_size = sizeof(struct utp_transfer_req_desc); 2276 struct utp_transfer_req_desc *src = lrbp->utr_descriptor_ptr; 2277 + struct utp_transfer_req_desc *dest; 2278 2279 spin_lock(&hwq->sq_lock); 2280 + dest = hwq->sqe_base_addr + hwq->sq_tail_slot; 2281 memcpy(dest, src, utrd_size); 2282 ufshcd_inc_sq_tail(hwq); 2283 spin_unlock(&hwq->sq_lock);
+4 -2
drivers/ufs/host/ufs-qcom.c
··· 1516 err = ufs_qcom_clk_scale_up_pre_change(hba); 1517 else 1518 err = ufs_qcom_clk_scale_down_pre_change(hba); 1519 - if (err) 1520 - ufshcd_uic_hibern8_exit(hba); 1521 1522 } else { 1523 if (scale_up) 1524 err = ufs_qcom_clk_scale_up_post_change(hba);
··· 1516 err = ufs_qcom_clk_scale_up_pre_change(hba); 1517 else 1518 err = ufs_qcom_clk_scale_down_pre_change(hba); 1519 1520 + if (err) { 1521 + ufshcd_uic_hibern8_exit(hba); 1522 + return err; 1523 + } 1524 } else { 1525 if (scale_up) 1526 err = ufs_qcom_clk_scale_up_post_change(hba);