Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Merge tag 'tegra-for-6.14-soc' of https://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into soc/drivers

soc/tegra: Cleanups for v6.14-rc1

This contains debugfs error handling cleanup, a typofix and an update to
the FUSE block's keepout list to properly allow reading these registers.

* tag 'tegra-for-6.14-soc' of https://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
soc/tegra: fuse: Update Tegra234 nvmem keepout list
soc/tegra: Fix spelling error in tegra234_lookup_slave_timeout()
soc/tegra: cbb: Drop unnecessary debugfs error handling

Link: https://lore.kernel.org/r/20250110185355.4143505-1-thierry.reding@gmail.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

+16 -23
+4 -16
drivers/soc/tegra/cbb/tegra-cbb.c
··· 69 69 } 70 70 DEFINE_SHOW_ATTRIBUTE(tegra_cbb_err); 71 71 72 - static int tegra_cbb_err_debugfs_init(struct tegra_cbb *cbb) 72 + static void tegra_cbb_err_debugfs_init(struct tegra_cbb *cbb) 73 73 { 74 74 static struct dentry *root; 75 75 76 - if (!root) { 76 + if (!root) 77 77 root = debugfs_create_file("tegra_cbb_err", 0444, NULL, cbb, &tegra_cbb_err_fops); 78 - if (IS_ERR_OR_NULL(root)) { 79 - pr_err("%s(): could not create debugfs node\n", __func__); 80 - return PTR_ERR(root); 81 - } 82 - } 83 - 84 - return 0; 85 78 } 86 79 87 80 void tegra_cbb_stall_enable(struct tegra_cbb *cbb) ··· 141 148 { 142 149 int ret; 143 150 144 - if (IS_ENABLED(CONFIG_DEBUG_FS)) { 145 - ret = tegra_cbb_err_debugfs_init(cbb); 146 - if (ret) { 147 - dev_err(cbb->dev, "failed to create debugfs\n"); 148 - return ret; 149 - } 150 - } 151 + if (IS_ENABLED(CONFIG_DEBUG_FS)) 152 + tegra_cbb_err_debugfs_init(cbb); 151 153 152 154 /* register interrupt handler for errors due to different initiators */ 153 155 ret = cbb->ops->interrupt_enable(cbb);
+1 -1
drivers/soc/tegra/cbb/tegra234-cbb.c
··· 277 277 * which timed out. 278 278 * a) Get block number from the index of set bit in 279 279 * <FABRIC>_SN_AXI2APB_<>_BLOCK_TMO_STATUS_0 register. 280 - * b) Get address of register repective to block number i.e. 280 + * b) Get address of register respective to block number i.e. 281 281 * <FABRIC>_SN_AXI2APB_<>_BLOCK<index-set-bit>_TMO_0. 282 282 * c) Read the register in above step to get client_id which 283 283 * timed out as per the set bits.
+11 -6
drivers/soc/tegra/fuse/fuse-tegra30.c
··· 647 647 }; 648 648 649 649 static const struct nvmem_keepout tegra234_fuse_keepouts[] = { 650 - { .start = 0x01c, .end = 0x0c8 }, 651 - { .start = 0x12c, .end = 0x184 }, 650 + { .start = 0x01c, .end = 0x064 }, 651 + { .start = 0x084, .end = 0x0a0 }, 652 + { .start = 0x0a4, .end = 0x0c8 }, 653 + { .start = 0x12c, .end = 0x164 }, 654 + { .start = 0x16c, .end = 0x184 }, 652 655 { .start = 0x190, .end = 0x198 }, 653 656 { .start = 0x1a0, .end = 0x204 }, 654 - { .start = 0x21c, .end = 0x250 }, 655 - { .start = 0x25c, .end = 0x2f0 }, 657 + { .start = 0x21c, .end = 0x2f0 }, 656 658 { .start = 0x310, .end = 0x3d8 }, 657 - { .start = 0x400, .end = 0x4f0 }, 658 - { .start = 0x4f8, .end = 0x7e8 }, 659 + { .start = 0x400, .end = 0x420 }, 660 + { .start = 0x444, .end = 0x490 }, 661 + { .start = 0x4bc, .end = 0x4f0 }, 662 + { .start = 0x4f8, .end = 0x54c }, 663 + { .start = 0x57c, .end = 0x7e8 }, 659 664 { .start = 0x8d0, .end = 0x8d8 }, 660 665 { .start = 0xacc, .end = 0xf00 } 661 666 };