From patchwork Tue Nov 19 17:50:53 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Balamuruhan S X-Patchwork-Id: 1197564 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=linux.ibm.com Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47HYMd0z5lz9sPK for ; Wed, 20 Nov 2019 04:53:17 +1100 (AEDT) Received: from localhost ([::1]:48662 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iX7gg-0007MJ-Cx for incoming@patchwork.ozlabs.org; Tue, 19 Nov 2019 12:53:14 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:53434) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iX7f2-0005og-2X for qemu-devel@nongnu.org; Tue, 19 Nov 2019 12:51:33 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iX7f0-0005Az-U5 for qemu-devel@nongnu.org; Tue, 19 Nov 2019 12:51:31 -0500 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:17640 helo=mx0a-001b2d01.pphosted.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iX7f0-0005AZ-P5 for qemu-devel@nongnu.org; Tue, 19 Nov 2019 12:51:30 -0500 Received: from pps.filterd (m0098413.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id xAJHnCaQ116317 for ; Tue, 19 Nov 2019 12:51:30 -0500 Received: from e06smtp05.uk.ibm.com (e06smtp05.uk.ibm.com [195.75.94.101]) by mx0b-001b2d01.pphosted.com with ESMTP id 2wcf7u1mb7-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 19 Nov 2019 12:51:30 -0500 Received: from localhost by e06smtp05.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 19 Nov 2019 17:51:28 -0000 Received: from b06avi18626390.portsmouth.uk.ibm.com (9.149.26.192) by e06smtp05.uk.ibm.com (192.168.101.135) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; (version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256/256) Tue, 19 Nov 2019 17:51:25 -0000 Received: from d06av22.portsmouth.uk.ibm.com (d06av22.portsmouth.uk.ibm.com [9.149.105.58]) by b06avi18626390.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id xAJHolQg30933434 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 19 Nov 2019 17:50:47 GMT Received: from d06av22.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 0A91F4C050; Tue, 19 Nov 2019 17:51:25 +0000 (GMT) Received: from d06av22.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id A46DD4C040; Tue, 19 Nov 2019 17:51:23 +0000 (GMT) Received: from localhost.localdomain.com (unknown [9.85.84.11]) by d06av22.portsmouth.uk.ibm.com (Postfix) with ESMTP; Tue, 19 Nov 2019 17:51:23 +0000 (GMT) From: Balamuruhan S To: qemu-devel@nongnu.org Subject: [PATCH 2/5] hw/ppc/pnv_xscom: PBA bar mask values are incorrect with homer/occ sizes Date: Tue, 19 Nov 2019 23:20:53 +0530 X-Mailer: git-send-email 2.14.5 In-Reply-To: <20191119175056.32518-1-bala24@linux.ibm.com> References: <20191119175056.32518-1-bala24@linux.ibm.com> MIME-Version: 1.0 X-TM-AS-GCONF: 00 x-cbid: 19111917-0020-0000-0000-0000038B2B07 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 19111917-0021-0000-0000-000021E158B6 Message-Id: <20191119175056.32518-3-bala24@linux.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.95, 18.0.572 definitions=2019-11-19_06:2019-11-15, 2019-11-19 signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 bulkscore=0 phishscore=0 mlxscore=0 suspectscore=1 priorityscore=1501 clxscore=1015 spamscore=0 adultscore=0 impostorscore=0 lowpriorityscore=0 mlxlogscore=999 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-1910280000 definitions=main-1911190152 X-MIME-Autoconverted: from 8bit to quoted-printable by mx0b-001b2d01.pphosted.com id xAJHnCaQ116317 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] [fuzzy] X-Received-From: 148.163.158.5 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Balamuruhan S , david@gibson.dropbear.id.au, qemu-ppc@nongnu.org, clg@kaod.org, groug@kaod.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" homer/occ sizes are calculated in skiboot with `(mask | 0xfffff) + 1`, and from xscom access should return correct mask values instead of actual sizes. Signed-off-by: Cédric Le Goater Signed-off-by: Balamuruhan S --- hw/ppc/pnv_xscom.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/hw/ppc/pnv_xscom.c b/hw/ppc/pnv_xscom.c index f01d788a65..cdd5fa356e 100644 --- a/hw/ppc/pnv_xscom.c +++ b/hw/ppc/pnv_xscom.c @@ -46,6 +46,10 @@ #define P9_PBA_BARMASK0 0x5012b04 #define P9_PBA_BARMASK2 0x5012b06 +/* Mask to calculate Homer/Occ size */ +#define HOMER_SIZE_MASK 0x0000000000300000ull +#define OCC_SIZE_MASK 0x0000000000700000ull + static void xscom_complete(CPUState *cs, uint64_t hmer_bits) { /* @@ -90,9 +94,8 @@ static uint64_t xscom_read_default(PnvChip *chip, uint32_t pcba) return PNV_HOMER_BASE(chip); case P9_PBA_BARMASK0: /* P9 homer region size */ - return PNV9_HOMER_SIZE; case P8_PBA_BARMASK0: /* P8 homer region size */ - return PNV_HOMER_SIZE; + return HOMER_SIZE_MASK; case P9_PBA_BAR2: /* P9 occ common area */ return PNV9_OCC_COMMON_AREA(chip); @@ -100,9 +103,8 @@ static uint64_t xscom_read_default(PnvChip *chip, uint32_t pcba) return PNV_OCC_COMMON_AREA(chip); case P9_PBA_BARMASK2: /* P9 occ common area size */ - return PNV9_OCC_COMMON_AREA_SIZE; case P8_PBA_BARMASK2: /* P8 occ common area size */ - return PNV_OCC_COMMON_AREA_SIZE; + return OCC_SIZE_MASK; case 0x1010c00: /* PIBAM FIR */ case 0x1010c03: /* PIBAM FIR MASK */