qcacmn: ADD qdf changes required for datapath

Remove qdf print from QDF_TRACE
Change physical address type to qdf_dma_addr_t
Add qdf API to get min of two numbers

Change-Id: Ie4e0a98d603e56e1bdaf3b8b7c099c7dad5b1bac
CRs-Fixed: 2016072
This commit is contained in:
Ishank Jain
2017-03-20 19:20:38 +05:30
committed by Sandeep Puligilla
parent 9d7d7043b4
commit 9dd1ed1a84
5 changed files with 12 additions and 7 deletions

View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2014-2016 The Linux Foundation. All rights reserved. * Copyright (c) 2014-2017 The Linux Foundation. All rights reserved.
* *
* Previously licensed under the ISC license by Qualcomm Atheros, Inc. * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
* *
@@ -191,7 +191,7 @@ static inline uint32_t qdf_str_lcopy(char *dest, const char *src, uint32_t bytes
*/ */
static inline uint32_t qdf_mem_map_nbytes_single(qdf_device_t osdev, void *buf, static inline uint32_t qdf_mem_map_nbytes_single(qdf_device_t osdev, void *buf,
qdf_dma_dir_t dir, int nbytes, qdf_dma_dir_t dir, int nbytes,
uint32_t *phy_addr) qdf_dma_addr_t *phy_addr)
{ {
#if defined(HIF_PCI) #if defined(HIF_PCI)
return __qdf_mem_map_nbytes_single(osdev, buf, dir, nbytes, phy_addr); return __qdf_mem_map_nbytes_single(osdev, buf, dir, nbytes, phy_addr);

View File

@@ -432,6 +432,11 @@ static inline uint8_t *qdf_get_u32(uint8_t *ptr, uint32_t *value)
*/ */
#define qdf_function __qdf_function #define qdf_function __qdf_function
/**
* qdf_min - minimum of two numbers
*/
#define qdf_min(a, b) __qdf_min(a, b)
/** /**
* qdf_get_pwr2() - get next power of 2 integer from input value * qdf_get_pwr2() - get next power of 2 integer from input value
* @value: input value to find next power of 2 integer * @value: input value to find next power of 2 integer

View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2014-2016 The Linux Foundation. All rights reserved. * Copyright (c) 2014-2017 The Linux Foundation. All rights reserved.
* *
* Previously licensed under the ISC license by Qualcomm Atheros, Inc. * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
* *
@@ -141,7 +141,7 @@ static inline uint32_t __qdf_str_lcopy(char *dest, const char *src,
static inline uint32_t __qdf_mem_map_nbytes_single(qdf_device_t osdev, static inline uint32_t __qdf_mem_map_nbytes_single(qdf_device_t osdev,
void *buf, qdf_dma_dir_t dir, void *buf, qdf_dma_dir_t dir,
int nbytes, int nbytes,
uint32_t *phy_addr) qdf_dma_addr_t *phy_addr)
{ {
/* assume that the OS only provides a single fragment */ /* assume that the OS only provides a single fragment */
*phy_addr = dma_map_single(osdev->dev, buf, nbytes, dir); *phy_addr = dma_map_single(osdev->dev, buf, nbytes, dir);

View File

@@ -63,7 +63,7 @@
do { \ do { \
extern int qdf_dbg_mask; \ extern int qdf_dbg_mask; \
if (qdf_dbg_mask >= log_level) { \ if (qdf_dbg_mask >= log_level) { \
printk("qdf: "args); \ printk(args); \
printk("\n"); \ printk("\n"); \
} \ } \
} while (0) } while (0)

View File

@@ -219,8 +219,8 @@ static inline bool __qdf_is_macaddr_equal(struct qdf_mac_addr *mac_addr1,
/** /**
* @brief memory barriers. * @brief memory barriers.
*/ */
#define __qdf_min(_a, _b) ((_a) < (_b) ? _a : _b) #define __qdf_min(_a, _b) min(a, b)
#define __qdf_max(_a, _b) ((_a) > (_b) ? _a : _b) #define __qdf_max(_a, _b) max(a, b)
#define MEMINFO_KB(x) ((x) << (PAGE_SHIFT - 10)) /* In kilobytes */ #define MEMINFO_KB(x) ((x) << (PAGE_SHIFT - 10)) /* In kilobytes */