diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-15 12:17:34 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-15 12:17:34 -0700 |
| commit | c2e5ca82a3319ddbd9640436742811fed0fba6f6 (patch) | |
| tree | ce6e4d0227a10e1930d9de166ec3c593b623f792 | |
| parent | f96dff13ee958f8098a59e525d903e335b38b5c9 (diff) | |
| download | patches-c2e5ca82a3319ddbd9640436742811fed0fba6f6.tar.gz | |
2.6.36-rc8 and some usb patches
7 files changed, 277 insertions, 1 deletions
diff --git a/driver-core/hpilo-despecificate-driver-from-ilo-generation.patch b/driver-core/hpilo-despecificate-driver-from-ilo-generation.patch new file mode 100644 index 00000000000000..2ef9e08c921cc0 --- /dev/null +++ b/driver-core/hpilo-despecificate-driver-from-ilo-generation.patch @@ -0,0 +1,54 @@ +From dannf@ldl.fc.hp.com Fri Oct 15 12:10:15 2010 +From: dann frazier <dannf@hp.com> +To: linux-kernel@vger.kernel.org +Cc: david.altobelli@hp.com, gregkh@suse.de, + dann frazier <dannf@hp.com> +Subject: hpilo: Despecificate driver from iLO generation +Date: Fri, 15 Oct 2010 10:14:34 -0600 +Message-Id: <1287159274-19139-1-git-send-email-dannf@hp.com> + +This driver supports iLO, iLO2 and iLO3. However, comments and Kconfig +reference only iLO and iLO2. Let's just call it "iLO" to avoid having to +update strings for each iLO generation. This is similar to the change made +to hpwdt in commit 36e3ff44cebd7e46756dec88f30c982bebefdab7. + +Signed-off-by: dann frazier <dannf@hp.com> +Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + +--- + drivers/misc/Kconfig | 10 +++++----- + drivers/misc/hpilo.c | 2 +- + 2 files changed, 6 insertions(+), 6 deletions(-) + +--- a/drivers/misc/Kconfig ++++ b/drivers/misc/Kconfig +@@ -248,15 +248,15 @@ config CS5535_CLOCK_EVENT_SRC + generic PIT, and are suitable for use as high-res timers. + + config HP_ILO +- tristate "Channel interface driver for HP iLO/iLO2 processor" ++ tristate "Channel interface driver for the HP iLO processor" + depends on PCI + default n + help + The channel interface driver allows applications to communicate +- with iLO/iLO2 management processors present on HP ProLiant +- servers. Upon loading, the driver creates /dev/hpilo/dXccbN files, +- which can be used to gather data from the management processor, +- via read and write system calls. ++ with iLO management processors present on HP ProLiant servers. ++ Upon loading, the driver creates /dev/hpilo/dXccbN files, which ++ can be used to gather data from the management processor, via ++ read and write system calls. + + To compile this driver as a module, choose M here: the + module will be called hpilo. +--- a/drivers/misc/hpilo.c ++++ b/drivers/misc/hpilo.c +@@ -1,5 +1,5 @@ + /* +- * Driver for HP iLO/iLO2 management processor. ++ * Driver for the HP iLO management processor. + * + * Copyright (C) 2008 Hewlett-Packard Development Company, L.P. + * David Altobelli <david.altobelli@hp.com> @@ -61,6 +61,7 @@ driver-core/driver-core-fix-build-for-config_block-not-enabled.patch driver-core/kobject-introduce-kset_find_obj_hinted.patch driver-core/driver-core-introduce-find_memory_block_hinted-which-utilizes-kset_find_obj_hinted.patch driver-core/driver-core-convert-link_mem_sections-to-use-find_memory_block_hinted.patch +driver-core/hpilo-despecificate-driver-from-ilo-generation.patch ##################################### # TTY patches for after 2.6.36 is out @@ -242,6 +243,10 @@ usb/usb-xhci-port-remote-wakeup-implementation.patch usb/usb-xhci-bus-power-management-implementation.patch usb/usb-xhci-pci-power-management-implementation.patch usb/usb-accept-some-invalid-ep0-maxpacket-values.patch +usb/usb-xhci-fix-compile-error-when-config_pm-n.patch +usb/usb-isp116x-hcd-use-resource_size-instead-of-defining-its-own-resource_len-macro.patch +usb/usb-isp1362-hcd-use-resource_size-instead-of-defining-its-own-resource_len-macro.patch +usb/usb-ohci-sh-use-resource_size-instead-of-defining-its-own-resource_len-macro.patch # staging stuff for next is now in the staging-next tree on git.kernel.org diff --git a/usb/usb-isp116x-hcd-use-resource_size-instead-of-defining-its-own-resource_len-macro.patch b/usb/usb-isp116x-hcd-use-resource_size-instead-of-defining-its-own-resource_len-macro.patch new file mode 100644 index 00000000000000..59d817f4bd9833 --- /dev/null +++ b/usb/usb-isp116x-hcd-use-resource_size-instead-of-defining-its-own-resource_len-macro.patch @@ -0,0 +1,44 @@ +From axel.lin@gmail.com Fri Oct 15 12:10:37 2010 +Subject: USB: isp116x-hcd - use resource_size instead of defining its own resource_len macro +From: Axel Lin <axel.lin@gmail.com> +Cc: Olav Kongas <ok@artecdesign.ee>, + Greg Kroah-Hartman <gregkh@suse.de>, linux-usb@vger.kernel.org +Date: Fri, 15 Oct 2010 13:26:21 +0800 +Message-Id: <1287120381.20429.1.camel@mola> + +Signed-off-by: Axel Lin <axel.lin@gmail.com> +Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + +--- + drivers/usb/host/isp116x-hcd.c | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) + +--- a/drivers/usb/host/isp116x-hcd.c ++++ b/drivers/usb/host/isp116x-hcd.c +@@ -1557,8 +1557,6 @@ static int isp116x_remove(struct platfor + return 0; + } + +-#define resource_len(r) (((r)->end - (r)->start) + 1) +- + static int __devinit isp116x_probe(struct platform_device *pdev) + { + struct usb_hcd *hcd; +@@ -1597,7 +1595,7 @@ static int __devinit isp116x_probe(struc + ret = -EBUSY; + goto err1; + } +- addr_reg = ioremap(addr->start, resource_len(addr)); ++ addr_reg = ioremap(addr->start, resource_size(addr)); + if (addr_reg == NULL) { + ret = -ENOMEM; + goto err2; +@@ -1606,7 +1604,7 @@ static int __devinit isp116x_probe(struc + ret = -EBUSY; + goto err3; + } +- data_reg = ioremap(data->start, resource_len(data)); ++ data_reg = ioremap(data->start, resource_size(data)); + if (data_reg == NULL) { + ret = -ENOMEM; + goto err4; diff --git a/usb/usb-isp1362-hcd-use-resource_size-instead-of-defining-its-own-resource_len-macro.patch b/usb/usb-isp1362-hcd-use-resource_size-instead-of-defining-its-own-resource_len-macro.patch new file mode 100644 index 00000000000000..d70b3a3701dbe9 --- /dev/null +++ b/usb/usb-isp1362-hcd-use-resource_size-instead-of-defining-its-own-resource_len-macro.patch @@ -0,0 +1,86 @@ +From linux-usb-owner@vger.kernel.org Fri Oct 15 12:11:01 2010 +Subject: USB: isp1362-hcd - use resource_size instead of defining its own resource_len macro +From: Axel Lin <axel.lin@gmail.com> +Cc: Greg Kroah-Hartman <gregkh@suse.de>, + Mike Frysinger <vapier@gentoo.org>, + Lothar Wassmann <LW@KARO-electronics.de>, + linux-usb@vger.kernel.org +Date: Fri, 15 Oct 2010 13:27:57 +0800 +Message-Id: <1287120477.20429.3.camel@mola> + +Signed-off-by: Axel Lin <axel.lin@gmail.com> +Acked-by: Mike Frysinger <vapier@gentoo.org> +Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + +--- + drivers/usb/host/isp1362-hcd.c | 18 ++++++++---------- + 1 file changed, 8 insertions(+), 10 deletions(-) + +--- a/drivers/usb/host/isp1362-hcd.c ++++ b/drivers/usb/host/isp1362-hcd.c +@@ -2649,8 +2649,6 @@ static struct hc_driver isp1362_hc_drive + + /*-------------------------------------------------------------------------*/ + +-#define resource_len(r) (((r)->end - (r)->start) + 1) +- + static int __devexit isp1362_remove(struct platform_device *pdev) + { + struct usb_hcd *hcd = platform_get_drvdata(pdev); +@@ -2672,12 +2670,12 @@ static int __devexit isp1362_remove(stru + res = platform_get_resource(pdev, IORESOURCE_MEM, 1); + DBG(0, "%s: release mem_region: %08lx\n", __func__, (long unsigned int)res->start); + if (res) +- release_mem_region(res->start, resource_len(res)); ++ release_mem_region(res->start, resource_size(res)); + + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); + DBG(0, "%s: release mem_region: %08lx\n", __func__, (long unsigned int)res->start); + if (res) +- release_mem_region(res->start, resource_len(res)); ++ release_mem_region(res->start, resource_size(res)); + + DBG(0, "%s: put_hcd\n", __func__); + usb_put_hcd(hcd); +@@ -2723,21 +2721,21 @@ static int __init isp1362_probe(struct p + goto err1; + } + +- if (!request_mem_region(addr->start, resource_len(addr), hcd_name)) { ++ if (!request_mem_region(addr->start, resource_size(addr), hcd_name)) { + retval = -EBUSY; + goto err1; + } +- addr_reg = ioremap(addr->start, resource_len(addr)); ++ addr_reg = ioremap(addr->start, resource_size(addr)); + if (addr_reg == NULL) { + retval = -ENOMEM; + goto err2; + } + +- if (!request_mem_region(data->start, resource_len(data), hcd_name)) { ++ if (!request_mem_region(data->start, resource_size(data), hcd_name)) { + retval = -EBUSY; + goto err3; + } +- data_reg = ioremap(data->start, resource_len(data)); ++ data_reg = ioremap(data->start, resource_size(data)); + if (data_reg == NULL) { + retval = -ENOMEM; + goto err4; +@@ -2795,13 +2793,13 @@ static int __init isp1362_probe(struct p + iounmap(data_reg); + err4: + DBG(0, "%s: Releasing mem region %08lx\n", __func__, (long unsigned int)data->start); +- release_mem_region(data->start, resource_len(data)); ++ release_mem_region(data->start, resource_size(data)); + err3: + DBG(0, "%s: Unmapping addr_reg @ %p\n", __func__, addr_reg); + iounmap(addr_reg); + err2: + DBG(0, "%s: Releasing mem region %08lx\n", __func__, (long unsigned int)addr->start); +- release_mem_region(addr->start, resource_len(addr)); ++ release_mem_region(addr->start, resource_size(addr)); + err1: + pr_err("%s: init error, %d\n", __func__, retval); + diff --git a/usb/usb-ohci-sh-use-resource_size-instead-of-defining-its-own-resource_len-macro.patch b/usb/usb-ohci-sh-use-resource_size-instead-of-defining-its-own-resource_len-macro.patch new file mode 100644 index 00000000000000..9cbb7794628990 --- /dev/null +++ b/usb/usb-ohci-sh-use-resource_size-instead-of-defining-its-own-resource_len-macro.patch @@ -0,0 +1,36 @@ +From axel.lin@gmail.com Fri Oct 15 12:11:28 2010 +Subject: USB: ohci-sh - use resource_size instead of defining its own resource_len macro +From: Axel Lin <axel.lin@gmail.com> +Cc: David Brownell <dbrownell@users.sourceforge.net>, + Yoshihiro Shimoda <shimoda.yoshihiro@renesas.com>, + Greg Kroah-Hartman <gregkh@suse.de>, linux-usb@vger.kernel.org +Date: Fri, 15 Oct 2010 13:29:24 +0800 +Message-Id: <1287120564.20429.5.camel@mola> + +Signed-off-by: Axel Lin <axel.lin@gmail.com> +Acked-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com> +Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + +--- + drivers/usb/host/ohci-sh.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +--- a/drivers/usb/host/ohci-sh.c ++++ b/drivers/usb/host/ohci-sh.c +@@ -77,7 +77,6 @@ static const struct hc_driver ohci_sh_hc + + /*-------------------------------------------------------------------------*/ + +-#define resource_len(r) (((r)->end - (r)->start) + 1) + static int ohci_hcd_sh_probe(struct platform_device *pdev) + { + struct resource *res = NULL; +@@ -109,7 +108,7 @@ static int ohci_hcd_sh_probe(struct plat + + hcd->regs = (void __iomem *)res->start; + hcd->rsrc_start = res->start; +- hcd->rsrc_len = resource_len(res); ++ hcd->rsrc_len = resource_size(res); + ret = usb_add_hcd(hcd, irq, IRQF_DISABLED); + if (ret != 0) { + err("Failed to add hcd"); diff --git a/usb/usb-xhci-fix-compile-error-when-config_pm-n.patch b/usb/usb-xhci-fix-compile-error-when-config_pm-n.patch new file mode 100644 index 00000000000000..d35a436548d5c5 --- /dev/null +++ b/usb/usb-xhci-fix-compile-error-when-config_pm-n.patch @@ -0,0 +1,51 @@ +From sarah.a.sharp@linux.intel.com Fri Oct 15 12:07:32 2010 +Date: Fri, 15 Oct 2010 11:24:14 -0700 +From: Sarah Sharp <sarah.a.sharp@linux.intel.com> +To: Greg KH <gregkh@suse.de> +Cc: Randy Dunlap <randy.dunlap@oracle.com>, + Stephen Rothwell <sfr@canb.auug.org.au>, Andiry Xu <andiry.xu@amd.com>, Dong Nguyen <dong.nguyen@amd.com>, + Libin Yang <libin.yang@amd.com> +Subject: USB: xhci: Fix compile error when CONFIG_PM=n +Message-ID: <20101015182414.GA12349@xanatos> +Content-Disposition: inline + +Fix this error when CONFIG_PM is not enabled: + +drivers/usb/host/xhci.c:675: error: implicit declaration of function 'usb_root_hub_lost_power' + +Wrap xhci_suspend() and xhci_resume() into an ifdef CONFIG_PM, along with +the functions that only they call -- xhci_save_registers() and +xhci_restore_registers(). + +Reported-by: Randy Dunlap <randy.dunlap@oracle.com> +Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com> +Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + +--- + drivers/usb/host/xhci.c | 8 ++++++++ + 1 file changed, 8 insertions(+) + +--- a/drivers/usb/host/xhci.c ++++ b/drivers/usb/host/xhci.c +@@ -551,6 +551,7 @@ void xhci_shutdown(struct usb_hcd *hcd) + xhci_readl(xhci, &xhci->op_regs->status)); + } + ++#ifdef CONFIG_PM + static void xhci_save_registers(struct xhci_hcd *xhci) + { + xhci->s3.command = xhci_readl(xhci, &xhci->op_regs->command); +@@ -761,6 +762,13 @@ int xhci_resume(struct xhci_hcd *xhci, b + return 0; + } + ++#else ++ ++#define xhci_suspend NULL ++#define xhci_resume NULL ++ ++#endif /* CONFIG_PM */ ++ + /*-------------------------------------------------------------------------*/ + + /** @@ -1 +1 @@ -2.6.36-rc7 +2.6.36-rc8 |