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

Commit 91618604 authored by Jakub Byczkowski's avatar Jakub Byczkowski Committed by Doug Ledford
Browse files

IB/hfi1: Add flag for platform config scratch register read 



Add flag in pport data structure to determine when platform config was
read from scratch registers. Change conditions in parse_platform_config
and get_platform_config_field to use the new flag.

Reviewed-by: default avatarEaswar Hariharan <easwar.hariharan@intel.com>
Reviewed-by: default avatarIra Weiny <ira.weiny@intel.com>
Signed-off-by: default avatarJakub Byczkowski <jakub.byczkowski@intel.com>
Signed-off-by: default avatarDennis Dalessandro <dennis.dalessandro@intel.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent 55774d09

drivers/infiniband/hw/hfi1/firmware.c

+4 −2
Original line number Diff line number Diff line
@@ -1789,6 +1789,7 @@ static int check_meta_version(struct hfi1_devdata *dd, u32 *system_table) 
int parse_platform_config(struct hfi1_devdata *dd)

{

	struct platform_config_cache *pcfgcache = &dd->pcfg_cache;

	struct hfi1_pportdata *ppd = dd->pport;

	u32 *ptr = NULL;

	u32 header1 = 0, header2 = 0, magic_num = 0, crc = 0, file_length = 0;

	u32 record_idx = 0, table_type = 0, table_length_dwords = 0;
@@ -1800,7 +1801,7 @@ int parse_platform_config(struct hfi1_devdata *dd) 
	 * scratch register bitmap, thus there is no platform config to parse.

	 * Skip parsing in these situations.

	 */

	if (is_integrated(dd) && !platform_config_load)

	if (ppd->config_from_scratch)

		return 0;



	if (!dd->platform_config.data) {
@@ -2089,13 +2090,14 @@ int get_platform_config_field(struct hfi1_devdata *dd, 
	int ret = 0, wlen = 0, seek = 0;

	u32 field_len_bits = 0, field_start_bits = 0, *src_ptr = NULL;

	struct platform_config_cache *pcfgcache = &dd->pcfg_cache;

	struct hfi1_pportdata *ppd = dd->pport;



	if (data)

		memset(data, 0, len);

	else

		return -EINVAL;



	if (is_integrated(dd) && !platform_config_load) {

	if (ppd->config_from_scratch) {

		/*

		 * Use saved configuration from ppd for integrated platforms

		 */

drivers/infiniband/hw/hfi1/hfi.h

+3 −0
Original line number Diff line number Diff line
@@ -677,6 +677,9 @@ struct hfi1_pportdata { 
	u8  default_atten;

	u8  max_power_class;



	/* did we read platform config from scratch registers? */

	bool config_from_scratch;



	/* GUIDs for this interface, in host order, guids[0] is a port guid */

	u64 guids[HFI1_GUIDS_PER_PORT];

drivers/infiniband/hw/hfi1/platform.c

+2 −0
Original line number Diff line number Diff line
@@ -138,6 +138,8 @@ static void save_platform_config_fields(struct hfi1_devdata *dd) 


	ppd->max_power_class = (temp_scratch & QSFP_MAX_POWER_SMASK) >>

				QSFP_MAX_POWER_SHIFT;



	ppd->config_from_scratch = true;

}



void get_platform_config(struct hfi1_devdata *dd)