Skip to content

Commit

Permalink
phb4: Change debug prints
Browse files Browse the repository at this point in the history 
Currently we print "PHB4" and mean either "PHB version 4" or "PHB
number 4" which can be quite confusing.

This makes it clearer when it's one or the other.

Also fixes some cut and paste errors in comments from PHB3.

Signed-off-by: Michael Neuling <mikey@neuling.org>
Signed-off-by: Stewart Smith <stewart@linux.vnet.ibm.com>
  • Loading branch information
@mikey @stewartsmith
mikey authored and stewartsmith committed Nov 24, 2016
1 parent 2d4f3cf commit fc930a3
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 20 deletions.
38 changes: 20 additions & 18 deletions hw/phb4.c
View file
Expand Up @@ -59,12 +59,15 @@

static void phb4_init_hw(struct phb4 *p, bool first_init);

#define PHBDBG(p, fmt, a...) prlog(PR_DEBUG, "PHB%d: " fmt, \
(p)->phb.opal_id, ## a)
#define PHBINF(p, fmt, a...) prlog(PR_INFO, "PHB%d: " fmt, \
(p)->phb.opal_id, ## a)
#define PHBERR(p, fmt, a...) prlog(PR_ERR, "PHB%d: " fmt, \
(p)->phb.opal_id, ## a)
#define PHBDBG(p, fmt, a...) prlog(PR_DEBUG, "PHB#%d[%d:%d]: " fmt, \
(p)->phb.opal_id, (p)->chip_id, \
(p)->index, ## a)
#define PHBINF(p, fmt, a...) prlog(PR_INFO, "PHB#%d[%d:%d]: " fmt, \
(p)->phb.opal_id, (p)->chip_id, \
(p)->index, ## a)
#define PHBERR(p, fmt, a...) prlog(PR_ERR, "PHB#%d[%d:%d]: " fmt, \
(p)->phb.opal_id, (p)->chip_id, \
(p)->index, ## a)

