Re: [PATCH 58/62] msi-laptop: Support some MSI 3G netbook that is need load SCM

Re: [PATCH 58/62] msi-laptop: Support some MSI 3G netbook that is need load SCM

[Joey Lee]

Hi Matthew, 

於 三，2010-03-03 於 13:45 +0000，Matthew Garrett 提到：
> On Tue, Mar 02, 2010 at 09:52:12PM -0700, Joey Lee wrote:
> 
> > I developed this driver on 2.6.31 kernel, and I found this key code is
> > in 2.6.33 kernel and later.
> > There have one and only one scancode to control 3 devices when end user
> > press fn+f11 key on MSI N034.
> > Currently, we setup this mapping in HAL key and mapping it to KEY_WLAN.
> 
> Ah! The key comes through the keyboard controller? In that case, yeah, 
> just map it to KEY_RFKILL in hal isntead of KEY_WLAN. Everything should 
> work fine then. If rfkill-input is configured, it'll kill all the 
> radios. If userland claims it instead, it can cycle through with 
> whatever policy is desired.
> 

Thank's for your review and suggestion.
Per discuss for msi-laptop patchset, I will submit a bit patch for the
following change:
	- remove threeg sysfs interface.
	- add KEY_RFKILL keymapping to msi-laptop.

Does it make sense? or I still miss something important?


Thank's
Joey Lee

Re: [PATCH 58/62] msi-laptop: Support some MSI 3G netbook that is need load SCM

[Matthew Garrett]

On Thu, Mar 04, 2010 at 10:07:53AM -0700, Joey Lee wrote:
> Thank's for your review and suggestion.
> Per discuss for msi-laptop patchset, I will submit a bit patch for the
> following change:
> 	- remove threeg sysfs interface.
> 	- add KEY_RFKILL keymapping to msi-laptop.

If the key event comes through the keyboard controller, there's no need 
to add the mapping to msi-laptop. Doing it through udev or hal is fine.

-- 
Matthew Garrett | mjg59@srcf.ucam.org

Re: [PATCH 58/62] msi-laptop: Support some MSI 3G netbook that is need load SCM

[Joey Lee]

