From patchwork Wed Jun 7 06:24:22 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shilpasri G Bhat X-Patchwork-Id: 772209 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 ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3wjJTL0lz6z9sNV for ; Wed, 7 Jun 2017 16:25:42 +1000 (AEST) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3wjJTK6WKrzDqL1 for ; Wed, 7 Jun 2017 16:25:41 +1000 (AEST) X-Original-To: skiboot@lists.ozlabs.org Delivered-To: skiboot@lists.ozlabs.org Received: from mx0a-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3wjJTF5TGtzDqKY for ; Wed, 7 Jun 2017 16:25:37 +1000 (AEST) Received: from pps.filterd (m0098414.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.0.20/8.16.0.20) with SMTP id v576OKAX028046 for ; Wed, 7 Jun 2017 02:25:34 -0400 Received: from e23smtp02.au.ibm.com (e23smtp02.au.ibm.com [202.81.31.144]) by mx0b-001b2d01.pphosted.com with ESMTP id 2axbxsrgmq-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Wed, 07 Jun 2017 02:25:34 -0400 Received: from localhost by e23smtp02.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 7 Jun 2017 16:25:31 +1000 Received: from d23relay09.au.ibm.com (202.81.31.228) by e23smtp02.au.ibm.com (202.81.31.208) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Wed, 7 Jun 2017 16:25:30 +1000 Received: from d23av02.au.ibm.com (d23av02.au.ibm.com [9.190.235.138]) by d23relay09.au.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id v576PLQ52949572 for ; Wed, 7 Jun 2017 16:25:29 +1000 Received: from d23av02.au.ibm.com (localhost [127.0.0.1]) by d23av02.au.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id v576OnNS018407 for ; Wed, 7 Jun 2017 16:24:49 +1000 Received: from oc4502181600.in.ibm.com (oc4502181600.in.ibm.com [9.124.35.111]) by d23av02.au.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id v576OmXK017657; Wed, 7 Jun 2017 16:24:48 +1000 From: Shilpasri G Bhat To: skiboot@lists.ozlabs.org Date: Wed, 7 Jun 2017 11:54:22 +0530 X-Mailer: git-send-email 1.8.3.1 X-TM-AS-MML: disable x-cbid: 17060706-0004-0000-0000-000002143ABB X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 17060706-0005-0000-0000-00005DF73CFB Message-Id: <1496816662-16611-1-git-send-email-shilpa.bhat@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2017-06-07_05:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=1 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1703280000 definitions=main-1706070118 Subject: [Skiboot] [PATCH] platform/zz: Add support for loading OCC in ZZ X-BeenThere: skiboot@lists.ozlabs.org X-Mailman-Version: 2.1.23 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: Shilpasri G Bhat --- hw/occ.c | 4 ++-- platforms/ibm-fsp/zz.c | 8 +++++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/hw/occ.c b/hw/occ.c index 34ef9a7..ab4e2d9 100644 --- a/hw/occ.c +++ b/hw/occ.c @@ -1413,8 +1413,8 @@ void occ_p9_interrupt(uint32_t chip_id) void occ_fsp_init(void) { - /* OCC is P8 only */ - if (proc_gen != proc_gen_p8) + /* OCC is supported in P8 and P9 */ + if (proc_gen < proc_gen_p8) return; /* If we have an FSP, register for notifications */ diff --git a/platforms/ibm-fsp/zz.c b/platforms/ibm-fsp/zz.c index 89d87b4..c13911f 100644 --- a/platforms/ibm-fsp/zz.c +++ b/platforms/ibm-fsp/zz.c @@ -44,10 +44,16 @@ static uint32_t ibm_fsp_occ_timeout(void) return 60; } +static void zz_init(void) +{ + hservices_init(); + ibm_fsp_init(); +} + DECLARE_PLATFORM(zz) = { .name = "ZZ", .probe = zz_probe, - .init = ibm_fsp_init, + .init = zz_init, .exit = ibm_fsp_exit, .cec_power_down = ibm_fsp_cec_power_down, .cec_reboot = ibm_fsp_cec_reboot,