superrob1500
/
mirror-linux
mirror of https://github.com/torvalds/linux
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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.
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEEiOrDCAFJzPfAjcif3SOs138+s6EFAmeBX1EACgkQ3SOs138+
 s6EqCQ/8CDdAY2FyCIohErcAYx566wjMb8SZcHraAL3kO0WtBZWexKEslwlNoOfY
 9qyp/kD838TRFbJdG/u7Sgo+eZ79VYC365bi7u4X1sh7IUepCEnEQ0kUx9VgmzZW
 1SPqLLovUUFtr+pr26q4/6xkiFAjFnO0jA7Mdx1/eAn11InYUrUhCFWRUqNUhk+u
 vdVr+W6SxFLt03JZDIKvVaumeeKZd5Ap/EtVWJYG9TupvvbhK+ynehht9y6EAfRW
 g4qgOmRdtqVmuius0hoPM6tqy0emUMEfv9dEmM1edmemWI70YnF/90BYE5q7M+Io
 P5oLXVm5bbYbBfUJV4wXqsFmjK7SVmm/ZYo+QPMVeYTqNdlmaEuBKMzIXDxUtPRY
 7ALADO2hdgyeEQm/1Gan9ds4kK1TO9z3hQVj9Hb3qewMG8Mxj40/C/o7BiH/Lb02
 YrWsXtc4I9NCOqaTI6C7ofxDMl+JJd+L8HD3gXnDQlC7axEQVuNBoWRNNhPVKfJ0
 iomCvdnMji1NbrChwrSYlCM4YePI27n9EMsh2Gk+D9MJK7RVnBLb2VwAlWy6GI2x
 diOy9UAJBYCx+DqBsVxNaJ8NSlgzlxAHOyTCuaKQy9U6L/13DrTPB/TU7R1Qo0R9
 3/UmDsVywkLhXmGokVpXKR8gvghoVY8N5vh7DjfxQstV9NNuPFY=
 =LsEi
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEiK/NIGsWEZVxh/FrYKtH/8kJUicFAmeHzCcACgkQYKtH/8kJ
 Uie5rhAAqUYxOBKBUXoiwy+CJXVIJZkZhWPJCOYrOUdDesV/pVcxsu/qaxXHFbk5
 5WG0GLyLEzMnqrIRH0gwpbW4He66uB6zgeGixC64a8y1pndrq62W7yd9v0+CLGhL
 jdHTuqCdmAvpmBjo75Yu1bfRS7wNhyAlp9QO9VXNJz+DX+S58pu/TAwSsYo/m3nU
 pHZfTuMZ7iSK8PBUNcpSb1P3pePz674ZlMBlvsXj6YBjxSjpHg3bsuQwfg/l34RE
 euqnCJA21YBZrQUebJHH3b98+HtLGNIV/UZ3jtZL3avs/IwUgqgHAXAApKug7aM1
 9NaOQO2oz02C/p3E3yovN1X45Oy9t1hO0hHwJU8lk7+5Tcp/jBVCa83fLT3WTG9Y
 TqnEoIJo5VxnZiw/UHqu2ITCIatlGk9IObzOe2lnWa55yfrsyZvpkAGTWN87kzXe
 Y1hfrFu6F5ptxphkvsYW3UgvtJ/FfWgHladKWw8ArKMtL1bP90HjTy5AT/lTNss4
 xIs9RnnljeeG82zjliL9HwP9DklhD9JjoN22L/v77zGkBAntu1aizT1jIKmr3IPq
 afUhAoE7YmJdGZbqy5BiKof4+21Fo7HYxIKyMSnnDxjA6HgOtm660y8vhKCO8ERr
 witqFOPIK4Gz8851J4vaDYm+irjb3EQLurSr5KtJz196vEJH6SY=
 =+AAx
 -----END PGP SIGNATURE-----

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>
pull/1134/head
Arnd Bergmann 2025-01-15 15:54:30 +01:00
parent f783d74ca6 836b341cc8
commit 03c75b04eb
3 changed files with 16 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/soc/tegra/cbb/tegra-cbb.c
View File

@ -69,19 +69,12 @@ static int tegra_cbb_err_show(struct seq_file *file, void *data)
}
DEFINE_SHOW_ATTRIBUTE(tegra_cbb_err);
static int tegra_cbb_err_debugfs_init(struct tegra_cbb *cbb)
static void tegra_cbb_err_debugfs_init(struct tegra_cbb *cbb)
{
static struct dentry *root;
if (!root) {
if (!root)
root = debugfs_create_file("tegra_cbb_err", 0444, NULL, cbb, &tegra_cbb_err_fops);
if (IS_ERR_OR_NULL(root)) {
pr_err("%s(): could not create debugfs node\n", __func__);
return PTR_ERR(root);
}
}
return 0;
}
void tegra_cbb_stall_enable(struct tegra_cbb *cbb)
@ -148,13 +141,8 @@ int tegra_cbb_register(struct tegra_cbb *cbb)
{
int ret;
if (IS_ENABLED(CONFIG_DEBUG_FS)) {
ret = tegra_cbb_err_debugfs_init(cbb);
if (ret) {
dev_err(cbb->dev, "failed to create debugfs\n");
return ret;
}
}
if (IS_ENABLED(CONFIG_DEBUG_FS))
tegra_cbb_err_debugfs_init(cbb);
/* register interrupt handler for errors due to different initiators */
ret = cbb->ops->interrupt_enable(cbb);

2
drivers/soc/tegra/cbb/tegra234-cbb.c
View File

@ -277,7 +277,7 @@ static void tegra234_lookup_slave_timeout(struct seq_file *file, struct tegra234
* which timed out.
* a) Get block number from the index of set bit in
* <FABRIC>_SN_AXI2APB_<>_BLOCK_TMO_STATUS_0 register.
* b) Get address of register repective to block number i.e.
* b) Get address of register respective to block number i.e.
* <FABRIC>_SN_AXI2APB_<>_BLOCK<index-set-bit>_TMO_0.
* c) Read the register in above step to get client_id which
* timed out as per the set bits.

17
drivers/soc/tegra/fuse/fuse-tegra30.c
View File

@ -647,15 +647,20 @@ static const struct nvmem_cell_lookup tegra234_fuse_lookups[] = {
};
static const struct nvmem_keepout tegra234_fuse_keepouts[] = {
{ .start = 0x01c, .end = 0x0c8 },
{ .start = 0x12c, .end = 0x184 },
{ .start = 0x01c, .end = 0x064 },
{ .start = 0x084, .end = 0x0a0 },
{ .start = 0x0a4, .end = 0x0c8 },
{ .start = 0x12c, .end = 0x164 },
{ .start = 0x16c, .end = 0x184 },
{ .start = 0x190, .end = 0x198 },
{ .start = 0x1a0, .end = 0x204 },
{ .start = 0x21c, .end = 0x250 },
{ .start = 0x25c, .end = 0x2f0 },
{ .start = 0x21c, .end = 0x2f0 },
{ .start = 0x310, .end = 0x3d8 },
{ .start = 0x400, .end = 0x4f0 },
{ .start = 0x4f8, .end = 0x7e8 },
{ .start = 0x400, .end = 0x420 },
{ .start = 0x444, .end = 0x490 },
{ .start = 0x4bc, .end = 0x4f0 },
{ .start = 0x4f8, .end = 0x54c },
{ .start = 0x57c, .end = 0x7e8 },
{ .start = 0x8d0, .end = 0x8d8 },
{ .start = 0xacc, .end = 0xf00 }
};