diff mbox series

[v1] Upload dsp firmware for ASUS laptop 1EB30 & 1EB31 and Update WHENCE for both

Message ID 20241009101807.1473-1-shenghao-ding@ti.com (mailing list archive)
State New, archived
Headers show
Series [v1] Upload dsp firmware for ASUS laptop 1EB30 & 1EB31 and Update WHENCE for both | expand

Commit Message

Shenghao Ding Oct. 9, 2024, 10:18 a.m. UTC 
Signed-off-by: Shenghao Ding <shenghao-ding@ti.com>
---
 WHENCE                     |   4 ++++
 ti/tas2781/TAS2XXX2234.bin | Bin
 2 files changed, 4 insertions(+)
 mode change 100644 => 100755 ti/tas2781/TAS2XXX2234.bin

Comments

Mario Limonciello Oct. 10, 2024, 3:06 a.m. UTC | #1 
On 10/9/24 05:18, Shenghao Ding wrote:
> Signed-off-by: Shenghao Ding <shenghao-ding@ti.com>
> ---
>   WHENCE                     |   4 ++++
>   ti/tas2781/TAS2XXX2234.bin | Bin
>   2 files changed, 4 insertions(+)
>   mode change 100644 => 100755 ti/tas2781/TAS2XXX2234.bin
> 
> diff --git a/WHENCE b/WHENCE
> index a9c8bb5..00096eb 100644
> --- a/WHENCE
> +++ b/WHENCE
> @@ -7487,6 +7487,8 @@ Originates from https://git.codelinaro.org/linaro/qcomlt/audioreach-topology.git
>   --------------------------------------------------------------------------
>   
>   Driver: ti-tas2781 - tas2781 firmware
> +File: ti/tas2781/TAS2XXX1EB30.bin
> +File: ti/tas2781/TAS2XXX1EB31.bin
>   File: ti/tas2781/TAS2XXX2234.bin
>   File: ti/tas2781/TAS2XXX387D.bin
>   File: ti/tas2781/TAS2XXX387E.bin
> @@ -7516,6 +7518,8 @@ File: ti/tas2781/TAS2XXX38DF.bin
>   File: ti/tas2781/TAS2XXX38E0.bin
>   File: ti/tas2781/TIAS2781RCA2.bin
>   File: ti/tas2781/TIAS2781RCA4.bin
> +Link: TAS2XXX1EB30.bin -> ti/tas2781/TAS2XXX1EB30.bin
> +Link: TAS2XXX1EB31.bin -> ti/tas2781/TAS2XXX1EB31.bin
>   Link: TAS2XXX2234.bin -> ti/tas2781/TAS2XXX2234.bin
>   Link: TAS2XXX387D.bin -> ti/tas2781/TAS2XXX387D.bin
>   Link: TAS2XXX387E.bin -> ti/tas2781/TAS2XXX387E.bin
> diff --git a/ti/tas2781/TAS2XXX2234.bin b/ti/tas2781/TAS2XXX2234.bin
> old mode 100644
> new mode 100755

Hello,

I tried to process this into a MR on Gitlab and it failed CI.

https://gitlab.com/kernel-firmware/linux-firmware/-/merge_requests/311

Please run 'make check' before submitting.

Thanks,
Shenghao Ding Oct. 10, 2024, 11:29 a.m. UTC | #2 
Hi Mario
Thanks for review, I met some trouble on "make check".  Kindly do me a favor.
The detail is inline.

