From patchwork Sun Jul 3 00:50:15 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Herrenschmidt X-Patchwork-Id: 643665 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3rhs5n4M6cz9s9n for ; Sun, 3 Jul 2016 10:51:09 +1000 (AEST) Received: from ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3rhs5n3cm3zDqpT for ; Sun, 3 Jul 2016 10:51:09 +1000 (AEST) X-Original-To: skiboot@lists.ozlabs.org Delivered-To: skiboot@lists.ozlabs.org Received: from gate.crashing.org (gate.crashing.org [63.228.1.57]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3rhs5G1mH7zDqnS for ; Sun, 3 Jul 2016 10:50:41 +1000 (AEST) Received: from pasglop.au.ibm.com (localhost.localdomain [127.0.0.1]) by gate.crashing.org (8.14.1/8.13.8) with ESMTP id u630oM1m006724; Sat, 2 Jul 2016 19:50:36 -0500 From: Benjamin Herrenschmidt To: skiboot@lists.ozlabs.org Date: Sun, 3 Jul 2016 10:50:15 +1000 Message-Id: <1467507018-16982-5-git-send-email-benh@kernel.crashing.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1467507018-16982-1-git-send-email-benh@kernel.crashing.org> References: <1467507018-16982-1-git-send-email-benh@kernel.crashing.org> Subject: [Skiboot] [PATCH 5/8] lpc: Remove lpc_ prefixes from struct lpcm members X-BeenThere: skiboot@lists.ozlabs.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: Mailing list for skiboot development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: skiboot-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Skiboot" Signed-off-by: Benjamin Herrenschmidt --- hw/lpc.c | 122 +++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 61 insertions(+), 61 deletions(-) diff --git a/hw/lpc.c b/hw/lpc.c index be755f8..bd14127 100644 --- a/hw/lpc.c +++ b/hw/lpc.c @@ -110,12 +110,12 @@ DEFINE_LOG_ENTRY(OPAL_RC_LPC_SYNC, OPAL_PLATFORM_ERR_EVT, OPAL_LPC, struct lpcm { uint32_t chip_id; - uint32_t lpc_xbase; - void *lpc_mbase; - struct lock lpc_lock; - uint8_t lpc_fw_idsel; - uint8_t lpc_fw_rdsz; - struct list_head lpc_clients; + uint32_t xbase; + void *mbase; + struct lock lock; + uint8_t fw_idsel; + uint8_t fw_rdsz; + struct list_head clients; bool has_serirq; }; @@ -144,13 +144,13 @@ static int64_t opb_mmio_write(struct lpcm *lpc, uint32_t addr, uint32_t data, { switch (sz) { case 1: - out_8(lpc->lpc_mbase + addr, data); + out_8(lpc->mbase + addr, data); return OPAL_SUCCESS; case 2: - out_be16(lpc->lpc_mbase + addr, data); + out_be16(lpc->mbase + addr, data); return OPAL_SUCCESS; case 4: - out_be32(lpc->lpc_mbase + addr, data); + out_be32(lpc->mbase + addr, data); return OPAL_SUCCESS; } prerror("LPC: Invalid data size %d\n", sz); @@ -164,7 +164,7 @@ static int64_t opb_write(struct lpcm *lpc, uint32_t addr, uint32_t data, int64_t rc, tout; uint64_t data_reg; - if (lpc->lpc_mbase) + if (lpc->mbase) return opb_mmio_write(lpc, addr, data, sz); switch(sz) { @@ -182,7 +182,7 @@ static int64_t opb_write(struct lpcm *lpc, uint32_t addr, uint32_t data, return OPAL_PARAMETER; } - rc = xscom_write(lpc->chip_id, lpc->lpc_xbase + ECCB_DATA, data_reg); + rc = xscom_write(lpc->chip_id, lpc->xbase + ECCB_DATA, data_reg); if (rc) { log_simple_error(&e_info(OPAL_RC_LPC_WRITE), "LPC: XSCOM write to ECCB DATA error %lld\n", rc); @@ -192,7 +192,7 @@ static int64_t opb_write(struct lpcm *lpc, uint32_t addr, uint32_t data, ctl = SETFIELD(ECCB_CTL_DATASZ, ctl, sz); ctl = SETFIELD(ECCB_CTL_ADDRLEN, ctl, ECCB_ADDRLEN_4B); ctl = SETFIELD(ECCB_CTL_ADDR, ctl, addr); - rc = xscom_write(lpc->chip_id, lpc->lpc_xbase + ECCB_CTL, ctl); + rc = xscom_write(lpc->chip_id, lpc->xbase + ECCB_CTL, ctl); if (rc) { log_simple_error(&e_info(OPAL_RC_LPC_WRITE), "LPC: XSCOM write to ECCB CTL error %lld\n", rc); @@ -200,7 +200,7 @@ static int64_t opb_write(struct lpcm *lpc, uint32_t addr, uint32_t data, } for (tout = 0; tout < ECCB_TIMEOUT; tout++) { - rc = xscom_read(lpc->chip_id, lpc->lpc_xbase + ECCB_STAT, + rc = xscom_read(lpc->chip_id, lpc->xbase + ECCB_STAT, &stat); if (rc) { log_simple_error(&e_info(OPAL_RC_LPC_WRITE), @@ -227,13 +227,13 @@ static int64_t opb_mmio_read(struct lpcm *lpc, uint32_t addr, uint32_t *data, { switch (sz) { case 1: - *data = in_8(lpc->lpc_mbase + addr); + *data = in_8(lpc->mbase + addr); return OPAL_SUCCESS; case 2: - *data = in_be16(lpc->lpc_mbase + addr); + *data = in_be16(lpc->mbase + addr); return OPAL_SUCCESS; case 4: - *data = in_be32(lpc->lpc_mbase + addr); + *data = in_be32(lpc->mbase + addr); return OPAL_SUCCESS; } prerror("LPC: Invalid data size %d\n", sz); @@ -246,7 +246,7 @@ static int64_t opb_read(struct lpcm *lpc, uint32_t addr, uint32_t *data, uint64_t ctl = ECCB_CTL_MAGIC | ECCB_CTL_READ, stat; int64_t rc, tout; - if (lpc->lpc_mbase) + if (lpc->mbase) return opb_mmio_read(lpc, addr, data, sz); if (sz != 1 && sz != 2 && sz != 4) { @@ -257,7 +257,7 @@ static int64_t opb_read(struct lpcm *lpc, uint32_t addr, uint32_t *data, ctl = SETFIELD(ECCB_CTL_DATASZ, ctl, sz); ctl = SETFIELD(ECCB_CTL_ADDRLEN, ctl, ECCB_ADDRLEN_4B); ctl = SETFIELD(ECCB_CTL_ADDR, ctl, addr); - rc = xscom_write(lpc->chip_id, lpc->lpc_xbase + ECCB_CTL, ctl); + rc = xscom_write(lpc->chip_id, lpc->xbase + ECCB_CTL, ctl); if (rc) { log_simple_error(&e_info(OPAL_RC_LPC_READ), "LPC: XSCOM write to ECCB CTL error %lld\n", rc); @@ -265,7 +265,7 @@ static int64_t opb_read(struct lpcm *lpc, uint32_t addr, uint32_t *data, } for (tout = 0; tout < ECCB_TIMEOUT; tout++) { - rc = xscom_read(lpc->chip_id, lpc->lpc_xbase + ECCB_STAT, + rc = xscom_read(lpc->chip_id, lpc->xbase + ECCB_STAT, &stat); if (rc) { log_simple_error(&e_info(OPAL_RC_LPC_READ), @@ -304,7 +304,7 @@ static int64_t lpc_set_fw_idsel(struct lpcm *lpc, uint8_t idsel) uint32_t val; int64_t rc; - if (idsel == lpc->lpc_fw_idsel) + if (idsel == lpc->fw_idsel) return OPAL_SUCCESS; if (idsel > 0xf) return OPAL_PARAMETER; @@ -322,7 +322,7 @@ static int64_t lpc_set_fw_idsel(struct lpcm *lpc, uint8_t idsel) prerror("LPC: Failed to write HC_FW_SEG_IDSEL register !\n"); return rc; } - lpc->lpc_fw_idsel = idsel; + lpc->fw_idsel = idsel; return OPAL_SUCCESS; } @@ -331,7 +331,7 @@ static int64_t lpc_set_fw_rdsz(struct lpcm *lpc, uint8_t rdsz) uint32_t val; int64_t rc; - if (rdsz == lpc->lpc_fw_rdsz) + if (rdsz == lpc->fw_rdsz) return OPAL_SUCCESS; switch(rdsz) { case 1: @@ -358,7 +358,7 @@ static int64_t lpc_set_fw_rdsz(struct lpcm *lpc, uint8_t rdsz) prerror("LPC: Failed to write LPC_HC_FW_RD_ACC_SIZE !\n"); return rc; } - lpc->lpc_fw_rdsz = rdsz; + lpc->fw_rdsz = rdsz; return OPAL_SUCCESS; } @@ -431,7 +431,7 @@ static int64_t __lpc_write(struct lpcm *lpc, enum OpalLPCAddressType addr_type, uint32_t opb_base; int64_t rc; - lock(&lpc->lpc_lock); + lock(&lpc->lock); /* * Convert to an OPB access and handle LPC HC configuration @@ -446,7 +446,7 @@ static int64_t __lpc_write(struct lpcm *lpc, enum OpalLPCAddressType addr_type, /* XXX Add LPC error handling/recovery */ bail: - unlock(&lpc->lpc_lock); + unlock(&lpc->lock); return rc; } @@ -496,7 +496,7 @@ static int64_t __lpc_read(struct lpcm *lpc, enum OpalLPCAddressType addr_type, uint32_t opb_base; int64_t rc; - lock(&lpc->lpc_lock); + lock(&lpc->lock); /* * Convert to an OPB access and handle LPC HC configuration @@ -511,7 +511,7 @@ static int64_t __lpc_read(struct lpcm *lpc, enum OpalLPCAddressType addr_type, /* XXX Add LPC error handling/recovery */ bail: - unlock(&lpc->lpc_lock); + unlock(&lpc->lock); return rc; } @@ -574,7 +574,7 @@ static void lpc_setup_serirq(struct lpcm *lpc) return; /* Collect serirq enable bits */ - list_for_each(&lpc->lpc_clients, ent, node) + list_for_each(&lpc->clients, ent, node) mask |= ent->clt->interrupts & LPC_HC_IRQ_SERIRQ_ALL; rc = opb_write(lpc, lpc_reg_opb_base + LPC_HC_IRQMASK, mask, 4); @@ -648,7 +648,7 @@ static void lpc_init_interrupts_one(struct proc_chip *chip) struct lpcm *lpc = chip->lpc; int rc; - lock(&lpc->lpc_lock); + lock(&lpc->lock); /* First mask them all */ rc = opb_write(lpc, lpc_reg_opb_base + LPC_HC_IRQMASK, 0, 4); @@ -684,7 +684,7 @@ static void lpc_init_interrupts_one(struct proc_chip *chip) ; } bail: - unlock(&lpc->lpc_lock); + unlock(&lpc->lock); } void lpc_init_interrupts(void) @@ -713,12 +713,12 @@ static void lpc_dispatch_reset(struct lpcm *lpc) prerror("LPC: Got LPC reset on chip 0x%x !\n", lpc->chip_id); /* Collect serirq enable bits */ - list_for_each(&lpc->lpc_clients, ent, node) { + list_for_each(&lpc->clients, ent, node) { if (!ent->clt->reset) continue; - unlock(&lpc->lpc_lock); + unlock(&lpc->lock); ent->clt->reset(lpc->chip_id); - lock(&lpc->lpc_lock); + lock(&lpc->lock); } /* Reconfigure serial interrupts */ @@ -777,14 +777,14 @@ static void lpc_dispatch_ser_irqs(struct lpcm *lpc, uint32_t irqs, irqs &= LPC_HC_IRQ_SERIRQ_ALL; /* Collect serirq enable bits */ - list_for_each(&lpc->lpc_clients, ent, node) { + list_for_each(&lpc->clients, ent, node) { if (!ent->clt->interrupt) continue; cirqs = ent->clt->interrupts & irqs; if (cirqs) { - unlock(&lpc->lpc_lock); + unlock(&lpc->lock); ent->clt->interrupt(lpc->chip_id, cirqs); - lock(&lpc->lpc_lock); + lock(&lpc->lock); } } @@ -811,7 +811,7 @@ void lpc_interrupt(uint32_t chip_id) return; lpc = chip->lpc; - lock(&lpc->lpc_lock); + lock(&lpc->lock); /* Grab OPB Master LS interrupt status */ rc = opb_read(lpc, opb_master_reg_base + OPB_MASTER_LS_IRQ_STAT, @@ -849,7 +849,7 @@ void lpc_interrupt(uint32_t chip_id) lpc_dispatch_ser_irqs(lpc, irqs, true); bail: - unlock(&lpc->lpc_lock); + unlock(&lpc->lock); } void lpc_serirq(uint32_t chip_id, uint32_t index __unused) @@ -864,7 +864,7 @@ void lpc_serirq(uint32_t chip_id, uint32_t index __unused) return; lpc = chip->lpc; - lock(&lpc->lpc_lock); + lock(&lpc->lock); /* Handle the lpc interrupt source (errors etc...) */ rc = opb_read(lpc, lpc_reg_opb_base + LPC_HC_IRQSTAT, &irqs, 4); @@ -880,7 +880,7 @@ void lpc_serirq(uint32_t chip_id, uint32_t index __unused) lpc_dispatch_ser_irqs(lpc, irqs, true); bail: - unlock(&lpc->lpc_lock); + unlock(&lpc->lock); } void lpc_all_interrupts(uint32_t chip_id) @@ -894,9 +894,9 @@ void lpc_all_interrupts(uint32_t chip_id) lpc = chip->lpc; /* Dispatch all */ - lock(&lpc->lpc_lock); + lock(&lpc->lock); lpc_dispatch_ser_irqs(lpc, LPC_HC_IRQ_SERIRQ_ALL, false); - unlock(&lpc->lpc_lock); + unlock(&lpc->lock); } static void lpc_init_chip_p8(struct dt_node *xn) @@ -911,11 +911,11 @@ static void lpc_init_chip_p8(struct dt_node *xn) lpc = zalloc(sizeof(struct lpcm)); assert(lpc); lpc->chip_id = gcid; - lpc->lpc_xbase = dt_get_address(xn, 0, NULL); - lpc->lpc_fw_idsel = 0xff; - lpc->lpc_fw_rdsz = 0xff; - list_head_init(&lpc->lpc_clients); - init_lock(&lpc->lpc_lock); + lpc->xbase = dt_get_address(xn, 0, NULL); + lpc->fw_idsel = 0xff; + lpc->fw_rdsz = 0xff; + list_head_init(&lpc->clients); + init_lock(&lpc->lock); if (lpc_default_chip_id < 0 || dt_has_node_property(xn, "primary", NULL)) { @@ -926,7 +926,7 @@ static void lpc_init_chip_p8(struct dt_node *xn) opb_write(lpc, lpc_reg_opb_base + LPC_HC_IRQMASK, 0, 4); printf("LPC[%03x]: Initialiezd, access via XSCOM, PCB_Addr=0x%x\n", - gcid, lpc->lpc_xbase); + gcid, lpc->xbase); dt_add_property(xn, "interrupt-controller", NULL, 0); dt_add_property_cells(xn, "#interrupt-cells", 1); @@ -955,11 +955,11 @@ static void lpc_init_chip_p9(struct dt_node *opb_node) addr <<= 32; addr |= dt_prop_get_cell(opb_node, "ranges", 2); - lpc->lpc_mbase = (void *)addr; - lpc->lpc_fw_idsel = 0xff; - lpc->lpc_fw_rdsz = 0xff; - list_head_init(&lpc->lpc_clients); - init_lock(&lpc->lpc_lock); + lpc->mbase = (void *)addr; + lpc->fw_idsel = 0xff; + lpc->fw_rdsz = 0xff; + list_head_init(&lpc->clients); + init_lock(&lpc->lock); if (lpc_default_chip_id < 0 || dt_has_node_property(opb_node, "primary", NULL)) { @@ -979,7 +979,7 @@ static void lpc_init_chip_p9(struct dt_node *opb_node) printf("LPC[%03x]: Initialized, access via MMIO @%p\n", - gcid, lpc->lpc_mbase); + gcid, lpc->mbase); chip->lpc = lpc; } @@ -1015,9 +1015,9 @@ void lpc_used_by_console(void) for_each_chip(chip) { struct lpcm *lpc = chip->lpc; if (lpc) { - lpc->lpc_lock.in_con_path = true; - lock(&lpc->lpc_lock); - unlock(&lpc->lpc_lock); + lpc->lock.in_con_path = true; + lock(&lpc->lock); + unlock(&lpc->lock); } } } @@ -1033,7 +1033,7 @@ bool lpc_ok(void) chip = get_chip(lpc_default_chip_id); if (!chip->lpc) return false; - return !lock_held_by_me(&chip->lpc->lpc_lock); + return !lock_held_by_me(&chip->lpc->lock); } void lpc_register_client(uint32_t chip_id, @@ -1054,9 +1054,9 @@ void lpc_register_client(uint32_t chip_id, ent = malloc(sizeof(*ent)); assert(ent); ent->clt = clt; - lock(&lpc->lpc_lock); - list_add(&lpc->lpc_clients, &ent->node); + lock(&lpc->lock); + list_add(&lpc->clients, &ent->node); if (lpc->has_serirq) lpc_setup_serirq(lpc); - unlock(&lpc->lpc_lock); + unlock(&lpc->lock); }