soc/tegra: fuse: Add ACPI support
v2 cover soc/tegra: fuse: Add ACPI support
This series of patches add ACPI support for Tegra194 and Tegra234 in Tegra fuse and apbmisc drivers. It also adds support for Tegra241 which uses ACPI boot.
Kartik (6):
soc/tegra: fuse: Refactor resource mapping soc/tegra: fuse: Add tegra_acpi_init_apbmisc() soc/tegra: fuse: Add function to add lookups soc/tegra: fuse: Add function to print SKU info soc/tegra: fuse: Add ACPI support for Tegra194 and Tegra234 soc/tegra: fuse: Add support for Tegra241
drivers/soc/tegra/Kconfig | 5 ++ drivers/soc/tegra/fuse/fuse-tegra.c | 119 +++++++++++++++++++------ drivers/soc/tegra/fuse/fuse-tegra30.c | 21 +++++ drivers/soc/tegra/fuse/fuse.h | 5 ++ drivers/soc/tegra/fuse/tegra-apbmisc.c | 110 +++++++++++++++++++---- include/soc/tegra/fuse.h | 1 + 6 files changed, 217 insertions(+), 44 deletions(-)
Signature · 1 line
2.34.1
PATCH v2 1/6 soc/tegra: fuse: Refactor resource mapping
To prepare for adding ACPI support to the tegra-apbmisc driver, relocate the code responsible for mapping memory resources from the function ‘tegra_init_apbmisc’ to the function ‘tegra_init_apbmisc_resources.’ This adjustment will allow the code to be shared between ‘tegra_init_apbmisc’ and the upcoming ‘tegra_acpi_init_apbmisc’ function.
--- drivers/soc/tegra/fuse/tegra-apbmisc.c | 37 +++++++++++++++----------- 1 file changed, 21 insertions(+), 16 deletions(-)
drivers/soc/tegra/fuse/tegra-apbmisc.c +21 -16
@@ -160,9 +160,28 @@ void __init tegra_init_revision(void) tegra_sku_info.platform =tegra_get_platform (); } -void __init tegra_init_apbmisc (void ) +static void tegra_init_apbmisc_resources (struct resource *apbmisc, +struct resource *straps) {void __iomem *strapping_base; + + apbmisc_base =ioremap (apbmisc->start,resource_size (apbmisc)); +if (apbmisc_base) + chipid =readl_relaxed (apbmisc_base +4 ); +else +pr_err ("failed to map APBMISC registers\n" ); + + strapping_base =ioremap (straps->start,resource_size (straps)); +if (strapping_base) { + strapping =readl_relaxed (strapping_base); +iounmap (strapping_base); + }else { +pr_err ("failed to map strapping options registers\n" ); + } +} + +void __init tegra_init_apbmisc (void ) +{struct resource apbmisc, straps;struct device_node *np;
@@ -219,21 +238,7 @@ void __init tegra_init_apbmisc(void) } } - apbmisc_base =ioremap (apbmisc.start,resource_size (&apbmisc)); -if (!apbmisc_base) { -pr_err ("failed to map APBMISC registers\n" ); - }else { - chipid =readl_relaxed (apbmisc_base +4 ); - } - - strapping_base =ioremap (straps.start,resource_size (&straps)); -if (!strapping_base) { -pr_err ("failed to map strapping options registers\n" ); - }else { - strapping =readl_relaxed (strapping_base); -iounmap (strapping_base); - } - +tegra_init_apbmisc_resources (&apbmisc, &straps); long_ram_code =of_property_read_bool (np,"nvidia,long-ram-code" ); put:
Signature · 1 line
2.34.1
PATCH v2 2/6 soc/tegra: fuse: Add tegra_acpi_init_apbmisc()
In reply to KartikIn preparation to ACPI support in Tegra fuse driver add function tegra_acpi_init_apbmisc() to initialize tegra-apbmisc driver.
Note that function tegra_acpi_init_apbmisc() is not placed in the __init section, because it will be called during probe.
--- drivers/soc/tegra/fuse/fuse.h | 1 + drivers/soc/tegra/fuse/tegra-apbmisc.c | 72 ++++++++++++++++++++++++++ 2 files changed, 73 insertions(+)
drivers/soc/tegra/fuse/fuse.h +1 -0
@@ -69,6 +69,7 @@ struct tegra_fuse {void tegra_init_revision (void );void tegra_init_apbmisc (void ); +void tegra_acpi_init_apbmisc (void );u32 __init tegra_fuse_read_spare (unsigned int spare);u32 __init tegra_fuse_read_early (unsigned int offset);
drivers/soc/tegra/fuse/tegra-apbmisc.c +72 -0
96 lines not on this page · raw message
Signature · 1 line
2.34.1
kernel test robot
build botRe: [PATCH v2 2/6] soc/tegra: fuse: Add tegra_acpi_init_apbmisc()
kernel test robot noticed the following build warnings:
Hi Kartik,
kernel test robot noticed the following build warnings:
[auto build test WARNING on tegra/for-next]
[also build test WARNING on linus/master v6.5 next-20230906] [If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Kartik/soc-tegra-fuse-Refactor-resource-mapping/20230906-032546 base: https://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git for-next patch link: https://lore.kernel.org/r/20230905125824.2947-3-kkartik%40nvidia.com patch subject: [PATCH v2 2/6] soc/tegra: fuse: Add tegra_acpi_init_apbmisc() config: arm-defconfig (https://download.01.org/0day-ci/archive/20230906/[email protected]/config) compiler: arm-linux-gnueabi-gcc (GCC) 13.2.0 reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20230906/[email protected]/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <[email protected]>
| Closes: https://lore.kernel.org/oe-kbuild-all/[email protected]/
All warnings (new ones prefixed by >>):
>> drivers/soc/tegra/fuse/tegra-apbmisc.c:133:36: warning: 'apbmisc_acpi_match' defined but not used [-Wunused-const-variable=]
133 | static const struct acpi_device_id apbmisc_acpi_match[] = {
| ^~~~~~~~~~~~~~~~~~vim +/apbmisc_acpi_match +133 drivers/soc/tegra/fuse/tegra-apbmisc.c
132
> 133 static const struct acpi_device_id apbmisc_acpi_match[] = { 134 { "NVDA2010" },
135 { /* sentinel */ }
136 };
137
Signature · 2 lines
0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki
kernel test robot
build botRe: [PATCH v2 2/6] soc/tegra: fuse: Add tegra_acpi_init_apbmisc()
In reply to Kartikkernel test robot noticed the following build warnings:
Hi Kartik,
kernel test robot noticed the following build warnings:
[auto build test WARNING on tegra/for-next]
[also build test WARNING on linus/master v6.5 next-20230906] [If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Kartik/soc-tegra-fuse-Refactor-resource-mapping/20230906-032546 base: https://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git for-next patch link: https://lore.kernel.org/r/20230905125824.2947-3-kkartik%40nvidia.com patch subject: [PATCH v2 2/6] soc/tegra: fuse: Add tegra_acpi_init_apbmisc() config: arm64-randconfig-r023-20230906 (https://download.01.org/0day-ci/archive/20230907/[email protected]/config) compiler: clang version 14.0.6 (https://github.com/llvm/llvm-project.git f28c006a5895fc0e329fe15fead81e37457cb1d1) reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20230907/[email protected]/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <[email protected]>
| Closes: https://lore.kernel.org/oe-kbuild-all/[email protected]/
All warnings (new ones prefixed by >>):
>> drivers/soc/tegra/fuse/tegra-apbmisc.c:133:36: warning: unused variable 'apbmisc_acpi_match' [-Wunused-const-variable]
static const struct acpi_device_id apbmisc_acpi_match[] = {
^1 warning generated.
vim +/apbmisc_acpi_match +133 drivers/soc/tegra/fuse/tegra-apbmisc.c
132
> 133 static const struct acpi_device_id apbmisc_acpi_match[] = { 134 { "NVDA2010" },
135 { /* sentinel */ }
136 };
137
Signature · 2 lines
0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki
PATCH v2 3/6 soc/tegra: fuse: Add function to add lookups
In reply to KartikAdd helper function tegra_fuse_add_lookups() to register Tegra fuse nvmem lookups. So, this can be shared between tegra_fuse_init() and ACPI probe, which is to be introduced later.
--- drivers/soc/tegra/fuse/fuse-tegra.c | 29 +++++++++++++++++++++++------ 1 file changed, 23 insertions(+), 6 deletions(-)
drivers/soc/tegra/fuse/fuse-tegra.c +23 -6
@@ -113,6 +113,24 @@ static void tegra_fuse_restore(void *base) fuse->clk =NULL ; } +static int tegra_fuse_add_lookups (struct tegra_fuse *fuse) +{ +size_t size; + +if (!fuse->soc->lookups) +return 0 ; + + size =size_mul (sizeof (*fuse->lookups), fuse->soc->num_lookups); + + fuse->lookups =kmemdup (fuse->soc->lookups, size,GFP_KERNEL ); +if (!fuse->lookups) +return -ENOMEM ; + +nvmem_add_cell_lookups (fuse->lookups, fuse->soc->num_lookups); + +return 0 ; +} +static int tegra_fuse_probe (struct platform_device *pdev) {void __iomem *base = fuse->base;
@@ -407,6 +425,7 @@ static int __init tegra_init_fuse(void)const struct of_device_id *match;struct device_node *np;struct resource regs; +int err;tegra_init_apbmisc ();
@@ -504,12 +523,10 @@ static int __init tegra_init_fuse(void)pr_debug ("Tegra CPU Speedo ID %d, SoC Speedo ID %d\n" , tegra_sku_info.cpu_speedo_id, tegra_sku_info.soc_speedo_id); -if (fuse->soc->lookups) { -size_t size =sizeof (*fuse->lookups) * fuse->soc->num_lookups; - - fuse->lookups =kmemdup (fuse->soc->lookups, size,GFP_KERNEL ); -if (fuse->lookups) -nvmem_add_cell_lookups (fuse->lookups, fuse->soc->num_lookups); + err =tegra_fuse_add_lookups (fuse); +if (err) { +pr_err ("failed to add FUSE lookups\n" ); +return err; }return 0 ;
Signature · 1 line
2.34.1
PATCH v2 4/6 soc/tegra: fuse: Add function to print SKU info
In reply to KartikAdd helper function tegra_fuse_print_sku_info() to print Tegra SKU information. So, it can be shared between tegra_fuse_init() and ACPI probe which is to be introduced later.
--- drivers/soc/tegra/fuse/fuse-tegra.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-)
drivers/soc/tegra/fuse/fuse-tegra.c +11 -6
@@ -113,6 +113,16 @@ static void tegra_fuse_restore(void *base) fuse->clk =NULL ; } +static void tegra_fuse_print_sku_info (struct tegra_sku_info *tegra_sku_info) +{ +pr_info ("Tegra Revision: %s SKU: %d CPU Process: %d SoC Process: %d\n" , + tegra_revision_name[tegra_sku_info->revision], + tegra_sku_info->sku_id, tegra_sku_info->cpu_process_id, + tegra_sku_info->soc_process_id); +pr_debug ("Tegra CPU Speedo ID %d, SoC Speedo ID %d\n" , + tegra_sku_info->cpu_speedo_id, tegra_sku_info->soc_speedo_id); +} +static int tegra_fuse_add_lookups (struct tegra_fuse *fuse) {size_t size;
@@ -516,12 +526,7 @@ static int __init tegra_init_fuse(void) fuse->soc->init (fuse); -pr_info ("Tegra Revision: %s SKU: %d CPU Process: %d SoC Process: %d\n" , - tegra_revision_name[tegra_sku_info.revision], - tegra_sku_info.sku_id, tegra_sku_info.cpu_process_id, - tegra_sku_info.soc_process_id); -pr_debug ("Tegra CPU Speedo ID %d, SoC Speedo ID %d\n" , - tegra_sku_info.cpu_speedo_id, tegra_sku_info.soc_speedo_id); +tegra_fuse_print_sku_info (&tegra_sku_info); err =tegra_fuse_add_lookups (fuse);if (err) {
Signature · 1 line
2.34.1
PATCH v2 5/6 soc/tegra: fuse: Add ACPI support for Tegra194 and Tegra234
In reply to KartikAdd ACPI support for Tegra194 & Tegra243 SoC's. This requires following modifications to the probe with ACPI boot is used:
- Initialize soc data.
- Add nvmem lookups.
- Register soc device.
- use devm_clk_get_optional() instead of devm_clk_get() to get fuse->clk, as fuse clocks are not required when using ACPI boot.
Also, drop '__init' keyword for tegra_soc_device_register() as this is also used by tegra_fuse_probe().
--- drivers/soc/tegra/fuse/fuse-tegra.c | 68 ++++++++++++++++++++++------- 1 file changed, 52 insertions(+), 16 deletions(-)
drivers/soc/tegra/fuse/fuse-tegra.c +52 -16
@@ -3,11 +3,13 @@* Copyright (c) 2013-2023, NVIDIA CORPORATION. All rights reserved. */ +#include <linux/acpi.h> #include <linux/clk.h> #include <linux/device.h> #include <linux/kobject.h> #include <linux/init.h> #include <linux/io.h> +#include <linux/mod_devicetable.h> #include <linux/nvmem-consumer.h> #include <linux/nvmem-provider.h> #include <linux/of.h>
@@ -94,6 +96,11 @@ static const struct of_device_id tegra_fuse_match[] = { {/* sentinel */ } }; +static const struct acpi_device_id tegra_fuse_acpi_match[] = { + {"NVDA200F" }, + {/* sentinel */ } +}; +static int tegra_fuse_read (void *priv,unsigned int offset,void *value,size_t bytes) {
@@ -148,6 +155,37 @@ static int tegra_fuse_probe(struct platform_device *pdev)struct resource *res;int err; +/* Initialize the soc data and lookups if using ACPI boot. */ +if (is_acpi_node (pdev->dev.fwnode) && !fuse->soc) { +u8 chip; + +tegra_acpi_init_apbmisc (); + + chip =tegra_get_chip_id (); +switch (chip) { +#if defined(CONFIG_ARCH_TEGRA_194_SOC ) +case TEGRA194 : + fuse->soc = &tegra194_fuse_soc; +break ; +#endif +#if defined(CONFIG_ARCH_TEGRA_234_SOC ) +case TEGRA234 : + fuse->soc = &tegra234_fuse_soc; +break ; +#endif +default : +return dev_err_probe (&pdev->dev, -EINVAL ,"Unsupported SoC: %02x\n" , chip); + } + + fuse->soc->init (fuse); +tegra_fuse_print_sku_info (&tegra_sku_info); +tegra_soc_device_register (); + + err =tegra_fuse_add_lookups (fuse); +if (err) +return dev_err_probe (&pdev->dev, err,"failed to add FUSE lookups\n" ); + } + err =devm_add_action (&pdev->dev, tegra_fuse_restore, (void __force *)base);if (err)return err;
@@ -158,14 +196,9 @@ static int tegra_fuse_probe(struct platform_device *pdev)return PTR_ERR (fuse->base); fuse->phys = res->start; - fuse->clk =devm_clk_get (&pdev->dev,"fuse" ); -if (IS_ERR (fuse->clk)) { -if (PTR_ERR (fuse->clk) != -EPROBE_DEFER ) -dev_err (&pdev->dev,"failed to get FUSE clock: %ld" , -PTR_ERR (fuse->clk)); - -return PTR_ERR (fuse->clk); - } + fuse->clk =devm_clk_get_optional (&pdev->dev,"fuse" ); +if (IS_ERR (fuse->clk)) +return dev_err_probe (&pdev->dev,PTR_ERR (fuse->clk),"failed to get FUSE clock\n" );platform_set_drvdata (pdev, fuse); fuse->dev = &pdev->dev;
@@ -207,12 +240,8 @@ static int tegra_fuse_probe(struct platform_device *pdev) } fuse->rst =devm_reset_control_get_optional (&pdev->dev,"fuse" ); -if (IS_ERR (fuse->rst)) { - err =PTR_ERR (fuse->rst); -dev_err (&pdev->dev,"failed to get FUSE reset: %pe\n" , - fuse->rst); -return err; - } +if (IS_ERR (fuse->rst)) +return dev_err_probe (&pdev->dev,PTR_ERR (fuse->rst),"failed to get FUSE reset" );/* * FUSE clock is enabled at a boot time, hence this resume/suspend
@@ -294,6 +323,7 @@ static struct platform_driver tegra_fuse_driver = { .driver = { .name = "tegra-fuse", .of_match_table = tegra_fuse_match, + .acpi_match_table = tegra_fuse_acpi_match, .pm = &tegra_fuse_pm, .suppress_bind_attrs = true, },
@@ -315,7 +345,13 @@ u32 __init tegra_fuse_read_early(unsigned int offset)int tegra_fuse_readl (unsigned long offset,u32 *value) { -if (!fuse->read || !fuse->clk) +/* +* Wait for fuse->clk to be initialized if device-tree boot is used. +*/ +if (is_of_node (fuse->dev->fwnode) && !fuse->clk) +return -EPROBE_DEFER ; + +if (!fuse->read)return -EPROBE_DEFER ;if (IS_ERR (fuse->clk))
@@ -398,7 +434,7 @@ const struct attribute_group tegra194_soc_attr_group = { };#endif -struct device *__init tegra_soc_device_register (void ) +struct device *tegra_soc_device_register (void ) {struct soc_device_attribute *attr;struct soc_device *dev;
Signature · 1 line
2.34.1
PATCH v2 6/6 soc/tegra: fuse: Add support for Tegra241
In reply to KartikAdd support for Tegra241 which use ACPI boot.
--- drivers/soc/tegra/Kconfig | 5 +++++ drivers/soc/tegra/fuse/fuse-tegra.c | 5 +++++ drivers/soc/tegra/fuse/fuse-tegra30.c | 21 +++++++++++++++++++++ drivers/soc/tegra/fuse/fuse.h | 4 ++++ drivers/soc/tegra/fuse/tegra-apbmisc.c | 1 + include/soc/tegra/fuse.h | 1 + 6 files changed, 37 insertions(+)
drivers/soc/tegra/Kconfig +5 -0
@@ -133,6 +133,11 @@ config ARCH_TEGRA_234_SOC help Enable support for the NVIDIA Tegra234 SoC. +config ARCH_TEGRA_241_SOC + bool "NVIDIA Tegra241 SoC" + help + Enable support for the NVIDIA Tegra241 SoC. + endif endif
drivers/soc/tegra/fuse/fuse-tegra.c +5 -0
@@ -172,6 +172,11 @@ static int tegra_fuse_probe(struct platform_device *pdev)case TEGRA234 : fuse->soc = &tegra234_fuse_soc;break ; +#endif +#if defined(CONFIG_ARCH_TEGRA_241_SOC ) +case TEGRA241 : + fuse->soc = &tegra241_fuse_soc; +break ;#endif default :return dev_err_probe (&pdev->dev, -EINVAL ,"Unsupported SoC: %02x\n" , chip);
drivers/soc/tegra/fuse/fuse-tegra30.c +21 -0
@@ -678,3 +678,24 @@ const struct tegra_fuse_soc tegra234_fuse_soc = { .clk_suspend_on = false, };#endif + +#if defined(CONFIG_ARCH_TEGRA_241_SOC ) +static const struct tegra_fuse_info tegra241_fuse_info = { + .read = tegra30_fuse_read, + .size =0x16008 , + .spare =0xcf0 , +}; + +static const struct nvmem_keepout tegra241_fuse_keepouts[] = { + { .start =0xc , .end =0x1600c } +}; + +const struct tegra_fuse_soc tegra241_fuse_soc = { + .init = tegra30_fuse_init, + .info = &tegra241_fuse_info, + .keepouts = tegra241_fuse_keepouts, + .num_keepouts =ARRAY_SIZE (tegra241_fuse_keepouts), + .soc_attr_group = &tegra194_soc_attr_group, + .clk_suspend_on = false, +}; +#endif
drivers/soc/tegra/fuse/fuse.h +4 -0
@@ -136,4 +136,8 @@ extern const struct tegra_fuse_soc tegra194_fuse_soc;extern const struct tegra_fuse_soc tegra234_fuse_soc;#endif +#ifdef CONFIG_ARCH_TEGRA_241_SOC +extern const struct tegra_fuse_soc tegra241_fuse_soc; +#endif +#endif
drivers/soc/tegra/fuse/tegra-apbmisc.c +1 -0
@@ -64,6 +64,7 @@ bool tegra_is_silicon(void)switch (tegra_get_chip_id ()) {case TEGRA194 :case TEGRA234 : +case TEGRA241 :case TEGRA264 :if (tegra_get_platform () ==0 )return true;
include/soc/tegra/fuse.h +1 -0
@@ -17,6 +17,7 @@#define TEGRA186 0x18#define TEGRA194 0x19#define TEGRA234 0x23 +#define TEGRA241 0x24#define TEGRA264 0x26#define TEGRA_FUSE_SKU_CALIB_0 0xf0
Signature · 1 line
2.34.1
Quoted 3 lines · Kartik
This series of patches add ACPI support for Tegra194 and Tegra234 in Tegra fuse and apbmisc drivers. It also adds support for Tegra241 which uses ACPI boot.
Neither here, nor in the individual patches I do _not_ see the changelog. What's going on?
Signature · 2 lines
With Best Regards, Andy Shevchenko
Quoted 11 lines · Andy Shevchenko
Quoted 3 lines · Kartik
This series of patches add ACPI support for Tegra194 and Tegra234 in Tegra fuse and apbmisc drivers. It also adds support for Tegra241 which uses ACPI boot.
Neither here, nor in the individual patches I do _not_ see the changelog. What's going on?
--
With Best Regards,
Andy Shevchenko
Apologies for the confusion. I've posted v3 of this series with changelogs.
Regards,
Kartik