pm80xx : Updates for the driver version 0.1.39.
Subsystems (2)
v3 cover pm80xx : Updates for the driver version 0.1.39.
From: Deepak Ukey <[email protected]>
This patch set includes some bug fixes and features for pm80xx driver.
Changes from V1:
For "Increase request sg length" patch.
- Modified the description of patch.
Removed below patches from the patchset.
- Support for char device.
- sysfs attribute for number of phys.
- IOCTL functionality to get phy status.
- IOCTL functionality to get phy error.
- IOCTL functionality for GPIO.
- IOCTL functionality for SGPIO.
- IOCTL functionality for TWI device.
Deepak Ukey (1):
pm80xx : sysfs attribute for non fatal dump.
Peter Chang (2):
pm80xx : Increase request sg length. pm80xx : Cleanup initialization loading fail path.
Vikram Auradkar (1):
pm80xx : Deal with kexec reboots.
Viswas G (1):
pm80xx : Introduce read and write length for IOCTL payload structure.
yuuzheng (1):
pm80xx : Free the tag when mpi_set_phy_profile_resp is received.
drivers/scsi/pm8001/pm8001_ctl.c | 51 ++++++++++++- drivers/scsi/pm8001/pm8001_defs.h | 5 +- drivers/scsi/pm8001/pm8001_hwi.c | 22 +++--- drivers/scsi/pm8001/pm8001_init.c | 80 +++++++++++++++----- drivers/scsi/pm8001/pm8001_sas.h | 7 +- drivers/scsi/pm8001/pm80xx_hwi.c | 155 ++++++++++++++++++++++++++++++++++++-- 6 files changed, 278 insertions(+), 42 deletions(-)
Signature · 1 line
2.16.3
PATCH v3 1/6 pm80xx : Increase request sg length.
From: Peter Chang <[email protected]>
Increasing the per-request size maximum (max_sectors_kb) runs into the per-device dma scatter gather list limit (max_segments) for users of the io vector system calls (eg, readv and writev). This is because the kernel combines io vectors into dma segments when possible, but it doesn't work for our user because the vectors in the buffer cache get scrambled.
This change bumps the advertised max scatter gather length to 528 to cover 2M w/ x86's 4k pages and some extra for the user checksum. It trims the size of some of the tables we don't care about and exposes all of the command slots upstream to the scsi layer. Also reduced the PM8001_MAX_CCB to 256 as pm8001 driver has memory limit depend on machine capability. If we increase the sg length, we need to trade-off it by decreasing PM8001_MAX_CCB. PM8001_MAX_CCB = 256 does not have any influence on normal use
Signed-off-by Peter Chang <[email protected]>
Signed-off-by Deepak Ukey <[email protected]>
Signed-off-by Viswas G <[email protected]>
Signed-off-by Radha Ramachandran <[email protected]>
Reported-by kbuild test robot <[email protected]>
--- drivers/scsi/pm8001/pm8001_defs.h | 5 +++-- drivers/scsi/pm8001/pm8001_init.c | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-)
drivers/scsi/pm8001/pm8001_defs.h +3 -2
@@ -75,7 +75,7 @@ enum port_type { };/* driver compile-time configuration */ -#define PM8001_MAX_CCB 512/* max ccbs supported */ +#define PM8001_MAX_CCB 256/* max ccbs supported */ #define PM8001_MPI_QUEUE 1024/* maximum mpi queue entries */ #define PM8001_MAX_INB_NUM 1#define PM8001_MAX_OUTB_NUM 1
@@ -99,7 +99,8 @@ enum port_type {#define OB (CI + PM8001_MAX_SPCV_INB_NUM)#define PI (OB + PM8001_MAX_SPCV_OUTB_NUM)#define USI_MAX_MEMCNT (PI + PM8001_MAX_SPCV_OUTB_NUM) -#define PM8001_MAX_DMA_SG SG_ALL +#define CONFIG_SCSI_PM8001_MAX_DMA_SG 528 +#define PM8001_MAX_DMA_SG CONFIG_SCSI_PM8001_MAX_DMA_SGenum memory_region_num {AAP1 =0x0 ,/* application acceleration processor */ IOP ,/* IO processor */
drivers/scsi/pm8001/pm8001_init.c +1 -1
@@ -95,7 +95,7 @@ static struct scsi_host_template pm8001_sht = { .bios_param = sas_bios_param, .can_queue = 1, .this_id = -1, - .sg_tablesize = SG_ALL, + .sg_tablesize = PM8001_MAX_DMA_SG, .max_sectors = SCSI_DEFAULT_MAX_SECTORS, .eh_device_reset_handler = sas_eh_device_reset_handler, .eh_target_reset_handler = sas_eh_target_reset_handler,
Signature · 1 line
2.16.3
Re: [PATCH V3 1/6] pm80xx : Increase request sg length.
Quoted 18 lines · Deepak Ukey
From: Peter Chang <[email protected]>
Increasing the per-request size maximum (
max_sectors_kb) runs into the per-device dma scatter gather list limit (max_segments) for users of the io vector system calls (eg, readv and writev). This is because the kernel combines io vectors into dma segments when possible, but it doesn't work for our user because the vectors in the buffer cache get scrambled.
This change bumps the advertised max scatter gather length to 528 to cover 2M w/ x86's 4k pages and some extra for the user checksum. It trims the size of some of the tables we don't care about and exposes all of the command slots upstream to the scsi layer. Also reduced thePM8001_MAX_CCBto 256 as pm8001 driver has memory limit depend on machine capability. If we increase the sg length, we need to trade-off it by decreasingPM8001_MAX_CCB.PM8001_MAX_CCB= 256 does not have any influence on normal use
Quoted 5 lines
Signed-off-by Peter Chang <[email protected]>Signed-off-by Deepak Ukey <[email protected]>Signed-off-by Viswas G <[email protected]>Signed-off-by Radha Ramachandran <[email protected]>Reported-by kbuild test robot <[email protected]>
Acked-by Jack Wang <[email protected]>
Thanks!
Quoted 44 lines
--- drivers/scsi/pm8001/pm8001_defs.h | 5 +++-- drivers/scsi/pm8001/pm8001_init.c | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-)drivers/scsi/pm8001/pm8001_defs.h +3
-2@@ -75,7 +75,7 @@ enum port_type { };/* driver compile-time configuration */ -#define PM8001_MAX_CCB 512/* max ccbs supported */ +#define PM8001_MAX_CCB 256/* max ccbs supported */ #define PM8001_MPI_QUEUE 1024/* maximum mpi queue entries */ #define PM8001_MAX_INB_NUM 1#define PM8001_MAX_OUTB_NUM 1@@ -99,7 +99,8 @@ enum port_type {#define OB (CI + PM8001_MAX_SPCV_INB_NUM)#define PI (OB + PM8001_MAX_SPCV_OUTB_NUM)#define USI_MAX_MEMCNT (PI + PM8001_MAX_SPCV_OUTB_NUM) -#define PM8001_MAX_DMA_SG SG_ALL +#define CONFIG_SCSI_PM8001_MAX_DMA_SG 528 +#define PM8001_MAX_DMA_SG CONFIG_SCSI_PM8001_MAX_DMA_SGenum memory_region_num {AAP1 =0x0 ,/* application acceleration processor */ IOP ,/* IO processor */ drivers/scsi/pm8001/pm8001_init.c +1
-2@@ -95,7 +95,7 @@ static struct scsi_host_template pm8001_sht = { .bios_param = sas_bios_param, .can_queue = 1, .this_id = -1, - .sg_tablesize = SG_ALL, + .sg_tablesize = PM8001_MAX_DMA_SG, .max_sectors = SCSI_DEFAULT_MAX_SECTORS, .eh_device_reset_handler = sas_eh_device_reset_handler, .eh_target_reset_handler = sas_eh_target_reset_handler, --2.16.3
PATCH v3 2/6 pm80xx : Deal with kexec reboots.
In reply to Deepak UkeyFrom: Vikram Auradkar <[email protected]>
A kexec reboot causes the controller fw to assert. This assertion shows up in two ways, the controller doesn't show up as ready and an interrupt is waiting as soon as the handler is registered. To resolve this added below fix:
-split the interrupt handling setup into two parts, setup and
request.
-If the controller ready register indicates not-ready, but that the
not readiness is only on the IOC units we can still try a reset to bring the system back to the pre-reboot state.
Signed-off-by Vikram Auradkar <[email protected]>
Signed-off-by Deepak Ukey <[email protected]>
Signed-off-by Viswas G <[email protected]>
Signed-off-by Radha Ramachandran <[email protected]>
Acked-by Jack Wang <[email protected]>
--- drivers/scsi/pm8001/pm8001_init.c | 48 +++++++++++++++++++++++++++++++++++---- drivers/scsi/pm8001/pm80xx_hwi.c | 15 ++++++++---- 2 files changed, 54 insertions(+), 9 deletions(-)
drivers/scsi/pm8001/pm8001_init.c +43 -5
@@ -248,6 +248,9 @@ static irqreturn_t pm8001_interrupt_handler_intx(int irq, void *dev_id)return ret; } +static u32 pm8001_setup_irq (struct pm8001_hba_info *pm8001_ha); +static u32 pm8001_request_irq (struct pm8001_hba_info *pm8001_ha); +/** * pm8001_alloc - initiate our hba structure and 6 DMAs area. * @pm8001_ha:our hba structure.
@@ -890,9 +893,7 @@ static int pm8001_configure_phy_settings(struct pm8001_hba_info *pm8001_ha)*/ static u32 pm8001_setup_msix (struct pm8001_hba_info *pm8001_ha) { -u32 i =0 , j =0 ;u32 number_of_intr; -int flag =0 ;int rc;/* SPCv controllers supports 64 msi-x */
@@ -900,11 +901,11 @@ static u32 pm8001_setup_msix(struct pm8001_hba_info *pm8001_ha) number_of_intr =1 ; }else { number_of_intr =PM8001_MAX_MSIX_VEC ; - flag &= ~IRQF_SHARED ; } rc =pci_alloc_irq_vectors (pm8001_ha->pdev, number_of_intr, number_of_intr,PCI_IRQ_MSIX ); + number_of_intr = rc;if (rc <0 )return rc; pm8001_ha->number_of_intr = number_of_intr;
@@ -912,8 +913,22 @@ static u32 pm8001_setup_msix(struct pm8001_hba_info *pm8001_ha)PM8001_INIT_DBG (pm8001_ha,pm8001_printk ("pci_alloc_irq_vectors request ret:%d no of intr %d\n" , rc, pm8001_ha->number_of_intr)); +return 0 ; +} + +static u32 pm8001_request_msix (struct pm8001_hba_info *pm8001_ha) +{ +u32 i =0 , j =0 ; +int flag =0 , rc =0 ; -for (i =0 ; i < number_of_intr; i++) { +if (pm8001_ha->chip_id != chip_8001) + flag &= ~IRQF_SHARED ; + +PM8001_INIT_DBG (pm8001_ha, +pm8001_printk ("pci_enable_msix request number of intr %d\n" , + pm8001_ha->number_of_intr)); + +for (i =0 ; i < pm8001_ha->number_of_intr; i++) {snprintf (pm8001_ha->intr_drvname[i],sizeof (pm8001_ha->intr_drvname[0 ]),"%s-%d" , pm8001_ha->name, i);
@@ -938,6 +953,21 @@ static u32 pm8001_setup_msix(struct pm8001_hba_info *pm8001_ha) }#endif +static u32 pm8001_setup_irq (struct pm8001_hba_info *pm8001_ha) +{ +struct pci_dev *pdev; + + pdev = pm8001_ha->pdev; + +#ifdef PM8001_USE_MSIX +if (pci_find_capability (pdev,PCI_CAP_ID_MSIX )) +return pm8001_setup_msix (pm8001_ha); +PM8001_INIT_DBG (pm8001_ha, +pm8001_printk ("MSIX not supported!!!\n" )); +#endif +return 0 ; +} +/** * pm8001_request_irq - register interrupt * @chip_info: our ha struct.
@@ -951,7 +981,7 @@ static u32 pm8001_request_irq(struct pm8001_hba_info *pm8001_ha)#ifdef PM8001_USE_MSIX if (pdev->msix_cap &&pci_msi_enabled ()) -return pm8001_setup_msix (pm8001_ha); +return pm8001_request_msix (pm8001_ha);else {PM8001_INIT_DBG (pm8001_ha,pm8001_printk ("MSIX not supported!!!\n" ));
@@ -1033,6 +1063,13 @@ static int pm8001_pci_probe(struct pci_dev *pdev, rc = -ENOMEM ; goto err_out_free; } +/* Setup Interrupt */ + rc =pm8001_setup_irq (pm8001_ha); +if (rc) { +PM8001_FAIL_DBG (pm8001_ha,pm8001_printk ( +"pm8001_setup_irq failed [ret: %d]\n" , rc)); + goto err_out_shost; + }list_add_tail (&pm8001_ha->list, &hba_list);PM8001_CHIP_DISP ->chip_soft_rst (pm8001_ha); rc =PM8001_CHIP_DISP ->chip_init (pm8001_ha);
@@ -1045,6 +1082,7 @@ static int pm8001_pci_probe(struct pci_dev *pdev, rc =scsi_add_host (shost, &pdev->dev);if (rc) goto err_out_ha_free; +/* Request Interrupt */ rc =pm8001_request_irq (pm8001_ha);if (rc) { PM8001_FAIL_DBG(pm8001_ha, pm8001_printk(
drivers/scsi/pm8001/pm80xx_hwi.c +11 -4
@@ -1438,11 +1438,18 @@ pm80xx_chip_soft_rst(struct pm8001_hba_info *pm8001_ha)if (!pm8001_ha->controller_fatal_error) {/* Check if MPI is in ready state to reset */ if (mpi_uninit_check (pm8001_ha) !=0 ) { - regval =pm8001_cr32 (pm8001_ha,0 ,MSGU_SCRATCH_PAD_1 ); +u32 r0 =pm8001_cr32 (pm8001_ha,0 ,MSGU_SCRATCH_PAD_0 ); +u32 r1 =pm8001_cr32 (pm8001_ha,0 ,MSGU_SCRATCH_PAD_1 ); +u32 r2 =pm8001_cr32 (pm8001_ha,0 ,MSGU_SCRATCH_PAD_2 ); +u32 r3 =pm8001_cr32 (pm8001_ha,0 ,MSGU_SCRATCH_PAD_3 );PM8001_FAIL_DBG (pm8001_ha,pm8001_printk ( -"MPI state is not ready scratch1 :0x%x\n" , - regval)); -return -1 ; +"MPI state is not ready scratch: %x:%x:%x:%x\n" , + r0, r1, r2, r3)); +/* if things aren't ready but the bootloader is ok then +* try the reset anyway. +*/ +if (r1 &SCRATCH_PAD1_BOOTSTATE_MASK ) +return -1 ; } }/* checked for reset register normal state; 0x0 */
Signature · 1 line
2.16.3
PATCH v3 3/6 pm80xx : Free the tag when mpi_set_phy_profile_resp is received.
In reply to Deepak UkeyFrom: yuuzheng <[email protected]>
In pm80xx driver, the command mpi_set_phy_profile_req is sent by host during boot to configure the phy profile such as analog setting page, rate control page. However, the tag is not freed when its response is received. As a result, 16 tags are missing for each HBA after boot. When NCQ is enabled with queue depth 16, it needs at least, 15 * 16 = 240 tags for each HBA to achieve the best performance. In current pm80xx driver with setting CCB_MAX = 256, the total number of tags in each HBA is 255 for data IO. Hence, without returning those tags to the pool after boot, some device will finally be forced to non-ncq mode by ATA layer due to excessive errors (i.e. LLDD cannot allocate tag for queued task).
Signed-off-by yuuzheng <[email protected]>
Signed-off-by Deepak Ukey <[email protected]>
Signed-off-by Viswas G <[email protected]>
Signed-off-by Radha Ramachandran <[email protected]>
Acked-by Jack Wang <[email protected]>
--- drivers/scsi/pm8001/pm80xx_hwi.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
drivers/scsi/pm8001/pm80xx_hwi.c +7 -3
@@ -3715,28 +3715,32 @@ static int mpi_flash_op_ext_resp(struct pm8001_hba_info *pm8001_ha, void *piomb)static int mpi_set_phy_profile_resp (struct pm8001_hba_info *pm8001_ha,void *piomb) { +u32 tag;u8 page_code; +int rc =0 ;struct set_phy_profile_resp *pPayload = (struct set_phy_profile_resp *)(piomb +4 );u32 ppc_phyid =le32_to_cpu (pPayload->ppc_phyid);u32 status =le32_to_cpu (pPayload->status); + tag =le32_to_cpu (pPayload->tag); page_code = (u8)((ppc_phyid &0xFF00 ) >>8 );if (status) {/* status is FAILED */ PM8001_FAIL_DBG (pm8001_ha,pm8001_printk ("PhyProfile command failed with status " "0x%08X \n" , status)); -return -1 ; + rc =-1 ; }else {if (page_code !=SAS_PHY_ANALOG_SETTINGS_PAGE ) {PM8001_FAIL_DBG (pm8001_ha,pm8001_printk ("Invalid page code 0x%X\n" , page_code)); -return -1 ; + rc =-1 ; } } -return 0 ; +pm8001_tag_free (pm8001_ha, tag); +return rc; }/**
Signature · 1 line
2.16.3
PATCH v3 4/6 pm80xx : Cleanup initialization loading fail path.
In reply to Deepak UkeyFrom: Peter Chang <[email protected]>
1)Move the instance tracking down after we think the instance is good to go. avoids having a use-after free.
2)There are goto targets for trying to cleanup if the hw fails to initialize, but there's some overlap depending on who thinks they own the sub-structures.
Signed-off-by Peter Chang <[email protected]>
Signed-off-by Deepak Ukey <[email protected]>
Signed-off-by Viswas G <[email protected]>
Signed-off-by Radha Ramachandran <[email protected]>
Acked-by Jack Wang <[email protected]>
--- drivers/scsi/pm8001/pm8001_init.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-)
drivers/scsi/pm8001/pm8001_init.c +11 -6
@@ -1016,6 +1016,7 @@ static int pm8001_pci_probe(struct pci_dev *pdev,struct pm8001_hba_info *pm8001_ha;struct Scsi_Host *shost =NULL ;const struct pm8001_chip_info *chip; +struct sas_ha_struct *sha;dev_printk (KERN_INFO , &pdev->dev,"pm80xx: driver version %s\n" ,DRV_VERSION );
@@ -1044,12 +1045,12 @@ static int pm8001_pci_probe(struct pci_dev *pdev, goto err_out_regions; } chip = &pm8001_chips[ent->driver_data]; -SHOST_TO_SAS_HA (shost) = -kzalloc (sizeof (struct sas_ha_struct ),GFP_KERNEL ); -if (!SHOST_TO_SAS_HA (shost)) { + sha =kzalloc (sizeof (struct sas_ha_struct ),GFP_KERNEL ); +if (!sha) { rc = -ENOMEM ; goto err_out_free_host; } +SHOST_TO_SAS_HA (shost) = sha; rc =pm8001_prep_sas_ha_init (shost, chip);if (rc) {
@@ -1070,7 +1071,7 @@ static int pm8001_pci_probe(struct pci_dev *pdev, "pm8001_setup_irq failed [ret: %d]\n", rc)); goto err_out_shost; } -list_add_tail (&pm8001_ha->list, &hba_list); +PM8001_CHIP_DISP ->chip_soft_rst (pm8001_ha); rc =PM8001_CHIP_DISP ->chip_init (pm8001_ha);if (rc) {
@@ -1105,8 +1106,12 @@ static int pm8001_pci_probe(struct pci_dev *pdev,pm8001_post_sas_ha_init (shost, chip); rc =sas_register_ha (SHOST_TO_SAS_HA (shost)); -if (rc) +if (rc) { +PM8001_FAIL_DBG (pm8001_ha,pm8001_printk ( +"sas_register_ha failed [ret: %d]\n" , rc)); goto err_out_shost; + } +list_add_tail (&pm8001_ha->list, &hba_list);scsi_scan_host (pm8001_ha->shost); pm8001_ha->flags =PM8001F_RUN_TIME ;return 0 ;
@@ -1116,7 +1121,7 @@ static int pm8001_pci_probe(struct pci_dev *pdev, err_out_ha_free:pm8001_free (pm8001_ha); err_out_free: -kfree (SHOST_TO_SAS_HA (shost)); +kfree (sha); err_out_free_host:scsi_host_put (shost); err_out_regions:
Signature · 1 line
2.16.3
PATCH v3 5/6 pm80xx : sysfs attribute for non fatal dump.
In reply to Deepak UkeyFrom: Deepak Ukey <[email protected]>
Added the sysfs attribute for non fatal log so that management utility can get the non fatal dump from driver. The non-fatal error is an error condition or abnormal behavior detected by the host, or detected and reported by the controller to the host.The non-fatal error does not stop the controller firmware and enables it to still respond to host requests. A typical example of a non-fatal error is an I/O timeout or an unusual error notification from the controller. Since the firmware is operational, the error dump information is pushed to host memory (by firmware) upon request from the host.
Signed-off-by Deepak Ukey <[email protected]>
Signed-off-by Viswas G <[email protected]>
Signed-off-by Radha Ramachandran <[email protected]>
Acked-by Jack Wang <[email protected]>
--- drivers/scsi/pm8001/pm8001_ctl.c | 45 +++++++++++++ drivers/scsi/pm8001/pm8001_init.c | 1 + drivers/scsi/pm8001/pm8001_sas.h | 4 ++ drivers/scsi/pm8001/pm80xx_hwi.c | 130 ++++++++++++++++++++++++++++++++++++++ 4 files changed, 180 insertions(+)
drivers/scsi/pm8001/pm8001_ctl.c +45 -0
@@ -554,6 +554,49 @@ static ssize_t pm8001_ctl_fatal_log_show(struct device *cdev, static DEVICE_ATTR(fatal_log, S_IRUGO, pm8001_ctl_fatal_log_show, NULL); +/** +** non_fatal_log_show - non fatal error logging +** @cdev:pointer to embedded class device +** @buf: the buffer returned +** +** A sysfs 'read-only' shost attribute. +**/ +static ssize_t non_fatal_log_show (struct device *cdev, +struct device_attribute *attr,char *buf) +{ +u32 count; + + count =pm80xx_get_non_fatal_dump (cdev, attr, buf); +return count; +} +static DEVICE_ATTR_RO (non_fatal_log); + +static ssize_t non_fatal_count_show (struct device *cdev, +struct device_attribute *attr,char *buf) +{ +struct Scsi_Host *shost =class_to_shost (cdev); +struct sas_ha_struct *sha =SHOST_TO_SAS_HA (shost); +struct pm8001_hba_info *pm8001_ha = sha->lldd_ha; + +return snprintf (buf,PAGE_SIZE ,"%08x" , + pm8001_ha->non_fatal_count); +} + +static ssize_t non_fatal_count_store (struct device *cdev, +struct device_attribute *attr,const char *buf,size_t count) +{ +struct Scsi_Host *shost =class_to_shost (cdev); +struct sas_ha_struct *sha =SHOST_TO_SAS_HA (shost); +struct pm8001_hba_info *pm8001_ha = sha->lldd_ha; +int val =0 ; + +if (kstrtoint (buf,16 , &val) !=0 ) +return -EINVAL ; + + pm8001_ha->non_fatal_count = val; +return strlen (buf); +} +static DEVICE_ATTR_RW (non_fatal_count);/** ** pm8001_ctl_gsm_log_show - gsm dump collection
@@ -829,6 +872,8 @@ struct device_attribute *pm8001_host_attrs[] = { &dev_attr_aap_log, &dev_attr_iop_log, &dev_attr_fatal_log, + &dev_attr_non_fatal_log, + &dev_attr_non_fatal_count, &dev_attr_gsm_log, &dev_attr_max_out_io, &dev_attr_max_devices,
drivers/scsi/pm8001/pm8001_init.c +1 -0
@@ -483,6 +483,7 @@ static struct pm8001_hba_info *pm8001_pci_alloc(struct pci_dev *pdev, pm8001_ha->shost = shost; pm8001_ha->id = pm8001_id++; pm8001_ha->logging_level = logging_level; + pm8001_ha->non_fatal_count =0 ;if (link_rate >=1 && link_rate <=15 ) pm8001_ha->link_rate = (link_rate <<8 );else {
drivers/scsi/pm8001/pm8001_sas.h +4 -0
@@ -558,6 +558,8 @@ struct pm8001_hba_info {const struct firmware *fw_image;struct isr_param irq_vector[PM8001_MAX_MSIX_VEC ];u32 reset_in_progress; +u32 non_fatal_count; +u32 non_fatal_read_length; };struct pm8001_work {
@@ -741,6 +743,8 @@ void pm8001_set_phy_profile_single(struct pm8001_hba_info *pm8001_ha,int pm80xx_bar4_shift (struct pm8001_hba_info *pm8001_ha,u32 shiftValue);ssize_t pm80xx_get_fatal_dump (struct device *cdev,struct device_attribute *attr,char *buf); +ssize_t pm80xx_get_non_fatal_dump (struct device *cdev, +struct device_attribute *attr,char *buf);ssize_t pm8001_get_gsm_dump (struct device *cdev,u32 ,char *buf);/* ctl shared API */ extern struct device_attribute *pm8001_host_attrs[];
drivers/scsi/pm8001/pm80xx_hwi.c +130 -0
136 lines not on this page · raw message
Signature · 1 line
2.16.3
PATCH v3 6/6 pm80xx : Introduce read and write length for IOCTL payload structure.
In reply to Deepak UkeyFrom: Viswas G <[email protected]>
Removed the common length and introduce read and write length for IOCTL payload structure.
Signed-off-by Deepak Ukey <[email protected]>
Signed-off-by Viswas G <[email protected]>
Signed-off-by Radha Ramachandran <[email protected]>
Acked-by Jack Wang <[email protected]>
--- drivers/scsi/pm8001/pm8001_ctl.c | 6 +++--- drivers/scsi/pm8001/pm8001_hwi.c | 22 +++++++++++----------- drivers/scsi/pm8001/pm8001_init.c | 12 ++++++------ drivers/scsi/pm8001/pm8001_sas.h | 3 ++- 4 files changed, 22 insertions(+), 21 deletions(-)
drivers/scsi/pm8001/pm8001_ctl.c +3 -3
@@ -463,7 +463,7 @@ static ssize_t pm8001_ctl_bios_version_show(struct device *cdev, pm8001_ha->nvmd_completion = &completion; payload.minor_function =7 ; payload.offset =0 ; - payload.length =4096 ; + payload.rd_length =4096 ; payload.func_specific =kzalloc (4096 ,GFP_KERNEL );if (!payload.func_specific)return -ENOMEM ;
@@ -674,7 +674,7 @@ static int pm8001_set_nvmd(struct pm8001_hba_info *pm8001_ha) payload = (struct pm8001_ioctl_payload *)ioctlbuffer;memcpy ((u8 *)&payload->func_specific, (u8 *)pm8001_ha->fw_image->data, pm8001_ha->fw_image->size); - payload->length = pm8001_ha->fw_image->size; + payload->wr_length = pm8001_ha->fw_image->size; payload->id =0 ; payload->minor_function =0x1 ; pm8001_ha->nvmd_completion = &completion;
@@ -720,7 +720,7 @@ static int pm8001_update_flash(struct pm8001_hba_info *pm8001_ha) IOCTL_BUF_SIZE);for (loopNumber =0 ; loopNumber < loopcount; loopNumber++) { payload = (struct pm8001_ioctl_payload *)ioctlbuffer; - payload->length =1024 *16 ; + payload->wr_length =1024 *16 ; payload->id =0 ; fwControl = (struct fw_control_info *)&payload->func_specific;
drivers/scsi/pm8001/pm8001_hwi.c +11 -11
@@ -4793,7 +4793,7 @@ int pm8001_chip_get_nvmd_req(struct pm8001_hba_info *pm8001_ha,if (!fw_control_context)return -ENOMEM ; fw_control_context->usrAddr = (u8 *)ioctl_payload->func_specific; - fw_control_context->len = ioctl_payload->length; + fw_control_context->len = ioctl_payload->rd_length; circularQ = &pm8001_ha->inbnd_q_tbl[0 ];memset (&nvmd_req,0 ,sizeof (nvmd_req)); rc =pm8001_tag_alloc (pm8001_ha, &tag);
@@ -4814,7 +4814,7 @@ int pm8001_chip_get_nvmd_req(struct pm8001_hba_info *pm8001_ha, nvmd_req.len_ir_vpdd =cpu_to_le32 (IPMode | twi_addr <<16 | twi_page_size <<8 |TWI_DEVICE ); - nvmd_req.resp_len =cpu_to_le32 (ioctl_payload->length); + nvmd_req.resp_len =cpu_to_le32 (ioctl_payload->rd_length); nvmd_req.resp_addr_hi =cpu_to_le32 (pm8001_ha->memoryMap.region[NVMD ].phys_addr_hi); nvmd_req.resp_addr_lo =
@@ -4823,7 +4823,7 @@ int pm8001_chip_get_nvmd_req(struct pm8001_hba_info *pm8001_ha, }case C_SEEPROM : { nvmd_req.len_ir_vpdd =cpu_to_le32 (IPMode |C_SEEPROM ); - nvmd_req.resp_len =cpu_to_le32 (ioctl_payload->length); + nvmd_req.resp_len =cpu_to_le32 (ioctl_payload->rd_length); nvmd_req.resp_addr_hi =cpu_to_le32 (pm8001_ha->memoryMap.region[NVMD ].phys_addr_hi); nvmd_req.resp_addr_lo =
@@ -4832,7 +4832,7 @@ int pm8001_chip_get_nvmd_req(struct pm8001_hba_info *pm8001_ha, }case VPD_FLASH : { nvmd_req.len_ir_vpdd =cpu_to_le32 (IPMode |VPD_FLASH ); - nvmd_req.resp_len =cpu_to_le32 (ioctl_payload->length); + nvmd_req.resp_len =cpu_to_le32 (ioctl_payload->rd_length); nvmd_req.resp_addr_hi =cpu_to_le32 (pm8001_ha->memoryMap.region[NVMD ].phys_addr_hi); nvmd_req.resp_addr_lo =
@@ -4841,7 +4841,7 @@ int pm8001_chip_get_nvmd_req(struct pm8001_hba_info *pm8001_ha, }case EXPAN_ROM : { nvmd_req.len_ir_vpdd =cpu_to_le32 (IPMode |EXPAN_ROM ); - nvmd_req.resp_len =cpu_to_le32 (ioctl_payload->length); + nvmd_req.resp_len =cpu_to_le32 (ioctl_payload->rd_length); nvmd_req.resp_addr_hi =cpu_to_le32 (pm8001_ha->memoryMap.region[NVMD ].phys_addr_hi); nvmd_req.resp_addr_lo =
@@ -4850,7 +4850,7 @@ int pm8001_chip_get_nvmd_req(struct pm8001_hba_info *pm8001_ha, }case IOP_RDUMP : { nvmd_req.len_ir_vpdd =cpu_to_le32 (IPMode |IOP_RDUMP ); - nvmd_req.resp_len =cpu_to_le32 (ioctl_payload->length); + nvmd_req.resp_len =cpu_to_le32 (ioctl_payload->rd_length); nvmd_req.vpd_offset =cpu_to_le32 (ioctl_payload->offset); nvmd_req.resp_addr_hi =cpu_to_le32 (pm8001_ha->memoryMap.region[NVMD ].phys_addr_hi);
@@ -4890,7 +4890,7 @@ int pm8001_chip_set_nvmd_req(struct pm8001_hba_info *pm8001_ha, circularQ = &pm8001_ha->inbnd_q_tbl[0 ];memcpy (pm8001_ha->memoryMap.region[NVMD ].virt_ptr, &ioctl_payload->func_specific, - ioctl_payload->length); + ioctl_payload->wr_length);memset (&nvmd_req,0 ,sizeof (nvmd_req)); rc =pm8001_tag_alloc (pm8001_ha, &tag);if (rc) {
@@ -4909,7 +4909,7 @@ int pm8001_chip_set_nvmd_req(struct pm8001_hba_info *pm8001_ha, nvmd_req.reserved[0 ] =cpu_to_le32 (0xFEDCBA98 ); nvmd_req.len_ir_vpdd =cpu_to_le32 (IPMode | twi_addr <<16 | twi_page_size <<8 |TWI_DEVICE ); - nvmd_req.resp_len =cpu_to_le32 (ioctl_payload->length); + nvmd_req.resp_len =cpu_to_le32 (ioctl_payload->wr_length); nvmd_req.resp_addr_hi =cpu_to_le32 (pm8001_ha->memoryMap.region[NVMD ].phys_addr_hi); nvmd_req.resp_addr_lo =
@@ -4918,7 +4918,7 @@ int pm8001_chip_set_nvmd_req(struct pm8001_hba_info *pm8001_ha, }case C_SEEPROM : nvmd_req.len_ir_vpdd =cpu_to_le32 (IPMode |C_SEEPROM ); - nvmd_req.resp_len =cpu_to_le32 (ioctl_payload->length); + nvmd_req.resp_len =cpu_to_le32 (ioctl_payload->wr_length); nvmd_req.reserved[0 ] =cpu_to_le32 (0xFEDCBA98 ); nvmd_req.resp_addr_hi =cpu_to_le32 (pm8001_ha->memoryMap.region[NVMD ].phys_addr_hi);
@@ -4927,7 +4927,7 @@ int pm8001_chip_set_nvmd_req(struct pm8001_hba_info *pm8001_ha,break ;case VPD_FLASH : nvmd_req.len_ir_vpdd =cpu_to_le32 (IPMode |VPD_FLASH ); - nvmd_req.resp_len =cpu_to_le32 (ioctl_payload->length); + nvmd_req.resp_len =cpu_to_le32 (ioctl_payload->wr_length); nvmd_req.reserved[0 ] =cpu_to_le32 (0xFEDCBA98 ); nvmd_req.resp_addr_hi =cpu_to_le32 (pm8001_ha->memoryMap.region[NVMD ].phys_addr_hi);
@@ -4936,7 +4936,7 @@ int pm8001_chip_set_nvmd_req(struct pm8001_hba_info *pm8001_ha,break ;case EXPAN_ROM : nvmd_req.len_ir_vpdd =cpu_to_le32 (IPMode |EXPAN_ROM ); - nvmd_req.resp_len =cpu_to_le32 (ioctl_payload->length); + nvmd_req.resp_len =cpu_to_le32 (ioctl_payload->wr_length); nvmd_req.reserved[0 ] =cpu_to_le32 (0xFEDCBA98 ); nvmd_req.resp_addr_hi =cpu_to_le32 (pm8001_ha->memoryMap.region[NVMD ].phys_addr_hi);
drivers/scsi/pm8001/pm8001_init.c +6 -6
@@ -636,22 +636,22 @@ static void pm8001_init_sas_add(struct pm8001_hba_info *pm8001_ha)if (pm8001_ha->chip_id == chip_8001) {if (deviceid ==0x8081 || deviceid ==0x0042 ) { payload.minor_function =4 ; - payload.length =4096 ; + payload.rd_length =4096 ; }else { payload.minor_function =0 ; - payload.length =128 ; + payload.rd_length =128 ; } }else if ((pm8001_ha->chip_id == chip_8070 || pm8001_ha->chip_id == chip_8072) && pm8001_ha->pdev->subsystem_vendor ==PCI_VENDOR_ID_ATTO ) { payload.minor_function =4 ; - payload.length =4096 ; + payload.rd_length =4096 ; }else { payload.minor_function =1 ; - payload.length =4096 ; + payload.rd_length =4096 ; } payload.offset =0 ; - payload.func_specific =kzalloc (payload.length,GFP_KERNEL ); + payload.func_specific =kzalloc (payload.rd_length,GFP_KERNEL );if (!payload.func_specific) {PM8001_INIT_DBG (pm8001_ha,pm8001_printk ("mem alloc fail\n" ));return ;
@@ -721,7 +721,7 @@ static int pm8001_get_phy_settings_info(struct pm8001_hba_info *pm8001_ha)/* SAS ADDRESS read from flash / EEPROM */ payload.minor_function =6 ; payload.offset =0 ; - payload.length =4096 ; + payload.rd_length =4096 ; payload.func_specific =kzalloc (4096 ,GFP_KERNEL );if (!payload.func_specific)return -ENOMEM ;
drivers/scsi/pm8001/pm8001_sas.h +2 -1
@@ -137,10 +137,11 @@ struct pm8001_ioctl_payload {u32 signature;u16 major_function;u16 minor_function; -u16 length;u16 status;u16 offset;u16 id; +u32 wr_length; +u32 rd_length;u8 *func_specific; };
Signature · 1 line
2.16.3
Martin K. Petersen
AppliedDeepak,
Quoted 1 line
This patch set includes some bug fixes and features for pm80xx driver.
Applied to 5.7/scsi-queue, thanks!
Signature · 1 line
Martin K. Petersen Oracle Linux Engineering