mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-29 22:02:02 +00:00
Code Issues Releases Wiki Activity

staging: wilc1000: make use of FIELD_GET/_PREP macro

Browse source 
Simplified the code by making use of FIELD_GET/_PREP bitfield macro.

Signed-off-by: Ajay Singh <ajay.kathat@microchip.com>
Link: https://lore.kernel.org/r/20200214172250.13026-2-ajay.kathat@microchip.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Ajay Singh 2020-02-14 11:52:15 +00:00 committed by Greg Kroah-Hartman
parent c77761d660
commit 38f193dff5
6 changed files with 39 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/staging/wilc1000/cfg80211.c
View file

@ -988,7 +988,7 @@ void wilc_wfi_p2p_rx(struct wilc_vif *vif, u8 *buff, u32 size)
s32 freq; s32 freq;
header = get_unaligned_le32(buff - HOST_HDR_OFFSET); header = get_unaligned_le32(buff - HOST_HDR_OFFSET);
pkt_offset = GET_PKT_OFFSET(header); pkt_offset = FIELD_GET(WILC_PKT_HDR_OFFSET_FIELD, header);
if (pkt_offset & IS_MANAGMEMENT_CALLBACK) { if (pkt_offset & IS_MANAGMEMENT_CALLBACK) {
bool ack = false; bool ack = false;

2
drivers/staging/wilc1000/mon.c
View file

@ -40,7 +40,7 @@ void wilc_wfi_monitor_rx(struct net_device *mon_dev, u8 *buff, u32 size)
* The packet offset field contain info about what type of management * The packet offset field contain info about what type of management
* the frame we are dealing with and ack status * the frame we are dealing with and ack status
*/ */
pkt_offset = GET_PKT_OFFSET(header); pkt_offset = FIELD_GET(WILC_PKT_HDR_OFFSET_FIELD, header);
if (pkt_offset & IS_MANAGMEMENT_CALLBACK) { if (pkt_offset & IS_MANAGMEMENT_CALLBACK) {
/* hostapd callback mgmt frame */ /* hostapd callback mgmt frame */

2
drivers/staging/wilc1000/netdev.h
View file

@ -29,8 +29,6 @@
#define TCP_ACK_FILTER_LINK_SPEED_THRESH 54 #define TCP_ACK_FILTER_LINK_SPEED_THRESH 54
#define DEFAULT_LINK_SPEED 72 #define DEFAULT_LINK_SPEED 72
#define GET_PKT_OFFSET(a) (((a) >> 22) & 0x1ff)
struct wilc_wfi_stats { struct wilc_wfi_stats {
unsigned long rx_packets; unsigned long rx_packets;
unsigned long tx_packets; unsigned long tx_packets;

2
drivers/staging/wilc1000/spi.c
View file

@ -898,7 +898,7 @@ static int wilc_spi_read_size(struct wilc *wilc, u32 *size)
int ret; int ret;
ret = spi_internal_read(wilc, 0xe840 - WILC_SPI_REG_BASE, size); ret = spi_internal_read(wilc, 0xe840 - WILC_SPI_REG_BASE, size);
*size = *size & IRQ_DMA_WD_CNT_MASK; *size = FIELD_GET(IRQ_DMA_WD_CNT_MASK, *size);
return ret; return ret;
} }

32
drivers/staging/wilc1000/wlan.c
View file

@ -568,8 +568,8 @@ int wilc_wlan_handle_txq(struct wilc *wilc, u32 *txq_count)
ret = func->hif_read_reg(wilc, WILC_HOST_VMM_CTL, &reg); ret = func->hif_read_reg(wilc, WILC_HOST_VMM_CTL, &reg);
if (ret) if (ret)
break; break;
if ((reg >> 2) & 0x1) { if (FIELD_GET(WILC_VMM_ENTRY_AVAILABLE, reg)) {
entries = ((reg >> 3) & 0x3f); entries = FIELD_GET(WILC_VMM_ENTRY_COUNT, reg);
break; break;
} }
release_bus(wilc, WILC_BUS_RELEASE_ALLOW_SLEEP); release_bus(wilc, WILC_BUS_RELEASE_ALLOW_SLEEP);
@ -610,6 +610,7 @@ int wilc_wlan_handle_txq(struct wilc *wilc, u32 *txq_count)
do { do {
u32 header, buffer_offset; u32 header, buffer_offset;
char *bssid; char *bssid;
u8 mgmt_ptk = 0;
tqe = wilc_wlan_txq_remove_from_head(dev); tqe = wilc_wlan_txq_remove_from_head(dev);
if (!tqe) if (!tqe)
@ -620,15 +621,16 @@ int wilc_wlan_handle_txq(struct wilc *wilc, u32 *txq_count)
break; break;
le32_to_cpus(&vmm_table[i]); le32_to_cpus(&vmm_table[i]);
vmm_sz = (vmm_table[i] & 0x3ff); vmm_sz = FIELD_GET(WILC_VMM_BUFFER_SIZE, vmm_table[i]);
vmm_sz *= 4; vmm_sz *= 4;
header = (tqe->type << 31) |
(tqe->buffer_size << 15) |
vmm_sz;
if (tqe->type == WILC_MGMT_PKT) if (tqe->type == WILC_MGMT_PKT)
header |= BIT(30); mgmt_ptk = 1;
else
header &= ~BIT(30); header = (FIELD_PREP(WILC_VMM_HDR_TYPE, tqe->type) |
FIELD_PREP(WILC_VMM_HDR_MGMT_FIELD, mgmt_ptk) |
FIELD_PREP(WILC_VMM_HDR_PKT_SIZE, tqe->buffer_size) |
FIELD_PREP(WILC_VMM_HDR_BUFF_SIZE, vmm_sz));
cpu_to_le32s(&header); cpu_to_le32s(&header);
memcpy(&txb[offset], &header, 4); memcpy(&txb[offset], &header, 4);
@ -686,10 +688,10 @@ static void wilc_wlan_handle_rx_buff(struct wilc *wilc, u8 *buffer, int size)
buff_ptr = buffer + offset; buff_ptr = buffer + offset;
header = get_unaligned_le32(buff_ptr); header = get_unaligned_le32(buff_ptr);
is_cfg_packet = (header >> 31) & 0x1; is_cfg_packet = FIELD_GET(WILC_PKT_HDR_CONFIG_FIELD, header);
pkt_offset = (header >> 22) & 0x1ff; pkt_offset = FIELD_GET(WILC_PKT_HDR_OFFSET_FIELD, header);
tp_len = (header >> 11) & 0x7ff; tp_len = FIELD_GET(WILC_PKT_HDR_TOTAL_LEN_FIELD, header);
pkt_len = header & 0x7ff; pkt_len = FIELD_GET(WILC_PKT_HDR_LEN_FIELD, header);
if (pkt_len == 0 || tp_len == 0) if (pkt_len == 0 || tp_len == 0)
break; break;
@ -758,11 +760,11 @@ static void wilc_wlan_handle_isr_ext(struct wilc *wilc, u32 int_status)
int ret = 0; int ret = 0;
struct rxq_entry_t *rqe; struct rxq_entry_t *rqe;
size = (int_status & 0x7fff) << 2; size = FIELD_GET(WILC_INTERRUPT_DATA_SIZE, int_status) << 2;
while (!size && retries < 10) { while (!size && retries < 10) {
wilc->hif_func->hif_read_size(wilc, &size); wilc->hif_func->hif_read_size(wilc, &size);
size = (size & 0x7fff) << 2; size = FIELD_GET(WILC_INTERRUPT_DATA_SIZE, size) << 2;
retries++; retries++;
} }

20
drivers/staging/wilc1000/wlan.h
View file

@ -8,6 +8,7 @@
#define WILC_WLAN_H #define WILC_WLAN_H
#include <linux/types.h> #include <linux/types.h>
#include <linux/bitfield.h>
/******************************************** /********************************************
* *
@ -135,6 +136,23 @@
#define MODALIAS "WILC_SPI" #define MODALIAS "WILC_SPI"
#define GPIO_NUM 0x44 #define GPIO_NUM 0x44
#define WILC_PKT_HDR_CONFIG_FIELD BIT(31)
#define WILC_PKT_HDR_OFFSET_FIELD GENMASK(30, 22)
#define WILC_PKT_HDR_TOTAL_LEN_FIELD GENMASK(21, 11)
#define WILC_PKT_HDR_LEN_FIELD GENMASK(10, 0)
#define WILC_INTERRUPT_DATA_SIZE GENMASK(14, 0)
#define WILC_VMM_BUFFER_SIZE GENMASK(9, 0)
#define WILC_VMM_HDR_TYPE BIT(31)
#define WILC_VMM_HDR_MGMT_FIELD BIT(30)
#define WILC_VMM_HDR_PKT_SIZE GENMASK(29, 15)
#define WILC_VMM_HDR_BUFF_SIZE GENMASK(14, 0)
#define WILC_VMM_ENTRY_COUNT GENMASK(8, 3)
#define WILC_VMM_ENTRY_AVAILABLE BIT(2)
/*******************************************/ /*******************************************/
/* E0 and later Interrupt flags. */ /* E0 and later Interrupt flags. */
/*******************************************/ /*******************************************/
@ -150,7 +168,7 @@
/* 21: INT5 flag */ /* 21: INT5 flag */
/*******************************************/ /*******************************************/
#define IRG_FLAGS_OFFSET 16 #define IRG_FLAGS_OFFSET 16
#define IRQ_DMA_WD_CNT_MASK ((1ul << IRG_FLAGS_OFFSET) - 1) #define IRQ_DMA_WD_CNT_MASK GENMASK(IRG_FLAGS_OFFSET - 1, 0)
#define INT_0 BIT(IRG_FLAGS_OFFSET) #define INT_0 BIT(IRG_FLAGS_OFFSET)
#define INT_1 BIT(IRG_FLAGS_OFFSET + 1) #define INT_1 BIT(IRG_FLAGS_OFFSET + 1)
#define INT_2 BIT(IRG_FLAGS_OFFSET + 2) #define INT_2 BIT(IRG_FLAGS_OFFSET + 2)