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

Commit eb70eb72 authored by Juuso Oikarinen's avatar Juuso Oikarinen Committed by John W. Linville
Browse files

wl1271: Update handling of the NVS file / INI parameters 



This patch updates the handling of the NVS file INI-section, trying to make
it slightly more generic, and exposing the parameters being set. This is done
in preparation for 5GHz parameters.

Signed-off-by: default avatarJuuso Oikarinen <juuso.oikarinen@nokia.com>
Reviewed-by: default avatarLuciano Coelho <luciano.coelho@nokia.com>
Signed-off-by: default avatarLuciano Coelho <luciano.coelho@nokia.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent ff37d9a9

drivers/net/wireless/wl12xx/wl1271.h

+1 −27
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ 
#include <net/mac80211.h>



#include "wl1271_conf.h"

#include "wl1271_ini.h"



#define DRIVER_NAME "wl1271"

#define DRIVER_PREFIX DRIVER_NAME ": "
@@ -116,33 +117,6 @@ enum { 
#define WL1271_TX_SECURITY_LO16(s) ((u16)((s) & 0xffff))

#define WL1271_TX_SECURITY_HI32(s) ((u32)(((s) >> 16) & 0xffffffff))



/* NVS data structure */

#define WL1271_NVS_SECTION_SIZE                  468



#define WL1271_NVS_GENERAL_PARAMS_SIZE            57

#define WL1271_NVS_GENERAL_PARAMS_SIZE_PADDED \

	(WL1271_NVS_GENERAL_PARAMS_SIZE + 1)

#define WL1271_NVS_STAT_RADIO_PARAMS_SIZE         17

#define WL1271_NVS_STAT_RADIO_PARAMS_SIZE_PADDED \

	(WL1271_NVS_STAT_RADIO_PARAMS_SIZE + 1)

#define WL1271_NVS_DYN_RADIO_PARAMS_SIZE          65

#define WL1271_NVS_DYN_RADIO_PARAMS_SIZE_PADDED \

	(WL1271_NVS_DYN_RADIO_PARAMS_SIZE + 1)

#define WL1271_NVS_FEM_COUNT                       2

#define WL1271_NVS_INI_SPARE_SIZE                124



struct wl1271_nvs_file {

	/* NVS section */

	u8 nvs[WL1271_NVS_SECTION_SIZE];



	/* INI section */

	u8 general_params[WL1271_NVS_GENERAL_PARAMS_SIZE_PADDED];

	u8 stat_radio_params[WL1271_NVS_STAT_RADIO_PARAMS_SIZE_PADDED];

	u8 dyn_radio_params[WL1271_NVS_FEM_COUNT]

			   [WL1271_NVS_DYN_RADIO_PARAMS_SIZE_PADDED];

	u8 ini_spare[WL1271_NVS_INI_SPARE_SIZE];

} __attribute__ ((packed));



/*

 * Enable/disable 802.11a support for WL1273

 */

drivers/net/wireless/wl12xx/wl1271_cmd.c

+7 −7
Original line number Diff line number Diff line
@@ -212,8 +212,8 @@ int wl1271_cmd_general_parms(struct wl1271 *wl) 


	gen_parms->test.id = TEST_CMD_INI_FILE_GENERAL_PARAM;



	memcpy(gen_parms->params, wl->nvs->general_params,

	       WL1271_NVS_GENERAL_PARAMS_SIZE);

	memcpy(&gen_parms->general_params, &wl->nvs->general_params,

	       sizeof(struct wl1271_ini_general_params));



	ret = wl1271_cmd_test(wl, gen_parms, sizeof(*gen_parms), 0);

	if (ret < 0)
@@ -238,11 +238,11 @@ int wl1271_cmd_radio_parms(struct wl1271 *wl) 


	radio_parms->test.id = TEST_CMD_INI_FILE_RADIO_PARAM;



	memcpy(radio_parms->stat_radio_params, wl->nvs->stat_radio_params,

	       WL1271_NVS_STAT_RADIO_PARAMS_SIZE);

	memcpy(radio_parms->dyn_radio_params,

	       wl->nvs->dyn_radio_params[rparam->fem],

	       WL1271_NVS_DYN_RADIO_PARAMS_SIZE);

	memcpy(&radio_parms->static_params_2, &wl->nvs->stat_radio_params_2,

	       sizeof(struct wl1271_ini_band_params_2));

	memcpy(&radio_parms->dyn_params_2,

	       &wl->nvs->dyn_radio_params_2[rparam->fem].params,

	       sizeof(struct wl1271_ini_fem_params_2));



	/* FIXME: current NVS is missing 5GHz parameters */

drivers/net/wireless/wl12xx/wl1271_cmd.h

+16 −10
Original line number Diff line number Diff line
@@ -439,24 +439,30 @@ struct wl1271_general_parms_cmd { 


	struct wl1271_cmd_test_header test;



	u8 params[WL1271_NVS_GENERAL_PARAMS_SIZE];

	s8 reserved[23];

} __attribute__ ((packed));

	struct wl1271_ini_general_params general_params;



#define WL1271_STAT_RADIO_PARAMS_5_SIZE    29

#define WL1271_DYN_RADIO_PARAMS_5_SIZE    104

	u8 sr_debug_table[WL1271_INI_MAX_SMART_REFLEX_PARAM];

	u8 sr_sen_n_p;

	u8 sr_sen_n_p_gain;

	u8 sr_sen_nrn;

	u8 sr_sen_prn;

	u8 padding[3];

} __attribute__ ((packed));