> -----Original Message-----
> From: Mario Limonciello <superm1@gmail.com>
> Sent: Thursday, October 10, 2024 11:06 AM
> To: Ding, Shenghao <shenghao-ding@ti.com>; linux-firmware@kernel.org
> Cc: Xu, Baojun <baojun.xu@ti.com>; derekjohn.clark@gmail.com;
> 13916275206@139.com; romangg@manjaro.org; linux-sound@vger.kernel.org;
> Chen, Robin <robinchen@ti.com>; linux-kernel@vger.kernel.org; Yi, Ken <k-
> yi@ti.com>; Navada Kanyana, Mukund <navada@ti.com>; philm@manjaro.org;
> jlobue10@gmail.com; luke@ljones.dev; antheas.dk@gmail.com
> Subject: [EXTERNAL] Re: [PATCH v1] Upload dsp firmware for ASUS laptop
> 1EB30 & 1EB31 and Update WHENCE for both
> 
> 
> On 10/9/24 05:18, Shenghao Ding wrote:
> > Signed-off-by: Shenghao Ding <shenghao-ding@ti.com>
> > ---
> >   WHENCE                     |   4 ++++
> >   ti/tas2781/TAS2XXX2234.bin | Bin
> >   2 files changed, 4 insertions(+)
> >   mode change 100644 => 100755 ti/tas2781/TAS2XXX2234.bin
> >
> > diff --git a/WHENCE b/WHENCE
> > index a9c8bb5..00096eb 100644
> > --- a/WHENCE
> > +++ b/WHENCE
> > @@ -7487,6 +7487,8 @@ Originates from
> Hello,
> 
> I tried to process this into a MR on Gitlab and it failed CI.
> 
> https://urldefense.com/v3/__https://gitlab.com/kernel-firmware/linux-
> firmware/-
> /merge_requests/311__;!!G3vK!T_f_IGXhtmSFR7P6UYZ14805X_k8seqk3G5386
> 2lXRJssIwKLs1Hegcn8NKMnqC9UGSPGCZ_lYOpoDo$
> 
> Please run 'make check' before submitting.
Although TAS2XXX1EB30.bin and TAS2XXX1EB31.bin are both in ti/tas2781, yet it reported "does not exist".
I have no idea why the file is there while report "does not exist". After I removed the newly-merged, no such report.

Following is the log. 

root@LAPTOP-70RJ5B8Q:/usr/local/src/fw_new# make check
Check that executables have shebangs.....................................Passed
Forbid new submodules....................................................Passed
Check Yaml...............................................................Passed
Check for broken symlinks............................(no files to check)Skipped
Detect Destroyed Symlinks................................................Passed
shellcheck...............................................................Passed
black....................................................................Passed
markdownlint.............................................................Failed
- hook id: markdownlint
- exit code: 1

internal/modules/cjs/loader.js:818
  throw err;
  ^

Error: Cannot find module 'node:fs'
Require stack:
- /root/.cache/pre-commit/repoxl59c0uz/node_env-system/lib/node_modules/markdownlint-cli/markdownlint.js
    at Function.Module._resolveFilename (internal/modules/cjs/loader.js:815:15)
    at Function.Module._load (internal/modules/cjs/loader.js:667:27)
    at Module.require (internal/modules/cjs/loader.js:887:19)
    at require (internal/modules/cjs/helpers.js:85:18)
    at Object.<anonymous> (/root/.cache/pre-commit/repoxl59c0uz/node_env-system/lib/node_modules/markdownlint-cli/markdownlint.js:5:12)
    at Module._compile (internal/modules/cjs/loader.js:999:30)
    at Object.Module._extensions..js (internal/modules/cjs/loader.js:1027:10)
    at Module.load (internal/modules/cjs/loader.js:863:32)
    at Function.Module._load (internal/modules/cjs/loader.js:708:14)
    at Function.executeUserEntryPoint [as runMain] (internal/modules/run_main.js:60:12) {
  code: 'MODULE_NOT_FOUND',
  requireStack: [
    '/root/.cache/pre-commit/repoxl59c0uz/node_env-system/lib/node_modules/markdownlint-cli/markdownlint.js'
  ]
}

Check whence.............................................................Failed
- hook id: check-whence
- exit code: 1

E: ti/tas2781/TAS2XXX1EB30.bin listed in WHENCE does not exist
E: ti/tas2781/TAS2XXX1EB31.bin listed in WHENCE does not exist
E: target ti/tas2781/TAS2XXX1EB30.bin of link TAS2XXX1EB30.bin in WHENCE does not exist
E: target ti/tas2781/TAS2XXX1EB31.bin of link TAS2XXX1EB31.bin in WHENCE does not exist

