Commit 1451455e authored by Martin K. Petersen's avatar Martin K. Petersen
Browse files

Merge patch series "libsas: Some tidy-up" 

John Garry <john.g.garry@oracle.com> says:

This series tidies-up libsas a bit, including:
- delete structure(s) with only one member
- delete structure members which are only ever set
- delete structure members which are never set and code which relies on
  that member being set

This conflicts with the following series:
https://lore.kernel.org/linux-scsi/20230809132249.37948-1-yuehaibing@huawei.com/

Any conflict should be trivial to resolve.

Based on mkp-scsi staging at a18e81d1 ("scsi: ufs: ufs-pci: Add support for QEMU")

Link: https://lore.kernel.org/r/20230815115156.343535-1-john.g.garry@oracle.com


Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parents ef5d681b 86344494

drivers/scsi/aic94xx/aic94xx_hwi.c

+1 −3
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ static int asd_get_user_sas_addr(struct asd_ha_struct *asd_ha) 
	if (asd_ha->hw_prof.sas_addr[0])

		return 0;



	return sas_request_addr(asd_ha->sas_ha.core.shost,

	return sas_request_addr(asd_ha->sas_ha.shost,

				asd_ha->hw_prof.sas_addr);

}
@@ -72,10 +72,8 @@ static int asd_init_phy(struct asd_phy *phy) 
	struct asd_sas_phy *sas_phy = &phy->sas_phy;



	sas_phy->enabled = 1;

	sas_phy->class = SAS;

	sas_phy->iproto = SAS_PROTOCOL_ALL;

	sas_phy->tproto = 0;

	sas_phy->type = PHY_TYPE_PHYSICAL;

	sas_phy->role = PHY_ROLE_INITIATOR;

	sas_phy->oob_mode = OOB_NOT_CONNECTED;

	sas_phy->linkrate = SAS_LINK_RATE_UNKNOWN;

drivers/scsi/aic94xx/aic94xx_init.c

