| Message ID | 1479141222-8493-7-git-send-email-erik.stromdahl@gmail.com (mailing list archive) |
|---|---|
| State | Not Applicable |
| Delegated to: | Kalle Valo |
| Headers | show |
On 14 November 2016 at 17:33, Erik Stromdahl <erik.stromdahl@gmail.com> wrote: > Added functions implementing the following BMI commands: > > BMI_READ_SOC_REGISTER > BMI_WRITE_SOC_REGISTER > > Reading and writing BMI registers is sometimes needed for > SDIO chipsets. I didn't see ath10k_bmi_write_soc_reg nor ath10k_bmi_read_soc_reg being used in your Patch 12. Is this patch really necessary? [...] > diff --git a/drivers/net/wireless/ath/ath10k/bmi.c b/drivers/net/wireless/ath/ath10k/bmi.c > index 2872d34..1c378a2 100644 > --- a/drivers/net/wireless/ath/ath10k/bmi.c > +++ b/drivers/net/wireless/ath/ath10k/bmi.c > @@ -97,7 +97,8 @@ int ath10k_bmi_read_memory(struct ath10k *ar, > u32 rxlen; > int ret; > > - ath10k_dbg(ar, ATH10K_DBG_BMI, "bmi read address 0x%x length %d\n", > + ath10k_dbg(ar, ATH10K_DBG_BMI, > + "bmi read memory address 0x%x length %d\n", > address, length); > > if (ar->bmi.done_sent) { > @@ -137,7 +138,8 @@ int ath10k_bmi_write_memory(struct ath10k *ar, > u32 txlen; > int ret; > > - ath10k_dbg(ar, ATH10K_DBG_BMI, "bmi write address 0x%x length %d\n", > + ath10k_dbg(ar, ATH10K_DBG_BMI, > + "bmi write memory address 0x%x length %d\n", > address, length); > These 2 hunks shouldn't be modified in this patch. If you want to do a clean up this warrants a separate patch :) Michał
On 11/15/2016 11:28 AM, Michal Kazior wrote: > On 14 November 2016 at 17:33, Erik Stromdahl <erik.stromdahl@gmail.com> wrote: >> Added functions implementing the following BMI commands: >> >> BMI_READ_SOC_REGISTER >> BMI_WRITE_SOC_REGISTER >> >> Reading and writing BMI registers is sometimes needed for >> SDIO chipsets. > > I didn't see ath10k_bmi_write_soc_reg nor ath10k_bmi_read_soc_reg > being used in your Patch 12. Is this patch really necessary? > > You are right, these functions are not used in patch 12. They are used in some other patches that was not included in this series (needs more cleanup before I can publish). I will remove them from the series. > [...] >> diff --git a/drivers/net/wireless/ath/ath10k/bmi.c b/drivers/net/wireless/ath/ath10k/bmi.c >> index 2872d34..1c378a2 100644 >> --- a/drivers/net/wireless/ath/ath10k/bmi.c >> +++ b/drivers/net/wireless/ath/ath10k/bmi.c >> @@ -97,7 +97,8 @@ int ath10k_bmi_read_memory(struct ath10k *ar, >> u32 rxlen; >> int ret; >> >> - ath10k_dbg(ar, ATH10K_DBG_BMI, "bmi read address 0x%x length %d\n", >> + ath10k_dbg(ar, ATH10K_DBG_BMI, >> + "bmi read memory address 0x%x length %d\n", >> address, length); >> >> if (ar->bmi.done_sent) { >> @@ -137,7 +138,8 @@ int ath10k_bmi_write_memory(struct ath10k *ar, >> u32 txlen; >> int ret; >> >> - ath10k_dbg(ar, ATH10K_DBG_BMI, "bmi write address 0x%x length %d\n", >> + ath10k_dbg(ar, ATH10K_DBG_BMI, >> + "bmi write memory address 0x%x length %d\n", >> address, length); >> > > These 2 hunks shouldn't be modified in this patch. If you want to do a > clean up this warrants a separate patch :) > > > Michał > Ok /Erik
diff --git a/drivers/net/wireless/ath/ath10k/bmi.c b/drivers/net/wireless/ath/ath10k/bmi.c index 2872d34..1c378a2 100644 --- a/drivers/net/wireless/ath/ath10k/bmi.c +++ b/drivers/net/wireless/ath/ath10k/bmi.c @@ -97,7 +97,8 @@ int ath10k_bmi_read_memory(struct ath10k *ar, u32 rxlen; int ret; - ath10k_dbg(ar, ATH10K_DBG_BMI, "bmi read address 0x%x length %d\n", + ath10k_dbg(ar, ATH10K_DBG_BMI, + "bmi read memory address 0x%x length %d\n", address, length); if (ar->bmi.done_sent) { @@ -137,7 +138,8 @@ int ath10k_bmi_write_memory(struct ath10k *ar, u32 txlen; int ret; - ath10k_dbg(ar, ATH10K_DBG_BMI, "bmi write address 0x%x length %d\n", + ath10k_dbg(ar, ATH10K_DBG_BMI, + "bmi write memory address 0x%x length %d\n", address, length); if (ar->bmi.done_sent) { @@ -175,6 +177,79 @@ int ath10k_bmi_write_memory(struct ath10k *ar, return 0; } +int ath10k_bmi_read_soc_reg(struct ath10k *ar, + u32 address, u32 *regval) +{ + struct bmi_cmd cmd; + union bmi_resp resp; + u32 cmdlen = sizeof(cmd.id) + sizeof(cmd.read_soc_reg); + u32 rxlen; + int ret; + + ath10k_dbg(ar, ATH10K_DBG_BMI, + "bmi read SOC register address 0x%x\n", + address); + + if (ar->bmi.done_sent) { + ath10k_warn(ar, "command disallowed\n"); + return -EBUSY; + } + + rxlen = sizeof(resp.read_soc_reg.value); + + cmd.id = __cpu_to_le32(BMI_READ_SOC_REGISTER); + cmd.read_soc_reg.addr = __cpu_to_le32(address); + + ret = ath10k_hif_exchange_bmi_msg(ar, &cmd, cmdlen, + &resp, &rxlen); + if (ret) { + ath10k_warn(ar, "unable to read from the device (%d)\n", + ret); + return ret; + } + + if (rxlen != sizeof(resp.read_soc_reg.value)) { + ath10k_warn(ar, "Unexpected read len: %u (expected %u)\n", + rxlen, sizeof(resp.read_soc_reg.value)); + return ret; + } + + *regval = __le32_to_cpu(resp.read_soc_reg.value); + + return 0; +} + +int ath10k_bmi_write_soc_reg(struct ath10k *ar, + u32 address, u32 regval) +{ + struct bmi_cmd cmd; + u32 cmdlen = sizeof(cmd.id) + sizeof(cmd.write_soc_reg); + int ret; + + ath10k_dbg(ar, ATH10K_DBG_BMI, + "bmi write SOC register address 0x%x\n", + address); + + if (ar->bmi.done_sent) { + ath10k_warn(ar, "command disallowed\n"); + return -EBUSY; + } + + cmd.id = __cpu_to_le32(BMI_WRITE_SOC_REGISTER); + cmd.write_soc_reg.addr = __cpu_to_le32(address); + cmd.write_soc_reg.value = __cpu_to_le32(regval); + + ret = ath10k_hif_exchange_bmi_msg(ar, &cmd, cmdlen, + NULL, NULL); + if (ret) { + ath10k_warn(ar, "unable to write to the device (%d)\n", + ret); + return ret; + } + + return 0; +} + int ath10k_bmi_execute(struct ath10k *ar, u32 address, u32 param, u32 *result) { struct bmi_cmd cmd; diff --git a/drivers/net/wireless/ath/ath10k/bmi.h b/drivers/net/wireless/ath/ath10k/bmi.h index 7d3231a..a867867 100644 --- a/drivers/net/wireless/ath/ath10k/bmi.h +++ b/drivers/net/wireless/ath/ath10k/bmi.h @@ -201,6 +201,10 @@ int ath10k_bmi_read_memory(struct ath10k *ar, u32 address, void *buffer, u32 length); int ath10k_bmi_write_memory(struct ath10k *ar, u32 address, const void *buffer, u32 length); +int ath10k_bmi_read_soc_reg(struct ath10k *ar, + u32 address, u32 *regval); +int ath10k_bmi_write_soc_reg(struct ath10k *ar, + u32 address, u32 regval); #define ath10k_bmi_read32(ar, item, val) \ ({ \
Added functions implementing the following BMI commands: BMI_READ_SOC_REGISTER BMI_WRITE_SOC_REGISTER Reading and writing BMI registers is sometimes needed for SDIO chipsets. Signed-off-by: Erik Stromdahl <erik.stromdahl@gmail.com> --- drivers/net/wireless/ath/ath10k/bmi.c | 79 ++++++++++++++++++++++++++++++++- drivers/net/wireless/ath/ath10k/bmi.h | 4 ++ 2 files changed, 81 insertions(+), 2 deletions(-)