From patchwork Wed Aug 9 15:18:17 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vasant Hegde X-Patchwork-Id: 799825 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 3xSFKM08sxz9s8V for ; Thu, 10 Aug 2017 01:18:47 +1000 (AEST) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3xSFKL5yl4zDqs7 for ; Thu, 10 Aug 2017 01:18:46 +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 3xSFKC3LpDzDqjk for ; Thu, 10 Aug 2017 01:18:39 +1000 (AEST) Received: from pps.filterd (m0098414.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.0.21/8.16.0.21) with SMTP id v79FEUXg002996 for ; Wed, 9 Aug 2017 11:18:37 -0400 Received: from e23smtp07.au.ibm.com (e23smtp07.au.ibm.com [202.81.31.140]) by mx0b-001b2d01.pphosted.com with ESMTP id 2c82vrrtwb-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Wed, 09 Aug 2017 11:18:36 -0400 Received: from localhost by e23smtp07.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 10 Aug 2017 01:18:34 +1000 Received: from d23relay10.au.ibm.com (202.81.31.229) by e23smtp07.au.ibm.com (202.81.31.204) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Thu, 10 Aug 2017 01:18:32 +1000 Received: from d23av06.au.ibm.com (d23av06.au.ibm.com [9.190.235.151]) by d23relay10.au.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id v79FIVbv22675684 for ; Thu, 10 Aug 2017 01:18:31 +1000 Received: from d23av06.au.ibm.com (localhost [127.0.0.1]) by d23av06.au.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id v79FIVup023556 for ; Thu, 10 Aug 2017 01:18:31 +1000 Received: from hegdevasant.in.ibm.com ([9.77.199.14]) by d23av06.au.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id v79FIS6O023510; Thu, 10 Aug 2017 01:18:29 +1000 From: Vasant Hegde To: skiboot@lists.ozlabs.org Date: Wed, 9 Aug 2017 20:48:17 +0530 X-Mailer: git-send-email 2.9.3 X-TM-AS-MML: disable x-cbid: 17080915-0044-0000-0000-00000281F7D7 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 17080915-0045-0000-0000-000007148CE7 Message-Id: <20170809151818.24423-1-hegdevasant@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2017-08-09_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-1706020000 definitions=main-1708090237 Subject: [Skiboot] [PATCH 1/2] opal-prd: Disable pnor access interface on FSP system 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: , Cc: Daniel M Crowell MIME-Version: 1.0 Errors-To: skiboot-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Skiboot" On FSP system host does not have access to PNOR. Hence disable PNOR access interfaces. CC: Jeremy Kerr CC: Daniel M Crowell Signed-off-by: Vasant Hegde Acked-by: Jeremy Kerr --- external/opal-prd/opal-prd.c | 14 ++++++++++---- external/opal-prd/pnor.c | 19 +++++++++++++++++++ external/opal-prd/pnor.h | 1 + 3 files changed, 30 insertions(+), 4 deletions(-) diff --git a/external/opal-prd/opal-prd.c b/external/opal-prd/opal-prd.c index 798d59c..a09a636 100644 --- a/external/opal-prd/opal-prd.c +++ b/external/opal-prd/opal-prd.c @@ -1949,10 +1949,16 @@ static int run_prd_daemon(struct opal_prd_ctx *ctx) fixup_hinterface_table(); - rc = pnor_init(&ctx->pnor); - if (rc) { - pr_log(LOG_ERR, "PNOR: Failed to open pnor: %m"); - goto out_close; + if (pnor_available(&ctx->pnor)) { + rc = pnor_init(&ctx->pnor); + if (rc) { + pr_log(LOG_ERR, "PNOR: Failed to open pnor: %m"); + goto out_close; + } + } else { + /* Disable PNOR function pointers */ + hinterface.pnor_read = NULL; + hinterface.pnor_write = NULL; } ipmi_init(ctx); diff --git a/external/opal-prd/pnor.c b/external/opal-prd/pnor.c index 0e7e5c0..c032421 100644 --- a/external/opal-prd/pnor.c +++ b/external/opal-prd/pnor.c @@ -32,6 +32,25 @@ #include "pnor.h" #include "opal-prd.h" +#define FDT_FLASH_PATH "/proc/device-tree/chosen/ibm,system-flash" + +bool pnor_available(struct pnor *pnor) +{ + /* --pnor is specified */ + if (pnor->path) { + if (access(pnor->path, R_OK | W_OK) == 0) + return true; + + pr_log(LOG_ERR, "PNOR: Does not have permission to read pnor: %m"); + return false; + } + + if (access(FDT_FLASH_PATH, R_OK) == 0) + return true; + + return false; +} + int pnor_init(struct pnor *pnor) { int rc; diff --git a/external/opal-prd/pnor.h b/external/opal-prd/pnor.h index 4ff449c..28571af 100644 --- a/external/opal-prd/pnor.h +++ b/external/opal-prd/pnor.h @@ -23,5 +23,6 @@ extern int pnor_operation(struct pnor *pnor, const char *name, extern int pnor_init(struct pnor *pnor); extern void pnor_close(struct pnor *pnor); +extern bool pnor_available(struct pnor *pnor); #endif /*PNOR_H*/