rt2800: add rt2800lib (part one)
Code unification. Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> Acked-by: Ivo van Doorn <IvDoorn@gmail.com> Acked-by: Gertjan van Wingerde <gwingerde@gmail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:

committed by
John W. Linville

parent
4d6f8b9f17
commit
89297425c2
@@ -45,229 +45,6 @@ static int modparam_nohwcrypt = 1;
|
||||
module_param_named(nohwcrypt, modparam_nohwcrypt, bool, S_IRUGO);
|
||||
MODULE_PARM_DESC(nohwcrypt, "Disable hardware encryption.");
|
||||
|
||||
/*
|
||||
* Register access.
|
||||
* All access to the CSR registers will go through the methods
|
||||
* rt2800_register_read and rt2800_register_write.
|
||||
* BBP and RF register require indirect register access,
|
||||
* and use the CSR registers BBPCSR and RFCSR to achieve this.
|
||||
* These indirect registers work with busy bits,
|
||||
* and we will try maximal REGISTER_BUSY_COUNT times to access
|
||||
* the register while taking a REGISTER_BUSY_DELAY us delay
|
||||
* between each attampt. When the busy bit is still set at that time,
|
||||
* the access attempt is considered to have failed,
|
||||
* and we will print an error.
|
||||
* The _lock versions must be used if you already hold the csr_mutex
|
||||
*/
|
||||
#define WAIT_FOR_BBP(__dev, __reg) \
|
||||
rt2800_regbusy_read((__dev), BBP_CSR_CFG, BBP_CSR_CFG_BUSY, (__reg))
|
||||
#define WAIT_FOR_RFCSR(__dev, __reg) \
|
||||
rt2800_regbusy_read((__dev), RF_CSR_CFG, RF_CSR_CFG_BUSY, (__reg))
|
||||
#define WAIT_FOR_RF(__dev, __reg) \
|
||||
rt2800_regbusy_read((__dev), RF_CSR_CFG0, RF_CSR_CFG0_BUSY, (__reg))
|
||||
#define WAIT_FOR_MCU(__dev, __reg) \
|
||||
rt2800_regbusy_read((__dev), H2M_MAILBOX_CSR, \
|
||||
H2M_MAILBOX_CSR_OWNER, (__reg))
|
||||
|
||||
static void rt2800usb_bbp_write(struct rt2x00_dev *rt2x00dev,
|
||||
const unsigned int word, const u8 value)
|
||||
{
|
||||
u32 reg;
|
||||
|
||||
mutex_lock(&rt2x00dev->csr_mutex);
|
||||
|
||||
/*
|
||||
* Wait until the BBP becomes available, afterwards we
|
||||
* can safely write the new data into the register.
|
||||
*/
|
||||
if (WAIT_FOR_BBP(rt2x00dev, ®)) {
|
||||
reg = 0;
|
||||
rt2x00_set_field32(®, BBP_CSR_CFG_VALUE, value);
|
||||
rt2x00_set_field32(®, BBP_CSR_CFG_REGNUM, word);
|
||||
rt2x00_set_field32(®, BBP_CSR_CFG_BUSY, 1);
|
||||
rt2x00_set_field32(®, BBP_CSR_CFG_READ_CONTROL, 0);
|
||||
|
||||
rt2800_register_write_lock(rt2x00dev, BBP_CSR_CFG, reg);
|
||||
}
|
||||
|
||||
mutex_unlock(&rt2x00dev->csr_mutex);
|
||||
}
|
||||
|
||||
static void rt2800usb_bbp_read(struct rt2x00_dev *rt2x00dev,
|
||||
const unsigned int word, u8 *value)
|
||||
{
|
||||
u32 reg;
|
||||
|
||||
mutex_lock(&rt2x00dev->csr_mutex);
|
||||
|
||||
/*
|
||||
* Wait until the BBP becomes available, afterwards we
|
||||
* can safely write the read request into the register.
|
||||
* After the data has been written, we wait until hardware
|
||||
* returns the correct value, if at any time the register
|
||||
* doesn't become available in time, reg will be 0xffffffff
|
||||
* which means we return 0xff to the caller.
|
||||
*/
|
||||
if (WAIT_FOR_BBP(rt2x00dev, ®)) {
|
||||
reg = 0;
|
||||
rt2x00_set_field32(®, BBP_CSR_CFG_REGNUM, word);
|
||||
rt2x00_set_field32(®, BBP_CSR_CFG_BUSY, 1);
|
||||
rt2x00_set_field32(®, BBP_CSR_CFG_READ_CONTROL, 1);
|
||||
|
||||
rt2800_register_write_lock(rt2x00dev, BBP_CSR_CFG, reg);
|
||||
|
||||
WAIT_FOR_BBP(rt2x00dev, ®);
|
||||
}
|
||||
|
||||
*value = rt2x00_get_field32(reg, BBP_CSR_CFG_VALUE);
|
||||
|
||||
mutex_unlock(&rt2x00dev->csr_mutex);
|
||||
}
|
||||
|
||||
static inline void rt2800_bbp_write(struct rt2x00_dev *rt2x00dev,
|
||||
const unsigned int word, const u8 value)
|
||||
{
|
||||
rt2800usb_bbp_write(rt2x00dev, word, value);
|
||||
}
|
||||
|
||||
static inline void rt2800_bbp_read(struct rt2x00_dev *rt2x00dev,
|
||||
const unsigned int word, u8 *value)
|
||||
{
|
||||
rt2800usb_bbp_read(rt2x00dev, word, value);
|
||||
}
|
||||
|
||||
static void rt2800usb_rfcsr_write(struct rt2x00_dev *rt2x00dev,
|
||||
const unsigned int word, const u8 value)
|
||||
{
|
||||
u32 reg;
|
||||
|
||||
mutex_lock(&rt2x00dev->csr_mutex);
|
||||
|
||||
/*
|
||||
* Wait until the RFCSR becomes available, afterwards we
|
||||
* can safely write the new data into the register.
|
||||
*/
|
||||
if (WAIT_FOR_RFCSR(rt2x00dev, ®)) {
|
||||
reg = 0;
|
||||
rt2x00_set_field32(®, RF_CSR_CFG_DATA, value);
|
||||
rt2x00_set_field32(®, RF_CSR_CFG_REGNUM, word);
|
||||
rt2x00_set_field32(®, RF_CSR_CFG_WRITE, 1);
|
||||
rt2x00_set_field32(®, RF_CSR_CFG_BUSY, 1);
|
||||
|
||||
rt2800_register_write_lock(rt2x00dev, RF_CSR_CFG, reg);
|
||||
}
|
||||
|
||||
mutex_unlock(&rt2x00dev->csr_mutex);
|
||||
}
|
||||
|
||||
static void rt2800usb_rfcsr_read(struct rt2x00_dev *rt2x00dev,
|
||||
const unsigned int word, u8 *value)
|
||||
{
|
||||
u32 reg;
|
||||
|
||||
mutex_lock(&rt2x00dev->csr_mutex);
|
||||
|
||||
/*
|
||||
* Wait until the RFCSR becomes available, afterwards we
|
||||
* can safely write the read request into the register.
|
||||
* After the data has been written, we wait until hardware
|
||||
* returns the correct value, if at any time the register
|
||||
* doesn't become available in time, reg will be 0xffffffff
|
||||
* which means we return 0xff to the caller.
|
||||
*/
|
||||
if (WAIT_FOR_RFCSR(rt2x00dev, ®)) {
|
||||
reg = 0;
|
||||
rt2x00_set_field32(®, RF_CSR_CFG_REGNUM, word);
|
||||
rt2x00_set_field32(®, RF_CSR_CFG_WRITE, 0);
|
||||
rt2x00_set_field32(®, RF_CSR_CFG_BUSY, 1);
|
||||
|
||||
rt2800_register_write_lock(rt2x00dev, RF_CSR_CFG, reg);
|
||||
|
||||
WAIT_FOR_RFCSR(rt2x00dev, ®);
|
||||
}
|
||||
|
||||
*value = rt2x00_get_field32(reg, RF_CSR_CFG_DATA);
|
||||
|
||||
mutex_unlock(&rt2x00dev->csr_mutex);
|
||||
}
|
||||
|
||||
static inline void rt2800_rfcsr_write(struct rt2x00_dev *rt2x00dev,
|
||||
const unsigned int word, const u8 value)
|
||||
{
|
||||
rt2800usb_rfcsr_write(rt2x00dev, word, value);
|
||||
}
|
||||
|
||||
static inline void rt2800_rfcsr_read(struct rt2x00_dev *rt2x00dev,
|
||||
const unsigned int word, u8 *value)
|
||||
{
|
||||
rt2800usb_rfcsr_read(rt2x00dev, word, value);
|
||||
}
|
||||
|
||||
static void rt2800usb_rf_write(struct rt2x00_dev *rt2x00dev,
|
||||
const unsigned int word, const u32 value)
|
||||
{
|
||||
u32 reg;
|
||||
|
||||
mutex_lock(&rt2x00dev->csr_mutex);
|
||||
|
||||
/*
|
||||
* Wait until the RF becomes available, afterwards we
|
||||
* can safely write the new data into the register.
|
||||
*/
|
||||
if (WAIT_FOR_RF(rt2x00dev, ®)) {
|
||||
reg = 0;
|
||||
rt2x00_set_field32(®, RF_CSR_CFG0_REG_VALUE_BW, value);
|
||||
rt2x00_set_field32(®, RF_CSR_CFG0_STANDBYMODE, 0);
|
||||
rt2x00_set_field32(®, RF_CSR_CFG0_SEL, 0);
|
||||
rt2x00_set_field32(®, RF_CSR_CFG0_BUSY, 1);
|
||||
|
||||
rt2800_register_write_lock(rt2x00dev, RF_CSR_CFG0, reg);
|
||||
rt2x00_rf_write(rt2x00dev, word, value);
|
||||
}
|
||||
|
||||
mutex_unlock(&rt2x00dev->csr_mutex);
|
||||
}
|
||||
|
||||
static inline void rt2800_rf_write(struct rt2x00_dev *rt2x00dev,
|
||||
const unsigned int word, const u32 value)
|
||||
{
|
||||
rt2800usb_rf_write(rt2x00dev, word, value);
|
||||
}
|
||||
|
||||
static void rt2800usb_mcu_request(struct rt2x00_dev *rt2x00dev,
|
||||
const u8 command, const u8 token,
|
||||
const u8 arg0, const u8 arg1)
|
||||
{
|
||||
u32 reg;
|
||||
|
||||
mutex_lock(&rt2x00dev->csr_mutex);
|
||||
|
||||
/*
|
||||
* Wait until the MCU becomes available, afterwards we
|
||||
* can safely write the new data into the register.
|
||||
*/
|
||||
if (WAIT_FOR_MCU(rt2x00dev, ®)) {
|
||||
rt2x00_set_field32(®, H2M_MAILBOX_CSR_OWNER, 1);
|
||||
rt2x00_set_field32(®, H2M_MAILBOX_CSR_CMD_TOKEN, token);
|
||||
rt2x00_set_field32(®, H2M_MAILBOX_CSR_ARG0, arg0);
|
||||
rt2x00_set_field32(®, H2M_MAILBOX_CSR_ARG1, arg1);
|
||||
rt2800_register_write_lock(rt2x00dev, H2M_MAILBOX_CSR, reg);
|
||||
|
||||
reg = 0;
|
||||
rt2x00_set_field32(®, HOST_CMD_CSR_HOST_COMMAND, command);
|
||||
rt2800_register_write_lock(rt2x00dev, HOST_CMD_CSR, reg);
|
||||
}
|
||||
|
||||
mutex_unlock(&rt2x00dev->csr_mutex);
|
||||
}
|
||||
|
||||
static inline void rt2800_mcu_request(struct rt2x00_dev *rt2x00dev,
|
||||
const u8 command, const u8 token,
|
||||
const u8 arg0, const u8 arg1)
|
||||
{
|
||||
rt2800usb_mcu_request(rt2x00dev, command, token, arg0, arg1);
|
||||
}
|
||||
|
||||
#ifdef CONFIG_RT2X00_LIB_DEBUGFS
|
||||
static const struct rt2x00debug rt2800usb_rt2x00debug = {
|
||||
.owner = THIS_MODULE,
|
||||
|
Reference in New Issue
Block a user