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

Commit d08c3181 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'powerpc-4.2-3' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux 

Pull powerpc fixes from Michael Ellerman:
 - TCE table memory calculation fix from Alexey
 - Build fix for ans-lcd from Luis
 - Unbalanced IRQ warning fix from Alistair

* tag 'powerpc-4.2-3' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux:
  powerpc/eeh-powernv: Fix unbalanced IRQ warning
  macintosh/ans-lcd: fix build failure after module_init/exit relocation
  powerpc/powernv/ioda2: Fix calculation for memory allocated for TCE table
parents 27667f47 b8d65e96

arch/powerpc/platforms/powernv/eeh-powernv.c

+1 −1
Original line number Diff line number Diff line
@@ -1478,7 +1478,7 @@ static int pnv_eeh_next_error(struct eeh_pe **pe) 
	}



	/* Unmask the event */

	if (eeh_enabled())

	if (ret == EEH_NEXT_ERR_NONE && eeh_enabled())

		enable_irq(eeh_event_irq);



	return ret;

arch/powerpc/platforms/powernv/pci-ioda.c

+6 −5
Original line number Diff line number Diff line
@@ -2220,7 +2220,7 @@ static void pnv_pci_ioda_setup_opal_tce_kill(struct pnv_phb *phb) 


static __be64 *pnv_pci_ioda2_table_do_alloc_pages(int nid, unsigned shift,

		unsigned levels, unsigned long limit,

		unsigned long *current_offset)

		unsigned long *current_offset, unsigned long *total_allocated)

{

	struct page *tce_mem = NULL;

	__be64 *addr, *tmp;
@@ -2236,6 +2236,7 @@ static __be64 *pnv_pci_ioda2_table_do_alloc_pages(int nid, unsigned shift, 
	}

	addr = page_address(tce_mem);

	memset(addr, 0, allocated);

	*total_allocated += allocated;



	--levels;

	if (!levels) {
@@ -2245,7 +2246,7 @@ static __be64 *pnv_pci_ioda2_table_do_alloc_pages(int nid, unsigned shift, 


	for (i = 0; i < entries; ++i) {

		tmp = pnv_pci_ioda2_table_do_alloc_pages(nid, shift,

				levels, limit, current_offset);

				levels, limit, current_offset, total_allocated);

		if (!tmp)

			break;
@@ -2267,7 +2268,7 @@ static long pnv_pci_ioda2_table_alloc_pages(int nid, __u64 bus_offset, 
		struct iommu_table *tbl)

{

	void *addr;

	unsigned long offset = 0, level_shift;

	unsigned long offset = 0, level_shift, total_allocated = 0;

	const unsigned window_shift = ilog2(window_size);

	unsigned entries_shift = window_shift - page_shift;

	unsigned table_shift = max_t(unsigned, entries_shift + 3, PAGE_SHIFT);
@@ -2286,7 +2287,7 @@ static long pnv_pci_ioda2_table_alloc_pages(int nid, __u64 bus_offset, 


	/* Allocate TCE table */

	addr = pnv_pci_ioda2_table_do_alloc_pages(nid, level_shift,

			levels, tce_table_size, &offset);

			levels, tce_table_size, &offset, &total_allocated);



	/* addr==NULL means that the first level allocation failed */

	if (!addr)
@@ -2308,7 +2309,7 @@ static long pnv_pci_ioda2_table_alloc_pages(int nid, __u64 bus_offset, 
			page_shift);

	tbl->it_level_size = 1ULL << (level_shift - 3);

	tbl->it_indirect_levels = levels - 1;

	tbl->it_allocated_size = offset;

	tbl->it_allocated_size = total_allocated;



	pr_devel("Created TCE table: ws=%08llx ts=%lx @%08llx\n",

			window_size, tce_table_size, bus_offset);

drivers/macintosh/ans-lcd.c

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
#include <linux/kernel.h>

#include <linux/miscdevice.h>

#include <linux/fcntl.h>

#include <linux/init.h>

#include <linux/module.h>

#include <linux/delay.h>

#include <linux/fs.h>