/* Note: The "ASB" name is historical, practically this means access via
* the XSCOM backdoor
Expand Down Expand Up @@ -901,8 +904,7 @@ static int64_t phb4_ioda_reset(struct phb *phb, bool purge)
uint64_t val;

if (purge) {
prlog(PR_DEBUG, "PHB%d: Purging all IODA tables...\n",
p->phb.opal_id);
PHBDBG(p, "Purging all IODA tables...\n");
phb4_init_ioda_cache(p);
}

Expand Down Expand Up @@ -3252,7 +3254,7 @@ static void phb4_probe_stack(struct dt_node *stk_node, uint32_t pec_index,
stk_index = dt_prop_get_u32(stk_node, "reg");
phb_num = dt_prop_get_u32(stk_node, "ibm,phb-index");
path = dt_get_path(stk_node);
prlog(PR_NOTICE, "PHB4: Chip %d Found PBCQ%d Stack %d at %s\n",
prlog(PR_NOTICE, "PHB: Chip %d Found PHB4 PBCQ%d Stack %d at %s\n",
gcid, pec_index, stk_index, path);
free(path);

Expand All @@ -3263,7 +3265,7 @@ static void phb4_probe_stack(struct dt_node *stk_node, uint32_t pec_index,
nest_stack = nest_base + 0x40 * (stk_index + 1);
etu_base = pci_base + 0x100 + 0x40 * stk_index;

prlog(PR_DEBUG, "PHB4[%d:%d] X[PE]=0x%08x/0x%08x X[PCI]=0x%08x/0x%08x X[ETU]=0x%08x\n",
prlog(PR_DEBUG, "PHB[%d:%d] X[PE]=0x%08x/0x%08x X[PCI]=0x%08x/0x%08x X[ETU]=0x%08x\n",
gcid, phb_num, nest_base, nest_stack, pci_base, pci_stack, etu_base);

/* Default BAR enables */
Expand All @@ -3272,33 +3274,33 @@ static void phb4_probe_stack(struct dt_node *stk_node, uint32_t pec_index,
/* Get and/or initialize PHB register BAR */
xscom_read(gcid, nest_stack + XPEC_NEST_STK_PHB_REG_BAR, &phb_bar);
if (phb_bar == 0 || force_assign) {
prerror("PHB4[%d:%d] No PHB BAR set ! Overriding\n", gcid, phb_num);
prerror("PHB[%d:%d] No PHB BAR set ! Overriding\n", gcid, phb_num);
phb_bar = MMIO_CALC(gcid, phb_num, PHB_BAR);
xscom_write(gcid, nest_stack + XPEC_NEST_STK_PHB_REG_BAR, phb_bar << 8);
}
bar_en |= XPEC_NEST_STK_BAR_EN_PHB;

xscom_read(gcid, nest_stack + XPEC_NEST_STK_PHB_REG_BAR, &phb_bar);
phb_bar >>= 8;
prlog(PR_ERR, "PHB4[%d:%d] REGS = 0x%016llx [4k]\n", gcid, phb_num, phb_bar);
prlog(PR_ERR, "PHB[%d:%d] REGS = 0x%016llx [4k]\n", gcid, phb_num, phb_bar);

/* Same with INT BAR (ESB) */
xscom_read(gcid, nest_stack + XPEC_NEST_STK_IRQ_BAR, &irq_bar);
if (irq_bar == 0 || force_assign) {
prerror("PHB4[%d:%d] No IRQ BAR set ! Overriding\n", gcid, phb_num);
prerror("PHB[%d:%d] No IRQ BAR set ! Overriding\n", gcid, phb_num);
irq_bar = MMIO_CALC(gcid, phb_num, ESB_BAR);
xscom_write(gcid, nest_stack + XPEC_NEST_STK_IRQ_BAR, irq_bar << 8);
}
bar_en |= XPEC_NEST_STK_BAR_EN_INT;

xscom_read(gcid, nest_stack + XPEC_NEST_STK_IRQ_BAR, &irq_bar);
irq_bar >>= 8;
prlog(PR_ERR, "PHB4[%d:%d] ESB = 0x%016llx [...]\n", gcid, phb_num, irq_bar);
prlog(PR_ERR, "PHB[%d:%d] ESB = 0x%016llx [...]\n", gcid, phb_num, irq_bar);

/* Same with MMIO windows */
xscom_read(gcid, nest_stack + XPEC_NEST_STK_MMIO_BAR0, &mmio0_bar);
if (mmio0_bar == 0 || force_assign) {
prerror("PHB4[%d:%d] No MMIO BAR set ! Overriding\n", gcid, phb_num);
prerror("PHB[%d:%d] No MMIO BAR set ! Overriding\n", gcid, phb_num);
mmio0_bar = MMIO_CALC(gcid, phb_num, MMIO0_BAR);
mmio0_bmask = (~(MMIO0_BAR_SIZE - 1)) & 0x00FFFFFFFFFFFFFFULL;
xscom_write(gcid, nest_stack + XPEC_NEST_STK_MMIO_BAR0, mmio0_bar << 8);
Expand All @@ -3316,15 +3318,15 @@ static void phb4_probe_stack(struct dt_node *stk_node, uint32_t pec_index,
mmio0_bmask &= 0xffffffffff000000ull;
mmio0_sz = ((~mmio0_bmask) >> 8) + 1;
mmio0_bar >>= 8;
prlog(PR_DEBUG, "PHB4[%d:%d] MMIO0 = 0x%016llx [0x%016llx]\n",
prlog(PR_DEBUG, "PHB[%d:%d] MMIO0 = 0x%016llx [0x%016llx]\n",
gcid, phb_num, mmio0_bar, mmio0_sz);

xscom_read(gcid, nest_stack + XPEC_NEST_STK_MMIO_BAR1, &mmio1_bar);
xscom_read(gcid, nest_stack + XPEC_NEST_STK_MMIO_BAR1_MASK, &mmio1_bmask);
mmio1_bmask &= 0xffffffffff000000ull;
mmio1_sz = ((~mmio1_bmask) >> 8) + 1;
mmio1_bar >>= 8;
prlog(PR_DEBUG, "PHB4[%d:%d] MMIO1 = 0x%016llx [0x%016llx]\n",
prlog(PR_DEBUG, "PHB[%d:%d] MMIO1 = 0x%016llx [0x%016llx]\n",
gcid, phb_num, mmio1_bar, mmio1_sz);

/* Build MMIO windows list */
Expand All @@ -3347,7 +3349,7 @@ static void phb4_probe_stack(struct dt_node *stk_node, uint32_t pec_index,

/* No MMIO windows ? Barf ! */
if (mmio_win_sz == 0) {
prerror("PHB4[%d:%d] No MMIO windows enabled !\n", gcid, phb_num);
prerror("PHB[%d:%d] No MMIO windows enabled !\n", gcid, phb_num);
return;
}

Expand Down
4 changes: 2 additions & 2 deletions include/phb4.h
View file
Expand Up @@ -224,9 +224,9 @@ struct phb4_err {
#define PHB4_CAPP_RECOVERY 0x00000008

struct phb4 {
unsigned int index; /* 0..2 index inside P8 */
unsigned int index; /* 0..5 index inside p9 */
unsigned int flags;
unsigned int chip_id; /* Chip ID (== GCID on P8) */
unsigned int chip_id; /* Chip ID (== GCID on p9) */
enum phb4_state state;
unsigned int rev; /* 00MMmmmm */
#define PHB4_REV_NIMBUS_DD10 0xa40001
Expand Down

0 comments on commit fc930a3

Please sign in to comment.