struct wl1271_radio_parms_cmd {

	struct wl1271_cmd_header header;



	struct wl1271_cmd_test_header test;



	u8 stat_radio_params[WL1271_NVS_STAT_RADIO_PARAMS_SIZE];

	u8 stat_radio_params_5[WL1271_STAT_RADIO_PARAMS_5_SIZE];

	/* Static radio parameters */

	struct wl1271_ini_band_params_2 static_params_2;

	struct wl1271_ini_band_params_5 static_params_5;



	u8 dyn_radio_params[WL1271_NVS_DYN_RADIO_PARAMS_SIZE];

	u8 reserved;

	u8 dyn_radio_params_5[WL1271_DYN_RADIO_PARAMS_5_SIZE];

	/* Dynamic radio parameters */

	struct wl1271_ini_fem_params_2 dyn_params_2;

	u8 padding2;

	struct wl1271_ini_fem_params_5 dyn_params_5;

	u8 padding3[2];

} __attribute__ ((packed));



struct wl1271_cmd_cal_channel_tune {

drivers/net/wireless/wl12xx/wl1271_ini.h

0 → 100644
+118 −0
Original line number Diff line number Diff line 
/*

 * This file is part of wl1271

 *

 * Copyright (C) 2010 Nokia Corporation

 *

 * Contact: Luciano Coelho <luciano.coelho@nokia.com>

 *

 * This program is free software; you can redistribute it and/or

 * modify it under the terms of the GNU General Public License

 * version 2 as published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful, but

 * WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

 * General Public License for more details.

 *

 * You should have received a copy of the GNU General Public License

 * along with this program; if not, write to the Free Software

 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA

 * 02110-1301 USA

 *

 */



#ifndef __WL1271_INI_H__

#define __WL1271_INI_H__



#define WL1271_INI_MAX_SMART_REFLEX_PARAM 16



struct wl1271_ini_general_params {

	u8 ref_clock;

	u8 settling_time;

	u8 clk_valid_on_wakeup;

	u8 dc2dc_mode;

	u8 dual_mode_select;

	u8 tx_bip_fem_auto_detect;

	u8 tx_bip_fem_manufacturer;

	u8 general_settings;

	u8 sr_state;

	u8 srf1[WL1271_INI_MAX_SMART_REFLEX_PARAM];

	u8 srf2[WL1271_INI_MAX_SMART_REFLEX_PARAM];

	u8 srf3[WL1271_INI_MAX_SMART_REFLEX_PARAM];

} __attribute__ ((packed));



#define WL1271_INI_RSSI_PROCESS_COMPENS_SIZE 15



struct wl1271_ini_band_params_2 {

