[<prev] [next>] [day] [month] [year] [list]
Date: Mon, 11 Nov 2013 14:30:03 -0500
From: Konrad Rzeszutek Wilk <konrad.wilk@...cle.com>
To: Linus Torvalds <torvalds@...ux-foundation.org>,
linux-kernel@...r.kernel.org, xen-devel@...ts.xensource.com,
Stefano Stabellini <stefano.stabellini@...citrix.com>
Subject: [GIT PULL] (xen) stable/for-linus-3.13-rc0-tag
Hey Linus,
Please git pull the following tag:
git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git stable/for-linus-3.13-rc0-tag
which has tons of fixes and two major features which are concentrated around
the Xen SWIOTLB library.
The short <blurb> is that the tracing facility (just one function) has been
added to SWIOTLB to make it easier to track I/O progress. Additionally under
Xen and ARM (32 & 64) the Xen-SWIOTLB driver "isused to translate physical to
machine and machine to physical addresses of foreign[guest] pages for
DMA operations" (Stefano) when booting under hardware without proper IOMMU.
There are also bug-fixes, cleanups, compile warning fixes, etc.
</blurb>
The commit times for some of the commits is a bit fresh - that is b/c
we wanted to make sure we have the Ack's from the ARM folks - which with
the string of back-to-back conferences took a bit of time. Rest assured -
the code has been stewing in #linux-next for some time.
There is also an easy to resolve conflict with the ARM tree, and
Stephen Rothwell is carrying a patch:
arch/arm/include/asm/dma-mapping.h between commit 6a6a5c15d871 ("ARM:
7805/1: mm: change max*pfn to include the physical offset of memory")
from the arm tree and commit e24b7aa368a0 ("arm: make SWIOTLB available")
from the xen-tip tree.
See attached file.
arch/arm/Kconfig | 7 +
arch/arm/include/asm/dma-mapping.h | 46 ++++++-
arch/arm/include/asm/io.h | 9 ++
arch/arm/include/asm/xen/hypervisor.h | 2 +
arch/arm/include/asm/xen/page-coherent.h | 50 +++++++
arch/arm/include/asm/xen/page.h | 44 +++++-
arch/arm/xen/Makefile | 2 +-
arch/arm/xen/mm.c | 65 +++++++++
arch/arm/xen/p2m.c | 208 +++++++++++++++++++++++++++++
arch/arm64/Kconfig | 1 +
arch/arm64/include/asm/dma-mapping.h | 14 +-
arch/arm64/include/asm/io.h | 10 ++
arch/arm64/include/asm/xen/page-coherent.h | 47 +++++++
arch/arm64/xen/Makefile | 2 +-
arch/ia64/include/asm/xen/page-coherent.h | 38 ++++++
arch/x86/include/asm/xen/page-coherent.h | 38 ++++++
arch/x86/xen/mmu.c | 15 ++-
arch/x86/xen/p2m.c | 6 +-
arch/x86/xen/pci-swiotlb-xen.c | 4 +
arch/x86/xen/setup.c | 2 +-
arch/x86/xen/smp.c | 10 +-
arch/x86/xen/spinlock.c | 2 +-
arch/x86/xen/time.c | 3 +-
drivers/tty/hvc/hvc_xen.c | 19 ++-
drivers/xen/Kconfig | 1 -
drivers/xen/balloon.c | 6 +-
drivers/xen/evtchn.c | 2 +-
drivers/xen/grant-table.c | 19 ++-
drivers/xen/pci.c | 47 +++++++
drivers/xen/platform-pci.c | 2 +-
drivers/xen/swiotlb-xen.c | 119 +++++++++++++----
include/trace/events/swiotlb.h | 46 +++++++
include/xen/interface/physdev.h | 11 ++
include/xen/swiotlb-xen.h | 3 +
include/xen/xen-ops.h | 7 +-
lib/swiotlb.c | 6 +
36 files changed, 846 insertions(+), 67 deletions(-)
Boris Ostrovsky (1):
xen/balloon: Set balloon's initial state to number of existing RAM pages
Konrad Rzeszutek Wilk (3):
xen/mmu: Correct PAT MST setting.
xen/hvc: If we use xen_raw_printk let it also work on HVM guests.
xen/mcfg: Call PHYSDEVOP_pci_mmcfg_reserved for MCFG areas.
Michael Opdenacker (2):
x86/xen: remove deprecated IRQF_DISABLED
xen: remove deprecated IRQF_DISABLED
Paul Gortmaker (1):
xen: delete new instances of added __cpuinit
Stefano Stabellini (23):
arm: make SWIOTLB available
arm64: define DMA_ERROR_CODE
arm/xen,arm64/xen: introduce p2m
xen/x86: allow __set_phys_to_machine for autotranslate guests
xen: make xen_create_contiguous_region return the dma address
xen/arm,arm64: enable SWIOTLB_XEN
swiotlb-xen: introduce xen_swiotlb_set_dma_mask
arm/xen: get_dma_ops: return xen_dma_ops if we are running as xen_initial_domain
arm64/xen: get_dma_ops: return xen_dma_ops if we are running as xen_initial_domain
xen: introduce xen_alloc/free_coherent_pages
swiotlb-xen: use xen_alloc/free_coherent_pages
xen: introduce xen_dma_map/unmap_page and xen_dma_sync_single_for_cpu/device
swiotlb-xen: use xen_dma_map/unmap_page, xen_dma_sync_single_for_cpu/device
swiotlb: print a warning when the swiotlb is full
arm,arm64: do not always merge biovec if we are running on Xen
grant-table: call set_phys_to_machine after mapping grant refs
swiotlb-xen: static inline xen_phys_to_bus, xen_bus_to_phys, xen_virt_to_bus and range_straddles_page_boundary
swiotlb-xen: fix error code returned by xen_swiotlb_map_sg_attrs
arm: make SWIOTLB available
pci-swiotlb-xen: call pci_request_acs only ifdef CONFIG_PCI
swiotlb-xen: missing include dma-direction.h
arm,arm64/include/asm/io.h: define struct bio_vec
xen/arm: pfn_to_mfn and mfn_to_pfn return the argument if nothing is in the p2m
Thierry Reding (1):
tracing/events: Fix swiotlb tracepoint creation
Zoltan Kiss (1):
tracing/events: Add bounce tracing to swiotbl
View attachment "linux-next-merge.patch" of type "text/plain" (1820 bytes)
Content of type "application/pgp-signature" skipped
Powered by blists - more mailing lists