Commit 9981b4fb authored Jul 24, 2018 by Linus Torvalds

linux

Pull MIPS fixes from Paul Burton:
 "A couple more MIPS fixes for 4.18:

   - Fix an off-by-one in reporting PCI resource sizes to userland which
     regressed in v3.12.

   - Fix writes to DDR controller registers used to flush write buffers,
     which regressed with some refactoring in v4.2"

* tag 'mips_fixes_4.18_4' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux:
  MIPS: ath79: fix register address in ath79_ddr_wb_flush()
  MIPS: Fix off-by-one in pci_resource_to_user()

parents 07230906 bc88ad2e

arch/mips/ath79/common.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -58,7 +58,7 @@ EXPORT_SYMBOL_GPL(ath79_ddr_ctrl_init);

		void ath79_ddr_wb_flush(u32 reg)
		{
		void __iomem *flush_reg = ath79_ddr_wb_flush_base + reg;
		void __iomem flush_reg = ath79_ddr_wb_flush_base + (reg 4);

		/* Flush the DDR write buffer. */
		__raw_writel(0x1, flush_reg);

arch/mips/pci/pci.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -54,5 +54,5 @@ void pci_resource_to_user(const struct pci_dev *dev, int bar,
		phys_addr_t size = resource_size(rsrc);

		*start = fixup_bigphys_addr(rsrc->start, size);
		*end = rsrc->start + size;
		*end = rsrc->start + size - 1;
		}

Admin message