* [PATCH 1/2] ath10k: Try to get mac-address from dts @ 2020-09-27 19:25 ` Ansuel Smith 0 siblings, 0 replies; 4+ messages in thread From: Ansuel Smith @ 2020-09-27 19:25 UTC (permalink / raw) To: 0001-ath10k-Try-to-get-mac-address-from-dts . patchKalle Valo Cc: netdev, linux-wireless, linux-kernel, ath10k, David S. Miller, Jakub Kicinski, Ansuel Smith Most of embedded device that have the ath10k wifi integrated store the mac-address in nvmem partitions. Try to fetch the mac-address using the standard 'of_get_mac_address' than in all the check also try to fetch the address using the nvmem api searching for a defined 'mac-address' cell. Mac-address defined in the dts have priority than any other address found. Tested-on: QCA9984 hw1.0 PCI 10.4 Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com> --- drivers/net/wireless/ath/ath10k/core.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/drivers/net/wireless/ath/ath10k/core.c b/drivers/net/wireless/ath/ath10k/core.c index 5f4e12196..9ed7b9883 100644 --- a/drivers/net/wireless/ath/ath10k/core.c +++ b/drivers/net/wireless/ath/ath10k/core.c @@ -8,6 +8,8 @@ #include <linux/module.h> #include <linux/firmware.h> #include <linux/of.h> +#include <linux/of_net.h> +#include <linux/property.h> #include <linux/property.h> #include <linux/dmi.h> #include <linux/ctype.h> @@ -2961,8 +2963,12 @@ EXPORT_SYMBOL(ath10k_core_stop); static int ath10k_core_probe_fw(struct ath10k *ar) { struct bmi_target_info target_info; + const char *mac; int ret = 0; + /* register the platform to be found by the of api */ + of_platform_device_create(ar->dev->of_node, NULL, NULL); + ret = ath10k_hif_power_up(ar, ATH10K_FIRMWARE_MODE_NORMAL); if (ret) { ath10k_err(ar, "could not power on hif bus (%d)\n", ret); @@ -3062,6 +3068,10 @@ static int ath10k_core_probe_fw(struct ath10k *ar) device_get_mac_address(ar->dev, ar->mac_addr, sizeof(ar->mac_addr)); + mac = of_get_mac_address(ar->dev->of_node); + if (!IS_ERR(mac)) + ether_addr_copy(ar->mac_addr, mac); + ret = ath10k_core_init_firmware_features(ar); if (ret) { ath10k_err(ar, "fatal problem with firmware features: %d\n", -- 2.27.0 _______________________________________________ ath10k mailing list ath10k@lists.infradead.org http://lists.infradead.org/mailman/listinfo/ath10k ^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 1/2] ath10k: Try to get mac-address from dts @ 2020-09-27 19:25 ` Ansuel Smith 0 siblings, 0 replies; 4+ messages in thread From: Ansuel Smith @ 2020-09-27 19:25 UTC (permalink / raw) To: 0001-ath10k-Try-to-get-mac-address-from-dts . patchKalle Valo Cc: Ansuel Smith, David S. Miller, Jakub Kicinski, ath10k, linux-wireless, netdev, linux-kernel Most of embedded device that have the ath10k wifi integrated store the mac-address in nvmem partitions. Try to fetch the mac-address using the standard 'of_get_mac_address' than in all the check also try to fetch the address using the nvmem api searching for a defined 'mac-address' cell. Mac-address defined in the dts have priority than any other address found. Tested-on: QCA9984 hw1.0 PCI 10.4 Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com> --- drivers/net/wireless/ath/ath10k/core.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/drivers/net/wireless/ath/ath10k/core.c b/drivers/net/wireless/ath/ath10k/core.c index 5f4e12196..9ed7b9883 100644 --- a/drivers/net/wireless/ath/ath10k/core.c +++ b/drivers/net/wireless/ath/ath10k/core.c @@ -8,6 +8,8 @@ #include <linux/module.h> #include <linux/firmware.h> #include <linux/of.h> +#include <linux/of_net.h> +#include <linux/property.h> #include <linux/property.h> #include <linux/dmi.h> #include <linux/ctype.h> @@ -2961,8 +2963,12 @@ EXPORT_SYMBOL(ath10k_core_stop); static int ath10k_core_probe_fw(struct ath10k *ar) { struct bmi_target_info target_info; + const char *mac; int ret = 0; + /* register the platform to be found by the of api */ + of_platform_device_create(ar->dev->of_node, NULL, NULL); + ret = ath10k_hif_power_up(ar, ATH10K_FIRMWARE_MODE_NORMAL); if (ret) { ath10k_err(ar, "could not power on hif bus (%d)\n", ret); @@ -3062,6 +3068,10 @@ static int ath10k_core_probe_fw(struct ath10k *ar) device_get_mac_address(ar->dev, ar->mac_addr, sizeof(ar->mac_addr)); + mac = of_get_mac_address(ar->dev->of_node); + if (!IS_ERR(mac)) + ether_addr_copy(ar->mac_addr, mac); + ret = ath10k_core_init_firmware_features(ar); if (ret) { ath10k_err(ar, "fatal problem with firmware features: %d\n", -- 2.27.0 ^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 2/2] ath10k: Try to download pre-cal using nvmem api 2020-09-27 19:25 ` Ansuel Smith @ 2020-09-27 19:25 ` Ansuel Smith -1 siblings, 0 replies; 4+ messages in thread From: Ansuel Smith @ 2020-09-27 19:25 UTC (permalink / raw) To: 0001-ath10k-Try-to-get-mac-address-from-dts . patchKalle Valo Cc: netdev, linux-wireless, linux-kernel, ath10k, David S. Miller, Jakub Kicinski, Ansuel Smith Most of routers that have the ath10k wifi chip integrated in the Soc have the pre-cal data stored in a dedicated nvmem partition. Introduce a new function to directly extract and use it if a nvmem with the name 'pre-cal' is defined and available. Pre-cal file have still priority to everything else. Tested-on: QCA9984 hw1.0 PCI 10.4 Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com> --- drivers/net/wireless/ath/ath10k/core.c | 52 +++++++++++++++++++++++++- drivers/net/wireless/ath/ath10k/core.h | 3 ++ 2 files changed, 53 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/ath/ath10k/core.c b/drivers/net/wireless/ath/ath10k/core.c index 9ed7b9883..dd509a4a8 100644 --- a/drivers/net/wireless/ath/ath10k/core.c +++ b/drivers/net/wireless/ath/ath10k/core.c @@ -15,6 +15,7 @@ #include <linux/ctype.h> #include <linux/pm_qos.h> #include <asm/byteorder.h> +#include <linux/nvmem-consumer.h> #include "core.h" #include "mac.h" @@ -920,7 +921,8 @@ static int ath10k_core_get_board_id_from_otp(struct ath10k *ar) } if (ar->cal_mode == ATH10K_PRE_CAL_MODE_DT || - ar->cal_mode == ATH10K_PRE_CAL_MODE_FILE) + ar->cal_mode == ATH10K_PRE_CAL_MODE_FILE || + ar->cal_mode == ATH10K_PRE_CAL_MODE_NVMEM) bmi_board_id_param = BMI_PARAM_GET_FLASH_BOARD_ID; else bmi_board_id_param = BMI_PARAM_GET_EEPROM_BOARD_ID; @@ -1682,7 +1684,8 @@ static int ath10k_download_and_run_otp(struct ath10k *ar) /* As of now pre-cal is valid for 10_4 variants */ if (ar->cal_mode == ATH10K_PRE_CAL_MODE_DT || - ar->cal_mode == ATH10K_PRE_CAL_MODE_FILE) + ar->cal_mode == ATH10K_PRE_CAL_MODE_FILE || + ar->cal_mode == ATH10K_PRE_CAL_MODE_NVMEM) bmi_otp_exe_param = BMI_PARAM_FLASH_SECTION_ALL; ret = ath10k_bmi_execute(ar, address, bmi_otp_exe_param, &result); @@ -1703,6 +1706,41 @@ static int ath10k_download_and_run_otp(struct ath10k *ar) return 0; } +static int ath10k_download_cal_nvmem(struct ath10k *ar) +{ + int ret; + size_t len; + const void *file; + struct nvmem_cell *cell; + struct platform_device *pdev = of_find_device_by_node(ar->dev->of_node); + + if (!pdev) + return -ENODEV; + + cell = nvmem_cell_get(ar->dev, "pre-cal"); + if (IS_ERR(cell)) + return PTR_ERR(cell); + + file = nvmem_cell_read(cell, &len); + nvmem_cell_put(cell); + + if (IS_ERR(file)) + return PTR_ERR(file); + + ret = ath10k_download_board_data(ar, file, len); + if (ret) { + ath10k_err(ar, "failed to download cal_file data: %d\n", ret); + goto err; + } + + ath10k_dbg(ar, ATH10K_DBG_BOOT, "boot cal file downloaded\n"); + + return 0; +err: + kfree(file); + return ret; +} + static int ath10k_download_cal_file(struct ath10k *ar, const struct firmware *file) { @@ -2049,6 +2087,16 @@ static int ath10k_core_pre_cal_download(struct ath10k *ar) goto success; } + ath10k_dbg(ar, ATH10K_DBG_BOOT, + "boot did not find a pre calibration file, try NVMEM next: %d\n", + ret); + + ret = ath10k_download_cal_nvmem(ar); + if (ret == 0) { + ar->cal_mode = ATH10K_PRE_CAL_MODE_NVMEM; + goto success; + } + ath10k_dbg(ar, ATH10K_DBG_BOOT, "boot did not find a pre calibration file, try DT next: %d\n", ret); diff --git a/drivers/net/wireless/ath/ath10k/core.h b/drivers/net/wireless/ath/ath10k/core.h index 4cf5bd489..186aba73a 100644 --- a/drivers/net/wireless/ath/ath10k/core.h +++ b/drivers/net/wireless/ath/ath10k/core.h @@ -864,6 +864,7 @@ enum ath10k_cal_mode { ATH10K_CAL_MODE_OTP, ATH10K_CAL_MODE_DT, ATH10K_PRE_CAL_MODE_FILE, + ATH10K_PRE_CAL_MODE_NVMEM, ATH10K_PRE_CAL_MODE_DT, ATH10K_CAL_MODE_EEPROM, }; @@ -886,6 +887,8 @@ static inline const char *ath10k_cal_mode_str(enum ath10k_cal_mode mode) return "dt"; case ATH10K_PRE_CAL_MODE_FILE: return "pre-cal-file"; + case ATH10K_PRE_CAL_MODE_NVMEM: + return "pre-cal-nvmem"; case ATH10K_PRE_CAL_MODE_DT: return "pre-cal-dt"; case ATH10K_CAL_MODE_EEPROM: -- 2.27.0 _______________________________________________ ath10k mailing list ath10k@lists.infradead.org http://lists.infradead.org/mailman/listinfo/ath10k ^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 2/2] ath10k: Try to download pre-cal using nvmem api @ 2020-09-27 19:25 ` Ansuel Smith 0 siblings, 0 replies; 4+ messages in thread From: Ansuel Smith @ 2020-09-27 19:25 UTC (permalink / raw) To: 0001-ath10k-Try-to-get-mac-address-from-dts . patchKalle Valo Cc: Ansuel Smith, David S. Miller, Jakub Kicinski, ath10k, linux-wireless, netdev, linux-kernel Most of routers that have the ath10k wifi chip integrated in the Soc have the pre-cal data stored in a dedicated nvmem partition. Introduce a new function to directly extract and use it if a nvmem with the name 'pre-cal' is defined and available. Pre-cal file have still priority to everything else. Tested-on: QCA9984 hw1.0 PCI 10.4 Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com> --- drivers/net/wireless/ath/ath10k/core.c | 52 +++++++++++++++++++++++++- drivers/net/wireless/ath/ath10k/core.h | 3 ++ 2 files changed, 53 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/ath/ath10k/core.c b/drivers/net/wireless/ath/ath10k/core.c index 9ed7b9883..dd509a4a8 100644 --- a/drivers/net/wireless/ath/ath10k/core.c +++ b/drivers/net/wireless/ath/ath10k/core.c @@ -15,6 +15,7 @@ #include <linux/ctype.h> #include <linux/pm_qos.h> #include <asm/byteorder.h> +#include <linux/nvmem-consumer.h> #include "core.h" #include "mac.h" @@ -920,7 +921,8 @@ static int ath10k_core_get_board_id_from_otp(struct ath10k *ar) } if (ar->cal_mode == ATH10K_PRE_CAL_MODE_DT || - ar->cal_mode == ATH10K_PRE_CAL_MODE_FILE) + ar->cal_mode == ATH10K_PRE_CAL_MODE_FILE || + ar->cal_mode == ATH10K_PRE_CAL_MODE_NVMEM) bmi_board_id_param = BMI_PARAM_GET_FLASH_BOARD_ID; else bmi_board_id_param = BMI_PARAM_GET_EEPROM_BOARD_ID; @@ -1682,7 +1684,8 @@ static int ath10k_download_and_run_otp(struct ath10k *ar) /* As of now pre-cal is valid for 10_4 variants */ if (ar->cal_mode == ATH10K_PRE_CAL_MODE_DT || - ar->cal_mode == ATH10K_PRE_CAL_MODE_FILE) + ar->cal_mode == ATH10K_PRE_CAL_MODE_FILE || + ar->cal_mode == ATH10K_PRE_CAL_MODE_NVMEM) bmi_otp_exe_param = BMI_PARAM_FLASH_SECTION_ALL; ret = ath10k_bmi_execute(ar, address, bmi_otp_exe_param, &result); @@ -1703,6 +1706,41 @@ static int ath10k_download_and_run_otp(struct ath10k *ar) return 0; } +static int ath10k_download_cal_nvmem(struct ath10k *ar) +{ + int ret; + size_t len; + const void *file; + struct nvmem_cell *cell; + struct platform_device *pdev = of_find_device_by_node(ar->dev->of_node); + + if (!pdev) + return -ENODEV; + + cell = nvmem_cell_get(ar->dev, "pre-cal"); + if (IS_ERR(cell)) + return PTR_ERR(cell); + + file = nvmem_cell_read(cell, &len); + nvmem_cell_put(cell); + + if (IS_ERR(file)) + return PTR_ERR(file); + + ret = ath10k_download_board_data(ar, file, len); + if (ret) { + ath10k_err(ar, "failed to download cal_file data: %d\n", ret); + goto err; + } + + ath10k_dbg(ar, ATH10K_DBG_BOOT, "boot cal file downloaded\n"); + + return 0; +err: + kfree(file); + return ret; +} + static int ath10k_download_cal_file(struct ath10k *ar, const struct firmware *file) { @@ -2049,6 +2087,16 @@ static int ath10k_core_pre_cal_download(struct ath10k *ar) goto success; } + ath10k_dbg(ar, ATH10K_DBG_BOOT, + "boot did not find a pre calibration file, try NVMEM next: %d\n", + ret); + + ret = ath10k_download_cal_nvmem(ar); + if (ret == 0) { + ar->cal_mode = ATH10K_PRE_CAL_MODE_NVMEM; + goto success; + } + ath10k_dbg(ar, ATH10K_DBG_BOOT, "boot did not find a pre calibration file, try DT next: %d\n", ret); diff --git a/drivers/net/wireless/ath/ath10k/core.h b/drivers/net/wireless/ath/ath10k/core.h index 4cf5bd489..186aba73a 100644 --- a/drivers/net/wireless/ath/ath10k/core.h +++ b/drivers/net/wireless/ath/ath10k/core.h @@ -864,6 +864,7 @@ enum ath10k_cal_mode { ATH10K_CAL_MODE_OTP, ATH10K_CAL_MODE_DT, ATH10K_PRE_CAL_MODE_FILE, + ATH10K_PRE_CAL_MODE_NVMEM, ATH10K_PRE_CAL_MODE_DT, ATH10K_CAL_MODE_EEPROM, }; @@ -886,6 +887,8 @@ static inline const char *ath10k_cal_mode_str(enum ath10k_cal_mode mode) return "dt"; case ATH10K_PRE_CAL_MODE_FILE: return "pre-cal-file"; + case ATH10K_PRE_CAL_MODE_NVMEM: + return "pre-cal-nvmem"; case ATH10K_PRE_CAL_MODE_DT: return "pre-cal-dt"; case ATH10K_CAL_MODE_EEPROM: -- 2.27.0 ^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-09-27 19:25 UTC | newest] Thread overview: 4+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2020-09-27 19:25 [PATCH 1/2] ath10k: Try to get mac-address from dts Ansuel Smith 2020-09-27 19:25 ` Ansuel Smith 2020-09-27 19:25 ` [PATCH 2/2] ath10k: Try to download pre-cal using nvmem api Ansuel Smith 2020-09-27 19:25 ` Ansuel Smith
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.