make: *** [Makefile:10: check] Error 1
root@LAPTOP-70RJ5B8Q:/usr/local/src/fw_new# ls ti/tas2781/TAS2XXX1* -al
-rw-r--r-- 1 root root 35220 Sep 28 21:54 ti/tas2781/TAS2XXX1EB30.bin
-rw-r--r-- 1 root root 35220 Sep 28 21:55 ti/tas2781/TAS2XXX1EB31.bin
root@LAPTOP-70RJ5B8Q:/usr/local/src/fw_new#
> 
> Thanks,
Mario Limonciello Oct. 10, 2024, 1:30 p.m. UTC | #3 
> Although TAS2XXX1EB30.bin and TAS2XXX1EB31.bin are both in ti/tas2781, yet it reported "does not exist".
> I have no idea why the file is there while report "does not exist". After I removed the newly-merged, no such report.

I think you forgot to git add them to the commit?

> 
> Following is the log.
> 
> root@LAPTOP-70RJ5B8Q:/usr/local/src/fw_new# make check
> Check that executables have shebangs.....................................Passed
> Forbid new submodules....................................................Passed
> Check Yaml...............................................................Passed
> Check for broken symlinks............................(no files to check)Skipped
> Detect Destroyed Symlinks................................................Passed
> shellcheck...............................................................Passed
> black....................................................................Passed
> markdownlint.............................................................Failed
> - hook id: markdownlint
> - exit code: 1
> 
> internal/modules/cjs/loader.js:818
>    throw err;
>    ^
> 
> Error: Cannot find module 'node:fs'
> Require stack:
> - /root/.cache/pre-commit/repoxl59c0uz/node_env-system/lib/node_modules/markdownlint-cli/markdownlint.js
>      at Function.Module._resolveFilename (internal/modules/cjs/loader.js:815:15)
>      at Function.Module._load (internal/modules/cjs/loader.js:667:27)
>      at Module.require (internal/modules/cjs/loader.js:887:19)
>      at require (internal/modules/cjs/helpers.js:85:18)
>      at Object.<anonymous> (/root/.cache/pre-commit/repoxl59c0uz/node_env-system/lib/node_modules/markdownlint-cli/markdownlint.js:5:12)
>      at Module._compile (internal/modules/cjs/loader.js:999:30)
>      at Object.Module._extensions..js (internal/modules/cjs/loader.js:1027:10)
>      at Module.load (internal/modules/cjs/loader.js:863:32)
>      at Function.Module._load (internal/modules/cjs/loader.js:708:14)
>      at Function.executeUserEntryPoint [as runMain] (internal/modules/run_main.js:60:12) {
>    code: 'MODULE_NOT_FOUND',
>    requireStack: [
>      '/root/.cache/pre-commit/repoxl59c0uz/node_env-system/lib/node_modules/markdownlint-cli/markdownlint.js'
>    ]
> }
> 

This looks like you're missing some dependencie on you system for 
markdownlint. You need nodejs v18.

If you can't install this you can skip this check when you commit by 
adding "SKIP=markdownlint" to your environment while running 'git commit'.

> Check whence.............................................................Failed
> - hook id: check-whence
> - exit code: 1
> 
> E: ti/tas2781/TAS2XXX1EB30.bin listed in WHENCE does not exist
> E: ti/tas2781/TAS2XXX1EB31.bin listed in WHENCE does not exist
> E: target ti/tas2781/TAS2XXX1EB30.bin of link TAS2XXX1EB30.bin in WHENCE does not exist
> E: target ti/tas2781/TAS2XXX1EB31.bin of link TAS2XXX1EB31.bin in WHENCE does not exist
> 

These files are missing in your commit or they have broken links. 
Double check them.

