diff options
| author | Dan Streetman <ddstreet@ieee.org> | 2015-02-17 15:38:53 -0500 |
|---|---|---|
| committer | Stewart Smith <stewart@linux.vnet.ibm.com> | 2015-02-19 12:20:28 +1100 |
| commit | 34b3786798f09650c4bf0d0ff92654fdb79748d3 (patch) | |
| tree | 47508c1ca700c7418527b6ad0990870f48a3cf80 /include | |
| parent | b3749779d1c9ba4b5b1b81de3ddfa0da1b830138 (diff) | |
| download | blackbird-skiboot-34b3786798f09650c4bf0d0ff92654fdb79748d3.tar.gz blackbird-skiboot-34b3786798f09650c4bf0d0ff92654fdb79748d3.zip | |
change direct use of LSH to SETFIELD
In several places, a "bus/device/function" u16 was being directly
or'ed into an address using a left-shift. This should be using
SETFIELD, especially now that all _LSH have been removed.
Change use of BDFN (bus/device/function) field from using plain
left-shift to using SETFIELD(). Add proper BDFN field definitions.
Signed-off-by: Dan Streetman <ddstreet@ieee.org>
Signed-off-by: Stewart Smith <stewart@linux.vnet.ibm.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/p5ioc2-regs.h | 1 | ||||
| -rw-r--r-- | include/p7ioc-regs.h | 1 | ||||
| -rw-r--r-- | include/phb3-regs.h | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/include/p5ioc2-regs.h b/include/p5ioc2-regs.h index c4a63c67..1628f7af 100644 --- a/include/p5ioc2-regs.h +++ b/include/p5ioc2-regs.h @@ -135,6 +135,7 @@ #define CAP_PCADR 0x140 #define CAP_PCADR_ENABLE PPC_BIT32(0) #define CAP_PCADR_FUNC PPC_BITMASK32(21,23) +#define CAP_PCADR_BDFN PPC_BITMASK32(8,23) /* bus,dev,func */ #define CAP_PCADR_EXTOFF PPC_BITMASK32(4,7) #define CAP_PCDAT 0x130 #define CAP_PCFGRW 0x160 diff --git a/include/p7ioc-regs.h b/include/p7ioc-regs.h index e868188e..4eb10d69 100644 --- a/include/p7ioc-regs.h +++ b/include/p7ioc-regs.h @@ -125,6 +125,7 @@ #define PHB_CA_BUS PPC_BITMASK(4,11) #define PHB_CA_DEV PPC_BITMASK(12,16) #define PHB_CA_FUNC PPC_BITMASK(17,19) +#define PHB_CA_BDFN PPC_BITMASK(4,19) /* bus,dev,func */ #define PHB_CA_REG PPC_BITMASK(20,31) #define PHB_LOCK1 0x148 #define PHB_PHB2_CONFIG 0x160 diff --git a/include/phb3-regs.h b/include/phb3-regs.h index 144c344a..b3f71601 100644 --- a/include/phb3-regs.h +++ b/include/phb3-regs.h @@ -43,6 +43,7 @@ #define PHB_CA_BUS PPC_BITMASK(4,11) #define PHB_CA_DEV PPC_BITMASK(12,16) #define PHB_CA_FUNC PPC_BITMASK(17,19) +#define PHB_CA_BDFN PPC_BITMASK(4,19) /* bus,dev,func */ #define PHB_CA_REG PPC_BITMASK(20,31) #define PHB_CA_PE PPC_BITMASK(40,47) #define PHB_LOCK1 0x148 |