+3 −4
Original line number Diff line number Diff line
@@ -667,7 +667,6 @@ static int asd_register_sas_ha(struct asd_ha_struct *asd_ha) 
	}



	asd_ha->sas_ha.sas_ha_name = (char *) asd_ha->name;

	asd_ha->sas_ha.lldd_module = THIS_MODULE;

	asd_ha->sas_ha.sas_addr = &asd_ha->hw_prof.sas_addr[0];



	for (i = 0; i < ASD_MAX_PHYS; i++) {
@@ -688,8 +687,8 @@ static int asd_unregister_sas_ha(struct asd_ha_struct *asd_ha) 


	err = sas_unregister_ha(&asd_ha->sas_ha);



	sas_remove_host(asd_ha->sas_ha.core.shost);

	scsi_host_put(asd_ha->sas_ha.core.shost);

	sas_remove_host(asd_ha->sas_ha.shost);

	scsi_host_put(asd_ha->sas_ha.shost);



	kfree(asd_ha->sas_ha.sas_phy);

	kfree(asd_ha->sas_ha.sas_port);
@@ -739,7 +738,7 @@ static int asd_pci_probe(struct pci_dev *dev, const struct pci_device_id *id) 
	asd_printk("found %s, device %s\n", asd_ha->name, pci_name(dev));



	SHOST_TO_SAS_HA(shost) = &asd_ha->sas_ha;

	asd_ha->sas_ha.core.shost = shost;

	asd_ha->sas_ha.shost = shost;

	shost->transportt = aic94xx_transport_template;

	shost->max_id = ~0;

	shost->max_lun = ~0;

drivers/scsi/aic94xx/aic94xx_task.c

+2 −10
Original line number Diff line number Diff line
@@ -388,14 +388,9 @@ static int asd_build_ata_ascb(struct asd_ascb *ascb, struct sas_task *task, 
		flags |= data_dir_flags[task->data_dir];

		scb->ata_task.ata_flags = flags;



		scb->ata_task.retry_count = task->ata_task.retry_count;

		scb->ata_task.retry_count = 0;



		flags = 0;

		if (task->ata_task.set_affil_pol)

			flags |= SET_AFFIL_POLICY;

		if (task->ata_task.stp_affil_pol)

			flags |= STP_AFFIL_POLICY;

		scb->ata_task.flags = flags;

		scb->ata_task.flags = 0;

	}

	ascb->tasklet_complete = asd_task_tasklet_complete;
@@ -485,9 +480,6 @@ static int asd_build_ssp_ascb(struct asd_ascb *ascb, struct sas_task *task, 
	scb->ssp_task.ssp_frame.tptt = cpu_to_be16(0xFFFF);



	memcpy(scb->ssp_task.ssp_cmd.lun, task->ssp_task.LUN, 8);

	if (task->ssp_task.enable_first_burst)

		scb->ssp_task.ssp_cmd.efb_prio_attr |= EFB_MASK;

	scb->ssp_task.ssp_cmd.efb_prio_attr |= (task->ssp_task.task_prio << 3);

	scb->ssp_task.ssp_cmd.efb_prio_attr |= (task->ssp_task.task_attr & 7);

	memcpy(scb->ssp_task.ssp_cmd.cdb, task->ssp_task.cmd->cmnd,

	       task->ssp_task.cmd->cmd_len);

drivers/scsi/hisi_sas/hisi_sas_main.c

+3 −6
Original line number Diff line number Diff line
@@ -1018,10 +1018,8 @@ static void hisi_sas_phy_init(struct hisi_hba *hisi_hba, int phy_no) 
	phy->minimum_linkrate = SAS_LINK_RATE_1_5_GBPS;

	phy->maximum_linkrate = hisi_hba->hw->phy_get_max_linkrate();

	sas_phy->enabled = (phy_no < hisi_hba->n_phy) ? 1 : 0;

	sas_phy->class = SAS;

	sas_phy->iproto = SAS_PROTOCOL_ALL;

	sas_phy->tproto = 0;

	sas_phy->type = PHY_TYPE_PHYSICAL;

	sas_phy->role = PHY_ROLE_INITIATOR;

	sas_phy->oob_mode = OOB_NOT_CONNECTED;

	sas_phy->linkrate = SAS_LINK_RATE_UNKNOWN;
@@ -2514,10 +2512,9 @@ int hisi_sas_probe(struct platform_device *pdev, 


	sha->sas_ha_name = DRV_NAME;

	sha->dev = hisi_hba->dev;

	sha->lldd_module = THIS_MODULE;

	sha->sas_addr = &hisi_hba->sas_addr[0];

	sha->num_phys = hisi_hba->n_phy;

	sha->core.shost = hisi_hba->shost;

	sha->shost = hisi_hba->shost;



	for (i = 0; i < hisi_hba->n_phy; i++) {

		sha->sas_phy[i] = &hisi_hba->phy[i].sas_phy;
@@ -2559,12 +2556,12 @@ void hisi_sas_remove(struct platform_device *pdev) 
{

	struct sas_ha_struct *sha = platform_get_drvdata(pdev);

	struct hisi_hba *hisi_hba = sha->lldd_ha;

	struct Scsi_Host *shost = sha->core.shost;

	struct Scsi_Host *shost = sha->shost;



	del_timer_sync(&hisi_hba->timer);



	sas_unregister_ha(sha);

	sas_remove_host(sha->core.shost);

	sas_remove_host(shost);



	hisi_sas_free(hisi_hba);

	scsi_host_put(shost);

drivers/scsi/hisi_sas/hisi_sas_v1_hw.c

+2 −7
Original line number Diff line number Diff line
@@ -960,7 +960,7 @@ static void prep_ssp_v1_hw(struct hisi_hba *hisi_hba, 
	struct scsi_cmnd *scsi_cmnd = ssp_task->cmd;

	struct sas_tmf_task *tmf = slot->tmf;

	int has_data = 0, priority = !!tmf;

	u8 *buf_cmd, fburst = 0;

	u8 *buf_cmd;

	u32 dw1, dw2;



	/* create header */
@@ -1018,16 +1018,11 @@ static void prep_ssp_v1_hw(struct hisi_hba *hisi_hba, 


	buf_cmd = hisi_sas_cmd_hdr_addr_mem(slot) +

		sizeof(struct ssp_frame_hdr);

	if (task->ssp_task.enable_first_burst) {

		fburst = (1 << 7);

		dw2 |= 1 << CMD_HDR_FIRST_BURST_OFF;

	}

	hdr->dw2 = cpu_to_le32(dw2);



	memcpy(buf_cmd, &task->ssp_task.LUN, 8);

	if (!tmf) {

		buf_cmd[9] = fburst | task->ssp_task.task_attr |

				(task->ssp_task.task_prio << 3);

		buf_cmd[9] = task->ssp_task.task_attr;

		memcpy(buf_cmd + 12, task->ssp_task.cmd->cmnd,

				task->ssp_task.cmd->cmd_len);

	} else {