[RESEND PATCH v5 1/5] acerhdf: Adding support for "manual mode"
Some Acer models require an additional command to turn off the fan after
bios mode has been enabled. Adding new section in bios table to allow
support for those models, by writing an extra "manual mode" register.
Cc: platform-driver-...@vger.kernel.org
Cc: Darren Hart
Cc: Andrew Morton
Cc: Andreas Mohr
Acked-by: Borislav Petkov
Signed-off-by: Peter Feuerer
---
drivers/platform/x86/acerhdf.c | 186 ++---
1 file changed, 102 insertions(+), 84 deletions(-)
diff --git a/drivers/platform/x86/acerhdf.c b/drivers/platform/x86/acerhdf.c
index f94467c..2c58f10 100644
--- a/drivers/platform/x86/acerhdf.c
+++ b/drivers/platform/x86/acerhdf.c
@@ -50,7 +50,7 @@
*/
#undef START_IN_KERNEL_MODE
-#define DRV_VER "0.5.26"
+#define DRV_VER "0.5.29"
/*
* According to the Atom N270 datasheet,
@@ -119,6 +119,17 @@ struct fancmd {
u8 cmd_auto;
};
+struct manualcmd {
+ u8 mreg;
+ u8 moff;
+};
+
+/* default register and command to disable fan in manual mode */
+static const struct manualcmd mcmd = {
+ .mreg = 0x94,
+ .moff = 0xff,
+};
+
/* BIOS settings */
struct bios_settings_t {
const char *vendor;
@@ -127,105 +138,106 @@ struct bios_settings_t {
unsigned char fanreg;
unsigned char tempreg;
struct fancmd cmd;
+ int mcmd_enable;
};
/* Register addresses and values for different BIOS versions */
static const struct bios_settings_t bios_tbl[] = {
/* AOA110 */
- {"Acer", "AOA110", "v0.3109", 0x55, 0x58, {0x1f, 0x00} },
- {"Acer", "AOA110", "v0.3114", 0x55, 0x58, {0x1f, 0x00} },
- {"Acer", "AOA110", "v0.3301", 0x55, 0x58, {0xaf, 0x00} },
- {"Acer", "AOA110", "v0.3304", 0x55, 0x58, {0xaf, 0x00} },
- {"Acer", "AOA110", "v0.3305", 0x55, 0x58, {0xaf, 0x00} },
- {"Acer", "AOA110", "v0.3307", 0x55, 0x58, {0xaf, 0x00} },
- {"Acer", "AOA110", "v0.3308", 0x55, 0x58, {0x21, 0x00} },
- {"Acer", "AOA110", "v0.3309", 0x55, 0x58, {0x21, 0x00} },
- {"Acer", "AOA110", "v0.3310", 0x55, 0x58, {0x21, 0x00} },
+ {"Acer", "AOA110", "v0.3109", 0x55, 0x58, {0x1f, 0x00}, 0},
+ {"Acer", "AOA110", "v0.3114", 0x55, 0x58, {0x1f, 0x00}, 0},
+ {"Acer", "AOA110", "v0.3301", 0x55, 0x58, {0xaf, 0x00}, 0},
+ {"Acer", "AOA110", "v0.3304", 0x55, 0x58, {0xaf, 0x00}, 0},
+ {"Acer", "AOA110", "v0.3305", 0x55, 0x58, {0xaf, 0x00}, 0},
+ {"Acer", "AOA110", "v0.3307", 0x55, 0x58, {0xaf, 0x00}, 0},
+ {"Acer", "AOA110", "v0.3308", 0x55, 0x58, {0x21, 0x00}, 0},
+ {"Acer", "AOA110", "v0.3309", 0x55, 0x58, {0x21, 0x00}, 0},
+ {"Acer", "AOA110", "v0.3310", 0x55, 0x58, {0x21, 0x00}, 0},
/* AOA150 */
- {"Acer", "AOA150", "v0.3114", 0x55, 0x58, {0x1f, 0x00} },
- {"Acer", "AOA150", "v0.3301", 0x55, 0x58, {0x20, 0x00} },
- {"Acer", "AOA150", "v0.3304", 0x55, 0x58, {0x20, 0x00} },
- {"Acer", "AOA150", "v0.3305", 0x55, 0x58, {0x20, 0x00} },
- {"Acer", "AOA150", "v0.3307", 0x55, 0x58, {0x20, 0x00} },
- {"Acer", "AOA150", "v0.3308", 0x55, 0x58, {0x20, 0x00} },
- {"Acer", "AOA150", "v0.3309", 0x55, 0x58, {0x20, 0x00} },
- {"Acer", "AOA150", "v0.3310", 0x55, 0x58, {0x20, 0x00} },
+ {"Acer", "AOA150", "v0.3114", 0x55, 0x58, {0x1f, 0x00}, 0},
+ {"Acer", "AOA150", "v0.3301", 0x55, 0x58, {0x20, 0x00}, 0},
+ {"Acer", "AOA150", "v0.3304", 0x55, 0x58, {0x20, 0x00}, 0},
+ {"Acer", "AOA150", "v0.3305", 0x55, 0x58, {0x20, 0x00}, 0},
+ {"Acer", "AOA150", "v0.3307", 0x55, 0x58, {0x20, 0x00}, 0},
+ {"Acer", "AOA150", "v0.3308", 0x55, 0x58, {0x20, 0x00}, 0},
+ {"Acer", "AOA150", "v0.3309", 0x55, 0x58, {0x20, 0x00}, 0},
+ {"Acer", "AOA150", "v0.3310", 0x55, 0x58, {0x20, 0x00}, 0},
/* LT1005u */
- {"Acer", "LT-10Q", "v0.3310", 0x55, 0x58, {0x20, 0x00} },
+ {"Acer", "LT-10Q", "v0.3310", 0x55, 0x58, {0x20, 0x00}, 0},
/* Acer 1410 */
- {"Acer", "Aspire 1410", "v0.3108", 0x55, 0x58, {0x9e, 0x00} },
- {"Acer", "Aspire 1410", "v0.3113", 0x55, 0x58, {0x9e, 0x00} },
- {"Acer", "Aspire 1410", "v0.3115", 0x55, 0x58, {0x9e, 0x00} },
- {"Acer", "Aspire 1410", "v0.3117", 0x55, 0x58, {0x9e, 0x00} },
- {"Acer", "Aspire 1410", "v0.3119", 0x55, 0x58, {0x9e, 0x00} },
- {"Acer", "Aspire 1410", "v0.3120", 0x55, 0x58, {0x9e, 0x00} },
- {"Acer", "Aspire 1410", "v1.3204", 0x55, 0x58, {0x9e, 0x00} },
- {"Acer", "Aspire 1410", "v1.3303", 0x55, 0x58, {0x9e, 0x00} },
- {"Acer", "Aspire 1410", "v1.3308", 0x55, 0x58, {0x9e, 0x00} },
- {"Acer", "Aspire 1410", "v1.3310", 0x55, 0x58, {0x9e, 0x00} },
- {"Acer", "Aspire 1410", "v1.3314", 0x55, 0x58, {0x9e, 0x00} },
+ {"Acer", "Aspire 1410", "v0.3108", 0x55, 0x58, {0x9e, 0x00}, 0},
+ {"Acer", "Aspire 1410", "v0.3113", 0x55, 0x58, {0x9e, 0x00}, 0},
+ {"Acer", "Aspire 1410", "v0.3115", 0x55, 0x58, {0x9e, 0x00}, 0},
+ {"Acer",
[RESEND PATCH v5 1/5] acerhdf: Adding support for manual mode
Some Acer models require an additional command to turn off the fan after
bios mode has been enabled. Adding new section in bios table to allow
support for those models, by writing an extra manual mode register.
Cc: platform-driver-...@vger.kernel.org
Cc: Darren Hart dvh...@infradead.org
Cc: Andrew Morton a...@linux-foundation.org
Cc: Andreas Mohr a...@lisas.de
Acked-by: Borislav Petkov b...@suse.de
Signed-off-by: Peter Feuerer pe...@piie.net
---
drivers/platform/x86/acerhdf.c | 186 ++---
1 file changed, 102 insertions(+), 84 deletions(-)
diff --git a/drivers/platform/x86/acerhdf.c b/drivers/platform/x86/acerhdf.c
index f94467c..2c58f10 100644
--- a/drivers/platform/x86/acerhdf.c
+++ b/drivers/platform/x86/acerhdf.c
@@ -50,7 +50,7 @@
*/
#undef START_IN_KERNEL_MODE
-#define DRV_VER 0.5.26
+#define DRV_VER 0.5.29
/*
* According to the Atom N270 datasheet,
@@ -119,6 +119,17 @@ struct fancmd {
u8 cmd_auto;
};
+struct manualcmd {
+ u8 mreg;
+ u8 moff;
+};
+
+/* default register and command to disable fan in manual mode */
+static const struct manualcmd mcmd = {
+ .mreg = 0x94,
+ .moff = 0xff,
+};
+
/* BIOS settings */
struct bios_settings_t {
const char *vendor;
@@ -127,105 +138,106 @@ struct bios_settings_t {
unsigned char fanreg;
unsigned char tempreg;
struct fancmd cmd;
+ int mcmd_enable;
};
/* Register addresses and values for different BIOS versions */
static const struct bios_settings_t bios_tbl[] = {
/* AOA110 */
- {Acer, AOA110, v0.3109, 0x55, 0x58, {0x1f, 0x00} },
- {Acer, AOA110, v0.3114, 0x55, 0x58, {0x1f, 0x00} },
- {Acer, AOA110, v0.3301, 0x55, 0x58, {0xaf, 0x00} },
- {Acer, AOA110, v0.3304, 0x55, 0x58, {0xaf, 0x00} },
- {Acer, AOA110, v0.3305, 0x55, 0x58, {0xaf, 0x00} },
- {Acer, AOA110, v0.3307, 0x55, 0x58, {0xaf, 0x00} },
- {Acer, AOA110, v0.3308, 0x55, 0x58, {0x21, 0x00} },
- {Acer, AOA110, v0.3309, 0x55, 0x58, {0x21, 0x00} },
- {Acer, AOA110, v0.3310, 0x55, 0x58, {0x21, 0x00} },
+ {Acer, AOA110, v0.3109, 0x55, 0x58, {0x1f, 0x00}, 0},
+ {Acer, AOA110, v0.3114, 0x55, 0x58, {0x1f, 0x00}, 0},
+ {Acer, AOA110, v0.3301, 0x55, 0x58, {0xaf, 0x00}, 0},
+ {Acer, AOA110, v0.3304, 0x55, 0x58, {0xaf, 0x00}, 0},
+ {Acer, AOA110, v0.3305, 0x55, 0x58, {0xaf, 0x00}, 0},
+ {Acer, AOA110, v0.3307, 0x55, 0x58, {0xaf, 0x00}, 0},
+ {Acer, AOA110, v0.3308, 0x55, 0x58, {0x21, 0x00}, 0},
+ {Acer, AOA110, v0.3309, 0x55, 0x58, {0x21, 0x00}, 0},
+ {Acer, AOA110, v0.3310, 0x55, 0x58, {0x21, 0x00}, 0},
/* AOA150 */
- {Acer, AOA150, v0.3114, 0x55, 0x58, {0x1f, 0x00} },
- {Acer, AOA150, v0.3301, 0x55, 0x58, {0x20, 0x00} },
- {Acer, AOA150, v0.3304, 0x55, 0x58, {0x20, 0x00} },
- {Acer, AOA150, v0.3305, 0x55, 0x58, {0x20, 0x00} },
- {Acer, AOA150, v0.3307, 0x55, 0x58, {0x20, 0x00} },
- {Acer, AOA150, v0.3308, 0x55, 0x58, {0x20, 0x00} },
- {Acer, AOA150, v0.3309, 0x55, 0x58, {0x20, 0x00} },
- {Acer, AOA150, v0.3310, 0x55, 0x58, {0x20, 0x00} },
+ {Acer, AOA150, v0.3114, 0x55, 0x58, {0x1f, 0x00}, 0},
+ {Acer, AOA150, v0.3301, 0x55, 0x58, {0x20, 0x00}, 0},
+ {Acer, AOA150, v0.3304, 0x55, 0x58, {0x20, 0x00}, 0},
+ {Acer, AOA150, v0.3305, 0x55, 0x58, {0x20, 0x00}, 0},
+ {Acer, AOA150, v0.3307, 0x55, 0x58, {0x20, 0x00}, 0},
+ {Acer, AOA150, v0.3308, 0x55, 0x58, {0x20, 0x00}, 0},
+ {Acer, AOA150, v0.3309, 0x55, 0x58, {0x20, 0x00}, 0},
+ {Acer, AOA150, v0.3310, 0x55, 0x58, {0x20, 0x00}, 0},
/* LT1005u */
- {Acer, LT-10Q, v0.3310, 0x55, 0x58, {0x20, 0x00} },
+ {Acer, LT-10Q, v0.3310, 0x55, 0x58, {0x20, 0x00}, 0},
/* Acer 1410 */
- {Acer, Aspire 1410, v0.3108, 0x55, 0x58, {0x9e, 0x00} },
- {Acer, Aspire 1410, v0.3113, 0x55, 0x58, {0x9e, 0x00} },
- {Acer, Aspire 1410, v0.3115, 0x55, 0x58, {0x9e, 0x00} },
- {Acer, Aspire 1410, v0.3117, 0x55, 0x58, {0x9e, 0x00} },
- {Acer, Aspire 1410, v0.3119, 0x55, 0x58, {0x9e, 0x00} },
- {Acer, Aspire 1410, v0.3120, 0x55, 0x58, {0x9e, 0x00} },
- {Acer, Aspire 1410, v1.3204, 0x55, 0x58, {0x9e, 0x00} },
- {Acer, Aspire 1410, v1.3303, 0x55, 0x58, {0x9e, 0x00} },
- {Acer, Aspire 1410, v1.3308, 0x55, 0x58, {0x9e, 0x00} },
- {Acer, Aspire 1410, v1.3310, 0x55, 0x58, {0x9e, 0x00} },
- {Acer, Aspire 1410, v1.3314, 0x55, 0x58, {0x9e, 0x00} },
+ {Acer, Aspire 1410, v0.3108, 0x55, 0x58, {0x9e, 0x00}, 0},
+ {Acer, Aspire 1410, v0.3113, 0x55, 0x58, {0x9e, 0x00}, 0},
+ {Acer, Aspire 1410, v0.3115, 0x55, 0x58, {0x9e, 0x00}, 0},
+ {Acer, Aspire 1410, v0.3117, 0x55, 0x58, {0x9e, 0x00}, 0},
+ {Acer, Aspire 1410, v0.3119, 0x55, 0x58, {0x9e, 0x00}, 0},
+ {Acer, Aspire 1410, v0.3120, 0x55, 0x58, {0x9e, 0x00}, 0},
+ {Acer, Aspire 1410, v1.3204,