> make: *** [Makefile:10: check] Error 1
> root@LAPTOP-70RJ5B8Q:/usr/local/src/fw_new# ls ti/tas2781/TAS2XXX1* -al
> -rw-r--r-- 1 root root 35220 Sep 28 21:54 ti/tas2781/TAS2XXX1EB30.bin
> -rw-r--r-- 1 root root 35220 Sep 28 21:55 ti/tas2781/TAS2XXX1EB31.bin
> root@LAPTOP-70RJ5B8Q:/usr/local/src/fw_new#
>>
>> Thanks,
Mario Limonciello Oct. 10, 2024, 1:39 p.m. UTC | #4 
On 10/10/24 08:30, Mario Limonciello wrote:
>> Although TAS2XXX1EB30.bin and TAS2XXX1EB31.bin are both in ti/tas2781, 
>> yet it reported "does not exist".
>> I have no idea why the file is there while report "does not exist". 
>> After I removed the newly-merged, no such report.
> 
> I think you forgot to git add them to the commit?
> 
>>
>> Following is the log.
>>
>> root@LAPTOP-70RJ5B8Q:/usr/local/src/fw_new# make check
>> Check that executables have 
>> shebangs.....................................Passed
>> Forbid new 
>> submodules....................................................Passed
>> Check 
>> Yaml...............................................................Passed
>> Check for broken symlinks............................(no files to 
>> check)Skipped
>> Detect Destroyed 
>> Symlinks................................................Passed
>> shellcheck...............................................................Passed
>> black....................................................................Passed
>> markdownlint.............................................................Failed
>> - hook id: markdownlint
>> - exit code: 1
>>
>> internal/modules/cjs/loader.js:818
>>    throw err;
>>    ^
>>
>> Error: Cannot find module 'node:fs'
>> Require stack:
>> - /root/.cache/pre-commit/repoxl59c0uz/node_env-system/lib/ 
>> node_modules/markdownlint-cli/markdownlint.js
>>      at Function.Module._resolveFilename (internal/modules/cjs/ 
>> loader.js:815:15)
>>      at Function.Module._load (internal/modules/cjs/loader.js:667:27)
>>      at Module.require (internal/modules/cjs/loader.js:887:19)
>>      at require (internal/modules/cjs/helpers.js:85:18)
>>      at Object.<anonymous> (/root/.cache/pre-commit/repoxl59c0uz/ 
>> node_env-system/lib/node_modules/markdownlint-cli/markdownlint.js:5:12)
>>      at Module._compile (internal/modules/cjs/loader.js:999:30)
>>      at Object.Module._extensions..js (internal/modules/cjs/ 
>> loader.js:1027:10)
>>      at Module.load (internal/modules/cjs/loader.js:863:32)
>>      at Function.Module._load (internal/modules/cjs/loader.js:708:14)
>>      at Function.executeUserEntryPoint [as runMain] (internal/modules/ 
>> run_main.js:60:12) {
>>    code: 'MODULE_NOT_FOUND',
>>    requireStack: [
>>      '/root/.cache/pre-commit/repoxl59c0uz/node_env-system/lib/ 
>> node_modules/markdownlint-cli/markdownlint.js'
>>    ]
>> }
>>
> 
> This looks like you're missing some dependencie on you system for 
> markdownlint. You need nodejs v18.
> 
> If you can't install this you can skip this check when you commit by 
> adding "SKIP=markdownlint" to your environment while running 'git commit'.
> 
>> Check 
>> whence.............................................................Failed
>> - hook id: check-whence
>> - exit code: 1
>>
>> E: ti/tas2781/TAS2XXX1EB30.bin listed in WHENCE does not exist
>> E: ti/tas2781/TAS2XXX1EB31.bin listed in WHENCE does not exist
>> E: target ti/tas2781/TAS2XXX1EB30.bin of link TAS2XXX1EB30.bin in 
>> WHENCE does not exist
>> E: target ti/tas2781/TAS2XXX1EB31.bin of link TAS2XXX1EB31.bin in 
>> WHENCE does not exist
>>
> 
> These files are missing in your commit or they have broken links. Double 
> check them.
> 
>> make: *** [Makefile:10: check] Error 1
>> root@LAPTOP-70RJ5B8Q:/usr/local/src/fw_new# ls ti/tas2781/TAS2XXX1* -al
>> -rw-r--r-- 1 root root 35220 Sep 28 21:54 ti/tas2781/TAS2XXX1EB30.bin
>> -rw-r--r-- 1 root root 35220 Sep 28 21:55 ti/tas2781/TAS2XXX1EB31.bin
>> root@LAPTOP-70RJ5B8Q:/usr/local/src/fw_new#
>>>
>>> Thanks,
> 

You know - as you've been having problems with git and at least I've got 
the intent and your S-o-b for the firmware I've taken your MR and 
rebased/squashed it for you here:

https://gitlab.com/kernel-firmware/linux-firmware/-/merge_requests/317

I'll merge this and if you have any follow ups you can do them on top as 
future MR (preferred!) or patches to M/L.

