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

Commit fbb9318b authored by Joachim Fenkes's avatar Joachim Fenkes Committed by Roland Dreier
Browse files

IB/ehca: Fix HW level autodetection 



Autodetection was missing a few HW revisions, causing certain eHCA1
revisions to be treated like eHCA2.  Fixed.

Signed-off-by: default avatarJoachim Fenkes <fenkes@de.ibm.com>
Signed-off-by: default avatarRoland Dreier <rolandd@cisco.com>
parent 8fcea95a

drivers/infiniband/hw/ehca/ehca_main.c

+17 −12
Original line number Diff line number Diff line
@@ -263,22 +263,27 @@ int ehca_sense_attributes(struct ehca_shca *shca) 


		ehca_gen_dbg(" ... hardware version=%x:%x", hcaaver, revid);



		if ((hcaaver == 1) && (revid == 0))

			shca->hw_level = 0x11;

		else if ((hcaaver == 1) && (revid == 1))

			shca->hw_level = 0x12;

		else if ((hcaaver == 1) && (revid == 2))

			shca->hw_level = 0x13;

		else if ((hcaaver == 2) && (revid == 0))

		if (hcaaver == 1) {

			if (revid <= 3)

				shca->hw_level = 0x10 | (revid + 1);

			else

				shca->hw_level = 0x14;

		} else if (hcaaver == 2) {

			if (revid == 0)

				shca->hw_level = 0x21;

		else if ((hcaaver == 2) && (revid == 0x10))

			else if (revid == 0x10)

				shca->hw_level = 0x22;

		else {

			else if (revid == 0x20 || revid == 0x21)

				shca->hw_level = 0x23;

		}



		if (!shca->hw_level) {

			ehca_gen_warn("unknown hardware version"

				      " - assuming default level");

			shca->hw_level = 0x22;

		}

	}

	} else

		shca->hw_level = ehca_hw_level;

	ehca_gen_dbg(" ... hardware level=%x", shca->hw_level);



	shca->sport[0].rate = IB_RATE_30_GBPS;