	u8 rx_trace_insertion_loss;

	u8 tx_trace_loss;

	u8 rx_rssi_process_compens[WL1271_INI_RSSI_PROCESS_COMPENS_SIZE];

} __attribute__ ((packed));



#define WL1271_INI_RATE_GROUP_COUNT 6

#define WL1271_INI_CHANNEL_COUNT_2 14



struct wl1271_ini_fem_params_2 {

	__le16 tx_bip_ref_pd_voltage;

	u8 tx_bip_ref_power;

	u8 tx_bip_ref_offset;

	u8 tx_per_rate_pwr_limits_normal[WL1271_INI_RATE_GROUP_COUNT];

	u8 tx_per_rate_pwr_limits_degraded[WL1271_INI_RATE_GROUP_COUNT];

	u8 tx_per_rate_pwr_limits_extreme[WL1271_INI_RATE_GROUP_COUNT];

	u8 tx_per_chan_pwr_limits_11b[WL1271_INI_CHANNEL_COUNT_2];

	u8 tx_per_chan_pwr_limits_ofdm[WL1271_INI_CHANNEL_COUNT_2];

	u8 tx_pd_vs_rate_offsets[WL1271_INI_RATE_GROUP_COUNT];

	u8 tx_ibias[WL1271_INI_RATE_GROUP_COUNT];

	u8 rx_fem_insertion_loss;

	u8 degraded_low_to_normal_thr;

	u8 normal_to_degraded_high_thr;

} __attribute__ ((packed));



#define WL1271_INI_CHANNEL_COUNT_5 35

#define WL1271_INI_SUB_BAND_COUNT_5 7



struct wl1271_ini_band_params_5 {

	u8 rx_trace_insertion_loss[WL1271_INI_SUB_BAND_COUNT_5];

	u8 tx_trace_loss[WL1271_INI_SUB_BAND_COUNT_5];

	u8 rx_rssi_process_compens[WL1271_INI_RSSI_PROCESS_COMPENS_SIZE];

} __attribute__ ((packed));



struct wl1271_ini_fem_params_5 {

	__le16 tx_bip_ref_pd_voltage[WL1271_INI_SUB_BAND_COUNT_5];

	u8 tx_bip_ref_power[WL1271_INI_SUB_BAND_COUNT_5];

	u8 tx_bip_ref_offset[WL1271_INI_SUB_BAND_COUNT_5];

	u8 tx_per_rate_pwr_limits_normal[WL1271_INI_RATE_GROUP_COUNT];

	u8 tx_per_rate_pwr_limits_degraded[WL1271_INI_RATE_GROUP_COUNT];

	u8 tx_per_rate_pwr_limits_extreme[WL1271_INI_RATE_GROUP_COUNT];

	u8 tx_per_chan_pwr_limits_ofdm[WL1271_INI_CHANNEL_COUNT_5];

	u8 tx_pd_vs_rate_offsets[WL1271_INI_RATE_GROUP_COUNT];

	u8 tx_ibias[WL1271_INI_RATE_GROUP_COUNT];

	u8 rx_fem_insertion_loss[WL1271_INI_SUB_BAND_COUNT_5];

	u8 degraded_low_to_normal_thr;

	u8 normal_to_degraded_high_thr;

} __attribute__ ((packed));





/* NVS data structure */

#define WL1271_INI_NVS_SECTION_SIZE		     468

#define WL1271_INI_SPARE_SIZE			     124

#define WL1271_INI_FEM_MODULE_COUNT                  2



struct wl1271_nvs_file {

	/* NVS section */

	u8 nvs[WL1271_INI_NVS_SECTION_SIZE];



	/* INI section */

	struct wl1271_ini_general_params general_params;

	u8 padding1;

	struct wl1271_ini_band_params_2 stat_radio_params_2;

	u8 padding2;

	struct {

		struct wl1271_ini_fem_params_2 params;

		u8 padding;

	} dyn_radio_params_2[WL1271_INI_FEM_MODULE_COUNT];



	u8 ini_spare[WL1271_INI_SPARE_SIZE];

} __attribute__ ((packed));



#endif