Thanks!
Antheas Kapenekakis Oct. 10, 2024, 1:52 p.m. UTC | #5 
Hi Mario,
as I am not logged in, kindly close
https://gitlab.com/kernel-firmware/linux-firmware/-/merge_requests/272

Then, while consulting it and
https://gitlab.com/kernel-firmware/linux-firmware/-/commit/d65613ab8c480dec6d63733d3286451aa8b3795f
, modify the whence so that 1EB3 points to 1EB30.

Otherwise, your merge will not work with the current TAS driver, and
we will have to do a second round of workarounds while it is the case.
We have had that symlink for over 3 months now, and as Chen said,
while not ideal, it will do for the time being.

You may add me as suggested-by using my lkml email signature

Antheas

On Thu, 10 Oct 2024 at 15:39, Mario Limonciello <superm1@gmail.com> wrote:
>
>
>
> On 10/10/24 08:30, Mario Limonciello wrote:
> >> Although TAS2XXX1EB30.bin and TAS2XXX1EB31.bin are both in ti/tas2781,
> >> yet it reported "does not exist".
> >> I have no idea why the file is there while report "does not exist".
> >> After I removed the newly-merged, no such report.
> >
> > I think you forgot to git add them to the commit?
> >
> >>
> >> Following is the log.
> >>
> >> root@LAPTOP-70RJ5B8Q:/usr/local/src/fw_new# make check
> >> Check that executables have
> >> shebangs.....................................Passed
> >> Forbid new
> >> submodules....................................................Passed
> >> Check
> >> Yaml...............................................................Passed
> >> Check for broken symlinks............................(no files to
> >> check)Skipped
> >> Detect Destroyed
> >> Symlinks................................................Passed
> >> shellcheck...............................................................Passed
> >> black....................................................................Passed
> >> markdownlint.............................................................Failed
> >> - hook id: markdownlint
> >> - exit code: 1
> >>
> >> internal/modules/cjs/loader.js:818
> >>    throw err;
> >>    ^
> >>
> >> Error: Cannot find module 'node:fs'
> >> Require stack:
> >> - /root/.cache/pre-commit/repoxl59c0uz/node_env-system/lib/
> >> node_modules/markdownlint-cli/markdownlint.js
> >>      at Function.Module._resolveFilename (internal/modules/cjs/
> >> loader.js:815:15)
> >>      at Function.Module._load (internal/modules/cjs/loader.js:667:27)
> >>      at Module.require (internal/modules/cjs/loader.js:887:19)
> >>      at require (internal/modules/cjs/helpers.js:85:18)
> >>      at Object.<anonymous> (/root/.cache/pre-commit/repoxl59c0uz/
> >> node_env-system/lib/node_modules/markdownlint-cli/markdownlint.js:5:12)
> >>      at Module._compile (internal/modules/cjs/loader.js:999:30)
> >>      at Object.Module._extensions..js (internal/modules/cjs/
> >> loader.js:1027:10)
> >>      at Module.load (internal/modules/cjs/loader.js:863:32)
> >>      at Function.Module._load (internal/modules/cjs/loader.js:708:14)
> >>      at Function.executeUserEntryPoint [as runMain] (internal/modules/
> >> run_main.js:60:12) {
> >>    code: 'MODULE_NOT_FOUND',
> >>    requireStack: [
> >>      '/root/.cache/pre-commit/repoxl59c0uz/node_env-system/lib/
> >> node_modules/markdownlint-cli/markdownlint.js'
> >>    ]
> >> }
> >>
> >
> > This looks like you're missing some dependencie on you system for
> > markdownlint. You need nodejs v18.
> >
> > If you can't install this you can skip this check when you commit by
> > adding "SKIP=markdownlint" to your environment while running 'git commit'.
> >
> >> Check
> >> whence.............................................................Failed
> >> - hook id: check-whence
> >> - exit code: 1
> >>
> >> E: ti/tas2781/TAS2XXX1EB30.bin listed in WHENCE does not exist
> >> E: ti/tas2781/TAS2XXX1EB31.bin listed in WHENCE does not exist
> >> E: target ti/tas2781/TAS2XXX1EB30.bin of link TAS2XXX1EB30.bin in
> >> WHENCE does not exist
> >> E: target ti/tas2781/TAS2XXX1EB31.bin of link TAS2XXX1EB31.bin in
> >> WHENCE does not exist
> >>
> >
> > These files are missing in your commit or they have broken links. Double
> > check them.
> >
> >> make: *** [Makefile:10: check] Error 1
> >> root@LAPTOP-70RJ5B8Q:/usr/local/src/fw_new# ls ti/tas2781/TAS2XXX1* -al
> >> -rw-r--r-- 1 root root 35220 Sep 28 21:54 ti/tas2781/TAS2XXX1EB30.bin
> >> -rw-r--r-- 1 root root 35220 Sep 28 21:55 ti/tas2781/TAS2XXX1EB31.bin
> >> root@LAPTOP-70RJ5B8Q:/usr/local/src/fw_new#
> >>>
> >>> Thanks,
> >
>
> You know - as you've been having problems with git and at least I've got
> the intent and your S-o-b for the firmware I've taken your MR and
> rebased/squashed it for you here:
>
> https://gitlab.com/kernel-firmware/linux-firmware/-/merge_requests/317
>
> I'll merge this and if you have any follow ups you can do them on top as
> future MR (preferred!) or patches to M/L.
>
> Thanks!
>
Shenghao Ding Oct. 11, 2024, 9:23 a.m. UTC | #6 
Hi Mario
Thanks for your support. Finally "make check" works, following is the log.

