summaryrefslogtreecommitdiffstats
path: root/hw/phb4.c
diff options
context:
space:
mode:
authorOliver O'Halloran <oohall@gmail.com>2019-02-01 14:57:43 +1100
committerStewart Smith <stewart@linux.ibm.com>2019-02-18 22:12:37 -0600
commit2f5d15f167b074f3e68df089a7ef53db9d0d77e5 (patch)
tree1b85147e8a278a18f66f2341db1381d58b018008 /hw/phb4.c
parent08981e62e1d989525d29d68443a345b4e56f9aa5 (diff)
downloadblackbird-skiboot-2f5d15f167b074f3e68df089a7ef53db9d0d77e5.tar.gz
blackbird-skiboot-2f5d15f167b074f3e68df089a7ef53db9d0d77e5.zip
phb4: Remove pointless NULL checks
When we allocate the various in-memory tables we assert() on the allocation. There's no point in checking if the table pointer is NULL or not at runtime. Reviewed-by: Andrew Donnellan <andrew.donnellan@au1.ibm.com> Signed-off-by: Oliver O'Halloran <oohall@gmail.com> Signed-off-by: Stewart Smith <stewart@linux.ibm.com>
Diffstat (limited to 'hw/phb4.c')
-rw-r--r--hw/phb4.c14
1 files changed, 2 insertions, 12 deletions
diff --git a/hw/phb4.c b/hw/phb4.c
index 50496d51..52479ae8 100644
--- a/hw/phb4.c
+++ b/hw/phb4.c
@@ -1137,10 +1137,8 @@ static int64_t phb4_ioda_reset(struct phb *phb, bool purge)
/* Additional OPAL specific inits */
/* Clear RTT and PELTV and PEST */
- if (p->tbl_rtt)
- memcpy((void *)p->tbl_rtt, p->rte_cache, RTT_TABLE_SIZE);
- if (p->tbl_peltv)
- memcpy((void *)p->tbl_peltv, p->peltv_cache, p->tbl_peltv_size);
+ memcpy((void *)p->tbl_rtt, p->rte_cache, RTT_TABLE_SIZE);
+ memcpy((void *)p->tbl_peltv, p->peltv_cache, p->tbl_peltv_size);
/* Clear PEST & PEEV */
for (i = 0; i < p->max_num_pes; i++) {
@@ -2113,8 +2111,6 @@ static int64_t phb4_set_pe(struct phb *phb,
uint16_t *rte;
/* Sanity check */
- if (!p->tbl_rtt)
- return OPAL_HARDWARE;
if (action != OPAL_MAP_PE && action != OPAL_UNMAP_PE)
return OPAL_PARAMETER;
if (pe_number >= p->num_pes || bdfn > 0xffff ||
@@ -2164,8 +2160,6 @@ static int64_t phb4_set_peltv(struct phb *phb,
uint32_t idx, mask;
/* Sanity check */
- if (!p->tbl_peltv)
- return OPAL_HARDWARE;
if (parent_pe >= p->num_pes || child_pe >= p->num_pes)
return OPAL_PARAMETER;
@@ -3831,10 +3825,6 @@ static int64_t phb4_err_inject(struct phb *phb, uint64_t pe_number,
uint64_t addr, uint64_t mask, bool is_write);
bool is_write;
- /* How could we get here without valid RTT? */
- if (!p->tbl_rtt)
- return OPAL_HARDWARE;
-
/* We can't inject error to the reserved PE */
if (pe_number == PHB4_RESERVED_PE_NUM(p) || pe_number >= p->num_pes)
return OPAL_PARAMETER;
OpenPOWER on IntegriCloud