Skip to content

Commit

Permalink
phb4: Do not set the PBCQ Tunnel BAR register when enabling capi mode.
Browse files Browse the repository at this point in the history
The cxl driver will set the capi value, like other drivers already do.

Signed-off-by: Philippe Bergheaud <felix@linux.ibm.com>
Signed-off-by: Stewart Smith <stewart@linux.ibm.com>
  • Loading branch information
philippe56 authored and stewartsmith committed Apr 10, 2018
1 parent 63594b0 commit e0cffe9
Showing 1 changed file with 0 additions and 19 deletions.
19 changes: 0 additions & 19 deletions hw/phb4.c
Original file line number Diff line number Diff line change
Expand Up @@ -3947,25 +3947,6 @@ static int64_t enable_capi_mode(struct phb4 *p, uint64_t pe_number,
((u64)CAPIMASK << 32) | PHB_CAPI_CMPM_ENABLE);

if (!(p->rev == PHB4_REV_NIMBUS_DD10)) {
/*
* PBCQ Tunnel Bar Register
*
* If set, for example by a driver that may already have
* tweaked the tunnel bar, then we do not touch it when
* entering capi mode. It's up to the driver to handle it.
*
* If unset, then we use the PSL_TNR_ADDR[TNR_Addr] reset
* value. For fpga/cxl, this code will define the tunnel bar.
*/
xscom_read(p->chip_id,
p->pe_stk_xscom + XPEC_NEST_STK_TUNNEL_BAR, &reg);
if (!reg) {
reg = 0x00020000E0000000ull << 8;
xscom_write(p->chip_id,
p->pe_stk_xscom + XPEC_NEST_STK_TUNNEL_BAR,
reg);
}

/* PB AIB Hardware Control Register
* Wait 32 PCI clocks for a credit to become available
* before rejecting.
Expand Down

0 comments on commit e0cffe9

Please sign in to comment.