On Sun, 31 May 2015, Henrique de Moraes Holschuh wrote:
> On Sun, 31 May 2015, Finn Thain wrote:
> > Make use of arch_nvram_ops in the thinkpad_acpi driver so that the
> > nvram_* function exports can be removed.
> >
> > This patch series was tested on a ThinkPad T43.
>
> Can you describe how you did the testing? A specific procedure is
> required to test the hotkey NVRAM polling codepaths (which will read
> several NVRAM bytes @10Hz by default) in a T43...
>
> > Signed-off-by: Finn Thain <fthain@xxxxxxxxxxxxxxxxxxx>
>
> The patch looks correct, so I don't expect any problems.
>
> Provided that your test procedure did enable hotkey NVRAM polling in the
> T43 and your hotkeys all still worked fine, you have my Acked-by.
The procedure I used was this,
1. $ xev
2. # rmmod thinkpad_acpi
3. Press <Access IBM> key and confirm that xev does not report any
events.
4. # modprobe thinkpad_acpi
5. Press <Access IBM> key and confirm that xev now reports the key press
events.
Is this sufficient?
Regards,
Finn
>
> > ---
> > drivers/platform/x86/thinkpad_acpi.c | 20 ++++++++++----------
> > 1 file changed, 10 insertions(+), 10 deletions(-)
> >
> > Index: linux/drivers/platform/x86/thinkpad_acpi.c
> > ===================================================================
> > --- linux.orig/drivers/platform/x86/thinkpad_acpi.c 2015-05-31 11:00:59.000000000 +1000
> > +++ linux/drivers/platform/x86/thinkpad_acpi.c 2015-05-31 11:01:07.000000000 +1000
> > @@ -2311,30 +2311,30 @@ static void hotkey_read_nvram(struct tp_
> > u8 d;
> >
> > if (m & TP_NVRAM_HKEY_GROUP_HK2) {
> > - d = nvram_read_byte(TP_NVRAM_ADDR_HK2);
> > + d = arch_nvram_ops.read_byte(TP_NVRAM_ADDR_HK2);
> > n->thinkpad_toggle = !!(d & TP_NVRAM_MASK_HKT_THINKPAD);
> > n->zoom_toggle = !!(d & TP_NVRAM_MASK_HKT_ZOOM);
> > n->display_toggle = !!(d & TP_NVRAM_MASK_HKT_DISPLAY);
> > n->hibernate_toggle = !!(d & TP_NVRAM_MASK_HKT_HIBERNATE);
> > }
> > if (m & TP_ACPI_HKEY_THNKLGHT_MASK) {
> > - d = nvram_read_byte(TP_NVRAM_ADDR_THINKLIGHT);
> > + d = arch_nvram_ops.read_byte(TP_NVRAM_ADDR_THINKLIGHT);
> > n->thinklight_toggle = !!(d & TP_NVRAM_MASK_THINKLIGHT);
> > }
> > if (m & TP_ACPI_HKEY_DISPXPAND_MASK) {
> > - d = nvram_read_byte(TP_NVRAM_ADDR_VIDEO);
> > + d = arch_nvram_ops.read_byte(TP_NVRAM_ADDR_VIDEO);
> > n->displayexp_toggle =
> > !!(d & TP_NVRAM_MASK_HKT_DISPEXPND);
> > }
> > if (m & TP_NVRAM_HKEY_GROUP_BRIGHTNESS) {
> > - d = nvram_read_byte(TP_NVRAM_ADDR_BRIGHTNESS);
> > + d = arch_nvram_ops.read_byte(TP_NVRAM_ADDR_BRIGHTNESS);
> > n->brightness_level = (d & TP_NVRAM_MASK_LEVEL_BRIGHTNESS)
> > >> TP_NVRAM_POS_LEVEL_BRIGHTNESS;
> > n->brightness_toggle =
> > !!(d & TP_NVRAM_MASK_HKT_BRIGHTNESS);
> > }
> > if (m & TP_NVRAM_HKEY_GROUP_VOLUME) {
> > - d = nvram_read_byte(TP_NVRAM_ADDR_MIXER);
> > + d = arch_nvram_ops.read_byte(TP_NVRAM_ADDR_MIXER);
> > n->volume_level = (d & TP_NVRAM_MASK_LEVEL_VOLUME)
> > >> TP_NVRAM_POS_LEVEL_VOLUME;
> > n->mute = !!(d & TP_NVRAM_MASK_MUTE);
> > @@ -6153,7 +6153,7 @@ static unsigned int tpacpi_brightness_nv
> > {
> > u8 lnvram;
> >
> > - lnvram = (nvram_read_byte(TP_NVRAM_ADDR_BRIGHTNESS)
> > + lnvram = (arch_nvram_ops.read_byte(TP_NVRAM_ADDR_BRIGHTNESS)
> > & TP_NVRAM_MASK_LEVEL_BRIGHTNESS)
> > >> TP_NVRAM_POS_LEVEL_BRIGHTNESS;
> > lnvram &= bright_maxlvl;
> > @@ -6178,7 +6178,7 @@ static void tpacpi_brightness_checkpoint
> > if (unlikely(!acpi_ec_read(TP_EC_BACKLIGHT, &lec)))
> > goto unlock;
> > lec &= TP_EC_BACKLIGHT_LVLMSK;
> > - b_nvram = nvram_read_byte(TP_NVRAM_ADDR_BRIGHTNESS);
> > + b_nvram = arch_nvram_ops.read_byte(TP_NVRAM_ADDR_BRIGHTNESS);
> >
> > if (lec != ((b_nvram & TP_NVRAM_MASK_LEVEL_BRIGHTNESS)
> > >> TP_NVRAM_POS_LEVEL_BRIGHTNESS)) {
> > @@ -6186,7 +6186,7 @@ static void tpacpi_brightness_checkpoint
> > b_nvram &= ~(TP_NVRAM_MASK_LEVEL_BRIGHTNESS <<
> > TP_NVRAM_POS_LEVEL_BRIGHTNESS);
> > b_nvram |= lec;
> > - nvram_write_byte(b_nvram, TP_NVRAM_ADDR_BRIGHTNESS);
> > + arch_nvram_ops.write_byte(b_nvram, TP_NVRAM_ADDR_BRIGHTNESS);
> > dbg_printk(TPACPI_DBG_BRGHT,
> > "updated NVRAM backlight level to %u (0x%02x)\n",
> > (unsigned int) lec, (unsigned int) b_nvram);
> > @@ -6794,13 +6794,13 @@ static void tpacpi_volume_checkpoint_nvr
> > if (unlikely(!acpi_ec_read(TP_EC_AUDIO, &lec)))
> > goto unlock;
> > lec &= ec_mask;
> > - b_nvram = nvram_read_byte(TP_NVRAM_ADDR_MIXER);
> > + b_nvram = arch_nvram_ops.read_byte(TP_NVRAM_ADDR_MIXER);
> >
> > if (lec != (b_nvram & ec_mask)) {
> > /* NVRAM needs update */
> > b_nvram &= ~ec_mask;
> > b_nvram |= lec;
> > - nvram_write_byte(b_nvram, TP_NVRAM_ADDR_MIXER);
> > + arch_nvram_ops.write_byte(b_nvram, TP_NVRAM_ADDR_MIXER);
> > dbg_printk(TPACPI_DBG_MIXER,
> > "updated NVRAM mixer status to 0x%02x (0x%02x)\n",
> > (unsigned int) lec, (unsigned int) b_nvram);
> >
> >
>
>
------------------------------------------------------------------------------
_______________________________________________
ibm-acpi-devel mailing list
ibm-acpi-devel@xxxxxxxxxxxxxxxxxxxxx
https://lists.sourceforge.net/lists/listinfo/ibm-acpi-devel
