Skip to content

Commit

Permalink
ath11k: ce: remove CE_COUNT() macro
Browse files Browse the repository at this point in the history 
This macro is evil as it's accesses ab variable in a hidden way. It's better
for readibility to access ab->hw_params.ce_count directly.

This is done in a separate patch to keep the patches simple. No functional changes.

Tested-on: QCA6390 hw2.0 PCI WLAN.HST.1.0.1-01740-QCAHSTSWPLZ_V2_TO_X86-1
Tested-on: IPQ8074 hw2.0 AHB WLAN.HK.2.1.0.1-01238-QCAHKSWPL_SILICONZ-2

Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/1597576599-8857-6-git-send-email-kvalo@codeaurora.org
  • Loading branch information
Kalle Valo committed Aug 18, 2020
1 parent 6e5e9f5 commit d9d4b5f
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 21 deletions.
12 changes: 6 additions & 6 deletions drivers/net/wireless/ath/ath11k/ahb.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -384,7 +384,7 @@ static void ath11k_ahb_kill_tasklets(struct ath11k_base *ab)
{
int i;

for (i = 0; i < CE_COUNT; i++) {
for (i = 0; i < ab->hw_params.ce_count; i++) {
struct ath11k_ce_pipe *ce_pipe = &ab->ce.ce_pipe[i];

if (ath11k_ce_get_attr_flags(ab, i) & CE_ATTR_DIS_INTR)
Expand Down Expand Up @@ -475,7 +475,7 @@ static void ath11k_ahb_sync_ce_irqs(struct ath11k_base *ab)
int i;
int irq_idx;

for (i = 0; i < CE_COUNT; i++) {
for (i = 0; i < ab->hw_params.ce_count; i++) {
if (ath11k_ce_get_attr_flags(ab, i) & CE_ATTR_DIS_INTR)
continue;

Expand Down Expand Up @@ -503,7 +503,7 @@ static void ath11k_ahb_ce_irqs_enable(struct ath11k_base *ab)
{
int i;

for (i = 0; i < CE_COUNT; i++) {
for (i = 0; i < ab->hw_params.ce_count; i++) {
if (ath11k_ce_get_attr_flags(ab, i) & CE_ATTR_DIS_INTR)
continue;
ath11k_ahb_ce_irq_enable(ab, i);
Expand All @@ -514,7 +514,7 @@ static void ath11k_ahb_ce_irqs_disable(struct ath11k_base *ab)
{
int i;

for (i = 0; i < CE_COUNT; i++) {
for (i = 0; i < ab->hw_params.ce_count; i++) {
if (ath11k_ce_get_attr_flags(ab, i) & CE_ATTR_DIS_INTR)
continue;
ath11k_ahb_ce_irq_disable(ab, i);
Expand Down Expand Up @@ -601,7 +601,7 @@ static void ath11k_ahb_free_irq(struct ath11k_base *ab)
int irq_idx;
int i;

for (i = 0; i < CE_COUNT; i++) {
for (i = 0; i < ab->hw_params.ce_count; i++) {
if (ath11k_ce_get_attr_flags(ab, i) & CE_ATTR_DIS_INTR)
continue;
irq_idx = ATH11K_IRQ_CE0_OFFSET + i;
Expand Down Expand Up @@ -756,7 +756,7 @@ static int ath11k_ahb_config_irq(struct ath11k_base *ab)
int ret;

/* Configure CE irqs */
for (i = 0; i < CE_COUNT; i++) {
for (i = 0; i < ab->hw_params.ce_count; i++) {
struct ath11k_ce_pipe *ce_pipe = &ab->ce.ce_pipe[i];

if (ath11k_ce_get_attr_flags(ab, i) & CE_ATTR_DIS_INTR)
Expand Down
12 changes: 6 additions & 6 deletions drivers/net/wireless/ath/ath11k/ce.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -718,7 +718,7 @@ void ath11k_ce_cleanup_pipes(struct ath11k_base *ab)
struct ath11k_ce_pipe *pipe;
int pipe_num;

for (pipe_num = 0; pipe_num < CE_COUNT; pipe_num++) {
for (pipe_num = 0; pipe_num < ab->hw_params.ce_count; pipe_num++) {
pipe = &ab->ce.ce_pipe[pipe_num];
ath11k_ce_rx_pipe_cleanup(pipe);

Expand All @@ -736,7 +736,7 @@ void ath11k_ce_rx_post_buf(struct ath11k_base *ab)
int i;
int ret;

for (i = 0; i < CE_COUNT; i++) {
for (i = 0; i < ab->hw_params.ce_count; i++) {
pipe = &ab->ce.ce_pipe[i];
ret = ath11k_ce_rx_post_pipe(pipe);
if (ret) {
Expand Down Expand Up @@ -767,7 +767,7 @@ int ath11k_ce_init_pipes(struct ath11k_base *ab)
int i;
int ret;

for (i = 0; i < CE_COUNT; i++) {
for (i = 0; i < ab->hw_params.ce_count; i++) {
pipe = &ab->ce.ce_pipe[i];

if (pipe->src_ring) {
Expand Down Expand Up @@ -825,7 +825,7 @@ void ath11k_ce_free_pipes(struct ath11k_base *ab)
int desc_sz;
int i;

for (i = 0; i < CE_COUNT; i++) {
for (i = 0; i < ab->hw_params.ce_count; i++) {
pipe = &ab->ce.ce_pipe[i];

if (pipe->src_ring) {
Expand Down Expand Up @@ -874,7 +874,7 @@ int ath11k_ce_alloc_pipes(struct ath11k_base *ab)

spin_lock_init(&ab->ce.ce_lock);

for (i = 0; i < CE_COUNT; i++) {
for (i = 0; i < ab->hw_params.ce_count; i++) {
attr = &ab->hw_params.host_ce_config[i];
pipe = &ab->ce.ce_pipe[i];
pipe->pipe_num = i;
Expand Down Expand Up @@ -914,7 +914,7 @@ void ath11k_ce_byte_swap(void *mem, u32 len)

int ath11k_ce_get_attr_flags(struct ath11k_base *ab, int ce_id)
{
if (ce_id >= CE_COUNT)
if (ce_id >= ab->hw_params.ce_count)
return -EINVAL;

return ab->hw_params.host_ce_config[ce_id].flags;
Expand Down
1 change: 0 additions & 1 deletion drivers/net/wireless/ath/ath11k/ce.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
#ifndef ATH11K_CE_H
#define ATH11K_CE_H

#define CE_COUNT (ab->hw_params.ce_count)
#define CE_COUNT_MAX 12

/* Byte swap data words */
Expand Down
2 changes: 1 addition & 1 deletion drivers/net/wireless/ath/ath11k/hal.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1157,7 +1157,7 @@ void ath11k_hal_dump_srng_stats(struct ath11k_base *ab)
int i;

ath11k_err(ab, "Last interrupt received for each CE:\n");
for (i = 0; i < CE_COUNT; i++) {
for (i = 0; i < ab->hw_params.ce_count; i++) {
ce_pipe = &ab->ce.ce_pipe[i];

if (ath11k_ce_get_attr_flags(ab, i) & CE_ATTR_DIS_INTR)
Expand Down
2 changes: 1 addition & 1 deletion drivers/net/wireless/ath/ath11k/htc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -478,7 +478,7 @@ int ath11k_htc_wait_target(struct ath11k_htc *htc)
if (!time_left) {
ath11k_warn(ab, "failed to receive control response completion, polling..\n");

for (i = 0; i < CE_COUNT; i++)
for (i = 0; i < ab->hw_params.ce_count; i++)
ath11k_ce_per_engine_service(htc->ab, i);

time_left =
Expand Down
12 changes: 6 additions & 6 deletions drivers/net/wireless/ath/ath11k/pci.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -393,7 +393,7 @@ static void ath11k_pci_free_irq(struct ath11k_base *ab)
{
int i, irq_idx;

for (i = 0; i < CE_COUNT; i++) {
for (i = 0; i < ab->hw_params.ce_count; i++) {
if (ath11k_ce_get_attr_flags(ab, i) & CE_ATTR_DIS_INTR)
continue;
irq_idx = ATH11K_PCI_IRQ_CE0_OFFSET + i;
Expand Down Expand Up @@ -421,7 +421,7 @@ static void ath11k_pci_ce_irqs_disable(struct ath11k_base *ab)
{
int i;

for (i = 0; i < CE_COUNT; i++) {
for (i = 0; i < ab->hw_params.ce_count; i++) {
if (ath11k_ce_get_attr_flags(ab, i) & CE_ATTR_DIS_INTR)
continue;
ath11k_pci_ce_irq_disable(ab, i);
Expand All @@ -433,7 +433,7 @@ static void ath11k_pci_sync_ce_irqs(struct ath11k_base *ab)
int i;
int irq_idx;

for (i = 0; i < CE_COUNT; i++) {
for (i = 0; i < ab->hw_params.ce_count; i++) {
if (ath11k_ce_get_attr_flags(ab, i) & CE_ATTR_DIS_INTR)
continue;

Expand Down Expand Up @@ -477,7 +477,7 @@ static int ath11k_pci_config_irq(struct ath11k_base *ab)
return ret;

/* Configure CE irqs */
for (i = 0; i < CE_COUNT; i++) {
for (i = 0; i < ab->hw_params.ce_count; i++) {
msi_data = (i % msi_data_count) + msi_irq_start;
irq = ath11k_pci_get_msi_irq(ab->dev, msi_data);
ce_pipe = &ab->ce.ce_pipe[i];
Expand Down Expand Up @@ -521,7 +521,7 @@ static void ath11k_pci_ce_irqs_enable(struct ath11k_base *ab)
{
int i;

for (i = 0; i < CE_COUNT; i++) {
for (i = 0; i < ab->hw_params.ce_count; i++) {
if (ath11k_ce_get_attr_flags(ab, i) & CE_ATTR_DIS_INTR)
continue;
ath11k_pci_ce_irq_enable(ab, i);
Expand Down Expand Up @@ -680,7 +680,7 @@ static void ath11k_pci_kill_tasklets(struct ath11k_base *ab)
{
int i;

for (i = 0; i < CE_COUNT; i++) {
for (i = 0; i < ab->hw_params.ce_count; i++) {
struct ath11k_ce_pipe *ce_pipe = &ab->ce.ce_pipe[i];

if (ath11k_ce_get_attr_flags(ab, i) & CE_ATTR_DIS_INTR)
Expand Down

0 comments on commit d9d4b5f

Please sign in to comment.