Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 16192896 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by James Bottomley
Browse files

[SCSI] mptsas: fix phy identifiers 



This patch from Eric fixes handling of the phy identifiers in mptsas.
I've split it up from his bigger patch as it should go into 2.6.14
still.

Signed-off-by: default avatarEric Moore <Eric.Moore@lsil.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parent f4fd20bf

drivers/message/fusion/mptsas.c

+8 −4
Original line number Original line Diff line number Diff line
@@ -257,7 +257,7 @@ static void mptsas_print_device_pg0(SasDevicePage0_t *pg0) 
	printk("SAS Address=0x%llX\n", le64_to_cpu(sas_address));

	printk("SAS Address=0x%llX\n", le64_to_cpu(sas_address));

	printk("Target ID=0x%X\n", pg0->TargetID);

	printk("Target ID=0x%X\n", pg0->TargetID);

	printk("Bus=0x%X\n", pg0->Bus);

	printk("Bus=0x%X\n", pg0->Bus);

	printk("PhyNum=0x%X\n", pg0->PhyNum);

	printk("Parent Phy Num=0x%X\n", pg0->PhyNum);

	printk("Access Status=0x%X\n", le16_to_cpu(pg0->AccessStatus));

	printk("Access Status=0x%X\n", le16_to_cpu(pg0->AccessStatus));

	printk("Device Info=0x%X\n", le32_to_cpu(pg0->DeviceInfo));

	printk("Device Info=0x%X\n", le32_to_cpu(pg0->DeviceInfo));

	printk("Flags=0x%X\n", le16_to_cpu(pg0->Flags));

	printk("Flags=0x%X\n", le16_to_cpu(pg0->Flags));
@@ -270,7 +270,7 @@ static void mptsas_print_expander_pg1(SasExpanderPage1_t *pg1) 
	printk("---- SAS EXPANDER PAGE 1 ------------\n");

	printk("---- SAS EXPANDER PAGE 1 ------------\n");





	printk("Physical Port=0x%X\n", pg1->PhysicalPort);

	printk("Physical Port=0x%X\n", pg1->PhysicalPort);

	printk("PHY Identifier=0x%X\n", pg1->Phy);

	printk("PHY Identifier=0x%X\n", pg1->PhyIdentifier);

	printk("Negotiated Link Rate=0x%X\n", pg1->NegotiatedLinkRate);

	printk("Negotiated Link Rate=0x%X\n", pg1->NegotiatedLinkRate);

	printk("Programmed Link Rate=0x%X\n", pg1->ProgrammedLinkRate);

	printk("Programmed Link Rate=0x%X\n", pg1->ProgrammedLinkRate);

	printk("Hardware Link Rate=0x%X\n", pg1->HwLinkRate);

	printk("Hardware Link Rate=0x%X\n", pg1->HwLinkRate);
@@ -604,7 +604,7 @@ mptsas_sas_expander_pg1(MPT_ADAPTER *ioc, struct mptsas_phyinfo *phy_info, 
	mptsas_print_expander_pg1(buffer);

	mptsas_print_expander_pg1(buffer);





	/* save config data */

	/* save config data */

	phy_info->phy_id = buffer->Phy;

	phy_info->phy_id = buffer->PhyIdentifier;

	phy_info->port_id = buffer->PhysicalPort;

	phy_info->port_id = buffer->PhysicalPort;

	phy_info->negotiated_link_rate = buffer->NegotiatedLinkRate;

	phy_info->negotiated_link_rate = buffer->NegotiatedLinkRate;

	phy_info->programmed_link_rate = buffer->ProgrammedLinkRate;

	phy_info->programmed_link_rate = buffer->ProgrammedLinkRate;
@@ -825,6 +825,8 @@ mptsas_probe_hba_phys(MPT_ADAPTER *ioc, int *index) 
		mptsas_sas_device_pg0(ioc, &port_info->phy_info[i].identify,

		mptsas_sas_device_pg0(ioc, &port_info->phy_info[i].identify,

			(MPI_SAS_DEVICE_PGAD_FORM_GET_NEXT_HANDLE <<

			(MPI_SAS_DEVICE_PGAD_FORM_GET_NEXT_HANDLE <<

			 MPI_SAS_DEVICE_PGAD_FORM_SHIFT), handle);

			 MPI_SAS_DEVICE_PGAD_FORM_SHIFT), handle);

		port_info->phy_info[i].identify.phy_id =

		    port_info->phy_info[i].phy_id;

		handle = port_info->phy_info[i].identify.handle;

		handle = port_info->phy_info[i].identify.handle;





		if (port_info->phy_info[i].attached.handle) {

		if (port_info->phy_info[i].attached.handle) {
@@ -881,6 +883,8 @@ mptsas_probe_expander_phys(MPT_ADAPTER *ioc, u32 *handle, int *index) 
				(MPI_SAS_DEVICE_PGAD_FORM_HANDLE <<

				(MPI_SAS_DEVICE_PGAD_FORM_HANDLE <<

				 MPI_SAS_DEVICE_PGAD_FORM_SHIFT),

				 MPI_SAS_DEVICE_PGAD_FORM_SHIFT),

				port_info->phy_info[i].identify.handle);

				port_info->phy_info[i].identify.handle);

			port_info->phy_info[i].identify.phy_id =

			    port_info->phy_info[i].phy_id;

		}

		}





		if (port_info->phy_info[i].attached.handle) {

		if (port_info->phy_info[i].attached.handle) {