Hi Robert,
Em Wed, 1 Dec 2021 22:10:58 +0100
Robert Schlabbach <robert_s@xxxxxxx> escreveu:
> The Si2157 (A30) is functional with the ROM firmware 3.0.5, but can also
> be patched at runtime, e.g. to firmware 3.1.3. However, although a
> firmware filename for its firmware patch exists, that has only been used
> for the Si2177 (A30) so far (which indeed takes the binary identical
> firmware patch).
>
> Add support for downloading firmware patches into the Si2157 (A30), but
> make it optional, so that initialization can succeed with and without a
> firmware patch being available. Keep the use of request_firmware() for
> this purpose rather than firmware_request_nowarn(), so that the warning
> in the log makes users aware that it is possible to provide a firmware
> for this tuner.
>
> The firmware patch is probably also optional for other (if not all)
> tuners supported by the driver, but since I do not have the others
> available to test, they are kept mandatory for now to avoid regressions.
This patch seems too risky. While I don't know the specifics of this
specific chipset, usually the ROM is on a separate chip that may or
may not be present. It may even have an unusable or problematic
firmware, depending on when the firmware was flashed.
What it could make sense, instead, would be to have a smarter error
logic that would:
1. print an error/warn message if the firmware file was
not found;
2. check if the device already come with a firmware that
it is known to work. On such case, allows the init
to proceed;
3. if no firmware or too old/broken firmware, return an
error.
Regards,
Mauro
>
> Signed-off-by: Robert Schlabbach <robert_s@xxxxxxx>
> ---
> drivers/media/tuners/si2157.c | 13 ++++++++++++-
> 1 file changed, 12 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/media/tuners/si2157.c b/drivers/media/tuners/si2157.c
> index 75ddf7ed1faf..757b27d1605a 100644
> --- a/drivers/media/tuners/si2157.c
> +++ b/drivers/media/tuners/si2157.c
> @@ -85,6 +85,7 @@ static int si2157_init(struct dvb_frontend *fe)
> struct si2157_cmd cmd;
> const struct firmware *fw;
> const char *fw_name;
> + unsigned int fw_required;
> unsigned int chip_id, xtal_trim;
>
> dev_dbg(&client->dev, "\n");
> @@ -151,6 +152,10 @@ static int si2157_init(struct dvb_frontend *fe)
> #define SI2146_A10 ('A' << 24 | 46 << 16 | '1' << 8 | '0' << 0)
> #define SI2141_A10 ('A' << 24 | 41 << 16 | '1' << 8 | '0' << 0)
>
> + /* assume firmware is required, unless verified not to be */
> + /* only the SI2157_A30 has been verified not to yet */
> + fw_required = true;
> +
> switch (chip_id) {
> case SI2158_A20:
> case SI2148_A20:
> @@ -159,10 +164,13 @@ static int si2157_init(struct dvb_frontend *fe)
> case SI2141_A10:
> fw_name = SI2141_A10_FIRMWARE;
> break;
> + case SI2157_A30:
> + fw_name = SI2157_A30_FIRMWARE;
> + fw_required = false;
> + break;
> case SI2177_A30:
> fw_name = SI2157_A30_FIRMWARE;
> break;
> - case SI2157_A30:
> case SI2147_A30:
> case SI2146_A10:
> fw_name = NULL;
> @@ -184,6 +192,9 @@ static int si2157_init(struct dvb_frontend *fe)
> /* request the firmware, this will block and timeout */
> ret = request_firmware(&fw, fw_name, &client->dev);
> if (ret) {
> + if (!fw_required)
> + goto skip_fw_download;
> +
> dev_err(&client->dev, "firmware file '%s' not found\n",
> fw_name);
> goto err;
> --
> 2.17.1
>
Thanks,
Mauro
