--- zzzz-none-000/linux-3.10.107/drivers/usb/storage/transport.c 2017-06-27 09:49:32.000000000 +0000 +++ scorpion-7490-727/linux-3.10.107/drivers/usb/storage/transport.c 2021-02-04 17:41:59.000000000 +0000 @@ -47,6 +47,7 @@ #include #include #include +#include #include @@ -63,6 +64,103 @@ #include #include "../../scsi/sd.h" +/* == 20171129 AVM/VGJ - Include AVM USB Suspend functions == */ +#include "../core/usb.h" + +/* 20171012 AVM/VGJ USB KPI */ +#if defined (CONFIG_AVM_KERNEL) + +#define BYTES_PER_GB (1024*1024*1024) + +int reset_count = 0; +module_param(reset_count, int, S_IRUGO | S_IWUSR); +MODULE_PARM_DESC(reset_count, "Count of reset errors"); + +int gb_transferred = 0; +module_param(gb_transferred, int, S_IRUGO | S_IWUSR); +MODULE_PARM_DESC(gb_transferred, "Count of gigabytes transferred"); + +int bytes_transferred = 0; +module_param(bytes_transferred, int, S_IRUGO | S_IWUSR); +MODULE_PARM_DESC(bytes_transferred, "Count of bytes transferred since last GB"); +#endif //(CONFIG_AVM_KERNEL) + +#if defined (CONFIG_AVM_USB_PM) +int max_spinup_ms = 0; +module_param(max_spinup_ms, int, S_IRUGO | S_IWUSR); +MODULE_PARM_DESC(max_spinup_ms, "Maximum Spin Up time in ms"); + +int spinup_error_count = 0; +module_param(spinup_error_count, int, S_IRUGO | S_IWUSR); +MODULE_PARM_DESC(spinup_error_count, "Count of failed spinups"); + + +/* == 20171005 AVM/VGJ - gets interface and resumes device if it necessary == */ +static int avm_usb_pm_get_storage(struct us_data *us) +{ + int ret; + + mutex_unlock(&us->dev_mutex); + ret = usb_autopm_get_interface(us->pusb_intf); + mutex_lock(&us->dev_mutex); + + return ret; +} + +/* == 20171005 AVM/VGJ - puts interface and schedules a suspend if necessary == */ +static void avm_usb_pm_put_storage(struct us_data *us) +{ + mutex_unlock(&us->dev_mutex); + usb_autopm_put_interface(us->pusb_intf); + mutex_lock(&us->dev_mutex); +} + +/*== 20171120 AVM/VGJ - Calculates spinup time for USB KPIs and optimizes autosuspend_delay ==*/ +static void avm_usb_pm_check_spinup_ms(struct us_data *us) +{ + if (us->resume_start > 0) { + unsigned int spinup_ms = jiffies_to_msecs(jiffies-us->resume_start); + us->resume_start = 0; + + printk(KERN_ERR "%s - spin up time %u ms\n", us->scsi_name, spinup_ms); + + /* == 20180219 AVM/VGJ - update device's and global max spin up time ==*/ + if (spinup_ms > us->max_spinup_ms) { + us->max_spinup_ms = spinup_ms; + + if (spinup_ms > max_spinup_ms) { + max_spinup_ms = spinup_ms; + printk(KERN_ERR "new max spin up time %u ms\n", max_spinup_ms); + } + + /* == 20171017 AVM/WKR - optimize suspend_delay ==*/ + if (us->max_spinup_ms > 5000) { + avm_usb_pm_min_delay(us->pusb_dev, AVM_USB_PM_SPINDOWN_DELAY); + } else if (us->max_spinup_ms < 2000) { + avm_usb_pm_max_delay(us->pusb_dev, AVM_USB_PM_FLASH_DELAY); + } + } + } +} + +/* == 20180215 AVM/VGJ Some HDDs are disconnected during spin up == */ +static void avm_usb_pm_check_spinup_error(struct us_data *us) +{ + if (us->resume_start > 0) { + if (us->pusb_dev->state == USB_STATE_NOTATTACHED) { + unsigned int spinup_ms = jiffies_to_msecs(jiffies - us->resume_start); + printk(KERN_ERR "device disconnected on spin up after %d ms\n", spinup_ms); + if (spinup_ms < 3000) { + spinup_error_count++; + avm_usb_pm_add_to_blacklist(us->pusb_dev); + } + } else { + /* == 20180216 AVM/WKR A USB reset after next resume might prevent storage errors == */ + us->pusb_dev->reset_resume = 1; + } + } +} +#endif //(CONFIG_AVM_USB_PM) /*********************************************************************** * Data transfer routines @@ -207,12 +305,24 @@ us->cr->wIndex = cpu_to_le16(index); us->cr->wLength = cpu_to_le16(size); +#ifdef CONFIG_AVM_USB_PM + /* == 20170929 AVM/VGJ - get interface and resume device if necessary ==*/ + if (avm_usb_pm_get_storage(us) < 0) { + return -EIO; + } +#endif + /* fill and submit the URB */ usb_fill_control_urb(us->current_urb, us->pusb_dev, pipe, (unsigned char*) us->cr, data, size, usb_stor_blocking_completion, NULL); status = usb_stor_msg_common(us, timeout); +#ifdef CONFIG_AVM_USB_PM + /* == 20170929 AVM/VGJ - put interface so device may be suspended ==*/ + avm_usb_pm_put_storage(us); +#endif + /* return the actual length of the data transferred if no error */ if (status == 0) status = us->current_urb->actual_length; @@ -599,6 +709,24 @@ int need_auto_sense; int result; +#ifdef CONFIG_AVM_USB_PM + unsigned int stop_unit_idle_ms = 0; + + if(us->pusb_dev->port_is_suspended) { + us->resume_start = jiffies; + } + + /* == 20180213 AVM/VGJ - check whether the command is Stop Unit and store idle time ==*/ + if ((srb->cmnd[0] == START_STOP) && !(srb->cmnd[4] & 0x01)) { + stop_unit_idle_ms = avm_usb_pm_get_idle_ms(us->pusb_dev); + } + + /* == 20170929 AVM/VGJ - get interface and resume device if necessary ==*/ + if (avm_usb_pm_get_storage(us) < 0) { + return; + } +#endif + /* send the command to the transport layer */ scsi_set_resid(srb, 0); result = us->transport(srb, us); @@ -623,6 +751,10 @@ if (result == USB_STOR_TRANSPORT_NO_SENSE) { srb->result = SAM_STAT_CHECK_CONDITION; last_sector_hacks(us, srb); +#ifdef CONFIG_AVM_USB_PM + /* == 20170929 AVM/VGJ - put interface so device may be suspended ==*/ + avm_usb_pm_put_storage(us); +#endif return; } @@ -753,6 +885,10 @@ srb->result = DID_ERROR << 16; if (!(us->fflags & US_FL_SCM_MULT_TARG)) goto Handle_Errors; +#ifdef CONFIG_AVM_USB_PM + /* == 20170929 AVM/VGJ - put interface so device may be suspended ==*/ + avm_usb_pm_put_storage(us); +#endif return; } @@ -858,6 +994,26 @@ srb->result = DID_ERROR << 16; last_sector_hacks(us, srb); +#ifdef CONFIG_AVM_USB_PM + /* == 20171120 AVM/VGJ - check spin up time ==*/ + if (!need_auto_sense) { + avm_usb_pm_check_spinup_ms(us); + } + + /* == 20170929 AVM/VGJ - put interface so device may be suspended ==*/ + avm_usb_pm_put_storage(us); + + /* == 20180214 AVM/VGJ - schedule suspend if unit is stopped ==*/ + if (stop_unit_idle_ms) { + unsigned int delay = AVM_USB_PM_MIN_DELAY; + /* == 20180214 AVM/VGJ - ensure 10 min of idle time if stop unit failed ==*/ + if (need_auto_sense && (stop_unit_idle_ms < AVM_USB_PM_SPINDOWN_DELAY)) { + delay = AVM_USB_PM_SPINDOWN_DELAY - stop_unit_idle_ms; + printk(KERN_ERR "stop unit failed, suspending in %u ms\n", delay); + } + pm_schedule_suspend(&us->pusb_dev->dev, delay); + } +#endif return; /* Error and abort processing: try to resynchronize with the device @@ -883,9 +1039,23 @@ usb_stor_report_device_reset(us); scsi_unlock(us_to_host(us)); us->transport_reset(us); + } else { +/* 20171012 AVM/VGJ Increment reset counter */ +#if defined (CONFIG_AVM_KERNEL) + printk(KERN_ERR "USB Storage device reset\n"); + reset_count++; +#endif } + clear_bit(US_FLIDX_RESETTING, &us->dflags); last_sector_hacks(us, srb); +#ifdef CONFIG_AVM_USB_PM + /* == 20180215 AVM/VGJ Some HDDs are disconnected during spin up == */ + avm_usb_pm_check_spinup_error(us); + + /* == 20170929 AVM/VGJ - put interface so device may be suspended ==*/ + avm_usb_pm_put_storage(us); +#endif } /* Stop the current URB transfer */ @@ -1040,9 +1210,20 @@ usb_stor_dbg(us, "GetMaxLUN command result is %d, data is %d\n", result, us->iobuf[0]); - /* if we have a successful request, return the result */ - if (result > 0) - return us->iobuf[0]; + /* + * If we have a successful request, return the result if valid. The + * CBW LUN field is 4 bits wide, so the value reported by the device + * should fit into that. + */ + if (result > 0) { + if (us->iobuf[0] < 16) { + return us->iobuf[0]; + } else { + dev_info(&us->pusb_intf->dev, + "Max LUN %d is not valid, using 0 instead", + us->iobuf[0]); + } + } /* * Some devices don't like GetMaxLUN. They may STALL the control @@ -1105,7 +1286,7 @@ * command phase and the data phase. Some devices need a little * more than that, probably because of clock rate inaccuracies. */ if (unlikely(us->fflags & US_FL_GO_SLOW)) - udelay(125); + usleep_range(125, 150); if (transfer_length) { unsigned int pipe = srb->sc_data_direction == DMA_FROM_DEVICE ? @@ -1148,6 +1329,19 @@ goto skipped_data_phase; } } + + /* == 20171116 == AVM/WK detect read error faster, skip 30s timeout == */ + if (result == USB_STOR_XFER_SHORT && + srb->sc_data_direction == DMA_FROM_DEVICE && + (transfer_length > 512) && + ((transfer_length % 512) == 0)) { + printk(KERN_ERR "%s(): Storage READ Error len=%u , res=%u \n", __func__, transfer_length , scsi_get_resid(srb)); + /* == 20180604 == AVM/VGJ Reset only if CSW was already received == */ + if (((scsi_get_resid(srb) + US_BULK_CS_WRAP_LEN) % 512) == 0) { + printk(KERN_ERR "%s(): triggering reset\n", __func__); + return USB_STOR_TRANSPORT_ERROR; + } + } } /* See flow chart on pg 15 of the Bulk Only Transport spec for @@ -1245,6 +1439,15 @@ return USB_STOR_TRANSPORT_NO_SENSE; } +/* 20171012 AVM/VGJ Increment bytes transferred counters */ +#if defined (CONFIG_AVM_KERNEL) + bytes_transferred += transfer_length; + if(bytes_transferred > BYTES_PER_GB) { + gb_transferred++; + bytes_transferred -= BYTES_PER_GB; + } +#endif + /* command good -- note that data could be short */ return USB_STOR_TRANSPORT_GOOD;