[-- Attachment #1: Type: text/plain, Size: 868 bytes --]

Hi Greg, 

Please kindly review the attached patch for removed the non-standard
interface "threeg" in msi-laptop driver.



Thank's a lot!
Joey Lee

於 五，2010-03-05 於 06:10 +0000，joeyli(Joey Lee) 提到：
> Hi Matthew, 
> 
> 於 四，2010-03-04 於 17:09 +0000，Matthew Garrett 提到：
> > On Thu, Mar 04, 2010 at 10:07:53AM -0700, Joey Lee wrote:
> > > Thank's for your review and suggestion.
> > > Per discuss for msi-laptop patchset, I will submit a bit patch for the
> > > following change:
> > > 	- remove threeg sysfs interface.
> > > 	- add KEY_RFKILL keymapping to msi-laptop.
> > 
> > If the key event comes through the keyboard controller, there's no need 
> > to add the mapping to msi-laptop. Doing it through udev or hal is fine.
> > 
> 
> Thank's fully undertood, now, will send patch for remove threeg sysfs
> interface.
> 
> 
> Joey Lee


[-- Attachment #2: 0006-Removed-non-standard-interface-threeg.patch --]
[-- Type: text/plain, Size: 3198 bytes --]

>From c9dc06048fcb0b8fadd510ef26b5af7b466aeab6 Mon Sep 17 00:00:00 2001
From: Lee, Chun-Yi <jlee@novell.com>
Date: Tue, 9 Mar 2010 20:25:42 +0800
Subject: [PATCH] Removed non-standard interface "threeg"

There already have standard rfkill wwan interface for 3G device, so, removed
non-standard interface "threeg".

Signed-off-by: Lee, Chun-Yi <jlee@novell.com>
---
 drivers/platform/x86/msi-laptop.c |   36 ------------------------------------
 1 files changed, 0 insertions(+), 36 deletions(-)

diff --git a/drivers/platform/x86/msi-laptop.c b/drivers/platform/x86/msi-laptop.c
index c2b05da..c891522 100644
--- a/drivers/platform/x86/msi-laptop.c
+++ b/drivers/platform/x86/msi-laptop.c
@@ -311,29 +311,6 @@ static ssize_t store_bluetooth(struct device *dev,
 	return set_device_state(buf, count, MSI_STANDARD_EC_BLUETOOTH_MASK);
 }
 
-static ssize_t show_threeg(struct device *dev,
-	struct device_attribute *attr, char *buf)
-{
-
-	int ret;
-
-	/* old msi ec not support 3G */
-	if (old_ec_model)
-		return -1;
-
-	ret = get_wireless_state_ec_standard();
-	if (ret < 0)
-		return ret;
-
-	return sprintf(buf, "%i\n", threeg_s);
-}
-
-static ssize_t store_threeg(struct device *dev,
-	struct device_attribute *attr, const char *buf, size_t count)
-{
-	return set_device_state(buf, count, MSI_STANDARD_EC_3G_MASK);
-}
-
 static ssize_t show_lcd_level(struct device *dev,
 	struct device_attribute *attr, char *buf)
 {
@@ -396,7 +373,6 @@ static DEVICE_ATTR(lcd_level, 0644, show_lcd_level, store_lcd_level);
 static DEVICE_ATTR(auto_brightness, 0644, show_auto_brightness, store_auto_brightness);
 static DEVICE_ATTR(bluetooth, 0444, show_bluetooth, NULL);
 static DEVICE_ATTR(wlan, 0444, show_wlan, NULL);
-static DEVICE_ATTR(threeg, 0444, show_threeg, NULL);
 
 static struct attribute *msipf_attributes[] = {
 	&dev_attr_lcd_level.attr,
@@ -635,10 +611,8 @@ static int load_scm_model_init(struct platform_device *sdev)
 	/* allow userland write sysfs file  */
 	dev_attr_bluetooth.store = store_bluetooth;
 	dev_attr_wlan.store = store_wlan;
-	dev_attr_threeg.store = store_threeg;
 	dev_attr_bluetooth.attr.mode |= S_IWUSR;
 	dev_attr_wlan.attr.mode |= S_IWUSR;
-	dev_attr_threeg.attr.mode |= S_IWUSR;
 
 	/* disable hardware control by fn key */
 	result = ec_read(MSI_STANDARD_EC_SCM_LOAD_ADDRESS, &data);
@@ -715,14 +689,6 @@ static int __init msi_init(void)
 	if (ret)
 		goto fail_platform_device2;
 
-	if (!old_ec_model) {
-		if (threeg_exists)
-			ret = device_create_file(&msipf_device->dev,
-						&dev_attr_threeg);
-		if (ret)
-			goto fail_platform_device2;
-	}
-
 	/* Disable automatic brightness control by default because
 	 * this module was probably loaded to do brightness control in
 	 * software. */
@@ -757,8 +723,6 @@ static void __exit msi_cleanup(void)
 {
 
 	sysfs_remove_group(&msipf_device->dev.kobj, &msipf_attribute_group);
-	if (!old_ec_model && threeg_exists)
-		device_remove_file(&msipf_device->dev, &dev_attr_threeg);
 	platform_device_unregister(msipf_device);
 	platform_driver_unregister(&msipf_driver);
 	backlight_device_unregister(msibl_device);
-- 
1.6.0.2

Re: [PATCH 58/62] msi-laptop: Support some MSI 3G netbook that is need load SCM

[Greg KH]

On Tue, Mar 09, 2010 at 05:42:58AM -0700, Joey Lee wrote:
> Hi Greg, 
> 
> Please kindly review the attached patch for removed the non-standard
> interface "threeg" in msi-laptop driver.

Looks good to me.

Matthew, are you going to be taking patches like this now?

If so, feel free to add:
	Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
to the patch.

If not, please let me know.

thanks,

greg k-h

Re: [PATCH 58/62] msi-laptop: Support some MSI 3G netbook that is need load SCM

[Matthew Garrett]

On Tue, Mar 09, 2010 at 01:01:50PM -0800, Greg KH wrote:
> On Tue, Mar 09, 2010 at 05:42:58AM -0700, Joey Lee wrote:
> > Hi Greg, 
> > 
> > Please kindly review the attached patch for removed the non-standard
> > interface "threeg" in msi-laptop driver.
> 
> Looks good to me.
> 
> Matthew, are you going to be taking patches like this now?

I am.

> If so, feel free to add:
> 	Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
> to the patch.

Will do.

Thanks,
-- 
Matthew Garrett | mjg59@srcf.ucam.org

Re: [PATCH 58/62] msi-laptop: Support some MSI 3G netbook that is need load SCM

[Joey Lee]

Hi Matthew, 

於 四，2010-03-04 於 17:09 +0000，Matthew Garrett 提到：
> On Thu, Mar 04, 2010 at 10:07:53AM -0700, Joey Lee wrote:
> > Thank's for your review and suggestion.
> > Per discuss for msi-laptop patchset, I will submit a bit patch for the
> > following change:
> > 	- remove threeg sysfs interface.
> > 	- add KEY_RFKILL keymapping to msi-laptop.
> 
> If the key event comes through the keyboard controller, there's no need 
> to add the mapping to msi-laptop. Doing it through udev or hal is fine.
> 

Thank's fully undertood, now, will send patch for remove threeg sysfs
interface.


Joey Lee

Re: [PATCH 58/62] msi-laptop: Support some MSI 3G netbook that is need load SCM

[Joey Lee]

Hi Matthew, 

First, thank's for your kindly review and suggestion to me.

於 二，2010-03-02 於 15:46 -0800，Greg KH 提到：
> On Tue, Mar 02, 2010 at 11:39:29PM +0000, Matthew Garrett wrote:
> > On Tue, Mar 02, 2010 at 03:28:57PM -0800, Greg Kroah-Hartman wrote:
> > > From: Lee, Chun-Yi <jlee@novell.com>
> > > 
> > > Some MSI 3G netbook only have one fn key to control Wlan/Bluetooth/3G,
> > > those netbook will load the SCM (windows app) to disable the original
> > > Wlan/Bluetooth control by BIOS when user press fn key, then control
> > > Wlan/Bluetooth/3G by SCM (software control by OS). Without SCM, user
> > > cann't on/off 3G module on those 3G netbook.
> > > On Linux, msi-laptop driver will do the same thing to disable the
> > > original BIOS control, then might need use HAL or other userland
> > > application to do the software control that simulate with SCM.
> > > e.g. MSI N034 netbook
> > 
> > How does the function key event get reported to userland? This should 
> > generate KEY_RFKILL and then just go through rfkill-input.

I developed this driver on 2.6.31 kernel, and I found this key code is
in 2.6.33 kernel and later.
There have one and only one scancode to control 3 devices when end user
press fn+f11 key on MSI N034.
Currently, we setup this mapping in HAL key and mapping it to KEY_WLAN.

Does that means I need mapping the scancode to KEY_RFKILL in msi-laptop
driver for 2.6.33 kernel?
If YES, I will submit another patch to add this scancode/keycode mapping
in msi-laptop.c

> I'm pretty sure that Joey is using rfkill here, but I didn't realize
> that it also supported an input device.
> 
> This code is just detecting the keypress, and acting on it, I think,
> right Joey?  Isn't that the way this is supposed to work?  Or is it
> supposed to use rfkill-input, which then userspace turns around and
> calls the other rfkill interface to then disable the wireless?  If so, I
> think a number of laptop drivers need to be changed to do this.
> 

There have a serial MSI netbook (like: N034) use only one scancode (one
function key) to control 3 devices (Wlan/Bluetooth/3G). It have a
sequence to control those device and userland application control this
sequence, almost like:
	- Bluetooth on, WLAN on, WWAN on
	- Bluetooth on, WLAN off, WWAN off
	- Bluetooth off, WLAN off, WWAN on
	....
	- Bluetooth off, WLAN off, WWAN off

Even on Windows platform, this job is also handle by userland
application, not by hardware or driver. And MSI EC provide a address to
turn on/off those devices' power and led light.

This patchset for msi-laptop driver is just to provide Wlan/Bluetooth/3G
rfkill sysfs interface for userland to turn on/off those devices's power
and led.
And this patchset doesn't do:
    - setup the wifi function key scancode/keycode mapping.
    - control those 3 devices on/off sequence. (userland control it)


Thank's
Joey Lee

Re: [PATCH 58/62] msi-laptop: Support some MSI 3G netbook that is need load SCM

[Matthew Garrett]

On Tue, Mar 02, 2010 at 09:52:12PM -0700, Joey Lee wrote:

> I developed this driver on 2.6.31 kernel, and I found this key code is
> in 2.6.33 kernel and later.
> There have one and only one scancode to control 3 devices when end user
> press fn+f11 key on MSI N034.
> Currently, we setup this mapping in HAL key and mapping it to KEY_WLAN.

Ah! The key comes through the keyboard controller? In that case, yeah, 
just map it to KEY_RFKILL in hal isntead of KEY_WLAN. Everything should 
work fine then. If rfkill-input is configured, it'll kill all the 
radios. If userland claims it instead, it can cycle through with 
whatever policy is desired.

-- 
Matthew Garrett | mjg59@srcf.ucam.org

[GIT PATCH] driver core patches for 2.6.33-git

[Greg KH]

Here is the big driver core patchset for the 2.6.34 merge window.

The msi-laptop driver also got updates through this patch series, at the
blessing of the maintainer of that driver.

Please pull from:
	master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-core-2.6.git/

All of these patches have been in the linux-next and mm trees for a
while.

The patches will be sent as a follow-on to this message to lkml for
people to see.

thanks,

greg k-h

------------

 Documentation/HOWTO                       |  113 +++------
 Documentation/kobject.txt                 |    2 +-
 arch/arm/mach-pxa/corgi_ssp.c             |    2 +-
 arch/arm/mach-pxa/sharpsl_pm.c            |    2 +-
 arch/arm/mach-s3c2410/h1940-bluetooth.c   |    2 +-
 arch/arm/mach-sa1100/jornada720_ssp.c     |    2 +-
 arch/ia64/kernel/topology.c               |    2 +-
 arch/mips/txx9/generic/7segled.c          |    5 +-
 arch/powerpc/kernel/cacheinfo.c           |    2 +-
 arch/s390/kernel/smp.c                    |   12 +-
 arch/s390/kernel/time.c                   |   49 +++-
 arch/sh/kernel/cpu/sh4/sq.c               |    2 +-
 arch/x86/kernel/cpu/intel_cacheinfo.c     |    2 +-
 arch/x86/kernel/cpu/mcheck/mce.c          |    1 +
 arch/x86/kernel/cpu/mcheck/mce_amd.c      |    2 +-
 block/blk-integrity.c                     |    2 +-
 block/blk-sysfs.c                         |    2 +-
 block/elevator.c                          |    2 +-
 drivers/acpi/system.c                     |    2 +
 drivers/auxdisplay/cfag12864bfb.c         |    2 +-
 drivers/base/Kconfig                      |   55 +++--
 drivers/base/bus.c                        |   26 +-
 drivers/base/class.c                      |   16 +-
 drivers/base/core.c                       |   33 +--
 drivers/base/cpu.c                        |  105 ++++-----
 drivers/base/dd.c                         |   38 ++--
 drivers/base/devtmpfs.c                   |   13 +
 drivers/base/firmware_class.c             |   11 +-
 drivers/base/memory.c                     |   20 +-
 drivers/base/node.c                       |   81 +++----
 drivers/base/platform.c                   |   76 ++++++-
 drivers/base/power/main.c                 |   20 +-
 drivers/base/sys.c                        |   17 +-
 drivers/block/osdblk.c                    |   12 +-
 drivers/block/pktcdvd.c                   |   14 +-
 drivers/cpufreq/cpufreq.c                 |    2 +-
 drivers/cpuidle/sysfs.c                   |    8 +-
 drivers/dma/ioat/dma.c                    |    2 +-
 drivers/dma/ioat/dma.h                    |    2 +-
 drivers/edac/edac_device_sysfs.c          |    6 +-
 drivers/edac/edac_mc_sysfs.c              |    4 +-
 drivers/edac/edac_pci_sysfs.c             |    4 +-
 drivers/firewire/core-device.c            |    5 +-
 drivers/firmware/edd.c                    |    2 +-
 drivers/firmware/efivars.c                |    2 +-
 drivers/firmware/iscsi_ibft.c             |    2 +-
 drivers/firmware/memmap.c                 |    2 +-
 drivers/gpio/gpiolib.c                    |    8 +-
 drivers/gpu/drm/drm_sysfs.c               |   18 +-
 drivers/gpu/drm/ttm/ttm_bo.c              |    2 +-
 drivers/gpu/drm/ttm/ttm_memory.c          |    2 +-
 drivers/i2c/busses/i2c-omap.c             |    2 +-
 drivers/ieee1394/nodemgr.c                |    5 +-
 drivers/infiniband/core/cm.c              |    2 +-
 drivers/infiniband/core/sysfs.c           |    2 +-
 drivers/infiniband/core/ucm.c             |   13 +-
 drivers/infiniband/core/user_mad.c        |    9 +-
 drivers/infiniband/core/uverbs_main.c     |    9 +-
 drivers/macintosh/windfarm_core.c         |    1 +
 drivers/macintosh/windfarm_smu_controls.c |    1 +
 drivers/md/dm-sysfs.c                     |    2 +-
 drivers/md/md.c                           |    4 +-
 drivers/media/video/omap24xxcam.c         |    2 +-
 drivers/misc/phantom.c                    |   13 +-
 drivers/mtd/ubi/build.c                   |    3 +-
 drivers/net/arm/am79c961a.c               |    2 +-
 drivers/net/bonding/bond_sysfs.c          |    5 +-
 drivers/net/ibmveth.c                     |    2 +-
 drivers/net/iseries_veth.c                |    4 +-
 drivers/parisc/pdc_stable.c               |    2 +-
 drivers/pci/bus.c                         |    4 +-
 drivers/pci/hotplug/fakephp.c             |    2 +-
 drivers/pci/pci-sysfs.c                   |    5 +
 drivers/pci/pci.c                         |    4 +-
 drivers/pci/slot.c                        |    2 +-
 drivers/pcmcia/ds.c                       |    8 +-
 drivers/platform/x86/Kconfig              |    1 +
 drivers/platform/x86/hp-wmi.c             |    4 +-
 drivers/platform/x86/msi-laptop.c         |  360 ++++++++++++++++++++++++++++-
 drivers/scsi/sgiwd93.c                    |    2 +-
 drivers/scsi/sni_53c710.c                 |    2 +-
 drivers/staging/asus_oled/asus_oled.c     |   13 +-
 drivers/uio/Kconfig                       |   24 +-
 drivers/uio/Makefile                      |    2 +-
 drivers/uio/uio.c                         |    4 +-
 drivers/uio/uio_netx.c                    |  172 ++++++++++++++
 drivers/uio/uio_smx.c                     |  140 -----------
 drivers/usb/core/driver.c                 |    4 +-
 drivers/uwb/driver.c                      |    5 +-
 drivers/uwb/umc-bus.c                     |    4 +-
 drivers/uwb/uwb-internal.h                |    4 +-
 drivers/uwb/wlp/sysfs.c                   |    3 +-
 drivers/video/acornfb.c                   |    2 +-
 drivers/video/arcfb.c                     |    2 +-
 drivers/video/cobalt_lcdfb.c              |    2 +-
 drivers/video/efifb.c                     |    2 +-
 drivers/video/epson1355fb.c               |    2 +-
 drivers/video/gbefb.c                     |    2 +-
 drivers/video/hgafb.c                     |    2 +-
 drivers/video/hitfb.c                     |    2 +-
 drivers/video/omap2/dss/manager.c         |    2 +-
 drivers/video/omap2/dss/overlay.c         |    2 +-
 drivers/video/q40fb.c                     |    2 +-
 drivers/video/s3c2410fb.c                 |    4 +-
 drivers/video/sa1100fb.c                  |    2 +-
 drivers/video/sgivwfb.c                   |    2 +-
 drivers/video/sh_mobile_lcdcfb.c          |    2 +-
 drivers/video/vesafb.c                    |    2 +-
 drivers/video/vfb.c                       |    2 +-
 drivers/video/vga16fb.c                   |    2 +-
 drivers/video/w100fb.c                    |    2 +-
 drivers/w1/masters/omap_hdq.c             |    4 +-
 drivers/xen/sys-hypervisor.c              |    2 +-
 fs/btrfs/sysfs.c                          |    4 +-
 fs/dlm/lockspace.c                        |    2 +-
 fs/ext4/super.c                           |    2 +-
 fs/gfs2/sys.c                             |    4 +-
 fs/ocfs2/cluster/masklog.c                |    2 +-
 fs/sysfs/bin.c                            |   50 ++--
 fs/sysfs/dir.c                            |  132 ++++++-----
 fs/sysfs/file.c                           |   47 +++-
 fs/sysfs/inode.c                          |   13 +-
 fs/sysfs/mount.c                          |    4 +-
 fs/sysfs/symlink.c                        |   38 +++
 fs/sysfs/sysfs.h                          |   17 +-
 include/linux/device.h                    |   40 +++-
 include/linux/kobject.h                   |   14 +-
 include/linux/platform_device.h           |    9 +-
 include/linux/sysdev.h                    |   21 ++-
 include/linux/sysfs.h                     |   61 +++++
 include/linux/usb.h                       |    6 +-
 kernel/module.c                           |    3 +
 kernel/params.c                           |    5 +-
 kernel/perf_event.c                       |   13 +-
 kernel/sched.c                            |    4 +
 lib/kobject.c                             |    6 +-
 lib/kobject_uevent.c                      |    2 +-
 mm/slub.c                                 |    4 +-
 net/bluetooth/l2cap.c                     |    4 +-
 net/bluetooth/rfcomm/core.c               |    4 +-
 net/bluetooth/rfcomm/sock.c               |    4 +-
 net/bluetooth/sco.c                       |    4 +-
 net/bridge/br_private.h                   |    2 +-
 net/bridge/br_sysfs_if.c                  |    2 +-
 samples/kobject/kobject-example.c         |    4 +-
 samples/kobject/kset-example.c            |    6 +-
 146 files changed, 1457 insertions(+), 792 deletions(-)
 create mode 100644 drivers/uio/uio_netx.c
 delete mode 100644 drivers/uio/uio_smx.c

---------------

Andi Kleen (12):
      sysdev: Pass attribute in sysdev_class attributes show/store
      sysdev: Convert node driver class attributes to be data driven
      sysdev: Convert cpu driver sysdev class attributes
      sysfs: Add sysfs_add/remove_files utility functions
      sysfs: Add attribute array to sysdev classes
      sysdev: Convert node driver
      sysdev: Use sysdev_class attribute arrays in node driver
      sysdev: Add sysdev_create/remove_files
      sysdev: Fix type of sysdev class attribute in memory driver
      driver-core: Add attribute argument to class_attribute show/store
      driver core: Add class_attr_string for simple read-only string
      driver core: Convert some drivers to CLASS_ATTR_STRING

Ben Hutchings (1):
      Driver core: Fix first line of kernel-doc for a few functions

Dmitry Torokhov (1):
      Driver core: add platform_create_bundle() helper

Emese Revfy (2):
      kobject: Constify struct kset_uevent_ops
      Driver core: Constify struct sysfs_ops in struct kobj_type

Eric Miao (1):
      driver core: make platform_device_id table const

Eric W. Biederman (13):
      sysfs: Cache the last sysfs_dirent to improve readdir scalability v2
      sysfs: Remove sysfs_get/put_active_two
      sysfs: Only take active references on attributes.
      sysfs: Use one lockdep class per sysfs attribute.
      sysfs: Use sysfs_attr_init and sysfs_bin_attr_init on dynamic attributes
      sysfs: Document sysfs_attr_init and sysfs_bin_attr_init
      sysfs: Use sysfs_attr_init and sysfs_bin_attr_init on module dynamic attributes
      sysfs: Serialize updates to the vfs inode
      sysfs: Pack sysfs_dirent more tightly.
      sysfs: Implement sysfs_rename_link
      driver core: Use sysfs_rename_link in device_rename
      sysfs: Pass super_block to sysfs_get_inode
      sysfs: Kill unused sysfs_sb variable.

Greg Kroah-Hartman (2):
      sysdev: fix up the probe/release attributes
      Driver core: create lock/unlock functions for struct device

Hans J. Koch (2):
      UIO: Add a driver for Hilscher netX-based fieldbus cards
      UIO: Remove SMX Cryptengine driver

Heiko Carstens (1):
      sysdev: fix missing s390 conversion

Johannes Berg (1):
      sysfs: windfarm: init sysfs attributes

John Ogness (1):
      UIO: minor Kconfig fixes

Kay Sievers (4):
      Driver-Core: devtmpfs - reset inode permissions before unlinking
      Driver-Core: devtmpfs - remove EXPERIMENTAL and enable it by default
      Driver-Core: disable /sbin/hotplug by default
      Driver-Core: require valid action string in uevent trigger

Lee, Chun-Yi (5):
      msi-laptop: Support standard ec 66/62 command on MSI notebook and nebook
      msi-laptop: Add threeg sysfs file for support query 3G state by standard 66/62 ec command
      msi-laptop: Support some MSI 3G netbook that is need load SCM
      msi-laptop: Add resume method for set the SCM load again
      msi-laptop: Detect 3G device exists by standard ec command

Luis R. Rodriguez (1):
      driver-core: firmware_class: remove base.h header inclusion

Radu Voicilas (2):
      kobject-example: Spelling fixes.
      kset-example: Spelling fixes.

Randy Dunlap (1):
      msi-laptop: depends on RFKILL

Stefan Richter (1):
      HOWTO: Updates on subsystem trees, patchwork, -next (vs. -mm)

Stephen Rothwell (1):
      sysfs: fix for thinko with sysfs_bin_attr_init()

Uwe Kleine-König (10):
      Driver core: make struct platform_driver.id_table const
      platform-drivers: move probe to .devinit.text in arch/arm
      platform-drivers: move probe to .devinit.text in drivers/scsi
      platform-drivers: move probe to .devinit.text in drivers/video
      x86: move hp-wmi's probe function to .devinit.text
      i2c: move i2c_omap's probe function to .devinit.text
      w1: move omap_hdq's probe function to .devinit.text
      media: move omap24xxcam's probe function to .devinit.text
      auxdisplay: move cfag12864bfb's probe function to .devinit.text
      net: move am79c961's probe function to .devinit.text

[PATCH 58/62] msi-laptop: Support some MSI 3G netbook that is need load SCM

[Greg Kroah-Hartman]

From: Lee, Chun-Yi <jlee@novell.com>

Some MSI 3G netbook only have one fn key to control Wlan/Bluetooth/3G,
those netbook will load the SCM (windows app) to disable the original
Wlan/Bluetooth control by BIOS when user press fn key, then control
Wlan/Bluetooth/3G by SCM (software control by OS). Without SCM, user
cann't on/off 3G module on those 3G netbook.
On Linux, msi-laptop driver will do the same thing to disable the
original BIOS control, then might need use HAL or other userland
application to do the software control that simulate with SCM.
e.g. MSI N034 netbook

Signed-off-by: Lee, Chun-Yi <jlee@novell.com>
Cc: Lennart Poettering <mzxreary@0pointer.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
 drivers/platform/x86/msi-laptop.c |  238 +++++++++++++++++++++++++++++++++++++
 1 files changed, 238 insertions(+), 0 deletions(-)

diff --git a/drivers/platform/x86/msi-laptop.c b/drivers/platform/x86/msi-laptop.c
index 1784d55..ff21d1a 100644
--- a/drivers/platform/x86/msi-laptop.c
+++ b/drivers/platform/x86/msi-laptop.c
@@ -58,6 +58,7 @@
 #include <linux/dmi.h>
 #include <linux/backlight.h>
 #include <linux/platform_device.h>
+#include <linux/rfkill.h>
 
 #define MSI_DRIVER_VERSION "0.5"
 
@@ -72,6 +73,10 @@
 #define MSI_STANDARD_EC_WLAN_MASK	(1 << 3)
 #define MSI_STANDARD_EC_3G_MASK		(1 << 4)
 
+/* For set SCM load flag to disable BIOS fn key */
+#define MSI_STANDARD_EC_SCM_LOAD_ADDRESS	0x2d
+#define MSI_STANDARD_EC_SCM_LOAD_MASK		(1 << 0)
+
 static int force;
 module_param(force, bool, 0);
 MODULE_PARM_DESC(force, "Force driver load, ignore DMI data");
@@ -83,6 +88,19 @@ MODULE_PARM_DESC(auto_brightness, "Enable automatic brightness control (0: disab
 static bool old_ec_model;
 static int wlan_s, bluetooth_s, threeg_s;
 
+/* Some MSI 3G netbook only have one fn key to control Wlan/Bluetooth/3G,
+ * those netbook will load the SCM (windows app) to disable the original
+ * Wlan/Bluetooth control by BIOS when user press fn key, then control
+ * Wlan/Bluetooth/3G by SCM (software control by OS). Without SCM, user
+ * cann't on/off 3G module on those 3G netbook.
+ * On Linux, msi-laptop driver will do the same thing to disable the
+ * original BIOS control, then might need use HAL or other userland
+ * application to do the software control that simulate with SCM.
+ * e.g. MSI N034 netbook
+ */
+static bool load_scm_model;
+static struct rfkill *rfk_wlan, *rfk_bluetooth, *rfk_threeg;
+
 /* Hardware access */
 
 static int set_lcd_level(int level)
@@ -139,6 +157,35 @@ static int set_auto_brightness(int enable)
 	return ec_transaction(MSI_EC_COMMAND_LCD_LEVEL, wdata, 2, NULL, 0, 1);
 }
 
+static ssize_t set_device_state(const char *buf, size_t count, u8 mask)
+{
+	int status;
+	u8 wdata = 0, rdata;
+	int result;
+
+	if (sscanf(buf, "%i", &status) != 1 || (status < 0 || status > 1))
+		return -EINVAL;
+
+	/* read current device state */
+	result = ec_read(MSI_STANDARD_EC_COMMAND_ADDRESS, &rdata);
+	if (result < 0)
+		return -EINVAL;
+
+	if (!!(rdata & mask) != status) {
+		/* reverse device bit */
+		if (rdata & mask)
+			wdata = rdata & ~mask;
+		else
+			wdata = rdata | mask;
+
+		result = ec_write(MSI_STANDARD_EC_COMMAND_ADDRESS, wdata);
+		if (result < 0)
+			return -EINVAL;
+	}
+
+	return count;
+}
+
 static int get_wireless_state(int *wlan, int *bluetooth)
 {
 	u8 wdata = 0, rdata;
@@ -215,6 +262,12 @@ static ssize_t show_wlan(struct device *dev,
 	return sprintf(buf, "%i\n", enabled);
 }
 
+static ssize_t store_wlan(struct device *dev,
+	struct device_attribute *attr, const char *buf, size_t count)
+{
+	return set_device_state(buf, count, MSI_STANDARD_EC_WLAN_MASK);
+}
+
 static ssize_t show_bluetooth(struct device *dev,
 	struct device_attribute *attr, char *buf)
 {
@@ -233,6 +286,12 @@ static ssize_t show_bluetooth(struct device *dev,
 	return sprintf(buf, "%i\n", enabled);
 }
 
+static ssize_t store_bluetooth(struct device *dev,
+	struct device_attribute *attr, const char *buf, size_t count)
+{
+	return set_device_state(buf, count, MSI_STANDARD_EC_BLUETOOTH_MASK);
+}
+
 static ssize_t show_threeg(struct device *dev,
 	struct device_attribute *attr, char *buf)
 {
@@ -250,6 +309,12 @@ static ssize_t show_threeg(struct device *dev,
 	return sprintf(buf, "%i\n", threeg_s);
 }
 
+static ssize_t store_threeg(struct device *dev,
+	struct device_attribute *attr, const char *buf, size_t count)
+{
+	return set_device_state(buf, count, MSI_STANDARD_EC_3G_MASK);
+}
+
 static ssize_t show_lcd_level(struct device *dev,
 	struct device_attribute *attr, char *buf)
 {
@@ -387,6 +452,169 @@ static struct dmi_system_id __initdata msi_dmi_table[] = {
 	{ }
 };
 
+static struct dmi_system_id __initdata msi_load_scm_models_dmi_table[] = {
+	{
+		.ident = "MSI N034",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR,
+				"MICRO-STAR INTERNATIONAL CO., LTD"),
+			DMI_MATCH(DMI_PRODUCT_NAME, "MS-N034"),
+			DMI_MATCH(DMI_CHASSIS_VENDOR,
+			"MICRO-STAR INTERNATIONAL CO., LTD")
+		},
+		.callback = dmi_check_cb
+	},
+	{ }
+};
+
+static int rfkill_bluetooth_set(void *data, bool blocked)
+{
+	/* Do something with blocked...*/
+	/*
+	 * blocked == false is on
+	 * blocked == true is off
+	 */
+	if (blocked)
+		set_device_state("0", 0, MSI_STANDARD_EC_BLUETOOTH_MASK);
+	else
+		set_device_state("1", 0, MSI_STANDARD_EC_BLUETOOTH_MASK);
+
+	return 0;
+}
+
+static int rfkill_wlan_set(void *data, bool blocked)
+{
+	if (blocked)
+		set_device_state("0", 0, MSI_STANDARD_EC_WLAN_MASK);
+	else
+		set_device_state("1", 0, MSI_STANDARD_EC_WLAN_MASK);
+
+	return 0;
+}
+
+static int rfkill_threeg_set(void *data, bool blocked)
+{
+	if (blocked)
+		set_device_state("0", 0, MSI_STANDARD_EC_3G_MASK);
+	else
+		set_device_state("1", 0, MSI_STANDARD_EC_3G_MASK);
+
+	return 0;
+}
+
+static struct rfkill_ops rfkill_bluetooth_ops = {
+	.set_block = rfkill_bluetooth_set
+};
+
+static struct rfkill_ops rfkill_wlan_ops = {
+	.set_block = rfkill_wlan_set
+};
+
+static struct rfkill_ops rfkill_threeg_ops = {
+	.set_block = rfkill_threeg_set
+};
+
+static void rfkill_cleanup(void)
+{
+	if (rfk_bluetooth) {
+		rfkill_unregister(rfk_bluetooth);
+		rfkill_destroy(rfk_bluetooth);
+	}
+
+	if (rfk_threeg) {
+		rfkill_unregister(rfk_threeg);
+		rfkill_destroy(rfk_threeg);
+	}
+
+	if (rfk_wlan) {
+		rfkill_unregister(rfk_wlan);
+		rfkill_destroy(rfk_wlan);
+	}
+}
+
+static int rfkill_init(struct platform_device *sdev)
+{
+	/* add rfkill */
+	int retval;
+
+	rfk_bluetooth = rfkill_alloc("msi-bluetooth", &sdev->dev,
+				RFKILL_TYPE_BLUETOOTH,
+				&rfkill_bluetooth_ops, NULL);
+	if (!rfk_bluetooth) {
+		retval = -ENOMEM;
+		goto err_bluetooth;
+	}
+	retval = rfkill_register(rfk_bluetooth);
+	if (retval)
+		goto err_bluetooth;
+
+	rfk_wlan = rfkill_alloc("msi-wlan", &sdev->dev, RFKILL_TYPE_WLAN,
+				&rfkill_wlan_ops, NULL);
+	if (!rfk_wlan) {
+		retval = -ENOMEM;
+		goto err_wlan;
+	}
+	retval = rfkill_register(rfk_wlan);
+	if (retval)
+		goto err_wlan;
+
+	rfk_threeg = rfkill_alloc("msi-threeg", &sdev->dev, RFKILL_TYPE_WWAN,
+				&rfkill_threeg_ops, NULL);
+	if (!rfk_threeg) {
+		retval = -ENOMEM;
+		goto err_threeg;
+	}
+	retval = rfkill_register(rfk_threeg);
+	if (retval)
+		goto err_threeg;
+
+	return 0;
+
+err_threeg:
+	rfkill_destroy(rfk_threeg);
+	if (rfk_wlan)
+		rfkill_unregister(rfk_wlan);
+err_wlan:
+	rfkill_destroy(rfk_wlan);
+	if (rfk_bluetooth)
+		rfkill_unregister(rfk_bluetooth);
+err_bluetooth:
+	rfkill_destroy(rfk_bluetooth);
+
+	return retval;
+}
+
+static int load_scm_model_init(struct platform_device *sdev)
+{
+	u8 data;
+	int result;
+
+	/* allow userland write sysfs file  */
+	dev_attr_bluetooth.store = store_bluetooth;
+	dev_attr_wlan.store = store_wlan;
+	dev_attr_threeg.store = store_threeg;
+	dev_attr_bluetooth.attr.mode |= S_IWUSR;
+	dev_attr_wlan.attr.mode |= S_IWUSR;
+	dev_attr_threeg.attr.mode |= S_IWUSR;
+
+	/* disable hardware control by fn key */
+	result = ec_read(MSI_STANDARD_EC_SCM_LOAD_ADDRESS, &data);
+	if (result < 0)
+		return result;
+
+	result = ec_write(MSI_STANDARD_EC_SCM_LOAD_ADDRESS,
+		data | MSI_STANDARD_EC_SCM_LOAD_MASK);
+	if (result < 0)
+		return result;
+
+	/* initial rfkill */
+	result = rfkill_init(sdev);
+	if (result < 0)
+		return result;
+
+	return 0;
+}
+
 static int __init msi_init(void)
 {
 	int ret;
@@ -397,6 +625,9 @@ static int __init msi_init(void)
 	if (force || dmi_check_system(msi_dmi_table))
 		old_ec_model = 1;
 
+	if (!old_ec_model && dmi_check_system(msi_load_scm_models_dmi_table))
+		load_scm_model = 1;
+
 	if (auto_brightness < 0 || auto_brightness > 2)
 		return -EINVAL;
 
@@ -429,6 +660,11 @@ static int __init msi_init(void)
 	if (ret)
 		goto fail_platform_device1;
 
+	if (load_scm_model && (load_scm_model_init(msipf_device) < 0)) {
+		ret = -EINVAL;
+		goto fail_platform_device1;
+	}
+
 	ret = sysfs_create_group(&msipf_device->dev.kobj, &msipf_attribute_group);
 	if (ret)
 		goto fail_platform_device2;
@@ -479,6 +715,8 @@ static void __exit msi_cleanup(void)
 	platform_driver_unregister(&msipf_driver);
 	backlight_device_unregister(msibl_device);
 
+	rfkill_cleanup();
+
 	/* Enable automatic brightness control again */
 	if (auto_brightness != 2)
 		set_auto_brightness(1);
-- 
1.7.0.1

Re: [PATCH 58/62] msi-laptop: Support some MSI 3G netbook that is need load SCM

[Matthew Garrett]

On Tue, Mar 02, 2010 at 03:28:57PM -0800, Greg Kroah-Hartman wrote:
> From: Lee, Chun-Yi <jlee@novell.com>
> 
> Some MSI 3G netbook only have one fn key to control Wlan/Bluetooth/3G,
> those netbook will load the SCM (windows app) to disable the original
> Wlan/Bluetooth control by BIOS when user press fn key, then control
> Wlan/Bluetooth/3G by SCM (software control by OS). Without SCM, user
> cann't on/off 3G module on those 3G netbook.
> On Linux, msi-laptop driver will do the same thing to disable the
> original BIOS control, then might need use HAL or other userland
> application to do the software control that simulate with SCM.
> e.g. MSI N034 netbook

How does the function key event get reported to userland? This should 
generate KEY_RFKILL and then just go through rfkill-input.

-- 
Matthew Garrett | mjg59@srcf.ucam.org

Re: [PATCH 58/62] msi-laptop: Support some MSI 3G netbook that is need load SCM

[Greg KH]

On Tue, Mar 02, 2010 at 11:39:29PM +0000, Matthew Garrett wrote:
> On Tue, Mar 02, 2010 at 03:28:57PM -0800, Greg Kroah-Hartman wrote:
> > From: Lee, Chun-Yi <jlee@novell.com>
> > 
> > Some MSI 3G netbook only have one fn key to control Wlan/Bluetooth/3G,
> > those netbook will load the SCM (windows app) to disable the original
> > Wlan/Bluetooth control by BIOS when user press fn key, then control
> > Wlan/Bluetooth/3G by SCM (software control by OS). Without SCM, user
> > cann't on/off 3G module on those 3G netbook.
> > On Linux, msi-laptop driver will do the same thing to disable the
> > original BIOS control, then might need use HAL or other userland
> > application to do the software control that simulate with SCM.
> > e.g. MSI N034 netbook
> 
> How does the function key event get reported to userland? This should 
> generate KEY_RFKILL and then just go through rfkill-input.

I'm pretty sure that Joey is using rfkill here, but I didn't realize
that it also supported an input device.

This code is just detecting the keypress, and acting on it, I think,
right Joey?  Isn't that the way this is supposed to work?  Or is it
supposed to use rfkill-input, which then userspace turns around and
calls the other rfkill interface to then disable the wireless?  If so, I
think a number of laptop drivers need to be changed to do this.

thanks,

greg k-h