root@LAPTOP-70RJ5B8Q:/usr/local/src/fw_new# make check
 Check that executables have shebangs.....................................Passed
 Forbid new submodules....................................................Passed
 Check Yaml...............................................................Passed
 Check for broken symlinks............................(no files to check)Skipped
 Detect Destroyed Symlinks................................................Passed
 shellcheck...............................................................Passed
 black....................................................................Passed
 markdownlint............................................................Skipped
 Check whence.............................................................Passed
 root@LAPTOP-70RJ5B8Q:/usr/local/src/fw_new#

> On 10/10/24 08:30, Mario Limonciello wrote:
> >> Although TAS2XXX1EB30.bin and TAS2XXX1EB31.bin are both in
> >> ti/tas2781, yet it reported "does not exist".
> >> I have no idea why the file is there while report "does not exist".
> >> After I removed the newly-merged, no such report.
> >
> > I think you forgot to git add them to the commit?
> >
> >>
................................
> I'll merge this and if you have any follow ups you can do them on top as future
> MR (preferred!) or patches to M/L.

It seemed that I was not used to submitting patch via gitlab. 
So, finally I have to submit the patch to the git.kernel.com
I'll try submitting next firmware binary file via Gitlab. Thanks.

> 
> Thanks!
diff mbox series

Patch

diff --git a/WHENCE b/WHENCE
index a9c8bb5..00096eb 100644
--- a/WHENCE
+++ b/WHENCE
@@ -7487,6 +7487,8 @@  Originates from https://git.codelinaro.org/linaro/qcomlt/audioreach-topology.git
 --------------------------------------------------------------------------
 
 Driver: ti-tas2781 - tas2781 firmware
+File: ti/tas2781/TAS2XXX1EB30.bin
+File: ti/tas2781/TAS2XXX1EB31.bin
 File: ti/tas2781/TAS2XXX2234.bin
 File: ti/tas2781/TAS2XXX387D.bin
 File: ti/tas2781/TAS2XXX387E.bin
@@ -7516,6 +7518,8 @@  File: ti/tas2781/TAS2XXX38DF.bin
 File: ti/tas2781/TAS2XXX38E0.bin
 File: ti/tas2781/TIAS2781RCA2.bin
 File: ti/tas2781/TIAS2781RCA4.bin
+Link: TAS2XXX1EB30.bin -> ti/tas2781/TAS2XXX1EB30.bin
+Link: TAS2XXX1EB31.bin -> ti/tas2781/TAS2XXX1EB31.bin
 Link: TAS2XXX2234.bin -> ti/tas2781/TAS2XXX2234.bin
 Link: TAS2XXX387D.bin -> ti/tas2781/TAS2XXX387D.bin
 Link: TAS2XXX387E.bin -> ti/tas2781/TAS2XXX387E.bin
diff --git a/ti/tas2781/TAS2XXX2234.bin b/ti/tas2781/TAS2XXX2234.bin
old mode 100644
new mode 100755