DriverDev-Devel Archive on lore.kernel.org
 help / color / Atom feed
From: "Jérôme Pouiller" <Jerome.Pouiller@silabs.com>
To: "devel@driverdev.osuosl.org" <devel@driverdev.osuosl.org>,
	"linux-wireless@vger.kernel.org" <linux-wireless@vger.kernel.org>
Cc: "netdev@vger.kernel.org" <netdev@vger.kernel.org>,
	"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
	Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	"David S . Miller" <davem@davemloft.net>,
	Kalle Valo <kvalo@codeaurora.org>
Subject: [PATCH v2 10/65] staging: wfx: use specialized structs for HIF arguments
Date: Wed, 15 Jan 2020 13:54:16 +0000
Message-ID: <20200115135338.14374-11-Jerome.Pouiller@silabs.com> (raw)
In-Reply-To: <20200115135338.14374-1-Jerome.Pouiller@silabs.com>

From: Jérôme Pouiller <jerome.pouiller@silabs.com>

Most of the commands that are sent to device should take struct in
argument. In the current code, when this struct is binary compatible
with a __le32, the driver use a __le32. This behavior is error prone.
This patch fixes that and uses the specialized structs instead.

Signed-off-by: Jérôme Pouiller <jerome.pouiller@silabs.com>
---
 drivers/staging/wfx/hif_tx.c     |  4 ++--
 drivers/staging/wfx/hif_tx_mib.h | 27 ++++++++++++++++++---------
 2 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/drivers/staging/wfx/hif_tx.c b/drivers/staging/wfx/hif_tx.c
index be3138590a4f..2d541601e224 100644
--- a/drivers/staging/wfx/hif_tx.c
+++ b/drivers/staging/wfx/hif_tx.c
@@ -432,14 +432,14 @@ int hif_start(struct wfx_vif *wvif, const struct ieee80211_bss_conf *conf,
 	return ret;
 }
 
-int hif_beacon_transmit(struct wfx_vif *wvif, bool enable_beaconing)
+int hif_beacon_transmit(struct wfx_vif *wvif, bool enable)
 {
 	int ret;
 	struct hif_msg *hif;
 	struct hif_req_beacon_transmit *body = wfx_alloc_hif(sizeof(*body),
 							     &hif);
 
-	body->enable_beaconing = enable_beaconing ? 1 : 0;
+	body->enable_beaconing = enable ? 1 : 0;
 	wfx_fill_header(hif, wvif->id, HIF_REQ_ID_BEACON_TRANSMIT,
 			sizeof(*body));
 	ret = wfx_cmd_send(wvif->wdev, hif, NULL, 0, false);
diff --git a/drivers/staging/wfx/hif_tx_mib.h b/drivers/staging/wfx/hif_tx_mib.h
index a325c870b4ea..5b39200bd697 100644
--- a/drivers/staging/wfx/hif_tx_mib.h
+++ b/drivers/staging/wfx/hif_tx_mib.h
@@ -278,10 +278,11 @@ static inline int hif_set_arp_ipv4_filter(struct wfx_vif *wvif, int idx,
 			     &arg, sizeof(arg));
 }
 
