On Mon, Jan 6, 2020 at 4:42 PM Hans de Goede <hdegoede@xxxxxxxxxx> wrote:
>
> Use our default values when wrong module-parameters are given, instead of
> refusing to load. Refusing to load leaves the fan at the BIOS default
> setting, which is "Off". The CPU's thermal throttling should protect the
> system from damage, but not-loading is really not the best fallback in this
> case.
>
> This commit fixes this by re-setting module-parameter values to their
> defaults if they are out of range, instead of failing the probe with
> -EINVAL.
>
> Cc: stable@xxxxxxxxxxxxxxx
> Cc: Jason Anderson <jasona.594@xxxxxxxxx>
> Reported-by: Jason Anderson <jasona.594@xxxxxxxxx>
> Fixes: 594ce6db326e ("platform/x86: GPD pocket fan: Use a min-speed of 2 while charging")
> Signed-off-by: Hans de Goede <hdegoede@xxxxxxxxxx>
> ---
> drivers/platform/x86/gpd-pocket-fan.c | 24 ++++++++++++++++++------
> 1 file changed, 18 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/platform/x86/gpd-pocket-fan.c b/drivers/platform/x86/gpd-pocket-fan.c
> index be85ed966bf3..1e6a42f2ea8a 100644
> --- a/drivers/platform/x86/gpd-pocket-fan.c
> +++ b/drivers/platform/x86/gpd-pocket-fan.c
> @@ -16,17 +16,26 @@
>
> #define MAX_SPEED 3
>
> -static int temp_limits[3] = { 55000, 60000, 65000 };
> +#define TEMP_LIMIT0_DEFAULT 55000
> +#define TEMP_LIMIT1_DEFAULT 60000
> +#define TEMP_LIMIT2_DEFAULT 65000
> +
> +#define HYSTERESIS_DEFAULT 3000
> +
> +#define SPEED_ON_AC_DEFAULT 2
> +
> +static int temp_limits[3] = {
> + TEMP_LIMIT0_DEFAULT, TEMP_LIMIT1_DEFAULT, TEMP_LIMIT2_DEFAULT };
I would rather put }; on the next line.
But okay, I'll do it myself when applying.
> module_param_array(temp_limits, int, NULL, 0444);
> MODULE_PARM_DESC(temp_limits,
> "Millicelsius values above which the fan speed increases");
>
> -static int hysteresis = 3000;
> +static int hysteresis = HYSTERESIS_DEFAULT;
> module_param(hysteresis, int, 0444);
> MODULE_PARM_DESC(hysteresis,
> "Hysteresis in millicelsius before lowering the fan speed");
>
> -static int speed_on_ac = 2;
> +static int speed_on_ac = SPEED_ON_AC_DEFAULT;
> module_param(speed_on_ac, int, 0444);
> MODULE_PARM_DESC(speed_on_ac,
> "minimum fan speed to allow when system is powered by AC");
> @@ -120,18 +129,21 @@ static int gpd_pocket_fan_probe(struct platform_device *pdev)
> if (temp_limits[i] < 40000 || temp_limits[i] > 70000) {
> dev_err(&pdev->dev, "Invalid temp-limit %d (must be between 40000 and 70000)\n",
> temp_limits[i]);
> - return -EINVAL;
> + temp_limits[0] = TEMP_LIMIT0_DEFAULT;
> + temp_limits[1] = TEMP_LIMIT1_DEFAULT;
> + temp_limits[2] = TEMP_LIMIT2_DEFAULT;
> + break;
> }
> }
> if (hysteresis < 1000 || hysteresis > 10000) {
> dev_err(&pdev->dev, "Invalid hysteresis %d (must be between 1000 and 10000)\n",
> hysteresis);
> - return -EINVAL;
> + hysteresis = HYSTERESIS_DEFAULT;
> }
> if (speed_on_ac < 0 || speed_on_ac > MAX_SPEED) {
> dev_err(&pdev->dev, "Invalid speed_on_ac %d (must be between 0 and 3)\n",
> speed_on_ac);
> - return -EINVAL;
> + speed_on_ac = SPEED_ON_AC_DEFAULT;
> }
>
> fan = devm_kzalloc(&pdev->dev, sizeof(*fan), GFP_KERNEL);
> --
> 2.24.1
>
--
With Best Regards,
Andy Shevchenko
