Skip to content

wifi: cc33xx: update to cc33xx-linux-mpu 1.0.2.17 #34

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
lategoodbye wants to merge 1 commit into
base: v6.12.34-2.1.0-phy-cb
Choose a base branch
from
Draft

wifi: cc33xx: update to cc33xx-linux-mpu 1.0.2.17 #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion drivers/bluetooth/btti_sdio.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -685,14 +685,15 @@ static int btti_sdio_tx_packet(struct btti_private *private_data,
payload = skb->data;
data_send_size = roundup(packet_len, BTSDIO_TX_ALIGN);
alignment_required = (data_send_size != packet_len);
alignment_required |= !IS_ALIGNED((unsigned long) skb->data, 4);

if (alignment_required) {
tmpbuf = kzalloc(data_send_size, GFP_KERNEL);
if (!tmpbuf) {
BT_ERR("[bt sdio] TX allocation failed");
return -ENOMEM;
}
memcpy(tmpbuf, payload, data_send_size);
memcpy(tmpbuf, payload, packet_len);
} else {
tmpbuf = payload;
}
Expand Down
2 changes: 1 addition & 1 deletion drivers/net/wireless/ti/cc33xx/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# SPDX-License-Identifier: GPL-2.0

cc33xx-objs = main.o cmd.o io.o event.o tx.o rx.o ps.o acx.o \
boot.o init.o scan.o debugfs.o
boot.o init.o scan.o debugfs.o sysfs.o

cc33xx_spi-objs = spi.o
cc33xx_sdio-objs = sdio.o
Expand Down
160 changes: 156 additions & 4 deletions drivers/net/wireless/ti/cc33xx/acx.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -498,6 +498,23 @@ int cc33xx_acx_init_get_fw_versions(struct cc33xx *cc)
return 0;
}

int cc33xx_acx_get_slow_clock_type(struct cc33xx *cc)
{
struct acx_slow_clk_type *acx;
int ret = 0;

acx = kzalloc(sizeof(*acx), GFP_KERNEL);
if (!acx)
ret = -ENOMEM;

ret = cc33xx_cmd_interrogate(cc, GET_SLOW_CLK_SOURCE, acx,
sizeof(struct acx_header), sizeof(struct acx_slow_clk_type));
cc->is_ext_slw_clk = acx->is_ext_slw_clk;

kfree(acx);
return ret;
}

int cc33xx_acx_set_ht_information(struct cc33xx *cc, struct cc33xx_vif *wlvif,
u16 ht_operation_mode, u32 he_oper_params,
u16 he_oper_nss_set)
Expand Down Expand Up @@ -659,6 +676,67 @@ int cc33xx_acx_get_tx_rate(struct cc33xx *cc, struct cc33xx_vif *wlvif,
}

#ifdef CONFIG_PM
/* Configure ARP IP - send IP to add, or 0.0.0.0 to remove */
int cc33xx_acx_arp_ip_config(struct cc33xx *cc, u8 role_id, __be32 ip_addr)
{
struct acx_arp_ip_cfg *acx;
int ret;


acx = kzalloc(sizeof(*acx), GFP_KERNEL);
if (!acx) {
ret = -ENOMEM;
goto out;
}

acx->role_id = role_id;

if (ip_addr) {
memcpy(acx->address, &ip_addr, ACX_IPV4_ADDR_LENGTH);
cc33xx_debug(DEBUG_ACX,
"acx arp ip filter: SETTING role=%d, IP=%pI4", role_id, &ip_addr);
} else {
memset(acx->address, 0, ACX_IPV4_ADDR_LENGTH);
cc33xx_debug(DEBUG_ACX,
"acx arp ip filter: CLEARING role=%d, IP=0.0.0.0", role_id);
}

ret = cc33xx_cmd_configure(cc, ACX_ARP_IP_CFG, acx, sizeof(*acx));
if (ret < 0) {
cc33xx_warning("acx arp ip filter failed: %d", ret);
goto out;
}

out:
kfree(acx);
return ret;
}

/* Enable/disable ARP offload feature */
int cc33xx_acx_arp_offload(struct cc33xx *cc, bool enable)
{
struct acx_arp_offload *acx;
int ret;

cc33xx_debug(DEBUG_ACX, "acx arp offload enable: %d", enable);

acx = kzalloc(sizeof(*acx), GFP_KERNEL);
if (!acx)
return -ENOMEM;

acx->enable = enable;

ret = cc33xx_cmd_configure(cc, ACX_ARP_OFFLOAD_ENABLE, acx, sizeof(*acx));
if (ret < 0) {
cc33xx_warning("acx arp offload failed: %d", ret);
goto out;
}

out:
kfree(acx);
return ret;
}

