Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 98ff7973 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 3.18.90 into android-3.18 



Changes in 3.18.90
	arm64: Initialise high_memory global variable earlier
	ALSA: hda - add support for docking station for HP 820 G2
	cpuidle: Validate cpu_dev in cpuidle_add_sysfs()
	r8152: fix the list rx_done may be used without initialization
	crypto: deadlock between crypto_alg_sem/rtnl_mutex/genl_mutex
	net: qmi_wwan: Add USB IDs for MDM6600 modem on Motorola Droid 4
	usb: gadget: f_uvc: Sanity check wMaxPacketSize for SuperSpeed
	usb: gadget: udc: remove pointer dereference after free
	netfilter: nfnl_cthelper: fix runtime expectation policy updates
	netfilter: nfnl_cthelper: Fix memory leak
	scsi: lpfc: Fix PT2PT PRLI reject
	KVM: x86: correct async page present tracepoint
	ARM: dts: ti: fix PCI bus dtc warnings
	hwmon: (asus_atk0110) fix uninitialized data access
	HID: xinmo: fix for out of range for THT 2P arcade controller.
	s390/qeth: no ETH header for outbound AF_IUCV
	net: Do not allow negative values for busy_read and busy_poll sysctl interfaces
	i40e: Do not enable NAPI on q_vectors that have no rings
	irda: vlsi_ir: fix check for DMA mapping errors
	netfilter: nfnl_cthelper: fix a race when walk the nf_ct_helper_hash table
	netfilter: nf_nat_snmp: Fix panic when snmp_trap_helper fails to register
	ARM: dts: am335x-evmsk: adjust mmc2 param to allow suspend
	isdn: kcapi: avoid uninitialized data
	xhci: plat: Register shutdown for xhci_plat
	ARM: dma-mapping: disallow dma_get_sgtable() for non-kernel managed memory
	cpuidle: powernv: Pass correct drv->cpumask for registration
	backlight: pwm_bl: Fix overflow condition
	crypto: crypto4xx - increase context and scatter ring buffer elements
	net: phy: at803x: Change error to EINVAL for invalid MAC
	PCI: Avoid bus reset if bridge itself is broken
	scsi: cxgb4i: fix Tx skb leak
	PCI: Create SR-IOV virtfn/physfn links before attaching driver
	igb: check memory allocation failure
	PCI/AER: Report non-fatal errors only to the affected endpoint
	scsi: lpfc: Fix secure firmware updates
	scsi: lpfc: PLOGI failures during NPIV testing
	fm10k: ensure we process SM mbx when processing VF mbx
	Linux 3.18.90

Change-Id: Id5f22e2e7f5ee9bac2dd98e55bca64baa1d0b4dd
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents a5900853 8da23652

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 3

PATCHLEVEL = 18

SUBLEVEL = 89

SUBLEVEL = 90

EXTRAVERSION =

NAME = Diseased Newt

arch/arm/boot/dts/am335x-evmsk.dts

+1 −0
Original line number Diff line number Diff line
@@ -646,6 +646,7 @@ 
	ti,non-removable;

	bus-width = <4>;

	cap-power-off-card;

	keep-power-in-suspend;

	pinctrl-names = "default";

	pinctrl-0 = <&mmc2_pins>;

arch/arm/boot/dts/dra7.dtsi

+2 −0
Original line number Diff line number Diff line
@@ -118,6 +118,7 @@ 
				device_type = "pci";

				ranges = <0x81000000 0 0          0x03000 0 0x00010000

					  0x82000000 0 0x20013000 0x13000 0 0xffed000>;

				bus-range = <0x00 0xff>;

				#interrupt-cells = <1>;

				num-lanes = <1>;

				ti,hwmods = "pcie1";
@@ -153,6 +154,7 @@ 
				device_type = "pci";

				ranges = <0x81000000 0 0          0x03000 0 0x00010000

					  0x82000000 0 0x30013000 0x13000 0 0xffed000>;

				bus-range = <0x00 0xff>;

				#interrupt-cells = <1>;

				num-lanes = <1>;

				ti,hwmods = "pcie2";

arch/arm/mm/dma-mapping.c

+19 −1
Original line number Diff line number Diff line
@@ -749,13 +749,31 @@ static void arm_coherent_dma_free(struct device *dev, size_t size, void *cpu_add 
	__arm_dma_free(dev, size, cpu_addr, handle, attrs, true);

}



/*

 * The whole dma_get_sgtable() idea is fundamentally unsafe - it seems

 * that the intention is to allow exporting memory allocated via the

 * coherent DMA APIs through the dma_buf API, which only accepts a

 * scattertable.  This presents a couple of problems:

 * 1. Not all memory allocated via the coherent DMA APIs is backed by

 *    a struct page

 * 2. Passing coherent DMA memory into the streaming APIs is not allowed

 *    as we will try to flush the memory through a different alias to that

 *    actually being used (and the flushes are redundant.)

 */

int arm_dma_get_sgtable(struct device *dev, struct sg_table *sgt,

		 void *cpu_addr, dma_addr_t handle, size_t size,

		 struct dma_attrs *attrs)

{

	struct page *page = pfn_to_page(dma_to_pfn(dev, handle));

	unsigned long pfn = dma_to_pfn(dev, handle);

	struct page *page;

	int ret;



	/* If the PFN is not valid, we do not have a struct page */

	if (!pfn_valid(pfn))

		return -ENXIO;



	page = pfn_to_page(pfn);



	ret = sg_alloc_table(sgt, 1, GFP_KERNEL);

	if (unlikely(ret))

		return ret;

arch/arm64/mm/init.c

+2 −1
Original line number Diff line number Diff line
@@ -157,6 +157,8 @@ void __init arm64_memblock_init(void) 
	/* 4GB maximum for 32-bit only capable devices */

	if (IS_ENABLED(CONFIG_ZONE_DMA))

		dma_phys_limit = max_zone_dma_phys();



	high_memory = __va(memblock_end_of_DRAM() - 1) + 1;

	dma_contiguous_reserve(dma_phys_limit);



	memblock_allow_resize();
@@ -179,7 +181,6 @@ void __init bootmem_init(void) 
	sparse_init();

	zone_sizes_init(min, max);



	high_memory = __va((max << PAGE_SHIFT) - 1) + 1;

	max_pfn = max_low_pfn = max;

}