Re: [PATCH 57/62] msi-laptop: Add threeg sysfs file for support query 3G state by standard 66/62 ec command

Re: [PATCH 57/62] msi-laptop: Add threeg sysfs file for support query 3G state by standard 66/62 ec command

[Joey Lee]

Hi Matthew,

於 三，2010-03-03 於 13:46 +0000，Matthew Garrett 提到：
> On Tue, Mar 02, 2010 at 03:47:00PM -0800, Greg KH wrote:
> > On Tue, Mar 02, 2010 at 11:36:16PM +0000, Matthew Garrett wrote:
> > > On Tue, Mar 02, 2010 at 03:28:56PM -0800, Greg Kroah-Hartman wrote:
> > > 
> > > > Add threeg sysfs file for support query 3G state by standard 66/62 ec
> > > > command, the MSI standard ec interface supported this feature.
> > > 
> > > No. Just use the rfkill interface.
> > 
> > Does rfkill support 3G?  I thought it was only for wireless (80211)
> > stuff.
> 
> rfkill has types for the majority of radios. A later patch adds the 3g 
> rfkill device, so this one should just be dropped - there's no reason to 
> add a non-standard radio control file now.
> 

So, "wwan" does not mean "3g"? or 3g is included in "wwan"?
And, does the "non-standard radio control file" mean like "threeg",
"wlan" or "bluetooth" in /sys/devices/platform/xxxxx ?

In current x86/platform, there have a bit driver still used the
"non-standard control file". Does that mean we need replace all of 
those control files by rfkill interface?


Thank's
Joey Lee

Re: [PATCH 57/62] msi-laptop: Add threeg sysfs file for support query 3G state by standard 66/62 ec command

[Matthew Garrett]

On Wed, Mar 03, 2010 at 08:25:38AM -0700, Joey Lee wrote:

> So, "wwan" does not mean "3g"? or 3g is included in "wwan"?
> And, does the "non-standard radio control file" mean like "threeg",
> "wlan" or "bluetooth" in /sys/devices/platform/xxxxx ?

wwan includes 3g, so it's the appropriate type to use here. The 
non-standard ones are the threeg, wlan and bluetooth files.

> In current x86/platform, there have a bit driver still used the
> "non-standard control file". Does that mean we need replace all of 
> those control files by rfkill interface?

Those are holdovers from before the rfkill interface was usable - we 
should probably be deprecating them. I /think/ all the drivers that 
provide them also provide an rfkill interface now, but if not we should 
probably port them.

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

Re: [PATCH 57/62] msi-laptop: Add threeg sysfs file for support query 3G state by standard 66/62 ec command

[Joey Lee]

Hi Greg, 

於 二，2010-03-02 於 15:47 -0800，Greg KH 提到：
> On Tue, Mar 02, 2010 at 11:36:16PM +0000, Matthew Garrett wrote:
> > On Tue, Mar 02, 2010 at 03:28:56PM -0800, Greg Kroah-Hartman wrote:
> > 
> > > Add threeg sysfs file for support query 3G state by standard 66/62 ec
> > > command, the MSI standard ec interface supported this feature.
> > 
> > No. Just use the rfkill interface.
> 
> Does rfkill support 3G?  I thought it was only for wireless (80211)
> stuff.
> 

M......No, rfkill have wwan type and I have also generate it in patch.
So, this patch to msi-laptop driver will gnerate the following interface
on MSI N034 netbook when netbook have 3G hardware module:
	- /sys/devices/platform/msi-laptop-pf/threeg
	- /sys/class/rfkill/rfkill2
	  	/sys/class/rfkill/rfkill2/type=wwan

I have reference acer-wmi.c then generate the threeg sysfs, and want to
follow the same style with "wlan" and "bluetooth" sysfs file
in /sys/devices/platform/msi-laptop-pf/rfkill

And, yes, userland just need control wwan by rfkill interface.
Do I need remove threeg sysfs file, now?


Thank's
Joey Lee

[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 57/62] msi-laptop: Add threeg sysfs file for support query 3G state by standard 66/62 ec command

[Greg Kroah-Hartman]

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

Add threeg sysfs file for support query 3G state by standard 66/62 ec
command, the MSI standard ec interface supported this feature.

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 |   31 ++++++++++++++++++++++++++++++-
 1 files changed, 30 insertions(+), 1 deletions(-)

diff --git a/drivers/platform/x86/msi-laptop.c b/drivers/platform/x86/msi-laptop.c
index 323e994..1784d55 100644
--- a/drivers/platform/x86/msi-laptop.c
+++ b/drivers/platform/x86/msi-laptop.c
@@ -70,6 +70,7 @@
 #define MSI_STANDARD_EC_BLUETOOTH_MASK	(1 << 0)
 #define MSI_STANDARD_EC_WEBCAM_MASK	(1 << 1)
 #define MSI_STANDARD_EC_WLAN_MASK	(1 << 3)
+#define MSI_STANDARD_EC_3G_MASK		(1 << 4)
 
 static int force;
 module_param(force, bool, 0);
@@ -80,7 +81,7 @@ module_param(auto_brightness, int, 0);
 MODULE_PARM_DESC(auto_brightness, "Enable automatic brightness control (0: disabled; 1: enabled; 2: don't touch)");
 
 static bool old_ec_model;
-static int wlan_s, bluetooth_s;
+static int wlan_s, bluetooth_s, threeg_s;
 
 /* Hardware access */
 
@@ -169,6 +170,8 @@ static int get_wireless_state_ec_standard(void)
 
 	bluetooth_s = !!(rdata & MSI_STANDARD_EC_BLUETOOTH_MASK);
 
+	threeg_s = !!(rdata & MSI_STANDARD_EC_3G_MASK);
+
 	return 0;
 }
 
@@ -230,6 +233,23 @@ static ssize_t show_bluetooth(struct device *dev,
 	return sprintf(buf, "%i\n", enabled);
 }
 
+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 show_lcd_level(struct device *dev,
 	struct device_attribute *attr, char *buf)
 {
@@ -292,6 +312,7 @@ 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,
@@ -412,6 +433,12 @@ static int __init msi_init(void)
 	if (ret)
 		goto fail_platform_device2;
 
+	if (!old_ec_model) {
+		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. */
@@ -446,6 +473,8 @@ static void __exit msi_cleanup(void)
 {
 
 	sysfs_remove_group(&msipf_device->dev.kobj, &msipf_attribute_group);
+	if (!old_ec_model)
+		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.7.0.1

Re: [PATCH 57/62] msi-laptop: Add threeg sysfs file for support query 3G state by standard 66/62 ec command

[Matthew Garrett]

On Tue, Mar 02, 2010 at 03:28:56PM -0800, Greg Kroah-Hartman wrote:

> Add threeg sysfs file for support query 3G state by standard 66/62 ec
> command, the MSI standard ec interface supported this feature.

No. Just use the rfkill interface.

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

Re: [PATCH 57/62] msi-laptop: Add threeg sysfs file for support query 3G state by standard 66/62 ec command

[Greg KH]

On Tue, Mar 02, 2010 at 11:36:16PM +0000, Matthew Garrett wrote:
> On Tue, Mar 02, 2010 at 03:28:56PM -0800, Greg Kroah-Hartman wrote:
> 
> > Add threeg sysfs file for support query 3G state by standard 66/62 ec
> > command, the MSI standard ec interface supported this feature.
> 
> No. Just use the rfkill interface.

Does rfkill support 3G?  I thought it was only for wireless (80211)
stuff.

thanks,

greg k-h

Re: [PATCH 57/62] msi-laptop: Add threeg sysfs file for support query 3G state by standard 66/62 ec command

[Matthew Garrett]

On Tue, Mar 02, 2010 at 03:47:00PM -0800, Greg KH wrote:
> On Tue, Mar 02, 2010 at 11:36:16PM +0000, Matthew Garrett wrote:
> > On Tue, Mar 02, 2010 at 03:28:56PM -0800, Greg Kroah-Hartman wrote:
> > 
> > > Add threeg sysfs file for support query 3G state by standard 66/62 ec
> > > command, the MSI standard ec interface supported this feature.
> > 
> > No. Just use the rfkill interface.
> 
> Does rfkill support 3G?  I thought it was only for wireless (80211)
> stuff.

rfkill has types for the majority of radios. A later patch adds the 3g 
rfkill device, so this one should just be dropped - there's no reason to 
add a non-standard radio control file now.

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