/* Set the global behaviour of RX filters - On/Off + default action */
int cc33xx_acx_default_rx_filter_enable(struct cc33xx *cc, bool enable,
enum rx_filter_action action)
Expand Down Expand Up @@ -689,10 +767,12 @@ int cc33xx_acx_default_rx_filter_enable(struct cc33xx *cc, bool enable,
static int cc33xx_rx_filter_get_fields_size(struct cc33xx_rx_filter *filter)
{
int i, fields_size = 0;
u8 data_len;

for (i = 0; i < filter->num_fields; i++) {
fields_size += filter->fields[i].len - sizeof(u8 *)
+ sizeof(struct cc33xx_rx_filter_field);
data_len = (filter->fields[i].flags & CC33XX_RX_FILTER_FLAG_MASKED) ?
filter->fields[i].len * 2 : filter->fields[i].len;
fields_size += RX_FILTER_FIELD_OVERHEAD + data_len;
}

return fields_size;
Expand All @@ -703,6 +783,7 @@ static void cc33xx_rx_filter_flatten_fields(struct cc33xx_rx_filter *filter,
{
int i;
struct cc33xx_rx_filter_field *field;
u8 data_len;

for (i = 0; i < filter->num_fields; i++) {
field = (struct cc33xx_rx_filter_field *)buf;
Expand All @@ -711,9 +792,10 @@ static void cc33xx_rx_filter_flatten_fields(struct cc33xx_rx_filter *filter,
field->flags = filter->fields[i].flags;
field->len = filter->fields[i].len;

memcpy(&field->pattern, filter->fields[i].pattern, field->len);
data_len = (filter->fields[i].flags & CC33XX_RX_FILTER_FLAG_MASKED) ?
filter->fields[i].len * 2 : filter->fields[i].len;
buf += sizeof(struct cc33xx_rx_filter_field) - sizeof(u8 *);
buf += field->len;
buf += data_len;
}
}

Expand Down Expand Up @@ -767,6 +849,7 @@ int cc33xx_acx_set_rx_filter(struct cc33xx *cc, u8 index, bool enable,
*/
int cc33xx_acx_set_peer_cap(struct cc33xx *cc,
struct ieee80211_sta_ht_cap *ht_cap,
struct ieee80211_sta_vht_cap *vht_cap,
struct ieee80211_sta_he_cap *he_cap,
struct cc33xx_vif *wlvif, bool allow_ht_operation,
u32 rate_set, u8 hlid)
Expand Down Expand Up @@ -802,6 +885,8 @@ int cc33xx_acx_set_peer_cap(struct cc33xx *cc,
acx->supported_rates = cpu_to_le32(rate_set);

acx->role_id = wlvif->role_id;
acx->vht_capabilities = cpu_to_le32(vht_cap->cap);
acx->vht_supported = vht_cap->vht_supported;
acx->has_he = he_cap->has_he;
memcpy(acx->mac_cap_info, he_cap->he_cap_elem.mac_cap_info, 6);
cap_info = he_cap->he_cap_elem.phy_cap_info;
Expand Down Expand Up @@ -848,6 +933,39 @@ int cc33xx_acx_set_antenna_select(struct cc33xx *cc, u8 selection)
return ret;
}

int cc33xx_acx_set_regdoamin_and_tx_control_params(struct cc33xx *cc, struct acx_phy_regdomain_tx_control_params *params)
{
struct acx_phy_regdomain_tx_control_params *acx;
int ret;

acx = kzalloc(sizeof(*acx), GFP_KERNEL);
if (!acx) {
ret = -ENOMEM;
goto out;
}

acx->bitmask = params->bitmask;
acx->country_code = params->country_code;
acx->reg_domain = params->reg_domain;

memcpy(acx->ble_ch_lim_1M, params->ble_ch_lim_1M, sizeof(u8) * BLE_LIM_CHANNELS_COUNT);
memcpy(acx->ble_ch_lim_2M, params->ble_ch_lim_2M, sizeof(u8) * BLE_LIM_CHANNELS_COUNT);

memcpy(acx->per_channel_power_limit, params->per_channel_power_limit, sizeof(u8) * REG_RULES_COUNT);


ret = cc33xx_cmd_configure(cc, PHY_REGDOMAIN_TX_POWER_PARAMS,
acx, sizeof(*acx));
if (ret < 0) {
cc33xx_warning("acx regdoamin_and_tx_control_params failed: %d", ret);
goto out;
}

out:
kfree(acx);
return ret;
}

int cc33xx_acx_set_tsf(struct cc33xx *cc, u64 tsf_val)
{
struct debug_set_tsf *set_tsf_cmd;
Expand Down Expand Up @@ -1087,6 +1205,40 @@ int cc33xx_acx_antenna_diversity_select_default_antenna(struct cc33xx *cc, u8 de
return ret;
}

int cc33xx_acx_cqm_rssi_config(struct cc33xx *cc, struct cc33xx_vif *wlvif, bool enable, s8 threshold, u8 hysteresis)
{
struct acx_cqm_rssi_config *cqm_params;
int ret = 0;
int role_id = wlvif->role_id;

cc33xx_debug(DEBUG_CMD, "CQM config: role=%u, enable=%d, threshold=%d dBm, hysteresis=%d",
role_id, enable, threshold, hysteresis);

if (wlvif && enable) {
wlvif->last_rssi_event = -1;
cc33xx_info("CQM: Reset last_rssi_event for role %u", role_id);
}

cqm_params = kzalloc(sizeof(*cqm_params), GFP_KERNEL);
if (!cqm_params) {
cc33xx_error("CQM: Failed to allocate command buffer");
return -ENOMEM;
}

cqm_params->role_id = role_id;
cqm_params->enable = enable;
cqm_params->threshold_dbm = threshold;
cqm_params->hysteresis_db = hysteresis;

ret = cc33xx_cmd_configure(cc, CQM_RSSI_CONFIG, cqm_params, sizeof(*cqm_params));
if (ret < 0) {
cc33xx_error("CQM: Failed to send configure command: %d", ret);
}

kfree(cqm_params);
return ret;
}

int cc33xx_acx_statistics(struct cc33xx *cc, void *stats)
{
int ret;
Expand Down
Loading