From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1031191AbdAFSQw (ORCPT ); Fri, 6 Jan 2017 13:16:52 -0500 Received: from mail-qk0-f194.google.com ([209.85.220.194]:35781 "EHLO mail-qk0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1031075AbdAFSQn (ORCPT ); Fri, 6 Jan 2017 13:16:43 -0500 Date: Fri, 6 Jan 2017 13:16:39 -0500 From: Konrad Rzeszutek Wilk To: linux-kernel@vger.kernel.org, torvalds@linux-foundation.org Cc: catalin.marinas@arm.com Subject: [GIT PULL] (swiotlb) for 4.10 Message-ID: <20170106181638.GA18428@localhost.localdomain> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.7.1 (2016-10-04) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hey Linus, Please git pull the following branch: git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb.git stable/for-linus-4.10 It has one fix to make i915 work when using Xen SWIOTLB, and a feature from Geert to aid in debugging of devices that can't do DMA outside the 32-bit address space. The feature from Geert is on top of v4.10 merge window commit (specifically you pulling my previous branch), as his changes were dependent on the Documentation/ movement patches. I figured it would just easier than me trying than to cherry-pick the Documentation patches to satisfy git. The patches have been soaking since 12/20, albeit I updated the last patch due to linux-next catching an compiler error and adding an Tested-and-Reported-by tag. Thanks! Documentation/admin-guide/kernel-parameters.txt | 3 +- arch/arm64/mm/dma-mapping.c | 3 +- arch/arm64/mm/init.c | 3 +- arch/x86/kernel/pci-swiotlb.c | 6 +-- arch/x86/xen/pci-swiotlb-xen.c | 2 +- drivers/gpu/drm/i915/i915_gem.c | 11 +----- drivers/xen/swiotlb-xen.c | 8 +++- include/linux/swiotlb.h | 11 +++++- include/trace/events/swiotlb.h | 17 ++++---- lib/swiotlb.c | 52 ++++++++++++++++++++++--- 10 files changed, 82 insertions(+), 34 deletions(-) Geert Uytterhoeven (3): x86, swiotlb: Simplify pci_swiotlb_detect_override() swiotlb: Convert swiotlb_force from int to enum swiotlb: Add swiotlb=noforce debug option Konrad Rzeszutek Wilk (1): swiotlb: Export swiotlb_max_segment to users