)]}' { "log": [ { "commit": "32aaeffbd4a7457bf2f7448b33b5946ff2a960eb", "tree": "faf7ad871d87176423ff9ed1d1ba4d9c688fc23f", "parents": [ "208bca0860406d16398145ddd950036a737c3c9d", "67b84999b1a8b1af5625b1eabe92146c5eb42932" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Nov 06 19:44:47 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Nov 06 19:44:47 2011 -0800" }, "message": "Merge branch \u0027modsplit-Oct31_2011\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux\n\n* \u0027modsplit-Oct31_2011\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux: (230 commits)\n Revert \"tracing: Include module.h in define_trace.h\"\n irq: don\u0027t put module.h into irq.h for tracking irqgen modules.\n bluetooth: macroize two small inlines to avoid module.h\n ip_vs.h: fix implicit use of module_get/module_put from module.h\n nf_conntrack.h: fix up fallout from implicit moduleparam.h presence\n include: replace linux/module.h with \"struct module\" wherever possible\n include: convert various register fcns to macros to avoid include chaining\n crypto.h: remove unused crypto_tfm_alg_modname() inline\n uwb.h: fix implicit use of asm/page.h for PAGE_SIZE\n pm_runtime.h: explicitly requires notifier.h\n linux/dmaengine.h: fix implicit use of bitmap.h and asm/page.h\n miscdevice.h: fix up implicit use of lists and types\n stop_machine.h: fix implicit use of smp.h for smp_processor_id\n of: fix implicit use of errno.h in include/linux/of.h\n of_platform.h: delete needless include \u003clinux/module.h\u003e\n acpi: remove module.h include from platform/aclinux.h\n miscdevice.h: delete unnecessary inclusion of module.h\n device_cgroup.h: delete needless include \u003clinux/module.h\u003e\n net: sch_generic remove redundant use of \u003clinux/module.h\u003e\n net: inet_timewait_sock doesnt need \u003clinux/module.h\u003e\n ...\n\nFix up trivial conflicts (other header files, and removal of the ab3550 mfd driver) in\n - drivers/media/dvb/frontends/dibx000_common.c\n - drivers/media/video/{mt9m111.c,ov6650.c}\n - drivers/mfd/ab3550-core.c\n - include/linux/dmaengine.h\n" }, { "commit": "02ebbbd481635fd3ce7018e5bb19c18c0f1e4561", "tree": "f07caea3ac9cb50492977a2f7b1d29bbce6e6a3a", "parents": [ "addd8c92cf55bba578b8a56e0f717a0a74b31008", "536ec4f8d13433126f948d6e90821f811a4ebdf8" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Nov 06 18:54:53 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Nov 06 18:54:53 2011 -0800" }, "message": "Merge branch \u0027trivial\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild\n\n* \u0027trivial\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:\n scsi: drop unused Kconfig symbol\n pci: drop unused Kconfig symbol\n stmmac: drop unused Kconfig symbol\n x86: drop unused Kconfig symbol\n powerpc: drop unused Kconfig symbols\n powerpc: 40x: drop unused Kconfig symbol\n mips: drop unused Kconfig symbols\n openrisc: drop unused Kconfig symbols\n arm: at91: drop unused Kconfig symbol\n samples: drop unused Kconfig symbol\n m32r: drop unused Kconfig symbol\n score: drop unused Kconfig symbols\n sh: drop unused Kconfig symbol\n um: drop unused Kconfig symbol\n sparc: drop unused Kconfig symbol\n alpha: drop unused Kconfig symbol\n\nFix up trivial conflict in drivers/net/ethernet/stmicro/stmmac/Kconfig\nas per Michal: the STMMAC_DUAL_MAC config variable is still unused and\nshould be deleted.\n" }, { "commit": "eefa9cfc891d18aa83744353d2a3fbe95a86ee2d", "tree": "7365f73b0ff9be45b7b8a623d7878105eeb12814", "parents": [ "363c75db1d7bbda0aa90e680565f2673bab92ee4" ], "author": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Fri May 27 09:42:30 2011 -0400" }, "committer": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Mon Oct 31 19:31:23 2011 -0400" }, "message": "pci: add module.h to files implicitly relying on its presence.\n\nThese were getting module.h implicitly from device.h but we want\nto clean that up, so we fix it here to avoid things like:\n\npci/slot.c: In function ‘pci_hp_create_module_link’:\npci/slot.c:383: error: ‘module_kset’ undeclared (first use in this function)\n\nSimilarly, rpadlpar_core.c is modular, so add module.h to its includes.\n\nSigned-off-by: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\n" }, { "commit": "363c75db1d7bbda0aa90e680565f2673bab92ee4", "tree": "7f6e2febf8b21f9bb17ad0ae2c699d362629441f", "parents": [ "d81a6d71760c4d8323f1f9a506c64084caa09063" ], "author": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Fri May 27 09:37:25 2011 -0400" }, "committer": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Mon Oct 31 19:31:22 2011 -0400" }, "message": "pci: Fix files needing export.h for EXPORT_SYMBOL/THIS_MODULE\n\nThey were implicitly getting it from device.h --\u003e module.h but\nwe want to clean that up. So add the minimal header for these\nmacros.\n\nSigned-off-by: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\n" }, { "commit": "a8d2de5e55183e2ec32228b3464be894cf7533c2", "tree": "8fb823149bc3025b3e5ff39d59f862a494fcc574", "parents": [ "2d3def0b73e33e5af2e81094710c07423e00b8be" ], "author": { "name": "Paul Bolle", "email": "pebolle@tiscali.nl", "time": "Mon Oct 24 13:43:38 2011 +0200" }, "committer": { "name": "Michal Marek", "email": "mmarek@suse.cz", "time": "Mon Oct 31 23:40:16 2011 +0100" }, "message": "pci: drop unused Kconfig symbol\n\nThere\u0027s no other Kconfig symbol that depends on XEN_PCIDEV_FE_DEBUG.\nNeither is there anything that uses CONFIG_XEN_PCIDEV_FE_DEBUG.\n\nSigned-off-by: Paul Bolle \u003cpebolle@tiscali.nl\u003e\nReviewed-by: Konrad Rzeszutek Wilk \u003ckonrad.wilk@oracle.com\u003e\nSigned-off-by: Michal Marek \u003cmmarek@suse.cz\u003e\n" }, { "commit": "0e59e7e7feb5a12938fbf9135147eeda3238c6c4", "tree": "dbe994369ca9cad6893f0fd710f75791bc84b816", "parents": [ "46b51ea2099fa2082342e52b8284aa828429b80b", "a513a99a7cebfb452839cc09c9c0586f72d96414" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Oct 28 14:20:44 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Oct 28 14:20:44 2011 -0700" }, "message": "Merge branch \u0027next-rebase\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci\n\n* \u0027next-rebase\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci:\n PCI: Clean-up MPS debug output\n pci: Clamp pcie_set_readrq() when using \"performance\" settings\n PCI: enable MPS \"performance\" setting to properly handle bridge MPS\n PCI: Workaround for Intel MPS errata\n PCI: Add support for PASID capability\n PCI: Add implementation for PRI capability\n PCI: Export ATS functions to modules\n PCI: Move ATS implementation into own file\n PCI / PM: Remove unnecessary error variable from acpi_dev_run_wake()\n PCI hotplug: acpiphp: Prevent deadlock on PCI-to-PCI bridge remove\n PCI / PM: Extend PME polling to all PCI devices\n PCI quirk: mmc: Always check for lower base frequency quirk for Ricoh 1180:e823\n PCI: Make pci_setup_bridge() non-static for use by arch code\n x86: constify PCI raw ops structures\n PCI: Add quirk for known incorrect MPSS\n PCI: Add Solarflare vendor ID and SFC4000 device IDs\n" }, { "commit": "a513a99a7cebfb452839cc09c9c0586f72d96414", "tree": "566fb8a8fa8c02ede05b2694dd16a8efea5342bb", "parents": [ "a1c473aa11e61bc871be16279c9bf976acf22504" ], "author": { "name": "Jon Mason", "email": "mason@myri.com", "time": "Fri Oct 14 14:56:16 2011 -0500" }, "committer": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Thu Oct 27 12:45:44 2011 -0700" }, "message": "PCI: Clean-up MPS debug output\n\nClean-up MPS debug output to make it a single line and aligned, thus\nmaking it more readable for a large number of buses and devices in a\nsingle system.\n\nSuggested by Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\n\nSigned-off-by: Jon Mason \u003cmason@myri.com\u003e\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\n" }, { "commit": "a1c473aa11e61bc871be16279c9bf976acf22504", "tree": "13f1c4565817bab8660e2e38f8fedc5344519788", "parents": [ "62f392ea5b5f87b641e16e61a4cedda21ef7341f" ], "author": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Fri Oct 14 14:56:15 2011 -0500" }, "committer": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Thu Oct 27 12:45:44 2011 -0700" }, "message": "pci: Clamp pcie_set_readrq() when using \"performance\" settings\n\nWhen configuring the PCIe settings for \"performance\", we allow parents\nto have a larger Max Payload Size than children and rely on children\nMax Read Request Size to not be larger than their own MPS to avoid\nhaving the host bridge generate responses they can\u0027t cope with.\n\nHowever, various drivers in Linux call pci_set_readrq() with arbitrary\nvalues, assuming this to be a simple performance tweak. This breaks\nunder our \"performance\" configuration.\n\nFix that by making sure the value programmed by pcie_set_readrq() is\nnever larger than the configured MPS for that device.\n\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nSigned-off-by: Jon Mason \u003cmason@myri.com\u003e\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\n" }, { "commit": "62f392ea5b5f87b641e16e61a4cedda21ef7341f", "tree": "3392e1c0b10f851df98b18797c0637608887d624", "parents": [ "d387a8d66670371e6be3b6d6bde2e38b8cade076" ], "author": { "name": "Jon Mason", "email": "mason@myri.com", "time": "Fri Oct 14 14:56:14 2011 -0500" }, "committer": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Thu Oct 27 12:45:43 2011 -0700" }, "message": "PCI: enable MPS \"performance\" setting to properly handle bridge MPS\n\nRework the \"performance\" MPS option to configure the device MPS with the\nsmaller of the device MPSS or the bridge MPS (which is assumed to be\nproperly configured at this point to the largest allowable MPS based on\nits parent bus).\n\nAlso, rework the MRRS setting to report an inability to set the MRRS to\na valid setting.\n\nSigned-off-by: Jon Mason \u003cmason@myri.com\u003e\nAcked-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\n" }, { "commit": "d387a8d66670371e6be3b6d6bde2e38b8cade076", "tree": "988a0d0898779694f4299886d7b72607a5b4fdea", "parents": [ "086ac11f6435c9dc2fe5025fc8ea3a1dbca273d6" ], "author": { "name": "Jon Mason", "email": "mason@myri.com", "time": "Fri Oct 14 14:56:13 2011 -0500" }, "committer": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Thu Oct 27 12:45:42 2011 -0700" }, "message": "PCI: Workaround for Intel MPS errata\n\nIntel 5000 and 5100 series memory controllers have a known issue if read\ncompletion coalescing is enabled and the PCI-E Maximum Payload Size is\nset to 256B. To work around this issue, disable read completion\ncoalescing in the memory controller and root complexes. Unfortunately,\nit must always be disabled, even if no 256B MPS devices are present, due\nto the possibility of one being hotplugged.\n\nLinks to erratas:\nhttp://www.intel.com/content/dam/doc/specification-update/5000-chipset-memory-controller-hub-specification-update.pdf\nhttp://www.intel.com/content/dam/doc/specification-update/5100-memory-controller-hub-chipset-specification-update.pdf\n\nThanks to Jesse Brandeburg and Ben Hutchings for providing insight into\nthe problem.\n\nTested-and-Reported-by: Avi Kivity \u003cavi@redhat.com\u003e\nSigned-off-by: Jon Mason \u003cmason@myri.com\u003e\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\n" }, { "commit": "982653009b883ef1529089e3e6f1ae2fee41cbe2", "tree": "eec3b1fe947d442ee204a2d648133bc5223e5c59", "parents": [ "37d96c28ecf0af1215bb6bbf580dbb1fabb5a6ec", "c020570138f5d9cb1fc0a853f9cf9e641178b5c5" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Oct 26 16:11:53 2011 +0200" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Oct 26 16:11:53 2011 +0200" }, "message": "Merge branch \u0027core-iommu-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\n* \u0027core-iommu-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:\n x86, ioapic: Consolidate the explicit EOI code\n x86, ioapic: Restore the mask bit correctly in eoi_ioapic_irq()\n x86, kdump, ioapic: Reset remote-IRR in clear_IO_APIC\n iommu: Rename the DMAR and INTR_REMAP config options\n x86, ioapic: Define irq_remap_modify_chip_defaults()\n x86, msi, intr-remap: Use the ioapic set affinity routine\n iommu: Cleanup ifdefs in detect_intel_iommu()\n iommu: No need to set dmar_disabled in check_zero_address()\n iommu: Move IOMMU specific code to intel-iommu.c\n intr_remap: Call dmar_dev_scope_init() explicitly\n x86, x2apic: Enable the bios request for x2apic optout\n" }, { "commit": "04a8752485e450124f92c9b931d268b48d75650a", "tree": "baf8ed39e1e085ff1d48ad734ef63b1d11e13ce1", "parents": [ "31018acd4c77f0e4b90f870011249f32c5e3d5b6", "e4184aaf3b2c4f2b69306f6cfc4bab8733c6c5f1", "4645bf306746106f805d2afa5330bf31df381626", "55e901fc1f03dd8437f877813c68b6014cdbeefd" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Oct 25 09:19:36 2011 +0200" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Oct 25 09:19:36 2011 +0200" }, "message": "Merge branches \u0027stable/drivers-3.2\u0027, \u0027stable/drivers.bugfixes-3.2\u0027 and \u0027stable/pci.fixes-3.2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen\n\n* \u0027stable/drivers-3.2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:\n xenbus: don\u0027t rely on xen_initial_domain to detect local xenstore\n xenbus: Fix loopback event channel assuming domain 0\n xen/pv-on-hvm:kexec: Fix implicit declaration of function \u0027xen_hvm_domain\u0027\n xen/pv-on-hvm kexec: add xs_reset_watches to shutdown watches from old kernel\n xen/pv-on-hvm kexec: update xs_wire.h:xsd_sockmsg_type from xen-unstable\n xen/pv-on-hvm kexec+kdump: reset PV devices in kexec or crash kernel\n xen/pv-on-hvm kexec: rebind virqs to existing eventchannel ports\n xen/pv-on-hvm kexec: prevent crash in xenwatch_thread() when stale watch events arrive\n\n* \u0027stable/drivers.bugfixes-3.2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:\n xen/pciback: Check if the device is found instead of blindly assuming so.\n xen/pciback: Do not dereference psdev during printk when it is NULL.\n xen: remove XEN_PLATFORM_PCI config option\n xen: XEN_PVHVM depends on PCI\n xen/pciback: double lock typo\n xen/pciback: use mutex rather than spinlock in vpci backend\n xen/pciback: Use mutexes when working with Xenbus state transitions.\n xen/pciback: miscellaneous adjustments\n xen/pciback: use mutex rather than spinlock in passthrough backend\n xen/pciback: use resource_size()\n\n* \u0027stable/pci.fixes-3.2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:\n xen/pci: support multi-segment systems\n xen-swiotlb: When doing coherent alloc/dealloc check before swizzling the MFNs.\n xen/pci: make bus notifier handler return sane values\n xen-swiotlb: fix printk and panic args\n xen-swiotlb: Fix wrong panic.\n xen-swiotlb: Retry up three times to allocate Xen-SWIOTLB\n xen-pcifront: Update warning comment to use \u0027e820_host\u0027 option.\n" }, { "commit": "086ac11f6435c9dc2fe5025fc8ea3a1dbca273d6", "tree": "29e9445f029b73bac174900cb68d5e1fd2748cef", "parents": [ "c320b976d7837c561ce4aa49dfe0a64f0e527ce4" ], "author": { "name": "Joerg Roedel", "email": "joerg.roedel@amd.com", "time": "Tue Sep 27 15:57:16 2011 +0200" }, "committer": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Fri Oct 14 09:05:35 2011 -0700" }, "message": "PCI: Add support for PASID capability\n\nDevices supporting Process Address Space Identifiers\n(PASIDs) can use an IOMMU to access multiple IO address\nspaces at the same time. A PCIe device indicates support for\nthis feature by implementing the PASID capability. This\npatch adds support for the capability to the Linux kernel.\n\nReviewed-by: Bjorn Helgaas \u003cbhelgaas@google.com\u003e\nSigned-off-by: Joerg Roedel \u003cjoerg.roedel@amd.com\u003e\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\n" }, { "commit": "c320b976d7837c561ce4aa49dfe0a64f0e527ce4", "tree": "09d12286e3c63ab15a472468795204eeb154f83c", "parents": [ "d4c0636c2107010f0ef8c4dfbb1d6368ae3b3ed9" ], "author": { "name": "Joerg Roedel", "email": "joerg.roedel@amd.com", "time": "Tue Sep 27 15:57:15 2011 +0200" }, "committer": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Fri Oct 14 09:05:34 2011 -0700" }, "message": "PCI: Add implementation for PRI capability\n\nImplement the necessary functions to handle PRI capabilities\non PCIe devices. With PRI devices behind an IOMMU can signal\npage fault conditions to software and recover from such\nfaults.\n\nReviewed-by: Bjorn Helgaas \u003cbhelgaas@google.com\u003e\nSigned-off-by: Joerg Roedel \u003cjoerg.roedel@amd.com\u003e\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\n" }, { "commit": "d4c0636c2107010f0ef8c4dfbb1d6368ae3b3ed9", "tree": "06ed57fc41718971fdf540f1034b0df31e3290dc", "parents": [ "db3c33c6d3fa04ee46b491e9d75d0d3b4798d074" ], "author": { "name": "Joerg Roedel", "email": "joerg.roedel@amd.com", "time": "Tue Sep 27 15:57:14 2011 +0200" }, "committer": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Fri Oct 14 09:05:34 2011 -0700" }, "message": "PCI: Export ATS functions to modules\n\nThis patch makes the ATS functions usable for modules.\nThey will be used by a module implementing some advanced\nAMD IOMMU features.\n\nReviewed-by: Bjorn Helgaas \u003cbhelgaas@google.com\u003e\nSigned-off-by: Joerg Roedel \u003cjoerg.roedel@amd.com\u003e\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\n" }, { "commit": "db3c33c6d3fa04ee46b491e9d75d0d3b4798d074", "tree": "6c1031398621e1b7195b2b23b7045a2eb5e917e1", "parents": [ "78d090b0be3f072a3c95022771c35183af961aaa" ], "author": { "name": "Joerg Roedel", "email": "joerg.roedel@amd.com", "time": "Tue Sep 27 15:57:13 2011 +0200" }, "committer": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Fri Oct 14 09:05:33 2011 -0700" }, "message": "PCI: Move ATS implementation into own file\n\nATS does not depend on IOV support, so move the code into\nits own file. This file will also include support for the\nPRI and PASID capabilities later.\nAlso give ATS its own Kconfig variable to allow selecting it\nwithout IOV support.\n\nReviewed-by: Bjorn Helgaas \u003cbhelgaas@google.com\u003e\nSigned-off-by: Joerg Roedel \u003cjoerg.roedel@amd.com\u003e\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\n" }, { "commit": "78d090b0be3f072a3c95022771c35183af961aaa", "tree": "ce8de79a4ab712a8c34e2abda68bcacde5173c40", "parents": [ "6af8bef14d6fc9e4e52c83fd646412e9dedadd26" ], "author": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Wed Sep 28 21:44:36 2011 +0200" }, "committer": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Fri Oct 14 09:05:32 2011 -0700" }, "message": "PCI / PM: Remove unnecessary error variable from acpi_dev_run_wake()\n\nThe result returned by acpi_dev_run_wake() is always either -EINVAL\nor -ENODEV, while obviously it should return 0 on success. The\nproblem is that the leftover error variable, that\u0027s not really used\nin the function, is initialized with -ENODEV and then returned\nwithout modification.\n\nTo fix this issue remove the error variable from acpi_dev_run_wake()\nand make the function return 0 on success as appropriate.\n\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\n" }, { "commit": "6af8bef14d6fc9e4e52c83fd646412e9dedadd26", "tree": "a1ddb0962fe8d5704cff9f3627322eb2fe0fa479", "parents": [ "379021d5c0899fcf9410cae4ca7a59a5a94ca769" ], "author": { "name": "Prarit Bhargava", "email": "prarit@redhat.com", "time": "Wed Sep 28 19:40:53 2011 -0400" }, "committer": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Fri Oct 14 09:05:31 2011 -0700" }, "message": "PCI hotplug: acpiphp: Prevent deadlock on PCI-to-PCI bridge remove\n\nI originally submitted a patch to workaround this by pushing all Ejection\nRequests and Device Checks onto the kacpi_hotplug queue.\n\nhttp://marc.info/?l\u003dlinux-acpi\u0026m\u003d131678270930105\u0026w\u003d2\n\nThe patch is still insufficient in that Bus Checks also need to be added.\n\nRather than add all events, including non-PCI-hotplug events, to the\nhotplug queue, mjg suggested that a better approach would be to modify\nthe acpiphp driver so only acpiphp events would be added to the\nkacpi_hotplug queue.\n\nIt\u0027s a longer patch, but at least we maintain the benefit of having separate\nqueues in ACPI. This, of course, is still only a workaround the problem.\nAs Bjorn and mjg pointed out, we have to refactor a lot of this code to do\nthe right thing but at this point it is a better to have this code working.\n\nThe acpi core places all events on the kacpi_notify queue. When the acpiphp\ndriver is loaded and a PCI card with a PCI-to-PCI bridge is removed the\nfollowing call sequence occurs:\n\ncleanup_p2p_bridge()\n\t -\u003e cleanup_bridge()\n\t\t -\u003e acpi_remove_notify_handler()\n\t\t\t -\u003e acpi_os_wait_events_complete()\n\t\t\t\t -\u003e flush_workqueue(kacpi_notify_wq)\n\nwhich is the queue we are currently executing on and the process will hang.\n\nMove all hotplug acpiphp events onto the kacpi_hotplug workqueue. In\nhandle_hotplug_event_bridge() and handle_hotplug_event_func() we can simply\npush the rest of the work onto the kacpi_hotplug queue and then avoid the\ndeadlock.\n\nSigned-off-by: Prarit Bhargava \u003cprarit@redhat.com\u003e\nCc: mjg@redhat.com\nCc: bhelgaas@google.com\nCc: linux-acpi@vger.kernel.org\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\n" }, { "commit": "379021d5c0899fcf9410cae4ca7a59a5a94ca769", "tree": "9c91ffb80fcb143b94c20922cb27d60d2c7e6654", "parents": [ "3e309cdf07c930f29a4e0f233e47d399bea34c68" ], "author": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Mon Oct 03 23:16:33 2011 +0200" }, "committer": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Fri Oct 14 09:05:31 2011 -0700" }, "message": "PCI / PM: Extend PME polling to all PCI devices\n\nThe land of PCI power management is a land of sorrow and ugliness,\nespecially in the area of signaling events by devices. There are\ndevices that set their PME Status bits, but don\u0027t really bother\nto send a PME message or assert PME#. There are hardware vendors\nwho don\u0027t connect PME# lines to the system core logic (they know\nwho they are). There are PCI Express Root Ports that don\u0027t bother\nto trigger interrupts when they receive PME messages from the devices\nbelow. There are ACPI BIOSes that forget to provide _PRW methods for\ndevices capable of signaling wakeup. Finally, there are BIOSes that\ndo provide _PRW methods for such devices, but then don\u0027t bother to\ncall Notify() for those devices from the corresponding _Lxx/_Exx\nGPE-handling methods. In all of these cases the kernel doesn\u0027t have\na chance to receive a proper notification that it should wake up a\ndevice, so devices stay in low-power states forever. Worse yet, in\nsome cases they continuously send PME Messages that are silently\nignored, because the kernel simply doesn\u0027t know that it should clear\nthe device\u0027s PME Status bit.\n\nThis problem was first observed for \"parallel\" (non-Express) PCI\ndevices on add-on cards and Matthew Garrett addressed it by adding\ncode that polls PME Status bits of such devices, if they are enabled\nto signal PME, to the kernel. Recently, however, it has turned out\nthat PCI Express devices are also affected by this issue and that it\nis not limited to add-on devices, so it seems necessary to extend\nthe PME polling to all PCI devices, including PCI Express and planar\nones. Still, it would be wasteful to poll the PME Status bits of\ndevices that are known to receive proper PME notifications, so make\nthe kernel (1) poll the PME Status bits of all PCI and PCIe devices\nenabled to signal PME and (2) disable the PME Status polling for\ndevices for which correct PME notifications are received.\n\nTested-by: Sarah Sharp \u003csarah.a.sharp@linux.intel.com\u003e\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\n" }, { "commit": "3e309cdf07c930f29a4e0f233e47d399bea34c68", "tree": "eac1fa4719329cab93a0dc646b1c4c11e6711518", "parents": [ "e24442733ee486c99d03fe2ecd98924d1bc14c51" ], "author": { "name": "Josh Boyer", "email": "jwboyer@redhat.com", "time": "Wed Oct 05 11:44:50 2011 -0400" }, "committer": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Fri Oct 14 09:05:30 2011 -0700" }, "message": "PCI quirk: mmc: Always check for lower base frequency quirk for Ricoh 1180:e823\n\nCommit 15bed0f2f added a quirk for the e823 Ricoh card reader to lower the\nbase frequency. However, the quirk first checks to see if the proprietary\nMMC controller is disabled, and returns if so. On some devices, such as the\nLenovo X220, the MMC controller is already disabled by firmware it seems,\nbut the frequency change is still needed so sdhci-pci can talk to the cards.\nSince the MMC controller is disabled, the frequency fixup was never being run\non these machines.\n\nThis moves the e823 check above the MMC controller check so that it always\ngets run.\n\nThis fixes https://bugzilla.redhat.com/show_bug.cgi?id\u003d722509\n\nSigned-off-by: Josh Boyer \u003cjwboyer@redhat.com\u003e\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\n" }, { "commit": "e24442733ee486c99d03fe2ecd98924d1bc14c51", "tree": "799b7789febb8491115c97f5a136042d26a81cff", "parents": [ "72da0b07b1b497927758a2102b856ce41e4ba81e" ], "author": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Sun Sep 11 14:08:38 2011 -0300" }, "committer": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Fri Oct 14 09:05:29 2011 -0700" }, "message": "PCI: Make pci_setup_bridge() non-static for use by arch code\n\nThe \"powernv\" platform of the powerpc architecture needs to assign PCI\nresources using a specific algorithm to fit some HW constraints of\nthe IBM \"IODA\" architecture (related to the ability to create error\nhandling domains that encompass specific segments of MMIO space).\n\nFor doing so, it wants to call pci_setup_bridge() from architecture\nspecific resource management in order to configure bridges after all\nresources have been assigned. So make it non-static.\n\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\n" }, { "commit": "a94d072b20239f6f615dc20f0a54f63e9b642f9e", "tree": "c9293c2d14142d6ffed8764f89e3af0333a2ee5d", "parents": [ "937383a58e47154d3098783df739e8fa8984a434" ], "author": { "name": "Ben Hutchings", "email": "bhutchings@solarflare.com", "time": "Wed Oct 05 22:35:03 2011 +0100" }, "committer": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Fri Oct 14 09:05:27 2011 -0700" }, "message": "PCI: Add quirk for known incorrect MPSS\n\nUsing legacy interrupts and TLPs \u003e 256 bytes on the SFC4000 (all\nrevisions) may cause interrupt messages to be replayed. In some\nsystems this results in a non-recoverable MCE. Early boards using the\nSFC4000 set the maximum payload size supported (MPSS) to 1024 bytes\nand we should override that.\n\nThere are probably other devices with similar issues, so give this\nquirk a generic name.\n\nSigned-off-by: Ben Hutchings \u003cbhutchings@solarflare.com\u003e\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\n" }, { "commit": "5f39e6705faade2e89d119958a8c51b9b6e2c53c", "tree": "e9d69f2f465daeca7cdc452a3b19d702f15e98b0", "parents": [ "05faadcf59507e8eea57ffbeea9cbb14c9a2ab3d" ], "author": { "name": "Jon Mason", "email": "mason@myri.com", "time": "Mon Oct 03 09:50:20 2011 -0500" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Oct 04 09:52:28 2011 -0700" }, "message": "PCI: Disable MPS configuration by default\n\nAdd the ability to disable PCI-E MPS turning and using the BIOS\nconfigured MPS defaults. Due to the number of issues recently\ndiscovered on some x86 chipsets, make this the default behavior.\n\nAlso, add the option for peer to peer DMA MPS configuration. Peer to\npeer DMA is outside the scope of this patch, but MPS configuration could\nprevent it from working by having the MPS on one root port different\nthan the MPS on another. To work around this, simply make the system\nwide MPS the smallest possible value (128B).\n\nSigned-off-by: Jon Mason \u003cmason@myri.com\u003e\nAcked-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "d3f138106b4b40640dc667f0222fd9f137387b32", "tree": "2c5d51deff32ec0999493bbb73cb18a7e4a455c3", "parents": [ "c39d77ffa28c6e72702193df4fa53928c1b6f3e6" ], "author": { "name": "Suresh Siddha", "email": "suresh.b.siddha@intel.com", "time": "Tue Aug 23 17:05:25 2011 -0700" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Wed Sep 21 10:22:03 2011 +0200" }, "message": "iommu: Rename the DMAR and INTR_REMAP config options\n\nChange the CONFIG_DMAR to CONFIG_INTEL_IOMMU to be consistent\nwith the other IOMMU options.\n\nRename the CONFIG_INTR_REMAP to CONFIG_IRQ_REMAP to match the\nirq subsystem name.\n\nAnd define the CONFIG_DMAR_TABLE for the common ACPI DMAR\nroutines shared by both CONFIG_INTEL_IOMMU and CONFIG_IRQ_REMAP.\n\nSigned-off-by: Suresh Siddha \u003csuresh.b.siddha@intel.com\u003e\nCc: yinghai@kernel.org\nCc: youquan.song@intel.com\nCc: joerg.roedel@amd.com\nCc: tony.luck@intel.com\nCc: dwmw2@infradead.org\nLink: http://lkml.kernel.org/r/20110824001456.558630224@sbsiddha-desk.sc.intel.com\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "1a4b1a41b8a3d5256019854e851beed063b34344", "tree": "fa62183e093cf032c74cac8149fb69a49b07b7e0", "parents": [ "2f4d3218e95d48de2951dcf2bea619ea49ef93de" ], "author": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Tue Sep 13 15:16:33 2011 -0300" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Sep 13 16:08:31 2011 -0700" }, "message": "pci: Don\u0027t crash when reading mpss from root complex\n\nIn pcie_find_smpss(), we have the following statement:\n\n \tif (dev-\u003eis_hotplug_bridge \u0026\u0026 (!list_is_singular(\u0026dev-\u003ebus-\u003edevices) ||\n\t dev-\u003ebus-\u003eself-\u003epcie_type !\u003d PCI_EXP_TYPE_ROOT_PORT))\n\nThe problem is that at least on my machine, this gets called for the\nroot complex (virtual P2P bridge), and dev-\u003ebus-\u003eself is NULL since\nthe parent bus for this is not itself anchor to a PCI device.\n\nThis adds the necessary NULL check.\n\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nAcked-by: Jon Mason \u003cmason@myri.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "ed2888e906b56769b4ffabb9c577190438aa68b8", "tree": "81d55511aaa0b2b4074b9432fee3e23beb98b503", "parents": [ "5307f6d5fb12fd01f9f321bc4a8fd77e74858647" ], "author": { "name": "Jon Mason", "email": "mason@myri.com", "time": "Thu Sep 08 16:41:18 2011 -0500" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Sep 09 19:49:58 2011 -0700" }, "message": "PCI: Remove MRRS modification from MPS setting code\n\nModifying the Maximum Read Request Size to 0 (value of 128Bytes) has\nmassive negative ramifications on some devices. Without knowing which\ndevices have this issue, do not modify from the default value when\nwalking the PCI-E bus in pcie_bus_safe mode. Also, make pcie_bus_safe\nthe default procedure.\n\nTested-by: Sven Schnelle \u003csvens@stackframe.org\u003e\nTested-by: Simon Kirby \u003csim@hostway.ca\u003e\nTested-by: Stephen M. Cameron \u003cscameron@beardog.cce.hp.com\u003e\nReported-and-tested-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nReported-and-tested-by: Niels Ole Salscheider \u003cniels_ole@salscheider-online.de\u003e\nReferences: https://bugzilla.kernel.org/show_bug.cgi?id\u003d42162\nSigned-off-by: Jon Mason \u003cmason@myri.com\u003e\nAcked-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "5307f6d5fb12fd01f9f321bc4a8fd77e74858647", "tree": "fa0087ac08c4a914e8c3456741d57ddf27534b9a", "parents": [ "a6a5ed0dd36b4977789e888170f96840cc8b4501" ], "author": { "name": "Shyam Iyer", "email": "shyam.iyer.t@gmail.com", "time": "Thu Sep 08 16:41:17 2011 -0500" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Sep 09 19:49:58 2011 -0700" }, "message": "Fix pointer dereference before call to pcie_bus_configure_settings\n\nCommit b03e7495a862 (\"PCI: Set PCI-E Max Payload Size on fabric\")\nintroduced a potential NULL pointer dereference in calls to\npcie_bus_configure_settings due to attempts to access pci_bus self\nvariables when the self pointer is NULL.\n\nTo correct this, verify that the self pointer in pci_bus is non-NULL\nbefore dereferencing it.\n\nReported-by: Stanislaw Gruszka \u003csgruszka@redhat.com\u003e\nSigned-off-by: Shyam Iyer \u003cshyam_iyer@dell.com\u003e\nSigned-off-by: Jon Mason \u003cmason@myri.com\u003e\nAcked-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "917e3e65c35459d52f0d0b890aa5df0cad07a051", "tree": "daa816a517b5c8666826e291cc385f7d7f5245b7", "parents": [ "02f8c6aee8df3cdc935e9bdd4f2d020306035dbe" ], "author": { "name": "Konrad Rzeszutek Wilk", "email": "konrad.wilk@oracle.com", "time": "Fri Jul 22 12:18:43 2011 -0400" }, "committer": { "name": "Konrad Rzeszutek Wilk", "email": "konrad.wilk@oracle.com", "time": "Fri Aug 26 12:09:34 2011 -0400" }, "message": "xen-pcifront: Update warning comment to use \u0027e820_host\u0027 option.\n\nWith Xen changeset 23428 \"libxl: Add \u0027e820_host\u0027 option to config file\"\nthe E820 as seen from the host can now be passed into the guest.\nThis means that a PV guest can now:\n - Use the correct PCI I/O gap. Before these patches, Linux guest would\n boot up and would tell:\n [ 0.000000] Allocating PCI resources starting at 40000000 (gap: 40000000:c0000000)\n while in actuality the PCI I/O gap should have been:\n [ 0.000000] Allocating PCI resources starting at b0000000 (gap: b0000000:4c000000)\n\n - The PV domain with PCI devices was limited to 3GB. It now can be booted\n with 4GB, 8GB, or whatever number you want. The PCI devices will now _not_ conflict\n with System RAM. Meaning the drivers can load.\n\nCC: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\nCC: linux-pci@vger.kernel.org\nCC: stable@kernel.org\n[v2: Made the string less broken up. Suggested by Joe Perches]\nSigned-off-by: Konrad Rzeszutek Wilk \u003ckonrad.wilk@oracle.com\u003e\n" }, { "commit": "47c08f3107270e5a439bc0106a308f7c48c9621d", "tree": "d003f7337671bd240da4a463cc6fe1f6fb163e55", "parents": [ "bed8cad9593974a46de5c8aa3d2ee7c49c17182f" ], "author": { "name": "Randy Dunlap", "email": "rdunlap@xenotime.net", "time": "Sat Aug 20 11:49:43 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Aug 20 18:02:32 2011 -0700" }, "message": "pci: fix new kernel-doc warning in pci.c\n\nFix new kernel-doc warning in pci.c:\n\n Warning(drivers/pci/pci.c:3259): No description found for parameter \u0027mps\u0027\n Warning(drivers/pci/pci.c:3259): Excess function parameter \u0027rq\u0027 description in \u0027pcie_set_mps\u0027\n\nSigned-off-by: Randy Dunlap \u003crdunlap@xenotime.net\u003e\nCc: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "0c3bef612881ee6216a36952ffaabfc35b83545c", "tree": "46e69e46d557c319ff3f261f37f1c184eaa9b844", "parents": [ "01b883358ba4b616d9d161b43af4bb5ee8124fe8", "69566dd8be42dea7a22f625abc96e65bb4b45d1f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Aug 19 10:02:37 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Aug 19 10:02:37 2011 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:\n PCI: OF: Don\u0027t crash when bridge parent is NULL.\n PCI: export pcie_bus_configure_settings symbol\n PCI: code and comments cleanup\n PCI: make cardbus-bridge resources optional\n PCI: make SRIOV resources optional\n PCI : ability to relocate assigned pci-resources\n PCI: honor child buses add_size in hot plug configuration\n PCI: Set PCI-E Max Payload Size on fabric\n" }, { "commit": "69566dd8be42dea7a22f625abc96e65bb4b45d1f", "tree": "48e73a52bd8b79b5b8674243b54b5f2e346e5b9b", "parents": [ "debc3b778508f59696ff188f0feca271dcbfa7d9" ], "author": { "name": "David Daney", "email": "david.daney@cavium.com", "time": "Tue Aug 16 11:24:37 2011 -0700" }, "committer": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Fri Aug 19 08:51:37 2011 -0700" }, "message": "PCI: OF: Don\u0027t crash when bridge parent is NULL.\n\nIn pcibios_get_phb_of_node(), we will crash while booting if\nbus-\u003ebridge-\u003eparent is NULL.\n\nCheck for this case and avoid dereferencing the NULL pointer.\n\nSigned-off-by: David Daney \u003cdavid.daney@cavium.com\u003e\nAcked-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nAcked-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\n" }, { "commit": "c299eba3c5a801657f275d33be588b34831cd30e", "tree": "022a2a72604443fa8ce8d3fd040fbda49b04f681", "parents": [ "1850536b93888e6cc3ee42e63e20e61f35f8b3e2", "4a8f5058bde15d737abe39b5bed3f21dcb6599d2" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Aug 02 21:17:02 2011 -1000" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Aug 02 21:17:02 2011 -1000" }, "message": "Merge branch \u0027release\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6\n\n* \u0027release\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6: (28 commits)\n ACPI: delete stale reference in kernel-parameters.txt\n ACPI: add missing _OSI strings\n ACPI: remove NID_INVAL\n thermal: make THERMAL_HWMON implementation fully internal\n thermal: split hwmon lookup to a separate function\n thermal: hide CONFIG_THERMAL_HWMON\n ACPI print OSI(Linux) warning only once\n ACPI: DMI workaround for Asus A8N-SLI Premium and Asus A8N-SLI DELUX\n ACPI / Battery: propagate sysfs error in acpi_battery_add()\n ACPI / Battery: avoid acpi_battery_add() use-after-free\n ACPI: introduce \"acpi_rsdp\u003d\" parameter for kdump\n ACPI: constify ops structs\n ACPI: fix CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS\n ACPI: fix 80 char overflow\n ACPI / Battery: Resolve the race condition in the sysfs_remove_battery()\n ACPI / Battery: Add the check before refresh sysfs in the battery_notify()\n ACPI / Battery: Add the hibernation process in the battery_notify()\n ACPI / Battery: Rename acpi_battery_quirks2 with acpi_battery_quirks\n ACPI / Battery: Change 16-bit signed negative battery current into correct value\n ACPI / Battery: Add the power unit macro\n ...\n" }, { "commit": "debc3b778508f59696ff188f0feca271dcbfa7d9", "tree": "539664ef0a6ce55aff6a43ae33da149c52090b63", "parents": [ "9e8bf93a7f416a3fa8fb6d76177d90e67bd45496" ], "author": { "name": "Jon Mason", "email": "mason@myri.com", "time": "Tue Aug 02 00:01:18 2011 -0500" }, "committer": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Tue Aug 02 08:53:00 2011 -0700" }, "message": "PCI: export pcie_bus_configure_settings symbol\n\npcie_bus_configure_settings needs to be exported if the PCI hotplug\ndriver is being compiled as a module.\n\nReported-by: Stephen Rothwell \u003csfr@canb.auug.org.au\u003e\nSigned-off-by: Jon Mason \u003cmason@myri.com\u003e\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\n" }, { "commit": "9e8bf93a7f416a3fa8fb6d76177d90e67bd45496", "tree": "0ad966551eec5894129010dbcaef1f271c960cec", "parents": [ "0a2daa1cf35004f5adbf4138555cc5669abf3a3e" ], "author": { "name": "Ram Pai", "email": "linuxram@us.ibm.com", "time": "Mon Jul 25 13:08:42 2011 -0700" }, "committer": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Mon Aug 01 11:50:50 2011 -0700" }, "message": "PCI: code and comments cleanup\n\na) adjust_resource_sorted() is now called reassign_resource_sorted()\nb) nice-to-have is now called optional\nc) add_list is now called realloc_list.\n\nSigned-off-by: Ram Pai \u003clinuxram@us.ibm.com\u003e\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\n" }, { "commit": "0a2daa1cf35004f5adbf4138555cc5669abf3a3e", "tree": "035bd37e33f7e95f226d9e46e173c043f0fbe018", "parents": [ "2aceefcbd5a73059e5f52831817ec277e987440d" ], "author": { "name": "Ram Pai", "email": "linuxram@us.ibm.com", "time": "Mon Jul 25 13:08:41 2011 -0700" }, "committer": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Mon Aug 01 11:50:40 2011 -0700" }, "message": "PCI: make cardbus-bridge resources optional\n\nAllocate resources to cardbus bridge only after all other genuine\nresources requests are satisfied. Dont retry if resource allocation\nfor cardbus-bridges fail.\n\nSigned-off-by: Ram Pai \u003clinuxram@us.ibm.com\u003e\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\n" }, { "commit": "2aceefcbd5a73059e5f52831817ec277e987440d", "tree": "37b1a0f36a0cde11ab73d5ca2108ab94a1eb10f6", "parents": [ "2bbc6942273b5b3097bd265d82227bdd84b351b2" ], "author": { "name": "Yinghai Lu", "email": "yinghai@kernel.org", "time": "Mon Jul 25 13:08:40 2011 -0700" }, "committer": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Mon Aug 01 11:50:31 2011 -0700" }, "message": "PCI: make SRIOV resources optional\n\nFrom: Yinghai Lu \u003cyinghai@kernel.org\u003e\n\nAllocate resources to SRIOV BARs only after all other required\nresource-requests are satisfied. Dont retry if resource allocation for SRIOV\nBARs fail.\n\nSigned-off-by: Ram Pai \u003clinuxram@us.ibm.com\u003e\nSigned-off-by: Yinghai Lu \u003cyinghai@kernel.org\u003e\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\n" }, { "commit": "2bbc6942273b5b3097bd265d82227bdd84b351b2", "tree": "34d846f34a94dbe7b0c4800cb8efc3cf2e07ad74", "parents": [ "be768912a49b10b68e96fbd8fa3cab0adfbd3091" ], "author": { "name": "Ram Pai", "email": "linuxram@us.ibm.com", "time": "Mon Jul 25 13:08:39 2011 -0700" }, "committer": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Mon Aug 01 11:50:15 2011 -0700" }, "message": "PCI : ability to relocate assigned pci-resources\n\nCurrently pci-bridges are allocated enough resources to satisfy their immediate\nrequirements. Any additional resource-requests fail if additional free space,\ncontiguous to the one already allocated, is not available. This behavior is not\nreasonable since sufficient contiguous resources, that can satisfy the request,\nare available at a different location.\n\nThis patch provides the ability to expand and relocate a allocated resource.\n\n\tv2: Changelog: Fixed size calculation in pci_reassign_resource()\n\tv3: Changelog : Split this patch. The resource.c changes are already\n\t\t\tupstream. All the pci driver changes are in here.\n\nSigned-off-by: Ram Pai \u003clinuxram@us.ibm.com\u003e\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\n" }, { "commit": "be768912a49b10b68e96fbd8fa3cab0adfbd3091", "tree": "d1414e67c840bd66fef1d92177d41a2c22529015", "parents": [ "b03e7495a862b028294f59fc87286d6d78ee7fa1" ], "author": { "name": "Yinghai Lu", "email": "yinghai@kernel.org", "time": "Mon Jul 25 13:08:38 2011 -0700" }, "committer": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Mon Aug 01 11:49:39 2011 -0700" }, "message": "PCI: honor child buses add_size in hot plug configuration\n\ngit commit c8adf9a3e873eddaaec11ac410a99ef6b9656938\n \"PCI: pre-allocate additional resources to devices only after\n\tsuccessful allocation of essential resources.\"\n\nfails to take into consideration the optional-resources needed by children\ndevices while calculating the optional-resource needed by the bridge.\n\nThis can be a problem on some setup. For example, if a hotplug bridge has 8\nchildren hotplug bridges, the bridge should have enough resources to accomodate\nthe hotplug requirements for each of its children hotplug bridges. Currently\nthis is not the case.\n\nThis patch fixes the problem.\n\nSigned-off-by: Yinghai Lu \u003cyinghai@kernel.org\u003e\nReviewed-by: Ram Pai \u003clinuxram@us.ibm.com\u003e\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\n" }, { "commit": "b03e7495a862b028294f59fc87286d6d78ee7fa1", "tree": "836fbfc2b0e34f034cb273c4d065baba3a65178c", "parents": [ "5f66d2b58ca879e70740c82422354144845d6dd3" ], "author": { "name": "Jon Mason", "email": "mason@myri.com", "time": "Wed Jul 20 15:20:54 2011 -0500" }, "committer": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Mon Aug 01 11:49:16 2011 -0700" }, "message": "PCI: Set PCI-E Max Payload Size on fabric\n\nOn a given PCI-E fabric, each device, bridge, and root port can have a\ndifferent PCI-E maximum payload size. There is a sizable performance\nboost for having the largest possible maximum payload size on each PCI-E\ndevice. However, if improperly configured, fatal bus errors can occur.\nThus, it is important to ensure that PCI-E payloads sends by a device\nare never larger than the MPS setting of all devices on the way to the\ndestination.\n\nThis can be achieved two ways:\n\n- A conservative approach is to use the smallest common denominator of\n the entire tree below a root complex for every device on that fabric.\n\nThis means for example that having a 128 bytes MPS USB controller on one\nleg of a switch will dramatically reduce performances of a video card or\n10GE adapter on another leg of that same switch.\n\nIt also means that any hierarchy supporting hotplug slots (including\nexpresscard or thunderbolt I suppose, dbl check that) will have to be\nentirely clamped to 128 bytes since we cannot predict what will be\nplugged into those slots, and we cannot change the MPS on a \"live\"\nsystem.\n\n- A more optimal way is possible, if it falls within a couple of\n constraints:\n* The top-level host bridge will never generate packets larger than the\n smallest TLP (or if it can be controlled independently from its MPS at\n least)\n* The device will never generate packets larger than MPS (which can be\n configured via MRRS)\n* No support of direct PCI-E \u003c-\u003e PCI-E transfers between devices without\n some additional code to specifically deal with that case\n\nThen we can use an approach that basically ignores downstream requests\nand focuses exclusively on upstream requests. In that case, all we need\nto care about is that a device MPS is no larger than its parent MPS,\nwhich allows us to keep all switches/bridges to the max MPS supported by\ntheir parent and eventually the PHB.\n\nIn this case, your USB controller would no longer \"starve\" your 10GE\nEthernet and your hotplug slots won\u0027t affect your global MPS.\nAdditionally, the hotplugged devices themselves can be configured to a\nlarger MPS up to the value configured in the hotplug bridge.\n\nTo choose between the two available options, two PCI kernel boot args\nhave been added to the PCI calls. \"pcie_bus_safe\" will provide the\nformer behavior, while \"pcie_bus_perf\" will perform the latter behavior.\nBy default, the latter behavior is used.\n\nNOTE: due to the location of the enablement, each arch will need to add\ncalls to this function. This patch only enables x86.\n\nThis patch includes a number of changes recommended by Benjamin\nHerrenschmidt.\n\nTested-by: Jordan_Hargrave@dell.com\nSigned-off-by: Jon Mason \u003cmason@myri.com\u003e\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\n" }, { "commit": "f85f19de90a9997583bb26e6f1f9297a4e152c18", "tree": "2dfe61dab6c39ca202f114cb68c68978da1624e3", "parents": [ "b993fdbc7fe26f96b59003a3552c418a71aa0a9f", "7b87c9df5602efd6c7edeb291bbd104d49a6babf" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jul 29 23:35:05 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jul 29 23:35:05 2011 -0700" }, "message": "Merge branch \u0027linux-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6\n\n* \u0027linux-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:\n PCI: remove printks about disabled bridge windows\n PCI: fold pci_calc_resource_flags() into decode_bar()\n PCI: treat mem BAR type \"11\" (reserved) as 32-bit, not 64-bit, BAR\n PCI: correct pcie_set_readrq write size\n PCI: pciehp: change wait time for valid configuration access\n x86/PCI: Preserve existing pci\u003dbfsort whitelist for Dell systems\n PCI: ARI is a PCIe v2 feature\n x86/PCI: quirks: Use pci_dev-\u003erevision\n PCI: Make the struct pci_dev * argument of pci_fixup_irqs const.\n PCI hotplug: cpqphp: use pci_dev-\u003evendor\n PCI hotplug: cpqphp: use pci_dev-\u003esubsystem_{vendor|device}\n x86/PCI: config space accessor functions should not ignore the segment argument\n PCI: Assign values to \u0027pci_obff_signal_type\u0027 enumeration constants\n x86/PCI: reduce severity of host bridge window conflict warnings\n PCI: enumerate the PCI device only removed out PCI hieratchy of OS when re-scanning PCI\n PCI: PCIe AER: add aer_recover_queue\n x86/PCI: select direct access mode for mmconfig option\n PCI hotplug: Rename is_ejectable which also exists in dock.c\n" }, { "commit": "e371d46ae45488bcb112a99a7de462e9e3aa6764", "tree": "9e2eceb292018e52304053bd8013cdb0a7f31dcc", "parents": [ "b0189cd087aa82bd23277cb5c8960ab030e13e5c", "e57712ebebbb9db7d8dcef216437b3171ddcf115" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jul 26 18:30:20 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jul 26 18:30:20 2011 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6:\n merge fchmod() and fchmodat() guts, kill ancient broken kludge\n xfs: fix misspelled S_IS...()\n xfs: get rid of open-coded S_ISREG(), etc.\n vfs: document locking requirements for d_move, __d_move and d_materialise_unique\n omfs: fix (mode \u0026 S_IFDIR) abuse\n btrfs: S_ISREG(mode) is not mode \u0026 S_IFREG...\n ima: fmode_t misspelled as mode_t...\n pci-label.c: size_t misspelled as mode_t\n jffs2: S_ISLNK(mode \u0026 S_IFMT) is pointless\n snd_msnd -\u003emode is fmode_t, not mode_t\n v9fs_iop_get_acl: get rid of unused variable\n vfs: dont chain pipe/anon/socket on superblock s_inodes list\n Documentation: Exporting: update description of d_splice_alias\n fs: add missing unlock in default_llseek()\n" }, { "commit": "60063497a95e716c9a689af3be2687d261f115b4", "tree": "6ce0d68db76982c53df46aee5f29f944ebf2c320", "parents": [ "148817ba092f9f6edd35bad3c6c6b8e8f90fe2ed" ], "author": { "name": "Arun Sharma", "email": "asharma@fb.com", "time": "Tue Jul 26 16:09:06 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jul 26 16:49:47 2011 -0700" }, "message": "atomic: use \u003clinux/atomic.h\u003e\n\nThis allows us to move duplicated code in \u003casm/atomic.h\u003e\n(atomic_inc_not_zero() for now) to \u003clinux/atomic.h\u003e\n\nSigned-off-by: Arun Sharma \u003casharma@fb.com\u003e\nReviewed-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\nCc: David Miller \u003cdavem@davemloft.net\u003e\nCc: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nAcked-by: Mike Frysinger \u003cvapier@gentoo.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "ed476418394f12d47f27a75424c237a94d244f10", "tree": "7237c6c7677ff112afa986dcf4379409aa25efc2", "parents": [ "61effb519cbf0b2973c65070a890fabfcbf84756" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Sun Jul 24 23:31:06 2011 -0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Jul 26 13:01:09 2011 -0400" }, "message": "pci-label.c: size_t misspelled as mode_t\n\nno, really, strlen() and snprintf() do not return mode_t values...\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "d3ec4844d449cf7af9e749f73ba2052fb7b72fc2", "tree": "c515913e85f7e50878c83da2a88bc5a7269d087c", "parents": [ "0003230e8200699860f0b10af524dc47bf8aecad", "df2e301fee3c2c2a87592151397ad7699bb14c37" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jul 25 13:56:39 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jul 25 13:56:39 2011 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (43 commits)\n fs: Merge split strings\n treewide: fix potentially dangerous trailing \u0027;\u0027 in #defined values/expressions\n uwb: Fix misspelling of neighbourhood in comment\n net, netfilter: Remove redundant goto in ebt_ulog_packet\n trivial: don\u0027t touch files that are removed in the staging tree\n lib/vsprintf: replace link to Draft by final RFC number\n doc: Kconfig: `to be\u0027 -\u003e `be\u0027\n doc: Kconfig: Typo: square -\u003e squared\n doc: Konfig: Documentation/power/{pm \u003d\u003e apm-acpi}.txt\n drivers/net: static should be at beginning of declaration\n drivers/media: static should be at beginning of declaration\n drivers/i2c: static should be at beginning of declaration\n XTENSA: static should be at beginning of declaration\n SH: static should be at beginning of declaration\n MIPS: static should be at beginning of declaration\n ARM: static should be at beginning of declaration\n rcu: treewide: Do not use rcu_read_lock_held when calling rcu_dereference_check\n Update my e-mail address\n PCIe ASPM: forcedly -\u003e forcibly\n gma500: push through device driver tree\n ...\n\nFix up trivial conflicts:\n - arch/arm/mach-ep93xx/dma-m2p.c (deleted)\n - drivers/gpio/gpio-ep93xx.c (renamed and context nearby)\n - drivers/net/r8169.c (just context changes)\n" }, { "commit": "6d16d6d9bb6f93e6f8506cfb3e91795d6443d54f", "tree": "92a1c9e4b645fa6d1fffedaeb56141b66f847320", "parents": [ "431bf99d26157d56689e5de65bd27ce9f077fc3f", "b395fb36d59e17b9335805c10fa30fc51c8a94c6" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jul 22 16:39:42 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jul 22 16:39:42 2011 -0700" }, "message": "Merge branch \u0027core-iommu-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027core-iommu-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n iommu/core: Fix build with INTR_REMAP\u003dy \u0026\u0026 CONFIG_DMAR\u003dn\n iommu/amd: Don\u0027t use MSI address range for DMA addresses\n iommu/amd: Move missing parts to drivers/iommu\n iommu: Move iommu Kconfig entries to submenu\n x86/ia64: intel-iommu: move to drivers/iommu/\n x86: amd_iommu: move to drivers/iommu/\n msm: iommu: move to drivers/iommu/\n drivers: iommu: move to a dedicated folder\n x86/amd-iommu: Store device alias as dev_data pointer\n x86/amd-iommu: Search for existind dev_data before allocting a new one\n x86/amd-iommu: Allow dev_data-\u003ealias to be NULL\n x86/amd-iommu: Use only dev_data in low-level domain attach/detach functions\n x86/amd-iommu: Use only dev_data for dte and iotlb flushing routines\n x86/amd-iommu: Store ATS state in dev_data\n x86/amd-iommu: Store devid in dev_data\n x86/amd-iommu: Introduce global dev_data_list\n x86/amd-iommu: Remove redundant device_flush_dte() calls\n iommu-api: Add missing header file\n\nFix up trivial conflicts (independent additions close to each other) in\ndrivers/Makefile and include/linux/pci.h\n" }, { "commit": "431bf99d26157d56689e5de65bd27ce9f077fc3f", "tree": "b15e357039956fcdd0e0e6177d2fc99bb3cfa822", "parents": [ "72f96e0e38d7e29ba16dcfd824ecaebe38b8293e", "7ae033cc0dfce68d8e0c83aca60837cf2bf0d2e6" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jul 22 16:01:57 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jul 22 16:01:57 2011 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6: (51 commits)\n PM: Improve error code of pm_notifier_call_chain()\n PM: Add \"RTC\" to PM trace time stamps to avoid confusion\n PM / Suspend: Export suspend_set_ops, suspend_valid_only_mem\n PM / Suspend: Add .suspend_again() callback to suspend_ops\n PM / OPP: Introduce function to free cpufreq table\n ARM / shmobile: Return -EBUSY from A4LC power off if A3RV is active\n PM / Domains: Take .power_off() error code into account\n ARM / shmobile: Use genpd_queue_power_off_work()\n ARM / shmobile: Use pm_genpd_poweroff_unused()\n PM / Domains: Introduce function to power off all unused PM domains\n OMAP: PM: disable idle on suspend for GPIO and UART\n OMAP: PM: omap_device: add API to disable idle on suspend\n OMAP: PM: omap_device: add system PM methods for PM domain handling\n OMAP: PM: omap_device: conditionally use PM domain runtime helpers\n PM / Runtime: Add new helper function: pm_runtime_status_suspended()\n PM / Domains: Queue up power off work only if it is not pending\n PM / Domains: Improve handling of wakeup devices during system suspend\n PM / Domains: Do not restore all devices on power off error\n PM / Domains: Allow callbacks to execute all runtime PM helpers\n PM / Domains: Do not execute device callbacks under locks\n ...\n" }, { "commit": "acb41c0f928fdb84a1c3753ac92c534a2a0f08d2", "tree": "4bf92f1c2b1f36fa68d3e77d646b04b863e1a7e4", "parents": [ "8181780c163e7111f15619067cfa044172d532e1", "ef3b4f8cc20e80c767e47b848fb7512770ab80d7" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jul 22 14:54:02 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jul 22 14:54:02 2011 -0700" }, "message": "Merge branch \u0027of-pci\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc\n\n* \u0027of-pci\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:\n pci/of: Consolidate pci_bus_to_OF_node()\n pci/of: Consolidate pci_device_to_OF_node()\n x86/devicetree: Use generic PCI \u003c-\u003e OF matching\n microblaze/pci: Move the remains of pci_32.c to pci-common.c\n microblaze/pci: Remove powermac originated cruft\n pci/of: Match PCI devices to OF nodes dynamically\n" }, { "commit": "7b87c9df5602efd6c7edeb291bbd104d49a6babf", "tree": "9fe9167f4492cf05c4e1b38ccf21ab8404900cb4", "parents": [ "28c6821a0f8e686d4f1a6107d970705d37475d87" ], "author": { "name": "Bjorn Helgaas", "email": "bhelgaas@google.com", "time": "Tue Jun 14 13:04:40 2011 -0600" }, "committer": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Fri Jul 22 09:08:07 2011 -0700" }, "message": "PCI: remove printks about disabled bridge windows\n\nI don\u0027t think there\u0027s enough value in the fact of a bridge window\nbeing disabled to justify cluttering the dmesg log with it.\n\nSigned-off-by: Bjorn Helgaas \u003cbhelgaas@google.com\u003e\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\n" }, { "commit": "28c6821a0f8e686d4f1a6107d970705d37475d87", "tree": "a62ab9151df067e2976c402944a08b02b8521ee9", "parents": [ "8d6a6a47636648754dc371b01228520a2adaf430" ], "author": { "name": "Bjorn Helgaas", "email": "bhelgaas@google.com", "time": "Tue Jun 14 13:04:35 2011 -0600" }, "committer": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Fri Jul 22 09:08:01 2011 -0700" }, "message": "PCI: fold pci_calc_resource_flags() into decode_bar()\n\ndecode_bar() and pci_calc_resource_flags() both looked at the PCI BAR\ntype information, and it\u0027s simpler to just do it all in one place.\n\ndecode_bar() sets IORESOURCE_IO, IORESOURCE_MEM, and IORESOURCE_MEM_64\nas appropriate, so res-\u003eflags contains all the information pci_bar_type\ndoes, so we don\u0027t need to test the pci_bar_type return value.\n\ndecode_bar() used to return pci_bar_type, which we no longer need. We\ncan simplify it a bit by returning the struct resource flags rather than\nupdating them internally.\n\nIn pci_update_resource(), there\u0027s no need to decode the BAR type bits\nagain; we can just test for IORESOURCE_MEM_64 directly.\n\nSigned-off-by: Bjorn Helgaas \u003cbhelgaas@google.com\u003e\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\n" }, { "commit": "8d6a6a47636648754dc371b01228520a2adaf430", "tree": "5bab37b155798d9db8549fe6ee28499b1a5633c5", "parents": [ "c9b378c7cbf623649e4ca64f955f2afd12ef01b2" ], "author": { "name": "Bjorn Helgaas", "email": "bhelgaas@google.com", "time": "Tue Jun 14 13:04:29 2011 -0600" }, "committer": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Fri Jul 22 09:06:58 2011 -0700" }, "message": "PCI: treat mem BAR type \"11\" (reserved) as 32-bit, not 64-bit, BAR\n\nThis fixes a minor regression where broken PCI devices that use the\nreserved \"11\" memory BAR type worked before e354597cce but not after.\n\nThe low four bits of a memory BAR are \"PTT0\" where P\u003d1 for prefetchable\nBARs, and TT is as follows:\n\n 00 32-bit BAR, anywhere in lower 4GB\n 01 anywhere below 1MB (reserved as of PCI 2.2)\n 10 64-bit BAR\n 11 reserved\n\nPrior to e354597cce, we treated \"0100\" as a 64-bit BAR and all others,\nincluding prefetchable 64-bit BARs (\"1100\") as 32-bit BARs. The e354597cce\nfix, which appeared in 2.6.28, treats \"x1x0\" as 64-bit BARs, so the\nreserved \"x110\" types are treated as 64-bit instead of 32-bit.\n\nThis patch returns to treating the reserved \"11\" type as a 32-bit BAR and\nadds a warning if we see it.\n\nIt also logs a note if we see a 1M BAR. This is not a warning, because\nsuch hardware conforms to pre-PCI 2.2 spec, but I think it\u0027s worth noting\nbecause Linux ignores the 1M restriction if it ever has to assign the BAR.\n\nCC: Peter Chubb \u003cpeterc@gelato.unsw.edu.au\u003e\nBugzilla: https://bugzilla.kernel.org/show_bug.cgi?id\u003d35952\nReported-by: Jan Zwiegers \u003cjan@radicalsystems.co.za\u003e\nSigned-off-by: Bjorn Helgaas \u003cbhelgaas@google.com\u003e\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\n" }, { "commit": "c9b378c7cbf623649e4ca64f955f2afd12ef01b2", "tree": "2fde509dd86d2548c5bdb8d00413bda8b513897f", "parents": [ "0cab0841dc1400f633a7e1ac1e448518692f927a" ], "author": { "name": "Jon Mason", "email": "jdmason@kudzu.us", "time": "Tue Jun 28 18:26:25 2011 -0500" }, "committer": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Fri Jul 22 09:06:51 2011 -0700" }, "message": "PCI: correct pcie_set_readrq write size\n\nWhen setting the PCI-E MRRS, pcie_set_readrq queries the current\nsettings via a pci_read_config_word call but writes the modified result\nvia a pci_write_config_dword. This results in writing 16 more bits than\nwere queried.\n\nAlso, the function description comment is slightly incorrect.\n\nSigned-off-by: Jon Mason \u003cjdmason@kudzu.us\u003e\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\n" }, { "commit": "0cab0841dc1400f633a7e1ac1e448518692f927a", "tree": "2b4ba002d6d4ee69ad351a2bcf7f9c484f696d2f", "parents": [ "9b373ed18f745bddf4288f1ec4a51fe822b8610a" ], "author": { "name": "Kenji Kaneshige", "email": "kaneshige.kenji@jp.fujitsu.com", "time": "Mon Jul 11 10:15:45 2011 +0900" }, "committer": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Fri Jul 22 09:06:41 2011 -0700" }, "message": "PCI: pciehp: change wait time for valid configuration access\n\nNaoki Yanagimoto reported that configuration read on some hot-added\nPCIe device returns invalid value. This patch fixes this problem.\n\nAccording to the PCIe spec, software must wait for at least 1 second\nto judge if the hot-added device is broken after Data Link Layer State\nChanged Event. This patch changes pciehp driver to wait for 1 second\nafter the Data Link Layer State Changed Event is detected before\ninitiating a configuration access instead of 100 ms.\n\nSigned-off-by: Kenji Kaneshige \u003ckaneshige.kenji@jp.fujitsu.com\u003e\nTested-by: Naoki Yanagimoto \u003cyanagimoto@np.css.fujitsu.com\u003e\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\n" }, { "commit": "864d296cf948aef0fa32b81407541572583f7572", "tree": "67d2cee99f6a5f591bcd6a19bb5333f6c4234598", "parents": [ "a8c7ef3187a266d201af887fd48afbef3598825a" ], "author": { "name": "Chris Wright", "email": "chrisw@sous-sol.org", "time": "Wed Jul 13 10:14:33 2011 -0700" }, "committer": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Fri Jul 22 08:41:51 2011 -0700" }, "message": "PCI: ARI is a PCIe v2 feature\n\nThe function pci_enable_ari() may mistakenly set the downstream port\nof a v1 PCIe switch in ARI Forwarding mode. This is a PCIe v2 feature,\nand with an SR-IOV device on that switch port believing the switch above\nis ARI capable it may attempt to use functions 8-255, translating into\ninvalid (non-zero) device numbers for that bus. This has been seen\nto cause Completion Timeouts and general misbehaviour including hangs\nand panics.\n\nCc: stable@kernel.org\nAcked-by: Don Dutile \u003cddutile@redhat.com\u003e\nTested-by: Don Dutile \u003cddutile@redhat.com\u003e\nSigned-off-by: Chris Wright \u003cchrisw@sous-sol.org\u003e\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\n" }, { "commit": "d5341942d784134f2997b3ff82cd63cf71d1f932", "tree": "355ad81a15d031bbfe7dd94ee6696d8889c926d0", "parents": [ "05d3ac267a9d10af6ca370afe21802333aad1d5c" ], "author": { "name": "Ralf Baechle", "email": "ralf@linux-mips.org", "time": "Fri Jun 10 15:30:21 2011 +0100" }, "committer": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Fri Jul 22 08:26:06 2011 -0700" }, "message": "PCI: Make the struct pci_dev * argument of pci_fixup_irqs const.\n\nAside of the usual motivation for constification, this function has a\nhistory of being abused a hook for interrupt and other fixups so I turned\nthis function const ages ago in the MIPS code but it should be done\ntreewide.\n\nDue to function pointer passing in varous places a few other functions\nhad to be constified as well.\n\nSigned-off-by: Ralf Baechle \u003cralf@linux-mips.org\u003e\nTo: Anton Vorontsov \u003cavorontsov@mvista.com\u003e\nTo: Chris Metcalf \u003ccmetcalf@tilera.com\u003e\nTo: Colin Cross \u003cccross@android.com\u003e\nAcked-by: \"David S. Miller\" \u003cdavem@davemloft.net\u003e\nTo: Eric Miao \u003ceric.y.miao@gmail.com\u003e\nTo: Erik Gilling \u003ckonkers@android.com\u003e\nAcked-by: Guan Xuetao \u003cgxt@mprc.pku.edu.cn\u003e\nTo: \"H. Peter Anvin\" \u003chpa@zytor.com\u003e\nTo: Imre Kaloz \u003ckaloz@openwrt.org\u003e\nTo: Ingo Molnar \u003cmingo@redhat.com\u003e\nTo: Ivan Kokshaysky \u003cink@jurassic.park.msu.ru\u003e\nTo: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\nTo: Krzysztof Halasa \u003ckhc@pm.waw.pl\u003e\nTo: Lennert Buytenhek \u003ckernel@wantstofly.org\u003e\nTo: Matt Turner \u003cmattst88@gmail.com\u003e\nTo: Nicolas Pitre \u003cnico@fluxnic.net\u003e\nTo: Olof Johansson \u003colof@lixom.net\u003e\nAcked-by: Paul Mundt \u003clethal@linux-sh.org\u003e\nTo: Richard Henderson \u003crth@twiddle.net\u003e\nTo: Russell King \u003clinux@arm.linux.org.uk\u003e\nTo: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nCc: linux-alpha@vger.kernel.org\nCc: linux-arm-kernel@lists.infradead.org\nCc: linux-kernel@vger.kernel.org\nCc: linux-mips@linux-mips.org\nCc: linux-pci@vger.kernel.org\nCc: linux-sh@vger.kernel.org\nCc: linux-tegra@vger.kernel.org\nCc: sparclinux@vger.kernel.org\nCc: x86@kernel.org\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\n" }, { "commit": "05d3ac267a9d10af6ca370afe21802333aad1d5c", "tree": "e899a687abe79fd272fbd3f8b6b2ca88057a21fa", "parents": [ "69b3e6199a2d01ad2e3102052be08e0ced91f388" ], "author": { "name": "Sergei Shtylyov", "email": "sshtylyov@ru.mvista.com", "time": "Wed Jul 13 19:20:14 2011 +0400" }, "committer": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Fri Jul 22 08:25:43 2011 -0700" }, "message": "PCI hotplug: cpqphp: use pci_dev-\u003evendor\n\nThe driver reads PCI vendor ID from the PCI configuration register while it is\nalready stored by the PCI subsystem in the \u0027vendor\u0027 field of \u0027struct pci_dev\u0027...\n\nSigned-off-by: Sergei Shtylyov \u003csshtylyov@ru.mvista.com\u003e\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\n" }, { "commit": "69b3e6199a2d01ad2e3102052be08e0ced91f388", "tree": "4310e1d65f7b92a92bd27cb1d92ca0041bc5e2c6", "parents": [ "db34a363b992e0c8063f432607561520d79fbfb8" ], "author": { "name": "Sergei Shtylyov", "email": "sshtylyov@ru.mvista.com", "time": "Wed Jul 13 19:21:25 2011 +0400" }, "committer": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Fri Jul 22 08:25:42 2011 -0700" }, "message": "PCI hotplug: cpqphp: use pci_dev-\u003esubsystem_{vendor|device}\n\nThe driver reads PCI subsystem IDs from the PCI configuration registers while\nthey are already stored by the PCI subsystem in the \u0027subsystem_{vendor|device}\u0027\nfields of \u0027struct pci_dev\u0027...\n\nSigned-off-by: Sergei Shtylyov \u003csshtylyov@ru.mvista.com\u003e\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\n" }, { "commit": "b1a98b695b4efe10067d0e1cb5b66146a4e517bf", "tree": "102d98bae1ffdd17a2090bcfee6b42c2c4bf39dd", "parents": [ "0918472ceeffad234df5589e45b646a94476f835" ], "author": { "name": "Tiejun Chen", "email": "tiejun.chen@windriver.com", "time": "Thu Jun 02 11:02:50 2011 +0800" }, "committer": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Fri Jul 22 08:25:38 2011 -0700" }, "message": "PCI: enumerate the PCI device only removed out PCI hieratchy of OS when re-scanning PCI\n\nWhen hot-plugging a root bridge, we always prevent assigning a bus number\nthat already exists. This makes sure we don\u0027t step over an existing bus.\nBut sometimes we only remove PCI device in PCI hieratchy of OS, i,e.\n\necho 1 \u003e /sys/bus/pci/devices/.../remove\n\nbut actually don\u0027t hotplug this device out the platform, so in this case\nwe still should re-scan this bus to enumerate this device when re-scanning\nPCI again.\n\nSigned-off-by: Tiejun Chen \u003ctiejun.chen@windriver.com\u003e\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\n" }, { "commit": "0918472ceeffad234df5589e45b646a94476f835", "tree": "3afd05b7710a56056cdf8273545990949dd553fa", "parents": [ "0aba496fc820d7c36775f2fd0ef81994e1af67a8" ], "author": { "name": "Huang Ying", "email": "ying.huang@intel.com", "time": "Tue May 17 16:08:37 2011 +0800" }, "committer": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Fri Jul 22 08:25:37 2011 -0700" }, "message": "PCI: PCIe AER: add aer_recover_queue\n\nIn addition to native PCIe AER, now APEI (ACPI Platform Error\nInterface) GHES (Generic Hardware Error Source) can be used to report\nPCIe AER errors too. To add support to APEI GHES PCIe AER recovery,\naer_recover_queue is added to export the recovery function in native\nPCIe AER driver.\n\nRecoverable PCIe AER errors are reported via NMI in APEI GHES. Then\nAPEI GHES uses irq_work to delay the error processing into an IRQ\nhandler. But PCIe AER recovery can be very time-consuming, so\naer_recover_queue, which can be used in IRQ handler, delays the real\nrecovery action into the process context, that is, work queue.\n\nSigned-off-by: Huang Ying \u003cying.huang@intel.com\u003e\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\n" }, { "commit": "efe6d7272b1bdb3989322a6f3f9ed063a40c6beb", "tree": "d425f9d6129d9f876ce6103e0f1497c09ce05aec", "parents": [ "f483d3923dc3a6394c483e28ccb3fe700bdf399e" ], "author": { "name": "Thomas Renninger", "email": "trenn@suse.de", "time": "Fri May 27 10:23:00 2011 +0200" }, "committer": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Fri Jul 22 08:25:35 2011 -0700" }, "message": "PCI hotplug: Rename is_ejectable which also exists in dock.c\n\nWhile it\u0027s declared static, etags points you to the wrong function\nin drivers/acpi/dock.c and acpiphp_glue.c for example also makes\nuse of some (exported..) functions from this file.\n\nIf you trust etags and oversee the static declaration (what happened\nto me) one gets totally confused...\n\nSigned-off-by: Thomas Renninger \u003ctrenn@suse.de\u003e\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\n" }, { "commit": "15bed0f2fa8e1d7db201692532c210a7823d2d21", "tree": "6dbfff9a19ed69fac94e5a76f6df10ba13f41d93", "parents": [ "770d7432009c8bc89cf72d47313866adf600c66a" ], "author": { "name": "Manoj Iyer", "email": "manoj.iyer@canonical.com", "time": "Mon Jul 11 16:28:35 2011 -0500" }, "committer": { "name": "Chris Ball", "email": "cjb@laptop.org", "time": "Thu Jul 21 10:35:04 2011 -0400" }, "message": "mmc: Added quirks for Ricoh 1180:e823 lower base clock frequency\n\nRicoh 1180:e823 does not recognize certain types of SD/MMC cards,\nas reported at http://launchpad.net/bugs/773524. Lowering the SD\nbase clock frequency from 200Mhz to 50Mhz fixes this issue. This\nsolution was suggest by Koji Matsumuro, Ricoh Company, Ltd.\n\nThis change has no negative performance effect on standard SD\ncards, though it\u0027s quite possible that there will be one on\nUHS-1 cards.\n\nSigned-off-by: Manoj Iyer \u003cmanoj.iyer@canonical.com\u003e\nTested-by: Daniel Manrique \u003cdaniel.manrique@canonical.com\u003e\nCc: Koji Matsumuro \u003cmatsumur@nts.ricoh.co.jp\u003e\nCc: \u003cstable@kernel.org\u003e\nAcked-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\nSigned-off-by: Chris Ball \u003ccjb@laptop.org\u003e\n" }, { "commit": "9c8b04be443b33939f374a811c82abeebe0a61d1", "tree": "9d6e3e682e9f1bbcdae726830f54430e860c7fa6", "parents": [ "e545b55a1e980cbb6a158886286106bbf39722b1" ], "author": { "name": "Vasiliy Kulikov", "email": "segoon@openwall.com", "time": "Sat Jun 25 21:07:52 2011 +0400" }, "committer": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Sat Jul 16 18:36:17 2011 -0400" }, "message": "ACPI: constify ops structs\n\nStructs battery_file, acpi_dock_ops, file_operations,\nthermal_cooling_device_ops, thermal_zone_device_ops, kernel_param_ops\nare not changed in runtime. It is safe to make them const.\nregister_hotplug_dock_device() was altered to take const \"ops\" argument\nto respect acpi_dock_ops\u0027 const notion.\n\nSigned-off-by: Vasiliy Kulikov \u003csegoon@openwall.com\u003e\nAcked-by: Jeff Garzik \u003cjgarzik@redhat.com\u003e\nSigned-off-by: Len Brown \u003clen.brown@intel.com\u003e\n" }, { "commit": "7ae033cc0dfce68d8e0c83aca60837cf2bf0d2e6", "tree": "91bb3b8ae2790c7fef06b1832a7df61ae496a77a", "parents": [ "ba1389d74f34c0c6e95cc135a332cd29c29d9c20", "c8c9fda5069456eb9e0e403c19764b2e257802e1" ], "author": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Fri Jul 15 23:59:25 2011 +0200" }, "committer": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Fri Jul 15 23:59:25 2011 +0200" }, "message": "Merge branch \u0027pm-runtime\u0027 into for-linus\n\n* pm-runtime:\n OMAP: PM: disable idle on suspend for GPIO and UART\n OMAP: PM: omap_device: add API to disable idle on suspend\n OMAP: PM: omap_device: add system PM methods for PM domain handling\n OMAP: PM: omap_device: conditionally use PM domain runtime helpers\n PM / Runtime: Add new helper function: pm_runtime_status_suspended()\n PM / Runtime: Consistent utilization of deferred_resume\n PM / Runtime: Prevent runtime_resume from racing with probe\n PM / Runtime: Replace \"run-time\" with \"runtime\" in documentation\n PM / Runtime: Improve documentation of enable, disable and barrier\n PM: Limit race conditions between runtime PM and system sleep (v2)\n PCI / PM: Detect early wakeup in pci_pm_prepare()\n PM / Runtime: Return special error code if runtime PM is disabled\n PM / Runtime: Update documentation of interactions with system sleep\n" }, { "commit": "b7e9c223be8ce335e30f2cf6ba588e6a4092275c", "tree": "2d1e3b75606abc18df7ad65e51ac3f90cd68b38d", "parents": [ "c172d82500a6cf3c32d1e650722a1055d72ce858", "e3bbfa78bab125f58b831b5f7f45b5a305091d72" ], "author": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Mon Jul 11 14:15:48 2011 +0200" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Mon Jul 11 14:15:55 2011 +0200" }, "message": "Merge branch \u0027master\u0027 into for-next\n\nSync with Linus\u0027 tree to be able to apply pending patches that\nare based on newer code already present upstream.\n" }, { "commit": "f483d3923dc3a6394c483e28ccb3fe700bdf399e", "tree": "ef487babd0ef104e1fa8323c23050d66096c0f3a", "parents": [ "a2fa83faf47b514ab947cea916d3691b66525073" ], "author": { "name": "Ram Pai", "email": "linuxram@us.ibm.com", "time": "Thu Jul 07 11:19:10 2011 -0700" }, "committer": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Fri Jul 08 15:49:20 2011 -0700" }, "message": "PCI: conditional resource-reallocation through kernel parameter pci\u003drealloc\n \nMultiple attempts to dynamically reallocate pci resources have\nunfortunately lead to regressions. Though we continue to fix the\nregressions and fine tune the dynamic-reallocation behavior, we have not\nreached a acceptable state yet.\n \nThis patch provides a interim solution. It disables dynamic reallocation\nby default, but adds the ability to enable it through pci\u003drealloc kernel\ncommand line parameter.\n \nTested-by: Oliver Hartkopp \u003csocketcan@hartkopp.net\u003e\nSigned-off-by: Ram Pai \u003clinuxram@us.ibm.com\u003e\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\n" }, { "commit": "b395fb36d59e17b9335805c10fa30fc51c8a94c6", "tree": "b96bc8eee33753e2a1b1181c62a028d7f89643d7", "parents": [ "fe0d42203cb5616eeff68b14576a0f7e2dd56625", "6b385b46ee17d7e1a68d3411b8cdb2342e0f0445" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Thu Jul 07 12:56:44 2011 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Thu Jul 07 12:58:28 2011 +0200" }, "message": "Merge branch \u0027iommu-3.1\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu into core/iommu\n" }, { "commit": "eea3fc0357eb89d0b2d1af37bdfb83eb4076a542", "tree": "be45aa2bc5370bdba7926f35dfdd73e8a6f464d0", "parents": [ "632e270e01d8a1ee9e8ea56c83028727f17b1d17" ], "author": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Wed Jul 06 10:51:40 2011 +0200" }, "committer": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Wed Jul 06 10:51:40 2011 +0200" }, "message": "PCI / PM: Detect early wakeup in pci_pm_prepare()\n\nA subsequent patch is going to move the invocation of\npm_runtime_barrier() from dpm_prepare() to __device_suspend().\nConsequently, early wakeup events resulting from runtime resume\nrequests for wakeup devices queued up right before system suspend\nwill only be detected after all of the subsystem-level .prepare()\ncallbacks have run. However, the PCI bus type calls\npm_runtime_get_sync() from its pci_pm_prepare() callback routine,\nso it would destroy the early wakeup events information regarding PCI\ndevices. To prevent this from happening add an early wakeup\ndetection mechanism, analogous to the one currently in dpm_prepare(),\nto pci_pm_prepare().\n\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\nAcked-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\n" }, { "commit": "8072ba1ba7fe9f48ad9f424829863214484dfc2f", "tree": "9d27e70791e9d0a346e1e7dc0390a2cc5c986caa", "parents": [ "0c4986388a814ef4e85ea62d10b247dd7dc7783d" ], "author": { "name": "Michael Witten", "email": "mfwitten@gmail.com", "time": "Tue Jun 28 06:15:05 2011 +0000" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Wed Jun 29 14:24:14 2011 +0200" }, "message": "PCIe ASPM: forcedly -\u003e forcibly\n\nMerriam-Webster tells us that the word exists. However ...\n\n * Google suggests `forcibly\u0027 because it doesn\u0027t recognize `forcedly\u0027.\n * Google lists 494 thousand results for `forcedly\u0027.\n * Google lists 13.7 million results for `forcibly\u0027.\n * Linus\u0027s repo contains 1 occurrence of `forcedly\u0027 ( 0 after my change).\n * Linus\u0027s repo contains 60 occurrences of `forcibly\u0027 (61 after my change).\n\nSigned-off-by: Michael Witten \u003cmfwitten@gmail.com\u003e\nSigned-off-by: Jiri Kosina \u003cjkosina@suse.cz\u003e\n" }, { "commit": "a64227b0855c42b5c037011afa80580ca3228527", "tree": "8633fc0989fd6e53c9f3f0bb5774c1a54bd5f18e", "parents": [ "c6830c22603aaecf65405af23f6da2d55892f9cb", "c31b55cd4eaf050bb5a15bd8251da1b3c7edeb1c" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jun 27 14:55:43 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jun 27 14:55:43 2011 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc:\n mmc: queue: bring discard_granularity/alignment into line with SCSI\n mmc: queue: append partition subname to queue thread name\n mmc: core: make erase timeout calculation allow for gated clock\n mmc: block: switch card to User Data Area when removing the block driver\n mmc: sdio: reset card during power_restore\n mmc: cb710: fix #ifdef HAVE_EFFICIENT_UNALIGNED_ACCESS\n mmc: sdhi: DMA slave ID 0 is invalid\n mmc: tmio: fix regression in TMIO_MMC_WRPROTECT_DISABLE handling\n mmc: omap_hsmmc: use original sg_len for dma_unmap_sg\n mmc: omap_hsmmc: fix ocr mask usage\n mmc: sdio: fix runtime PM path during driver removal\n mmc: Add PCI fixup quirks for Ricoh 1180:e823 reader\n mmc: sdhi: fix module unloading\n mmc: of_mmc_spi: add NO_IRQ define to of_mmc_spi.c\n mmc: vub300: fix null dereferences in error handling\n" }, { "commit": "12f1ba5a7dac4caf8b4e6ccd6453f0a095e74c7c", "tree": "8af7cdfba131994d24ecf0bc7bc701ce11835ba2", "parents": [ "143e859d05d0abf4c3b67c64c93695d59fd41342", "6e33a852a37dee02979ec9d82bea26c07cee5bce" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jun 24 08:36:16 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jun 24 08:36:16 2011 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:\n x86/PCI/ACPI: fix type mismatch\n PCI: fix new kernel-doc warning\n PCI: Fix warning in drivers/pci/probe.c on sparc64\n" }, { "commit": "a5f76d5eba157bf637beb2dd18026db2917c512e", "tree": "0f23e14459b8324e965c6a82d8b74dde1b4018e4", "parents": [ "ca9c6890b598997165a7c85c001f382c910f12b0" ], "author": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Tue Jun 21 23:47:15 2011 +0200" }, "committer": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Tue Jun 21 23:47:15 2011 +0200" }, "message": "PCI / PM: Block races between runtime PM and system sleep\n\nAfter commit e8665002477f0278f84f898145b1f141ba26ee26\n(PM: Allow pm_runtime_suspend() to succeed during system suspend) it\nis possible that a device resumed by the pm_runtime_resume(dev) in\npci_pm_prepare() will be suspended immediately from a work item,\ntimer function or otherwise, defeating the very purpose of calling\npm_runtime_resume(dev) from there. To prevent that from happening\nit is necessary to increment the runtime PM usage counter of the\ndevice by replacing pm_runtime_resume() with pm_runtime_get_sync().\nMoreover, the incremented runtime PM usage counter has to be\ndecremented by the corresponding pci_pm_complete(), via\npm_runtime_put_sync().\n\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\nCc: stable@kernel.org\nAcked-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\n" }, { "commit": "801019d59d4e1d1523e5897949fd3b6843571bd0", "tree": "398a934d23eb28d3e555d5938c8abe52152fcd2f", "parents": [ "56299378726d5f2ba8d3c8cbbd13cb280ba45e4f", "71f77580906b60eb43daff0efb99792e76a3d06d", "403f81d8ee532c976d50a5e1051f14ec78ae8db3" ], "author": { "name": "Joerg Roedel", "email": "joerg.roedel@amd.com", "time": "Tue Jun 21 11:14:10 2011 +0200" }, "committer": { "name": "Joerg Roedel", "email": "joerg.roedel@amd.com", "time": "Tue Jun 21 11:14:10 2011 +0200" }, "message": "Merge branches \u0027amd/transparent-bridge\u0027 and \u0027core\u0027\n\nConflicts:\n\tarch/x86/include/asm/amd_iommu_types.h\n\tarch/x86/kernel/amd_iommu.c\n\nSigned-off-by: Joerg Roedel \u003cjoerg.roedel@amd.com\u003e\n" }, { "commit": "166e9278a3f98bab29ebb3d685a81cfb11b98be0", "tree": "f8f3e8a28c5d96d9053567d6a9ef8e04e7b298dd", "parents": [ "29b68415e335ba9e0eb6057f9405aa4d9c23efe4" ], "author": { "name": "Ohad Ben-Cohen", "email": "ohad@wizery.com", "time": "Fri Jun 10 21:42:27 2011 +0300" }, "committer": { "name": "Joerg Roedel", "email": "joerg.roedel@amd.com", "time": "Tue Jun 21 10:49:30 2011 +0200" }, "message": "x86/ia64: intel-iommu: move to drivers/iommu/\n\nThis should ease finding similarities with different platforms,\nwith the intention of solving problems once in a generic framework\nwhich everyone can use.\n\nNote: to move intel-iommu.c, the declaration of pci_find_upstream_pcie_bridge()\nhas to move from drivers/pci/pci.h to include/linux/pci.h. This is handled\nin this patch, too.\n\nAs suggested, also drop DMAR\u0027s EXPERIMENTAL tag while we\u0027re at it.\n\nCompile-tested on x86_64.\n\nSigned-off-by: Ohad Ben-Cohen \u003cohad@wizery.com\u003e\nSigned-off-by: Joerg Roedel \u003cjoerg.roedel@amd.com\u003e\n" }, { "commit": "be98ca652faa6468916a9b7608befff215a8ca70", "tree": "13ed7ba7e41eb98acf9c9d5230e683d8b7f96e9e", "parents": [ "742a0c7cae9bd0f913c71722289b8ec862d70a2b" ], "author": { "name": "Manoj Iyer", "email": "manoj.iyer@canonical.com", "time": "Thu May 26 11:19:05 2011 -0500" }, "committer": { "name": "Chris Ball", "email": "cjb@laptop.org", "time": "Sat Jun 18 22:18:18 2011 -0400" }, "message": "mmc: Add PCI fixup quirks for Ricoh 1180:e823 reader\n\nSigned-off-by: Manoj Iyer \u003cmanoj.iyer@canonical.com\u003e\nCc: \u003cstable@kernel.org\u003e\nSigned-off-by: Chris Ball \u003ccjb@laptop.org\u003e\n" }, { "commit": "f39e8409955fad210a9a7169cc53c4c18daaef3a", "tree": "c2ebaa508062410e8f3a9de6ee8704dc1bc615c7", "parents": [ "6211b3e1bba952fcd16d477b5dafb1904bac0e48", "66aa6962ff520804f9874e57ea97995153f499d8" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jun 14 11:25:32 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jun 14 11:25:32 2011 -0700" }, "message": "Merge branch \u0027drm-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6\n\n* \u0027drm-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:\n drm: Compare only lower 32 bits of framebuffer map offsets\n drm/i915: Don\u0027t leak in i915_gem_shmem_pread_slow()\n drm/radeon/kms: do bounds checking for 3D_LOAD_VBPNTR and bump array limit\n drm/radeon/kms: fix mac g5 quirk\n x86/uv/x2apic: update for change in pci bridge handling.\n alpha, drm: Remove obsolete Alpha support in MGA DRM code\n alpha/drm: Cleanup Alpha support in DRM generic code\n savage: remove unnecessary if statement\n drm/radeon: fix GUI idle IH debug statements\n drm/radeon/kms: check modes against max pixel clock\n drm: fix fbs in DRM_IOCTL_MODE_GETRESOURCES ioctl\n" }, { "commit": "7ad35cf288fd63a19bf50e490440a992de808b2b", "tree": "a240c3487926ebe62d8c10e0d1ae75db38f025e6", "parents": [ "83533c132a55aac735028f6fb9b956e8c078db1f" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed May 25 14:00:49 2011 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Jun 14 09:50:12 2011 +1000" }, "message": "x86/uv/x2apic: update for change in pci bridge handling.\n\nWhen I added 3448a19da479b6bd1e28e2a2be9fa16c6a6feb39\nI forgot about the special uv handling code for this, so this\npatch fixes it up.\n\nAcked-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\nAcked-by: Ingo Molnar\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "28f65c11f2ffb3957259dece647a24f8ad2e241b", "tree": "6b7621d09d10df89eedd908d4506fb9f457a909f", "parents": [ "140a1ef2f91a00e1d25f0878c193abdc25bf6ebe" ], "author": { "name": "Joe Perches", "email": "joe@perches.com", "time": "Thu Jun 09 09:13:32 2011 -0700" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Fri Jun 10 14:55:36 2011 +0200" }, "message": "treewide: Convert uses of struct resource to resource_size(ptr)\n\nSeveral fixes as well where the +1 was missing.\n\nDone via coccinelle scripts like:\n\n@@\nstruct resource *ptr;\n@@\n\n- ptr-\u003eend - ptr-\u003estart + 1\n+ resource_size(ptr)\n\nand some grep and typing.\n\nMostly uncompiled, no cross-compilers.\n\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nSigned-off-by: Jiri Kosina \u003cjkosina@suse.cz\u003e\n" }, { "commit": "7f45e5cd1718ed769295033ca214032848a0097d", "tree": "bc4d2d43ea939c6c6b3782bf7d77537446eea225", "parents": [ "6aecceccf5aa626b0af203e54ca62cbf308c53d8", "10f0d07c51516bd24b040016c6d4304eef05f115" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jun 09 16:33:01 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jun 09 16:33:01 2011 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:\n sparc32, leon: bugfix in LEON SMP interrupt init\n sparc32, sun4m: bugfix in SMP IPI traphandler\n sparc: Remove unnecessary semicolons\n Add support for allocating irqs for bootbus devices\n Do not skip interrupt sources in sun4d interrupt handler and acknowledge interrupts correctly\n Restructure sun4d_build_device_irq so that timer interrupts can be allocated\n sparc: PCIC_PCI needs SPARC32 dependency\n sparc: Do not select GENERIC_HARDIRQS_NO_DEPRECATED\n sparc32,leon: add GRPCI2 PCI Host driver\n sparc32,leon: added LEON-common low-level PCI routines\n sparc32: added CONFIG_PCIC_PCI Kconfig setting\n" }, { "commit": "98d9f30c820d509145757e6ecbc36013aa02f7bc", "tree": "dd5da915d991352ced56ed849612029339f64198", "parents": [ "1fa7b6a29c61358cc2ca6f64cef4aa0e1a7ca74c" ], "author": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Mon Apr 11 11:37:07 2011 +1000" }, "committer": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Wed Jun 08 09:08:17 2011 +1000" }, "message": "pci/of: Match PCI devices to OF nodes dynamically\n\npowerpc has two different ways of matching PCI devices to their\ncorresponding OF node (if any) for historical reasons. The ppc64 one\ndoes a scan looking for matching bus/dev/fn, while the ppc32 one does a\nscan looking only for matching dev/fn on each level in order to be\nagnostic to busses being renumbered (which Linux does on some\nplatforms).\n\nThis removes both and instead moves the matching code to the PCI core\nitself. It\u0027s the most logical place to do it: when a pci_dev is created,\nwe know the parent and thus can do a single level scan for the matching\ndevice_node (if any).\n\nThe benefit is that all archs now get the matching for free. There\u0027s one\nhook the arch might want to provide to match a PHB bus to its device\nnode. A default weak implementation is provided that looks for the\nparent device device node, but it\u0027s not entirely reliable on powerpc for\nvarious reasons so powerpc provides its own.\n\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nAcked-by: Michal Simek \u003cmonstr@monstr.eu\u003e\nAcked-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\n" }, { "commit": "99592ba4a80edb84938e7e0cf71fdecff1ce67fd", "tree": "a60f9a74b5fbd1f00481c28576d4a18910cb852e", "parents": [ "59c5f46fbe01a00eedf54a23789634438bb80603" ], "author": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Tue Jun 07 21:32:31 2011 +0200" }, "committer": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Tue Jun 07 21:32:31 2011 +0200" }, "message": "PM / Intel IOMMU: Fix init_iommu_pm_ops() for CONFIG_PM unset\n\nIf CONFIG_PM is not set, init_iommu_pm_ops() introduced by commit\n134fac3f457f3dd753ecdb25e6da3e5f6629f696 (PCI / Intel IOMMU: Use\nsyscore_ops instead of sysdev class and sysdev) is not defined\nappropriately. Fix this issue.\n\nReported-by: Tony Luck \u003ctony.luck@intel.com\u003e\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\n" }, { "commit": "26893c1368aeb96e06e4f9dce61bbde3351d5e9f", "tree": "1457ec4070127d751d7c4f938d37c1dcf5aa901d", "parents": [ "cfe3af5dde34a019c1bd2485b1dc0f2d7a326ccd" ], "author": { "name": "Daniel Hellstrom", "email": "daniel@gaisler.com", "time": "Mon May 23 21:04:47 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jun 02 14:32:37 2011 -0700" }, "message": "sparc32,leon: added LEON-common low-level PCI routines\n\nThe LEON architecture does not have a BIOS or bootloader that\ninitializes PCI for us, instead Linux generic PCI layer is used\nto set up resources and IRQ.\n\nSigned-off-by: Daniel Hellstrom \u003cdaniel@gaisler.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "f0f52a9463839c52a63c05d6e7d4a330d94a9794", "tree": "d964f65aa37dd46b457bc615f2f37e75390c6df8", "parents": [ "0f48f2600911d5de6393829e4a9986d4075558b3", "70e535d1e5d1e4317e894d6228b762cf9c3fbc6a" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jun 02 05:48:50 2011 +0900" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jun 02 05:48:50 2011 +0900" }, "message": "Merge git://git.infradead.org/iommu-2.6\n\n* git://git.infradead.org/iommu-2.6:\n intel-iommu: Fix off-by-one in RMRR setup\n intel-iommu: Add domain check in domain_remove_one_dev_info\n intel-iommu: Remove Host Bridge devices from identity mapping\n intel-iommu: Use coherent DMA mask when requested\n intel-iommu: Dont cache iova above 32bit\n intel-iommu: Speed up processing of the identity_mapping function\n intel-iommu: Check for identity mapping candidate using system dma mask\n intel-iommu: Only unlink device domains from iommu\n intel-iommu: Enable super page (2MiB, 1GiB, etc.) support\n intel-iommu: Flush unmaps at domain_exit\n intel-iommu: Remove obsolete comment from detect_intel_iommu\n intel-iommu: fix VT-d PMR disable for TXT on S3 resume\n" }, { "commit": "3f37d6229ca309f96b163b943ff982f4697630cd", "tree": "4099ff1c8b424c6e5bb51c419b1ea0a6d427b979", "parents": [ "5aceca9d3cbdacbd017712513387d930f9f944d9" ], "author": { "name": "Randy Dunlap", "email": "randy.dunlap@oracle.com", "time": "Wed May 25 19:21:25 2011 -0700" }, "committer": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Wed Jun 01 11:43:29 2011 -0700" }, "message": "PCI: fix new kernel-doc warning\n\nFix pci.c kernel-doc warnings:\n\nWarning(drivers/pci/pci.c:3292): No description found for parameter \u0027flags\u0027\nWarning(drivers/pci/pci.c:3292): Excess function parameter \u0027change_bridge_flags\u0027 description in \u0027pci_set_vga_state\u0027\n\nSigned-off-by: Randy Dunlap \u003crandy.dunlap@oracle.com\u003e\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\n" }, { "commit": "70e535d1e5d1e4317e894d6228b762cf9c3fbc6a", "tree": "2c7ed5f263440c6a7302c19a31827488eade9ea5", "parents": [ "8519dc4401ddf8a5399f979870bbeeadbc111186" ], "author": { "name": "David Woodhouse", "email": "David.Woodhouse@intel.com", "time": "Tue May 31 00:22:52 2011 +0100" }, "committer": { "name": "David Woodhouse", "email": "David.Woodhouse@intel.com", "time": "Wed Jun 01 12:48:21 2011 +0100" }, "message": "intel-iommu: Fix off-by-one in RMRR setup\n\nWe were mapping an extra byte (and hence usually an extra page):\niommu_prepare_identity_map() expects to be given an \u0027end\u0027 argument which\nis the last byte to be mapped; not the first byte *not* to be mapped.\n\nSigned-off-by: David Woodhouse \u003cDavid.Woodhouse@intel.com\u003e\n" }, { "commit": "8519dc4401ddf8a5399f979870bbeeadbc111186", "tree": "a1eb0bc0fa29b955a757a1e1c1c76f569e6be4ee", "parents": [ "825507d6d059f1cbe2503e0e5a3926225b983aec" ], "author": { "name": "Mike Habeck", "email": "habeck@sgi.com", "time": "Sat May 28 13:15:07 2011 -0500" }, "committer": { "name": "David Woodhouse", "email": "David.Woodhouse@intel.com", "time": "Wed Jun 01 12:47:48 2011 +0100" }, "message": "intel-iommu: Add domain check in domain_remove_one_dev_info\n\nThe comment in domain_remove_one_dev_info() states \"No need to compare\nPCI domain; it has to be the same\". But for the si_domain that isn\u0027t\ngoing to be true, as it consists of all the PCI devices that are\nidentity mapped thus multiple PCI domains can be in si_domain. The\ncode needs to validate the PCI domain too.\n\nSigned-off-by: Mike Habeck \u003chabeck@sgi.com\u003e\nSigned-off-by: Mike Travis \u003ctravis@sgi.com\u003e\nCc: stable@kernel.org\nSigned-off-by: David Woodhouse \u003cDavid.Woodhouse@intel.com\u003e\n" }, { "commit": "825507d6d059f1cbe2503e0e5a3926225b983aec", "tree": "8f191cb5c4704a4710c7b89b81d9629206714d3b", "parents": [ "c681d0ba1252954208220ad32248a3e8e2fc98e4" ], "author": { "name": "Mike Travis", "email": "travis@sgi.com", "time": "Sat May 28 13:15:06 2011 -0500" }, "committer": { "name": "David Woodhouse", "email": "David.Woodhouse@intel.com", "time": "Wed Jun 01 12:47:46 2011 +0100" }, "message": "intel-iommu: Remove Host Bridge devices from identity mapping\n\nWhen using the 1:1 (identity) PCI DMA remapping, PCI Host Bridge devices\nthat do not use the IOMMU causes a kernel panic. Fix that by not\ninserting those devices into the si_domain.\n\nSigned-off-by: Mike Travis \u003ctravis@sgi.com\u003e\nReviewed-by: Mike Habeck \u003chabeck@sgi.com\u003e\nCc: stable@kernel.org\nSigned-off-by: David Woodhouse \u003cDavid.Woodhouse@intel.com\u003e\n" }, { "commit": "c681d0ba1252954208220ad32248a3e8e2fc98e4", "tree": "fe74fdee4fa76e743aa0e8d2d22f958b1a1c710e", "parents": [ "1c9fc3d11b84fbd0c4f4aa7855702c2a1f098ebb" ], "author": { "name": "Mike Travis", "email": "travis@sgi.com", "time": "Sat May 28 13:15:05 2011 -0500" }, "committer": { "name": "David Woodhouse", "email": "David.Woodhouse@intel.com", "time": "Wed Jun 01 12:47:45 2011 +0100" }, "message": "intel-iommu: Use coherent DMA mask when requested\n\nThe __intel_map_single function is not honoring the passed in DMA mask.\nThis results in not using the coherent DMA mask when called from\nintel_alloc_coherent().\n\nSigned-off-by: Mike Travis \u003ctravis@sgi.com\u003e\nAcked-by: Chris Wright \u003cchrisw@sous-sol.org\u003e\nReviewed-by: Mike Habeck \u003chabeck@sgi.com\u003e\nCc: stable@kernel.org\nSigned-off-by: David Woodhouse \u003cDavid.Woodhouse@intel.com\u003e\n" }, { "commit": "1c9fc3d11b84fbd0c4f4aa7855702c2a1f098ebb", "tree": "c06f2bcc3b5aa5d0cb0869815e6247afc736ea7a", "parents": [ "cb452a4040bb051d92e85d6e7eb60c11734c1781" ], "author": { "name": "Chris Wright", "email": "chrisw@sous-sol.org", "time": "Sat May 28 13:15:04 2011 -0500" }, "committer": { "name": "David Woodhouse", "email": "David.Woodhouse@intel.com", "time": "Wed Jun 01 12:47:40 2011 +0100" }, "message": "intel-iommu: Dont cache iova above 32bit\n\nMike Travis and Mike Habeck reported an issue where iova allocation\nwould return a range that was larger than a device\u0027s dma mask.\n\nhttps://lkml.org/lkml/2011/3/29/423\n\nThe dmar initialization code will reserve all PCI MMIO regions and copy\nthose reservations into a domain specific iova tree. It is possible for\none of those regions to be above the dma mask of a device. It is typical\nto allocate iovas with a 32bit mask (despite device\u0027s dma mask possibly\nbeing larger) and cache the result until it exhausts the lower 32bit\naddress space. Freeing the iova range that is \u003e\u003d the last iova in the\nlower 32bit range when there is still an iova above the 32bit range will\ncorrupt the cached iova by pointing it to a region that is above 32bit.\nIf that region is also larger than the device\u0027s dma mask, a subsequent\nallocation will return an unusable iova and cause dma failure.\n\nSimply don\u0027t cache an iova that is above the 32bit caching boundary.\n\nReported-by: Mike Travis \u003ctravis@sgi.com\u003e\nReported-by: Mike Habeck \u003chabeck@sgi.com\u003e\nCc: stable@kernel.org\nAcked-by: Mike Travis \u003ctravis@sgi.com\u003e\nTested-by: Mike Habeck \u003chabeck@sgi.com\u003e\nSigned-off-by: Chris Wright \u003cchrisw@sous-sol.org\u003e\nSigned-off-by: David Woodhouse \u003cDavid.Woodhouse@intel.com\u003e\n" }, { "commit": "cb452a4040bb051d92e85d6e7eb60c11734c1781", "tree": "ef19298ec70274c9c199fa74a4f08e77cc69080b", "parents": [ "8fcc5372fbac085199d84a880503ed67aba3fe49" ], "author": { "name": "Mike Travis", "email": "travis@sgi.com", "time": "Sat May 28 13:15:03 2011 -0500" }, "committer": { "name": "David Woodhouse", "email": "David.Woodhouse@intel.com", "time": "Wed Jun 01 12:47:36 2011 +0100" }, "message": "intel-iommu: Speed up processing of the identity_mapping function\n\nWhen there are a large count of PCI devices, and the pass through\noption for iommu is set, much time is spent in the identity_mapping\nfunction hunting though the iommu domains to check if a specific\ndevice is \"identity mapped\".\n\nSpeed up the function by checking the cached info to see if\nit\u0027s mapped to the static identity domain.\n\nSigned-off-by: Mike Travis \u003ctravis@sgi.com\u003e\nReviewed-by: Mike Habeck \u003chabeck@sgi.com\u003e\nCc: stable@kernel.org\nSigned-off-by: David Woodhouse \u003cDavid.Woodhouse@intel.com\u003e\n" }, { "commit": "8fcc5372fbac085199d84a880503ed67aba3fe49", "tree": "aab84e5ac18fa8028efa49e2cc47a5b97d873916", "parents": [ "9b4554b21ed07e8556405510638171f0c787742a" ], "author": { "name": "Chris Wright", "email": "chrisw@sous-sol.org", "time": "Sat May 28 13:15:02 2011 -0500" }, "committer": { "name": "David Woodhouse", "email": "David.Woodhouse@intel.com", "time": "Wed Jun 01 12:47:34 2011 +0100" }, "message": "intel-iommu: Check for identity mapping candidate using system dma mask\n\nThe identity mapping code appears to make the assumption that if the\ndevices dma_mask is greater than 32bits the device can use identity\nmapping. But that is not true: take the case where we have a 40bit\ndevice in a 44bit architecture. The device can potentially receive a\nphysical address that it will truncate and cause incorrect addresses\nto be used.\n\nInstead check to see if the device\u0027s dma_mask is large enough\nto address the system\u0027s dma_mask.\n\nSigned-off-by: Mike Travis \u003ctravis@sgi.com\u003e\nReviewed-by: Mike Habeck \u003chabeck@sgi.com\u003e\nCc: stable@kernel.org\nSigned-off-by: David Woodhouse \u003cDavid.Woodhouse@intel.com\u003e\n" }, { "commit": "9b4554b21ed07e8556405510638171f0c787742a", "tree": "384c8517f6aee9a09a43ac55c7d0cbadc3d2ee23", "parents": [ "6dd9a7c73761a8a5f5475d5cfdc15368a0f4c06d" ], "author": { "name": "Alex Williamson", "email": "alex.williamson@redhat.com", "time": "Tue May 24 12:19:04 2011 -0400" }, "committer": { "name": "David Woodhouse", "email": "David.Woodhouse@intel.com", "time": "Wed Jun 01 12:47:29 2011 +0100" }, "message": "intel-iommu: Only unlink device domains from iommu\n\nCommit a97590e5 added unlinking domains from iommus to reciprocate the\niommu from domains unlinking that was already done. We actually want\nto only do this for device domains and never for the static\nidentity map domain or VM domains. The SI domain is special and\nnever freed, while VM domain-\u003eid lives in their own special address\nspace, separate from iommu-\u003edomain_ids.\n\nIn the current code, a VM can get domain-\u003eid zero, then mark that\ndomain unused when unbound from pci-stub. This leads to DMAR\nwrite faults when the device is re-bound to the host driver.\n\nSigned-off-by: Alex Williamson \u003calex.williamson@redhat.com\u003e\nCc: stable@kernel.org\nSigned-off-by: David Woodhouse \u003cDavid.Woodhouse@intel.com\u003e\n" }, { "commit": "6dd9a7c73761a8a5f5475d5cfdc15368a0f4c06d", "tree": "cb685e370cc1cb2dec39b29500bdd22fd1814596", "parents": [ "7b668357810ecb5fdda4418689d50f5d95aea6a8" ], "author": { "name": "Youquan Song", "email": "youquan.song@intel.com", "time": "Wed May 25 19:13:49 2011 +0100" }, "committer": { "name": "David Woodhouse", "email": "David.Woodhouse@intel.com", "time": "Wed Jun 01 12:26:35 2011 +0100" }, "message": "intel-iommu: Enable super page (2MiB, 1GiB, etc.) support\n\nThere are no externally-visible changes with this. In the loop in the\ninternal __domain_mapping() function, we simply detect if we are mapping:\n - size \u003e\u003d 2MiB, and\n - virtual address aligned to 2MiB, and\n - physical address aligned to 2MiB, and\n - on hardware that supports superpages.\n\n(and likewise for larger superpages).\n\nWe automatically use a superpage for such mappings. We never have to\nworry about *breaking* superpages, since we trust that we will always\n*unmap* the same range that was mapped. So all we need to do is ensure\nthat dma_pte_clear_range() will also cope with superpages.\n\nAdjust pfn_to_dma_pte() to take a superpage \u0027level\u0027 as an argument, so\nit can return a PTE at the appropriate level rather than always\nextending the page tables all the way down to level 1. Again, this is\nsimplified by the fact that we should never encounter existing small\npages when we\u0027re creating a mapping; any old mapping that used the same\nvirtual range will have been entirely removed and its obsolete page\ntables freed.\n\nProvide an \u0027intel_iommu\u003dsp_off\u0027 argument on the command line as a\nchicken bit. Not that it should ever be required.\n\n\u003d\u003d\n\nThe original commit seen in the iommu-2.6.git was Youquan\u0027s\nimplementation (and completion) of my own half-baked code which I\u0027d\ntyped into an email. Followed by half a dozen subsequent \u0027fixes\u0027.\n\nI\u0027ve taken the unusual step of rewriting history and collapsing the\noriginal commits in order to keep the main history simpler, and make\nlife easier for the people who are going to have to backport this to\nolder kernels. And also so I can give it a more coherent commit comment\nwhich (hopefully) gives a better explanation of what\u0027s going on.\n\nThe original sequence of commits leading to identical code was:\n\nYouquan Song (3):\n intel-iommu: super page support\n intel-iommu: Fix superpage alignment calculation error\n intel-iommu: Fix superpage level calculation error in dma_pfn_level_pte()\n\nDavid Woodhouse (4):\n intel-iommu: Precalculate superpage support for dmar_domain\n intel-iommu: Fix hardware_largepage_caps()\n intel-iommu: Fix inappropriate use of superpages in __domain_mapping()\n intel-iommu: Fix phys_pfn in __domain_mapping for sglist pages\n\nSigned-off-by: Youquan Song \u003cyouquan.song@intel.com\u003e\nSigned-off-by: David Woodhouse \u003cDavid.Woodhouse@intel.com\u003e\n" }, { "commit": "5aceca9d3cbdacbd017712513387d930f9f944d9", "tree": "026fbf89f4f5e077d865561b631bcc5210f32871", "parents": [ "af0d6a0a3a30946f7df69c764791f1b0643f7cd6" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon May 23 17:12:22 2011 -0700" }, "committer": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Tue May 31 14:29:26 2011 -0700" }, "message": "PCI: Fix warning in drivers/pci/probe.c on sparc64\n\nIO_SPACE_LIMIT is currently used in two ways:\n\n1) As a way to mask I/O port values read out of PCI base address\n registers. This value should be 64-bit.\n\n2) As a value which is the upper limit for all I/O \"ports\" in the\n system.\n\nOn sparc64 we store the full 64-bit physical I/O address in the\nresources. For this reason we define IO_SPACE_LIMIT at a 64-bit\n\"all 1\u0027s\".\n\nThis is the right value to use for ioport_resource.end and for the\ncheck made in drivers/pcmcia/rsrc_nonstatic.c:adjust_io().\n\nBut in driver/pci/probe.c:__pci_read_base() we mask this against\na \"u32\" variable and thus get the following warning:\n\ndrivers/pci/probe.c: In function ¡__pci_read_base¢:\ndrivers/pci/probe.c:207: warning: large integer implicitly truncated to unsigned type\n\nFix this by using an explicit \"u32\" cast.\n\nI considered changing sparc64 to define a 32-bit \"all 1\u0027s\" like\nmost other systems do, but this wouldn\u0027t work because the checks\nin PCMCIA\u0027s rsrc_nonstatic.c would no longer be right since they\nare testing against fully formed 64-bit resources. As described\nabove, on sparc64 such resources will hold full 64-bit physical\nI/O addresses, not bus-centric 32-bit ones.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\n" }, { "commit": "daa94222b638bfe34f745d0982de7a165ce7f67c", "tree": "2157ed94339d46f7a2da22e22648a70319e8fdd0", "parents": [ "f310642123e0d32d919c60ca3fab5acd130c4ba3", "751516f0a9bad32544f40f471037c0e45fb639c9" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun May 29 11:19:16 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun May 29 11:19:16 2011 -0700" }, "message": "Merge branch \u0027release\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6\n\n* \u0027release\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6:\n ACPI EC: remove redundant code\n ACPI: Add D3 cold state\n ACPI: processor: fix processor_physically_present in UP kernel\n ACPI: Split out custom_method functionality into an own driver\n ACPI: Cleanup custom_method debug stuff\n ACPI EC: enable MSI workaround for Quanta laptops\n ACPICA: Update to version 20110413\n ACPICA: Execute an orphan _REG method under the EC device\n ACPICA: Move ACPI_NUM_PREDEFINED_REGIONS to a more appropriate place\n ACPICA: Update internal address SpaceID for DataTable regions\n ACPICA: Add more methods eligible for NULL package element removal\n ACPICA: Split all internal Global Lock functions to new file - evglock\n ACPI: EC: add another DMI check for ASUS hardware\n ACPI EC: remove dead code\n ACPICA: Fix code divergence of global lock handling\n ACPICA: Use acpi_os_create_lock interface\n ACPI: osl, add acpi_os_create_lock interface\n ACPI:Fix goto flows in thermal-sys\n" }, { "commit": "28c2103dad04dba29ba86e22dad5735db8f0e13c", "tree": "7bdd422ae53e4f48bdaa48e1d83e6c25a1ee56e4", "parents": [ "61c4f2c81c61f73549928dfd9f3e8f26aa36a8cf" ], "author": { "name": "Lin Ming", "email": "ming.m.lin@intel.com", "time": "Wed May 04 22:56:43 2011 +0800" }, "committer": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Sun May 29 02:21:08 2011 -0400" }, "message": "ACPI: Add D3 cold state\n\n_SxW returns an Integer containing the lowest D-state supported in state\nSx. If OSPM has not indicated that it supports _PR3, then the value “3”\ncorresponds to D3. If it has indicated _PR3 support, the value “3”\nrepresents D3hot and the value “4” represents D3cold.\n\nLinux does set _OSC._PR3, so we should fix it to expect that _SxW can\nreturn 4.\n\nSigned-off-by: Lin Ming \u003cming.m.lin@intel.com\u003e\nAcked-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\nSigned-off-by: Len Brown \u003clen.brown@intel.com\u003e\n" }, { "commit": "98b98d316349e9a028e632629fe813d07fa5afdd", "tree": "caaf6a662a86c5e2a418f0929ca05f0748803ac5", "parents": [ "0d66cba1ac3ad38614077443d604d6a09cec99de", "931474c4c30633400ff0dff8fb452ae20e01d067" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 24 12:06:40 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 24 12:06:40 2011 -0700" }, "message": "Merge branch \u0027drm-core-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6\n\n* \u0027drm-core-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: (169 commits)\n drivers/gpu/drm/radeon/atom.c: fix warning\n drm/radeon/kms: bump kms version number\n drm/radeon/kms: properly set num banks for fusion asics\n drm/radeon/kms/atom: move dig phy init out of modesetting\n drm/radeon/kms/cayman: fix typo in register mask\n drm/radeon/kms: fix typo in spread spectrum code\n drm/radeon/kms: fix tile_config value reported to userspace on cayman.\n drm/radeon/kms: fix incorrect comparison in cayman setup code.\n drm/radeon/kms: add wait idle ioctl for eg-\u003ecayman\n drm/radeon/cayman: setup hdp to invalidate and flush when asked\n drm/radeon/evergreen/btc/fusion: setup hdp to invalidate and flush when asked\n agp/uninorth: Fix lockups with radeon KMS and \u003e1x.\n drm/radeon/kms: the SS_Id field in the LCD table if for LVDS only\n drm/radeon/kms: properly set the CLK_REF bit for DCE3 devices\n drm/radeon/kms: fixup eDP connector handling\n drm/radeon/kms: bail early for eDP in hotplug callback\n drm/radeon/kms: simplify hotplug handler logic\n drm/radeon/kms: rewrite DP handling\n drm/radeon/kms/atom: add support for setting DP panel mode\n drm/radeon/kms: atombios.h updates for DP panel mode\n ...\n" }, { "commit": "7b668357810ecb5fdda4418689d50f5d95aea6a8", "tree": "5a448c81b76121cd3903f807288bd562dc27645b", "parents": [ "b3a530e4e734cab7043a3ab7d135f539042443a7" ], "author": { "name": "Alex Williamson", "email": "alex.williamson@redhat.com", "time": "Tue May 24 12:02:41 2011 +0100" }, "committer": { "name": "David Woodhouse", "email": "David.Woodhouse@intel.com", "time": "Tue May 24 13:08:34 2011 +0100" }, "message": "intel-iommu: Flush unmaps at domain_exit\n\nWe typically batch unmaps to be lazily flushed out at\nregular intervals. When we destroy a domain, we need\nto force a flush of these lazy unmaps to be sure none\nreference the domain we\u0027re about to free.\n\nFixes: https://bugzilla.kernel.org/show_bug.cgi?id\u003d35062\nSigned-off-by: Alex Williamson \u003calex.williamson@redhat.com\u003e\nSigned-off-by: David Woodhouse \u003cDavid.Woodhouse@intel.com\u003e\nCc: stable@kernel.org\n" }, { "commit": "b3a530e4e734cab7043a3ab7d135f539042443a7", "tree": "1ec7b06647018dedd86fcc574caaed46e3536277", "parents": [ "b779260b097dec295e8798277ed08ec5ecd3b2c1" ], "author": { "name": "Jan Kiszka", "email": "jan.kiszka@siemens.com", "time": "Sun May 15 12:34:55 2011 +0200" }, "committer": { "name": "David Woodhouse", "email": "David.Woodhouse@intel.com", "time": "Tue May 24 13:08:31 2011 +0100" }, "message": "intel-iommu: Remove obsolete comment from detect_intel_iommu\n\nSince cacd4213d8, this comment no longer applies.\n\nSigned-off-by: Jan Kiszka \u003cjan.kiszka@siemens.com\u003e\nSigned-off-by: David Woodhouse \u003cDavid.Woodhouse@intel.com\u003e\n" }, { "commit": "b779260b097dec295e8798277ed08ec5ecd3b2c1", "tree": "5aa7bc90c3b399e8d11c80f20f7a4d85fe901edc", "parents": [ "61c4f2c81c61f73549928dfd9f3e8f26aa36a8cf" ], "author": { "name": "Joseph Cihula", "email": "joseph.cihula@intel.com", "time": "Tue May 03 00:08:37 2011 -0700" }, "committer": { "name": "David Woodhouse", "email": "David.Woodhouse@intel.com", "time": "Tue May 24 13:07:56 2011 +0100" }, "message": "intel-iommu: fix VT-d PMR disable for TXT on S3 resume\n\nThis patch is a follow on to https://lkml.org/lkml/2011/3/21/239, which\nwas merged as commit 51a63e67da6056c13b5b597dcc9e1b3bd7ceaa55.\n\nThis patch adds support for S3, as pointed out by Chris Wright.\n\nSigned-off-by: Joseph Cihula \u003cjoseph.cihula@intel.com\u003e\nSigned-off-by: David Woodhouse \u003cDavid.Woodhouse@intel.com\u003e\n" }, { "commit": "5e152b4c9e0fce6149c74406346a7ae7e7a17727", "tree": "12503a50142797c1babfd87099c193b3e4d54f93", "parents": [ "a77febbef105554c5a37241cf903f48ab7bc03c7", "9251bac97d47fdaea406ea0595c2d0aa50022f12" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 23 15:39:34 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 23 15:39:34 2011 -0700" }, "message": "Merge branch \u0027linux-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6\n\n* \u0027linux-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6: (27 commits)\n PCI: Don\u0027t use dmi_name_in_vendors in quirk\n PCI: remove unused AER functions\n PCI/sysfs: move bus cpuaffinity to class dev_attrs\n PCI: add rescan to /sys/.../pci_bus/.../\n PCI: update bridge resources to get more big ranges when allocating space (again)\n KVM: Use pci_store/load_saved_state() around VM device usage\n PCI: Add interfaces to store and load the device saved state\n PCI: Track the size of each saved capability data area\n PCI/e1000e: Add and use pci_disable_link_state_locked()\n x86/PCI: derive pcibios_last_bus from ACPI MCFG\n PCI: add latency tolerance reporting enable/disable support\n PCI: add OBFF enable/disable support\n PCI: add ID-based ordering enable/disable support\n PCI hotplug: acpiphp: assume device is in state D0 after powering on a slot.\n PCI: Set PCIE maxpayload for card during hotplug insertion\n PCI/ACPI: Report _OSC control mask returned on failure to get control\n x86/PCI: irq and pci_ids patch for Intel Panther Point DeviceIDs\n PCI: handle positive error codes\n PCI: check pci_vpd_pci22_wait() return\n PCI: Use ICH6_GPIO_EN in ich6_lpc_acpi_gpio\n ...\n\nFix up trivial conflicts in include/linux/pci_ids.h: commit a6e5e2be4461\nmoved the intel SMBUS ID definitons to the i2c-i801.c driver.\n" }, { "commit": "9251bac97d47fdaea406ea0595c2d0aa50022f12", "tree": "a312c2f1810b9d8f8e0164113bd81a2f39227c74", "parents": [ "cbfddd20937ed890ce7027fa08a7c84e977128cf" ], "author": { "name": "Jean Delvare", "email": "khali@linux-fr.org", "time": "Sun May 15 18:13:46 2011 +0200" }, "committer": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Sat May 21 12:17:15 2011 -0700" }, "message": "PCI: Don\u0027t use dmi_name_in_vendors in quirk\n\nDon\u0027t use the costly dmi_name_in_vendors() when we know the string we\nare looking for can only be in the DMI board name field. This is more\nrobust and, more importantly, much faster.\n\nSigned-off-by: Jean Delvare \u003ckhali@linux-fr.org\u003e\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\n" } ], "next": "cbfddd20937ed890ce7027fa08a7c84e977128cf" }