From: Bjorn Helgaas <bhelgaas@google.com>
Date: Mon, 13 May 2019 23:34:42 +0000 (-0500)
Subject: Merge branch 'remotes/lorenzo/pci/rcar'
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=bac9789e535a6353854e19532d1db3d5580cb58c;p=linux.git

Merge branch 'remotes/lorenzo/pci/rcar'

  - Use BIT() when appropriate in rcar (Marek Vasut)

  - Use u32 to match rcar hardware register widths (Marek Vasut)

  - Use BITS_PER_BYTE when appropriate in rcar (Marek Vasut)

  - Remove unnecessary casts in rcar (Marek Vasut)

  - Fix 64-bit MSI target addresses in rcar (Marek Vasut)

  - Check for __get_free_pages() failure in rcar (Kangjie Lu)

  - Fix shadowed rcar "irq" variable (Wolfram Sang)

* remotes/lorenzo/pci/rcar:
  PCI: rcar: Do not shadow the 'irq' variable
  PCI: rcar: Fix a potential NULL pointer dereference
  PCI: rcar: Fix 64bit MSI message address handling
  PCI: rcar: Clean up debug messages
  PCI: rcar: Replace (8 * n) with (BITS_PER_BYTE * n)
  PCI: rcar: Replace various variable types with unsigned ones for register values
  PCI: rcar: Replace unsigned long with u32/unsigned int in register accessors
  PCI: rcar: Clean up remaining macros defining bits

# Conflicts:
#	drivers/pci/controller/pcie-rcar.c
---

bac9789e535a6353854e19532d1db3d5580cb58c
diff --cc drivers/pci/controller/pcie-rcar.c
index 6a4e435bd35f3,e4cebeb184701..f6a669a9af414
--- a/drivers/pci/controller/pcie-rcar.c
+++ b/drivers/pci/controller/pcie-rcar.c
@@@ -46,10 -46,9 +46,10 @@@
  
  /* Transfer control */
  #define PCIETCTLR		0x02000
 +#define  DL_DOWN		BIT(3)
- #define  CFINIT			1
+ #define  CFINIT			BIT(0)
  #define PCIETSTR		0x02004
- #define  DATA_LINK_ACTIVE	1
+ #define  DATA_LINK_ACTIVE	BIT(0)
  #define PCIEERRFR		0x02020
  #define  UNSUPPORTED_REQUEST	BIT(4)
  #define PCIEMSIFR		0x02044