diff --git a/drivers/misc/mediatek/connectivity/wlan/adaptor/Makefile b/drivers/misc/mediatek/connectivity/wlan/adaptor/Makefile index 7ca14f0e3..0dadfe708 100644 --- a/drivers/misc/mediatek/connectivity/wlan/adaptor/Makefile +++ b/drivers/misc/mediatek/connectivity/wlan/adaptor/Makefile @@ -70,7 +70,6 @@ $(MODULE_NAME)-objs += wmt_cdev_wifi.o ifneq ($(CONFIG_MTK_CONNSYS_DEDICATED_LOG_PATH),) $(MODULE_NAME)-objs += fw_log_wifi.o $(MODULE_NAME)-objs += fw_log_ics.o -$(MODULE_NAME)-objs += wlan_ring.o endif ifeq ($(CONNAC_VER), 2_0) $(MODULE_NAME)-objs += wifi_pwr_on.o diff --git a/drivers/misc/mediatek/connectivity/wlan/adaptor/wlan_ring.c b/drivers/misc/mediatek/connectivity/wlan/adaptor/wlan_ring.c deleted file mode 100644 index aa2fca73e..000000000 --- a/drivers/misc/mediatek/connectivity/wlan/adaptor/wlan_ring.c +++ /dev/null @@ -1,143 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ - -/* - * Copyright (c) 2021 MediaTek Inc. - */ - -#include "ring.h" -#include -#include -#include - -void wlan_ring_init(void *base, unsigned int max_size, unsigned int read, - unsigned int write, struct ring *ring) -{ - WARN_ON(!base); - - /* making sure max_size is power of 2 */ - WARN_ON(!max_size || (max_size & (max_size - 1))); - - /* making sure write largger than read */ - WARN_ON(read > write); - - ring->base = base; - ring->read = read; - ring->write = write; - ring->max_size = max_size; -} - -void wlan_ring_dump(const char *title, struct ring *ring) -{ - pr_info("[%s] ring:{write=%d, read=%d, max_size=%d}\n", - title, ring->write, ring->read, ring->max_size); -} - -void wlan_ring_dump_segment(const char *title, struct ring_segment *seg) -{ - pr_info("[%s] seg:{ring_pt=0x%p, data_pos=%d, sz=%d, remain=%d}\n", - title, seg->ring_pt, seg->data_pos, - seg->sz, seg->remain); -} - -/* - * Function prepares the ring_segment and - * returns the number of valid bytes for read. - */ -unsigned int wlan_ring_read_prepare(unsigned int sz, - struct ring_segment *seg, - struct ring *ring) -{ - unsigned int wt = ring->write; - unsigned int rd = ring->read; - - memset(seg, 0, sizeof(struct ring_segment)); - if (sz > wt - rd) - sz = wt - rd; - seg->remain = sz; - /* wlan_ring_dump(__func__, ring); */ - /* wlan_ring_dump_segment(__func__, seg); */ - return seg->remain; -} - -/* - * Function prepares the ring_segment and - * returns the number of bytes available for write. - */ -unsigned int wlan_ring_write_prepare(unsigned int sz, - struct ring_segment *seg, - struct ring *ring) -{ - unsigned int wt = ring->write; - unsigned int rd = ring->read; - - memset(seg, 0, sizeof(struct ring_segment)); - if (sz > ring->max_size - (wt - rd)) - sz = ring->max_size - (wt - rd); - seg->remain = sz; - /* wlan_ring_dump(__func__, ring); */ - /* wlan_ring_dump_segment(__func__, seg); */ - return seg->remain; -} - -unsigned int wlan_ring_overwrite_prepare(unsigned int sz, struct ring_segment *seg, - struct ring *ring) -{ - unsigned int wt = ring->write; - unsigned int rd = ring->read; - - memset(seg, 0, sizeof(struct ring_segment)); - if (sz > ring->max_size - (wt - rd)) - ring->read += sz - (ring->max_size - (wt - rd)); - seg->remain = sz; - /* wlan_ring_dump(__func__, ring); */ - /* wlan_ring_dump_segment(__func__, seg); */ - return seg->remain; -} - -void __wlan_ring_segment_prepare(unsigned int from, unsigned int sz, - struct ring_segment *seg, - struct ring *ring) -{ - unsigned int ring_pos = from & (ring->max_size - 1); - - seg->ring_pt = ring->base + ring_pos; - seg->data_pos = (seg->sz ? seg->data_pos + seg->sz : 0); - if (ring_pos + sz <= ring->max_size) - seg->sz = sz; - else - seg->sz = ring->max_size - ring_pos; - seg->remain -= seg->sz; - /* wlan_ring_dump(__func__, ring); */ - /* wlan_ring_dump_segment(__func__, seg); */ -} - -void _wlan_ring_segment_prepare(unsigned int from, - struct ring_segment *seg, - struct ring *ring) -{ - __wlan_ring_segment_prepare(from, seg->remain, seg, ring); -} - -void _wlan_ring_segment_prepare_item(unsigned int from, - struct ring_segment *seg, - struct ring *ring) -{ - unsigned int size; - - size = (seg->remain ? 1 : 0); - __wlan_ring_segment_prepare(from, size, seg, ring); -} - -void _wlan_ring_read_commit(struct ring_segment *seg, struct ring *ring) -{ - ring->read += seg->sz; - /* wlan_ring_dump(__func__, ring); */ - /* wlan_ring_dump_segment(__func__, seg); */ -} -void _wlan_ring_write_commit(struct ring_segment *seg, struct ring *ring) -{ - ring->write += seg->sz; - /* wlan_ring_dump(__func__, ring); */ - /* wlan_ring_dump_segment(__func__, seg); */ -} -