Commit 6ae01050 authored by Hans de Goede's avatar Hans de Goede Committed by Andy Shevchenko

platform/x86: GPD pocket fan: Use default values when wrong modparams are given

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@vger.kernel.org
Cc: Jason Anderson <jasona.594@gmail.com>
Reported-by: default avatarJason Anderson <jasona.594@gmail.com>
Fixes: 594ce6db ("platform/x86: GPD pocket fan: Use a min-speed of 2 while charging")
Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
parent 638bc4ca
...@@ -16,17 +16,27 @@ ...@@ -16,17 +16,27 @@
#define MAX_SPEED 3 #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,
};
module_param_array(temp_limits, int, NULL, 0444); module_param_array(temp_limits, int, NULL, 0444);
MODULE_PARM_DESC(temp_limits, MODULE_PARM_DESC(temp_limits,
"Millicelsius values above which the fan speed increases"); "Millicelsius values above which the fan speed increases");
static int hysteresis = 3000; static int hysteresis = HYSTERESIS_DEFAULT;
module_param(hysteresis, int, 0444); module_param(hysteresis, int, 0444);
MODULE_PARM_DESC(hysteresis, MODULE_PARM_DESC(hysteresis,
"Hysteresis in millicelsius before lowering the fan speed"); "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_param(speed_on_ac, int, 0444);
MODULE_PARM_DESC(speed_on_ac, MODULE_PARM_DESC(speed_on_ac,
"minimum fan speed to allow when system is powered by AC"); "minimum fan speed to allow when system is powered by AC");
...@@ -120,18 +130,21 @@ static int gpd_pocket_fan_probe(struct platform_device *pdev) ...@@ -120,18 +130,21 @@ static int gpd_pocket_fan_probe(struct platform_device *pdev)
if (temp_limits[i] < 40000 || temp_limits[i] > 70000) { if (temp_limits[i] < 40000 || temp_limits[i] > 70000) {
dev_err(&pdev->dev, "Invalid temp-limit %d (must be between 40000 and 70000)\n", dev_err(&pdev->dev, "Invalid temp-limit %d (must be between 40000 and 70000)\n",
temp_limits[i]); 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) { if (hysteresis < 1000 || hysteresis > 10000) {
dev_err(&pdev->dev, "Invalid hysteresis %d (must be between 1000 and 10000)\n", dev_err(&pdev->dev, "Invalid hysteresis %d (must be between 1000 and 10000)\n",
hysteresis); hysteresis);
return -EINVAL; hysteresis = HYSTERESIS_DEFAULT;
} }
if (speed_on_ac < 0 || speed_on_ac > MAX_SPEED) { 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", dev_err(&pdev->dev, "Invalid speed_on_ac %d (must be between 0 and 3)\n",
speed_on_ac); speed_on_ac);
return -EINVAL; speed_on_ac = SPEED_ON_AC_DEFAULT;
} }
fan = devm_kzalloc(&pdev->dev, sizeof(*fan), GFP_KERNEL); fan = devm_kzalloc(&pdev->dev, sizeof(*fan), GFP_KERNEL);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment