public inbox for linux-acpi@vger.kernel.org
 help / color / mirror / Atom feed
  • * Re: [PATCH 6/4] Fix forcedeth hibernate/wake-on-lan problems
           [not found] <20080518125715.GA19229@yamamaya.is-a-geek.org>
           [not found] ` <20080518150908.GA4606@yamamaya.is-a-geek.org>
    @ 2008-05-31 23:20 ` Tobias Diedrich
      1 sibling, 0 replies; 13+ messages in thread
    From: Tobias Diedrich @ 2008-05-31 23:20 UTC (permalink / raw)
      To: netdev, linux-kernel, Ayaz Abdulla, Rafael J. Wysocki,
    	Stephen Hemminger, Davi
    
    From: Tobias Diedrich <ranma+kernel@tdiedrich.de>
    
    This patch is the minimal amount of code needed to support
    wake-on-lan in platform mode properly (i.e. "ethtool -s eth0 wol g"
    is sufficient, no additional magic needed) for me.
    
    This is derived from David Brownells patch
    (http://lists.laptop.org/pipermail/devel/2007-April/004691.html).
    However I decided to move the hook into pci-acpi.c since the other
    two pci hooks also live there and pci and acpi are the only users of
    the platform_enable_wakeup-hook.
    
    As a 'side-effect' this also makes wake on usb activity work for me
    and I had to disable usb wakeup (which is enabled by default) using
    the power/wakeup sysfs functionality ("echo disabled >
    ${sysfs_path_to_device}/power/wakeup").
    
    (BTW I first thought the 'immediate reboot because of usb wake' effect is
    caused by the optical mouse generating a wake event, but it rather
    seems to be a problem with a flaky secondary usb host controller,
    which sees a connected device where nothing is attached)
    
    Signed-off-by: Tobias Diedrich <ranma+kernel@tdiedrich.de>
    
    Index: linux-2.6.26-rc4.forcedwol/drivers/pci/pci-acpi.c
    ===================================================================
    --- linux-2.6.26-rc4.forcedwol.orig/drivers/pci/pci-acpi.c	2008-06-01 00:40:23.000000000 +0200
    +++ linux-2.6.26-rc4.forcedwol/drivers/pci/pci-acpi.c	2008-06-01 00:46:55.000000000 +0200
    @@ -315,6 +315,25 @@
     	}
     	return PCI_POWER_ERROR;
     }
    +
    +static int acpi_platform_enable_wakeup(struct device *dev, int is_on)
    +{
    +	struct acpi_device	*adev;
    +	int			status;
    +
    +	if (!device_can_wakeup(dev))
    +		return -EINVAL;
    +
    +	if (is_on && !device_may_wakeup(dev))
    +		return -EINVAL;
    +
    +	status = acpi_bus_get_device(DEVICE_ACPI_HANDLE(dev), &adev);
    +	if (status < 0)
    +		return status;
    +
    +	adev->wakeup.state.enabled = !!is_on;
    +	return 0;
    +}
     #endif
     
     static int acpi_pci_set_power_state(struct pci_dev *dev, pci_power_t state)
    @@ -399,6 +418,7 @@
     		return 0;
     #ifdef	CONFIG_ACPI_SLEEP
     	platform_pci_choose_state = acpi_pci_choose_state;
    +	platform_enable_wakeup = acpi_platform_enable_wakeup;
     #endif
     	platform_pci_set_power_state = acpi_pci_set_power_state;
     	return 0;
    
    ^ permalink raw reply	[flat|nested] 13+ messages in thread

  • end of thread, other threads:[~2008-06-05  2:38 UTC | newest]
    
    Thread overview: 13+ messages (download: mbox.gz follow: Atom feed
    -- links below jump to the message on this page --
         [not found] <20080518125715.GA19229@yamamaya.is-a-geek.org>
         [not found] ` <20080518150908.GA4606@yamamaya.is-a-geek.org>
         [not found]   ` <20080525150444.GA29739@yamamaya.is-a-geek.org>
         [not found]     ` <20080525181329.GA5044@yamamaya.is-a-geek.org>
    2008-05-27  6:21       ` [PATCH 0/4] Fix forcedeth hibernate/wake-on-lan problems Tobias Diedrich
         [not found]       ` <20080527062153.GA3651@yamamaya.is-a-geek.org>
    2008-05-27 21:32         ` David Brownell
    2008-05-31  7:20           ` Pavel Machek
    2008-06-05  2:38             ` David Brownell
    2008-05-31 22:12         ` Tobias Diedrich
    2008-06-01  2:51           ` [linux-pm] " Alan Stern
    2008-06-01  7:49             ` Tobias Diedrich
    2008-06-02 21:09               ` Alan Stern
    2008-06-03  6:16                 ` Tobias Diedrich
    2008-06-03 14:12                   ` Alan Stern
    2008-06-03 17:30                     ` Tobias Diedrich
    2008-06-03 20:06                       ` Alan Stern
    2008-05-31 23:20 ` [PATCH 6/4] " Tobias Diedrich
    

    This is a public inbox, see mirroring instructions
    for how to clone and mirror all data and code used for this inbox