-static inline int hif_use_multi_tx_conf(struct wfx_dev *wdev,
-					bool enabled)
+static inline int hif_use_multi_tx_conf(struct wfx_dev *wdev, bool enable)
 {
-	__le32 arg = enabled ? cpu_to_le32(1) : 0;
+	struct hif_mib_gl_set_multi_msg arg = {
+		.enable_multi_tx_conf = enable,
+	};
 
 	return hif_write_mib(wdev, -1, HIF_MIB_ID_GL_SET_MULTI_MSG,
 			     &arg, sizeof(arg));
@@ -306,7 +307,9 @@ static inline int hif_set_uapsd_info(struct wfx_vif *wvif, unsigned long val)
 
 static inline int hif_erp_use_protection(struct wfx_vif *wvif, bool enable)
 {
-	__le32 arg = enable ? cpu_to_le32(1) : 0;
+	struct hif_mib_non_erp_protection arg = {
+		.use_cts_to_self = enable,
+	};
 
 	return hif_write_mib(wvif->wdev, wvif->id,
 			     HIF_MIB_ID_NON_ERP_PROTECTION, &arg, sizeof(arg));
@@ -314,16 +317,18 @@ static inline int hif_erp_use_protection(struct wfx_vif *wvif, bool enable)
 
 static inline int hif_slot_time(struct wfx_vif *wvif, int val)
 {
-	__le32 arg = cpu_to_le32(val);
+	struct hif_mib_slot_time arg = {
+		.slot_time = cpu_to_le32(val),
+	};
 
 	return hif_write_mib(wvif->wdev, wvif->id, HIF_MIB_ID_SLOT_TIME,
 			     &arg, sizeof(arg));
 }
 
-static inline int hif_dual_cts_protection(struct wfx_vif *wvif, bool val)
+static inline int hif_dual_cts_protection(struct wfx_vif *wvif, bool enable)
 {
 	struct hif_mib_set_ht_protection arg = {
-		.dual_cts_prot = val,
+		.dual_cts_prot = enable,
 	};
 
 	return hif_write_mib(wvif->wdev, wvif->id, HIF_MIB_ID_SET_HT_PROTECTION,
@@ -332,7 +337,9 @@ static inline int hif_dual_cts_protection(struct wfx_vif *wvif, bool val)
 
 static inline int hif_wep_default_key_id(struct wfx_vif *wvif, int val)
 {
-	__le32 arg = cpu_to_le32(val);
+	struct hif_mib_wep_default_key_id arg = {
+		.wep_default_key_id = val,
+	};
 
 	return hif_write_mib(wvif->wdev, wvif->id,
 			     HIF_MIB_ID_DOT11_WEP_DEFAULT_KEY_ID,
@@ -341,7 +348,9 @@ static inline int hif_wep_default_key_id(struct wfx_vif *wvif, int val)
 
 static inline int hif_rts_threshold(struct wfx_vif *wvif, int val)
 {
-	__le32 arg = cpu_to_le32(val > 0 ? val : 0xFFFF);
+	struct hif_mib_dot11_rts_threshold arg = {
+		.threshold = cpu_to_le32(val > 0 ? val : 0xFFFF),
+	};
 
 	return hif_write_mib(wvif->wdev, wvif->id,
 			     HIF_MIB_ID_DOT11_RTS_THRESHOLD, &arg, sizeof(arg));
-- 
2.25.0

_______________________________________________
devel mailing list
devel@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

  parent reply index

Thread overview: 66+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-01-15 13:54 [PATCH v2 00/65] Simplify and improve the wfx driver Jérôme Pouiller
2020-01-15 13:54 ` [PATCH v2 01/65] staging: wfx: revert unexpected change in debugfs output Jérôme Pouiller
2020-01-15 13:54 ` [PATCH v2 02/65] staging: wfx: make hif_scan() usage clearer Jérôme Pouiller
2020-01-15 13:54 ` [PATCH v2 03/65] staging: wfx: add missing PROBE_RESP_OFFLOAD feature Jérôme Pouiller
2020-01-15 13:54 ` [PATCH v2 04/65] staging: wfx: send rate policies one by one Jérôme Pouiller
2020-01-15 13:54 ` [PATCH v2 05/65] staging: wfx: simplify hif_set_tx_rate_retry_policy() usage Jérôme Pouiller
2020-01-15 13:54 ` [PATCH v2 06/65] staging: wfx: simplify hif_set_output_power() usage Jérôme Pouiller
2020-01-15 13:54 ` [PATCH v2 07/65] staging: wfx: simplify hif_set_rcpi_rssi_threshold() usage Jérôme Pouiller
2020-01-15 13:54 ` [PATCH v2 08/65] staging: wfx: simplify hif_set_arp_ipv4_filter() usage Jérôme Pouiller
2020-01-15 13:54 ` [PATCH v2 09/65] staging: wfx: simplify hif_start() usage Jérôme Pouiller
2020-01-15 13:54 ` Jérôme Pouiller [this message]
2020-01-15 13:54 ` [PATCH v2 11/65] staging: wfx: retrieve ampdu_density from sta->ht_cap Jérôme Pouiller
2020-01-15 13:54 ` [PATCH v2 12/65] staging: wfx: retrieve greenfield mode from sta->ht_cap and bss_conf Jérôme Pouiller
2020-01-15 13:54 ` [PATCH v2 13/65] staging: wfx: drop struct wfx_ht_info Jérôme Pouiller
2020-01-15 13:54 ` [PATCH v2 14/65] staging: wfx: drop wdev->output_power Jérôme Pouiller
2020-01-15 13:54 ` [PATCH v2 15/65] staging: wfx: simplify wfx_config() Jérôme Pouiller
2020-01-15 13:54 ` [PATCH v2 16/65] staging: wfx: rename wfx_upload_beacon() Jérôme Pouiller
2020-01-15 13:54 ` [PATCH v2 17/65] staging: wfx: simplify wfx_upload_ap_templates() Jérôme Pouiller
2020-01-15 13:54 ` [PATCH v2 18/65] staging: wfx: simplify wfx_update_beaconing() Jérôme Pouiller
2020-01-15 13:54 ` [PATCH v2 19/65] staging: wfx: fix __wfx_flush() when drop == false Jérôme Pouiller
2020-01-15 13:54 ` [PATCH v2 20/65] staging: wfx: simplify wfx_flush() Jérôme Pouiller
2020-01-15 13:54 ` [PATCH v2 21/65] staging: wfx: simplify update of DTIM period Jérôme Pouiller
2020-01-15 13:54 ` [PATCH v2 22/65] staging: wfx: drop wvif->dtim_period Jérôme Pouiller
2020-01-15 13:54 ` [PATCH v2 23/65] staging: wfx: drop wvif->enable_beacon Jérôme Pouiller
2020-01-15 13:54 ` [PATCH v2 24/65] staging: wfx: drop wvif->cqm_rssi_thold Jérôme Pouiller
2020-01-15 13:54 ` [PATCH v2 25/65] staging: wfx: drop wvif->setbssparams_done Jérôme Pouiller
2020-01-15 13:54 ` [PATCH v2 26/65] staging: wfx: drop wfx_set_cts_work() Jérôme Pouiller
2020-01-15 13:54 ` [PATCH v2 27/65] staging: wfx: SSID should be provided to hif_start() even if hidden Jérôme Pouiller
2020-01-15 13:54 ` [PATCH v2 28/65] staging: wfx: simplify hif_update_ie() Jérôme Pouiller
2020-01-15 13:54 ` [PATCH v2 29/65] staging: wfx: simplify hif_join() Jérôme Pouiller
2020-01-15 13:54 ` [PATCH v2 30/65] staging: wfx: simplify hif_set_association_mode() Jérôme Pouiller
2020-01-15 13:54 ` [PATCH v2 31/65] staging: wfx: simplify hif_set_uc_mc_bc_condition() Jérôme Pouiller
2020-01-15 13:54 ` [PATCH v2 32/65] staging: wfx: simplify hif_mib_uc_mc_bc_data_frame_condition Jérôme Pouiller
2020-01-15 13:54 ` [PATCH v2 33/65] staging: wfx: simplify hif_mib_set_data_filtering Jérôme Pouiller
2020-01-15 13:54 ` [PATCH v2 34/65] staging: wfx: simplify hif_set_data_filtering() Jérôme Pouiller
2020-01-15 13:54 ` [PATCH v2 35/65] staging: wfx: simplify hif_set_mac_addr_condition() Jérôme Pouiller
2020-01-15 13:54 ` [PATCH v2 36/65] staging: wfx: simplify hif_set_config_data_filter() Jérôme Pouiller
2020-01-15 13:54 ` [PATCH v2 37/65] staging: wfx: simplify wfx_set_mcast_filter() Jérôme Pouiller
2020-01-15 13:54 ` [PATCH v2 38/65] staging: wfx: simplify wfx_update_filtering() Jérôme Pouiller
2020-01-15 13:54 ` [PATCH v2 39/65] staging: wfx: simplify wfx_scan_complete() Jérôme Pouiller
2020-01-15 13:55 ` [PATCH v2 40/65] staging: wfx: update power-save per interface Jérôme Pouiller
2020-01-15 13:55 ` [PATCH v2 41/65] staging: wfx: with multiple vifs, force PS only if channels differs Jérôme Pouiller
2020-01-15 13:55 ` [PATCH v2 42/65] staging: wfx: do not update uapsd if not necessary Jérôme Pouiller
2020-01-15 13:55 ` [PATCH v2 43/65] staging: wfx: fix case where RTS threshold is 0 Jérôme Pouiller
2020-01-15 13:55 ` [PATCH v2 44/65] staging: wfx: fix possible overflow on jiffies comparaison Jérôme Pouiller
2020-01-15 13:55 ` [PATCH v2 45/65] staging: wfx: remove handling of "early_data" Jérôme Pouiller
2020-01-15 13:55 ` [PATCH v2 46/65] staging: wfx: relocate "buffered" information to sta_priv Jérôme Pouiller
2020-01-15 13:55 ` [PATCH v2 47/65] staging: wfx: fix bss_loss Jérôme Pouiller
2020-01-15 13:55 ` [PATCH v2 48/65] staging: wfx: fix RCU usage Jérôme Pouiller
2020-01-15 13:55 ` [PATCH v2 49/65] staging: wfx: simplify wfx_set_tim_impl() Jérôme Pouiller
2020-01-15 13:55 ` [PATCH v2 50/65] staging: wfx: simplify the link-id allocation Jérôme Pouiller
2020-01-15 13:55 ` [PATCH v2 51/65] staging: wfx: check that no tx is pending before release sta Jérôme Pouiller
2020-01-15 13:55 ` [PATCH v2 52/65] staging: wfx: replace wfx_tx_get_tid() with ieee80211_get_tid() Jérôme Pouiller
2020-01-15 13:55 ` [PATCH v2 53/65] staging: wfx: pspoll_mask make no sense Jérôme Pouiller
2020-01-15 13:55 ` [PATCH v2 54/65] staging: wfx: sta and dtim Jérôme Pouiller
2020-01-15 13:55 ` [PATCH v2 55/65] staging: wfx: firmware never return PS status for stations Jérôme Pouiller
2020-01-15 13:55 ` [PATCH v2 56/65] staging: wfx: simplify wfx_suspend_resume_mc() Jérôme Pouiller
2020-01-15 13:55 ` [PATCH v2 57/65] staging: wfx: simplify handling of IEEE80211_TX_CTL_SEND_AFTER_DTIM Jérôme Pouiller
2020-01-15 13:55 ` [PATCH v2 58/65] staging: wfx: simplify wfx_ps_notify_sta() Jérôme Pouiller
2020-01-15 13:55 ` [PATCH v2 59/65] staging: wfx: ensure that packet_id is unique Jérôme Pouiller
2020-01-15 13:55 ` [PATCH v2 60/65] staging: wfx: remove unused do_probe Jérôme Pouiller
2020-01-15 13:55 ` [PATCH v2 61/65] staging: wfx: remove check for interface state Jérôme Pouiller
2020-01-15 13:55 ` [PATCH v2 62/65] staging: wfx: simplify hif_handle_tx_data() Jérôme Pouiller
2020-01-15 13:55 ` [PATCH v2 63/65] staging: wfx: simplify wfx_tx_queue_get_num_queued() Jérôme Pouiller
2020-01-15 13:55 ` [PATCH v2 64/65] staging: wfx: simplify hif_multi_tx_confirm() Jérôme Pouiller
2020-01-15 13:55 ` [PATCH v2 65/65] staging: wfx: update TODO Jérôme Pouiller

Reply instructions:

You may reply publically to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200115135338.14374-11-Jerome.Pouiller@silabs.com \
    --to=jerome.pouiller@silabs.com \
    --cc=davem@davemloft.net \
    --cc=devel@driverdev.osuosl.org \
    --cc=gregkh@linuxfoundation.org \
    --cc=kvalo@codeaurora.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-wireless@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

DriverDev-Devel Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/driverdev-devel/0 driverdev-devel/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 driverdev-devel driverdev-devel/ https://lore.kernel.org/driverdev-devel \
		driverdev-devel@linuxdriverproject.org devel@driverdev.osuosl.org
	public-inbox-index driverdev-devel

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.linuxdriverproject.driverdev-devel


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git