From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 6A9CAA0093 for ; Fri, 17 Jun 2022 19:18:20 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6312B41148; Fri, 17 Jun 2022 19:18:20 +0200 (CEST) Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by mails.dpdk.org (Postfix) with ESMTP id 4719240F19; Fri, 17 Jun 2022 19:18:17 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1655486297; x=1687022297; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=3zoQM420jjInRAUVRN1I5u28Gthk/Z+YrxC22+fhq2E=; b=PCKa4vwn98s/79ByF8ofqO2TUO0Qebz5BO/lJRC6Ys2wirWHfDE8jEAD F48Ez7XZY9VROgTAhobf+gqO1mcNJ0q/NxQtIJPNJ6EM801zaon4VdbHE mR5dwGFsgJ/DMVAVT3pnM4j16amdu+dDi5zJyytwsHNY8ayPDLR27asoj QmxScmK/awPn6H4k/TIuXEFh0q9J/gOm7xxB6wEr9j4HQcGAkaYIhw/hB 2ByEsWXrnBccsl35A08RxglF6cVDAFMvAQMWe8EyXL6Jyq3GP7McDxNW1 MQw3PiACMKPCstk8UfXIasn7q3mbznyhEP3637Kkes0Jooj6aOoTEpcai A==; X-IronPort-AV: E=McAfee;i="6400,9594,10380"; a="280247039" X-IronPort-AV: E=Sophos;i="5.92,306,1650956400"; d="scan'208";a="280247039" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Jun 2022 07:41:59 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.92,306,1650956400"; d="scan'208";a="912628644" Received: from orsmsx601.amr.corp.intel.com ([10.22.229.14]) by fmsmga005.fm.intel.com with ESMTP; 17 Jun 2022 07:41:59 -0700 Received: from orsmsx611.amr.corp.intel.com (10.22.229.24) by ORSMSX601.amr.corp.intel.com (10.22.229.14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.27; Fri, 17 Jun 2022 07:41:58 -0700 Received: from orsmsx607.amr.corp.intel.com (10.22.229.20) by ORSMSX611.amr.corp.intel.com (10.22.229.24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.27; Fri, 17 Jun 2022 07:41:57 -0700 Received: from orsedg603.ED.cps.intel.com (10.7.248.4) by orsmsx607.amr.corp.intel.com (10.22.229.20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.27 via Frontend Transport; Fri, 17 Jun 2022 07:41:57 -0700 Received: from NAM12-BN8-obe.outbound.protection.outlook.com (104.47.55.171) by edgegateway.intel.com (134.134.137.100) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2308.27; Fri, 17 Jun 2022 07:41:57 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hw76clVrOlFtoM8NSX01OrTTHjzBKlS5u8D1OsdIZyUs01QlINgRHK3gs/T1UY/JT41R68Db81g6Y9h1vDlq7IVpNbPqB8B1nrxE6IrSzqdEMLyZDP78NZ+m3u8FfAkahLzfV2HxL5HY3DeErf7Oj4o4OVL3k8/ZwOIqRUNVmyvIPY5KSTUba8cJeA3ZCu5jxynrPvJuW68in16t+4/C+Txmc0LaEIgo/YW3ERl138UQ7oaxo+qQ69Mjkqnw747A6vFcB1+iRgxIxVgYbvakbTtfdJK7iiv2MuF+HjCA1SvDqTqL+XOjLhazdfQfXlfCRF/LnGkAlKquHegjleKr2g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=EWRtC6pSC15ImT6GfB8sqmA9nATv5nnMUoenl0UPjO0=; b=J7BHiPngXkIoePIGEwR6eq5Q/CV/wJC71hOIfZKrTjDd00fmnuSfKZ7g5ki4dWrVjtG/rkgGKzOrbQ3MX9dwUw5Bulhmg57efITtTfkO1WWEwi+lwM9CCpQEyNjaF4sWKK6vRd9C5QDteRhuGq8kA5ErN9u3xXZqLdIQjS+ddU4Tsl68INjzywl132LTS26wLOKGRSvrQ7OFY3O9NXFCFToXPXR+JqY+Xk0Q2GCrLrvuxRsXU7xGfXW6xOSj4C7RWkWhAbu4iTSO0S4KmPKezCimdy9tU5PI4JGsrApb/F+t6OC0Ez2mnA/niO5HtYLqdGVWhLU7kLtkw5JHwYDJzQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none Received: from DM6PR11MB4252.namprd11.prod.outlook.com (2603:10b6:5:201::26) by SN6PR11MB2703.namprd11.prod.outlook.com (2603:10b6:805:59::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5353.15; Fri, 17 Jun 2022 14:41:55 +0000 Received: from DM6PR11MB4252.namprd11.prod.outlook.com ([fe80::b9d5:600c:9f13:bc96]) by DM6PR11MB4252.namprd11.prod.outlook.com ([fe80::b9d5:600c:9f13:bc96%7]) with mapi id 15.20.5332.023; Fri, 17 Jun 2022 14:41:55 +0000 From: "Xu, Rosen" To: "Huang, Wei" , "dev@dpdk.org" , "thomas@monjalon.net" , "nipun.gupta@nxp.com" , "hemant.agrawal@nxp.com" CC: "stable@dpdk.org" , "Zhang, Tianfei" , "Zhang, Qi Z" Subject: RE: [PATCH v3 1/4] raw/ifpga/base: add PMCI base driver Thread-Topic: [PATCH v3 1/4] raw/ifpga/base: add PMCI base driver Thread-Index: AQHYghmH3v0ZUy0FzkC3qI45ABNBaa1TrDsA Date: Fri, 17 Jun 2022 14:41:54 +0000 Message-ID: References: <1654827900-10023-1-git-send-email-wei.huang@intel.com> <1655450375-10739-1-git-send-email-wei.huang@intel.com> <1655450375-10739-2-git-send-email-wei.huang@intel.com> In-Reply-To: <1655450375-10739-2-git-send-email-wei.huang@intel.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiZDY4MmFlOTYtYTY3Ny00MmM5LWIzNzktYTY2MzEyZTJhYzJhIiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjEwLjE4MDQuNDkiLCJUcnVzdGVkTGFiZWxIYXNoIjoiMlU1WmlESVREeFwvVHZrdTgxSE44eHliU1dNR2gxSkY4UlNpZWVsQWQxMFZrS3RXK2MxQTlsb2lGMTFraHNyc3AifQ== x-ctpclassification: CTP_NT authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=intel.com; x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 7d6d9938-e790-450d-fd2d-08da506f863d x-ms-traffictypediagnostic: SN6PR11MB2703:EE_ x-microsoft-antispam-prvs: x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: aX0ZBikpQlX/zg5mgJAJZDZ7Y7bPHhmDZqHmg3ixM+e65umA7DS5sPFm7uLO3mwuNFDOgAJh+K5sFl36lhDb5DFC6dNOj8Jx09284QcwCPNFKH6P+R3f1soAEq/uep/jNBc7hbm97NctluRVtyCJe4tSVq56oRN1/2kgVmB2kW54rh1V4/8xxD6npKJagnSxN1OaEblqj8PsMJ0vXmGcShxy+3Q+IITGNrIiLSIpILylFR0724/qYyn8nlMBkOn4kijYJqO5X81OhxRcLPt3Ou5rSxfg/JYTUl7Q6IeQ+mvjlGZo24r47H0PmLORq44uI8OJJVGE0PjKBgZT3vUffPXQDWU1+F6z5U0BQ5G30U6FIRaUr1lb5kC0Zwc9CGOio9eENn/v8F/EsBtL2OezPy3j/rTC6e1yeElIHNPlUhaZT+0GR78vnZxOCeQFeSwapx3V4+pF6kDTuybvr2WZNjRJSUvLcUbJbC2OFKmhwioVRbZF7V6/IxNYFsnjD2unuCMWZ+S21xTPLfMSpPU2cM38wBrGTd/0+YkBUHVS2ej14krueUtWm79d5TMdlAIADxz7oIuFPcI3yehEUdM+j3SN2pyjMq6rutzs9kok8fn/9G0Z/QPFaj1qaKcXc27aCvsFOBW9EkfsTiVrj89FzP0sfbBC8mHfWyTs7mkOgfASIYMHDySKZlevFGA8d68rn+YeSlvtFhsVsQ3ZvIZg0A== x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DM6PR11MB4252.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230016)(366004)(55016003)(7696005)(66946007)(2906002)(66556008)(498600001)(26005)(316002)(54906003)(53546011)(71200400001)(9686003)(38070700005)(76116006)(82960400001)(33656002)(110136005)(4326008)(186003)(122000001)(38100700002)(107886003)(83380400001)(8936002)(52536014)(8676002)(66446008)(6506007)(5660300002)(64756008)(30864003)(66476007)(86362001)(559001)(579004); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?jDmiANTGytdjX+nuH8Mo+n3G2QtShi1Jwj3T2lXJiJrGViekWWLYgD/6pFk9?= =?us-ascii?Q?rCrjaARgqpAasUWjzrjUfwVFphOA191d3T68N96TICX9x93MOWPx75kdpcNW?= =?us-ascii?Q?5lJq6DymPKheGWz6gw6LDt1orKDb1haBG/R2amDo7thi3+T9xZJBmbdAdEWo?= =?us-ascii?Q?uPxSSJrFUhmlxTtudWbZNI9N0xImr+iA+fE1Md3qsankAetdwXF9ekH7W/Hp?= =?us-ascii?Q?hm49V3qm3Gs00u81k3h3rrCFTkHNDrex2vCeED8cDONtwn7gMPo55y/ZNGTp?= =?us-ascii?Q?yXGE6egX6MQdBu79b3EBoYXglsRODx9bqTAwxi9hVzsjLONU5DdG1tchsWK3?= =?us-ascii?Q?Pr8leO34YKcmfe0j69K2PA4LI15GdjJ/aLG7XmySZfQli7CErzlZ4gggg3Xt?= =?us-ascii?Q?NJxmHKQLWAB4O7edFKYerxxKbZSCLi/C16CV2IrjasbqyHJtZH3k7QMfFwX+?= =?us-ascii?Q?A2hhJjADH10QXv6ytJ89wh4T52EmwidBD5bGDRXzOl7FIIkqLdiMuJ2J1UxR?= =?us-ascii?Q?I9C4ysg1WopCmc78LIWXIMkoufo8zh0YBau49tjAg9/J9VDuSJaCuWtYw6vM?= =?us-ascii?Q?C+G/0f5PsUHeHnQZVg7UPnkOOcwcuBT+CS/+l0sgRzdQje8oFqIgvvm7pWwq?= =?us-ascii?Q?RweJAVxqNAzo22bJc2Bk2r8zAb93QriD/ltWBHlxZW2xd/2FO+14sS1nImsk?= =?us-ascii?Q?I90YBVR2GeRFJymZ6BJPLwc00CC471KLfFXp2uFSgvlb1YbWI3Xi18j0PO6o?= =?us-ascii?Q?0qa/Ux6fSU4lyY145qyztgVMvgl/kBLjxaDPa8KDASPTefqlOLm8s6GeRNUk?= =?us-ascii?Q?MPh05Z1kcvtBRDHUcCq3HbVSlOCvNwDLp63lOjBIWSnWyK2BhOtb+srjCNKE?= =?us-ascii?Q?pf2gauTX6tImVPkmQO7cIAAPGTdXjTzo5BPUmyHYBQN0cPXJPUQgoLOw0QTl?= =?us-ascii?Q?swznMc0SWG4lXc67+3tjOb2zU8xveKJZifL47G7vTpsiJEpGp2w7TCdT+kd3?= =?us-ascii?Q?G2gfm8cW25X4lRX2cFseVMIOXKgsRWvMZ0scYRj+JVzBGMVPAKEUko3rtTkD?= =?us-ascii?Q?i78WXbl0zWA+a/i+xEJeJfFCEE+oZypEKwdAC+GGFMzUNxPvluoiXRGyZ5Pi?= =?us-ascii?Q?CPkPBTl9DbQHMrUgk/X4aGS3RhLhz7bH6YoMUFdG1MSn7JxBN7CkTVoWNM9l?= =?us-ascii?Q?uK3vZrjknbUL8E6Yz9QJ1EoqMPuDw/jVIg4mqwnu0TzqW7wpaOHGauWV2u8e?= =?us-ascii?Q?ciPxZ6sEsljcEjdLEHB2vDGsy+M7WXXS44CP02l2kkQn51778UmpSF8SfiUc?= =?us-ascii?Q?gGhtAiaj8QykPm7y/1NlF4L5I1gmc6q2gLu90HXiCvK2tnKK4I2Le4UXmGhK?= =?us-ascii?Q?4wfM7z2IcvMOvZh+hg3JBvfenT8yUOphQRcPYkyr1zWvFOglQA+95cVwu2MC?= =?us-ascii?Q?GdsRnWY6DzQevMddvvBS6ZIu/8Vr7LunzL9pMuKyTGePIzXXaL7Ri4hTLvj4?= =?us-ascii?Q?HQSpHw7hg+PDsAc+H3KKIF52MVRFjK5xxaTVQHAouLLZs4fZigifsYEnpWT1?= =?us-ascii?Q?OjhpdWF0IpTiuxEC9Ko3nsDqV7S4vL/9sdS4eIMidTEkfIcieLuBdeATT0g3?= =?us-ascii?Q?psOIw+ENxxPobwXXdHJnnVGYMn+UogUTbTTw6hAq81lgKcREGJu8uO8TM5D3?= =?us-ascii?Q?1KpbbboLqiAMRi2f9QRqsjz3TxwTGa6ej7+vt5PVHsvcaClhfIaZ64x385z8?= =?us-ascii?Q?94PpVy0dsA=3D=3D?= Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: DM6PR11MB4252.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7d6d9938-e790-450d-fd2d-08da506f863d X-MS-Exchange-CrossTenant-originalarrivaltime: 17 Jun 2022 14:41:54.9679 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: 7Tebgwu+9DWqjBZ6Qq2Tw3VEryEJCxdGQ4cbGNZSdyLawi0pBwoWXbIQzHFhlXDIZEYxSDEABbqxjf162Pf7GQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN6PR11MB2703 X-OriginatorOrg: intel.com X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Hi, > -----Original Message----- > From: Huang, Wei > Sent: Friday, June 17, 2022 15:20 > To: dev@dpdk.org; thomas@monjalon.net; nipun.gupta@nxp.com; > hemant.agrawal@nxp.com > Cc: stable@dpdk.org; Xu, Rosen ; Zhang, Tianfei > ; Zhang, Qi Z ; Huang, Wei > > Subject: [PATCH v3 1/4] raw/ifpga/base: add PMCI base driver >=20 > PMCI (Platform Management Control Interface) is a new module in FPGA, > which is designed to cooperate with BMC chip to fulfill board management > functions. > This base driver implements interfaces to access registers of BMC chip. >=20 > Signed-off-by: Wei Huang > --- > v2: fix typo. 'spi_master' is not misspelled and is not introduced > in this patch > --- > v3: split PMCI driver into several patches > --- > drivers/raw/ifpga/base/ifpga_defines.h | 2 + > drivers/raw/ifpga/base/ifpga_feature_dev.c | 2 + > drivers/raw/ifpga/base/ifpga_feature_dev.h | 1 + > drivers/raw/ifpga/base/ifpga_fme.c | 142 ++++++++++++-- > drivers/raw/ifpga/base/opae_intel_max10.c | 297 > ++++++++++++++++++++--------- > drivers/raw/ifpga/base/opae_intel_max10.h | 229 > +++++++++++++++++++++- > drivers/raw/ifpga/base/opae_osdep.h | 43 ++++- > 7 files changed, 597 insertions(+), 119 deletions(-) >=20 > diff --git a/drivers/raw/ifpga/base/ifpga_defines.h > b/drivers/raw/ifpga/base/ifpga_defines.h > index 9a280eb..f84ed1d 100644 > --- a/drivers/raw/ifpga/base/ifpga_defines.h > +++ b/drivers/raw/ifpga/base/ifpga_defines.h > @@ -23,6 +23,7 @@ > #define FME_FEATURE_NIOS_SPI "fme_nios_spi" > #define FME_FEATURE_I2C_MASTER "fme_i2c_master" > #define FME_FEATURE_ETH_GROUP "fme_eth_group" > +#define FME_FEATURE_PMCI "fme_pmci" >=20 > #define PORT_FEATURE_HEADER "port_hdr" > #define PORT_FEATURE_UAFU "port_uafu" > @@ -91,6 +92,7 @@ enum fpga_id_type { > #define FME_FEATURE_ID_NIOS_SPI 0xd > #define FME_FEATURE_ID_I2C_MASTER 0xf > #define FME_FEATURE_ID_ETH_GROUP 0x10 > +#define FME_FEATURE_ID_PMCI 0x12 >=20 > #define PORT_FEATURE_ID_HEADER FEATURE_ID_FIU_HEADER #define > PORT_FEATURE_ID_ERROR 0x10 diff --git > a/drivers/raw/ifpga/base/ifpga_feature_dev.c > b/drivers/raw/ifpga/base/ifpga_feature_dev.c > index dbecc7b..0a00af1 100644 > --- a/drivers/raw/ifpga/base/ifpga_feature_dev.c > +++ b/drivers/raw/ifpga/base/ifpga_feature_dev.c > @@ -227,6 +227,8 @@ int port_clear_error(struct ifpga_port_hw *port) > &fme_i2c_master_ops),}, > {FEATURE_DRV(FME_FEATURE_ID_ETH_GROUP, > FME_FEATURE_ETH_GROUP, > &fme_eth_group_ops),}, > + {FEATURE_DRV(FME_FEATURE_ID_PMCI, FME_FEATURE_PMCI, > + &fme_pmci_ops),}, > {0, NULL, NULL}, /* end of arrary */ > }; >=20 > diff --git a/drivers/raw/ifpga/base/ifpga_feature_dev.h > b/drivers/raw/ifpga/base/ifpga_feature_dev.h > index b355d22..a637eb5 100644 > --- a/drivers/raw/ifpga/base/ifpga_feature_dev.h > +++ b/drivers/raw/ifpga/base/ifpga_feature_dev.h > @@ -178,6 +178,7 @@ int do_pr(struct ifpga_hw *hw, u32 port_id, const > char *buffer, u32 size, extern struct ifpga_feature_ops fme_i2c_master_o= ps; > extern struct ifpga_feature_ops fme_eth_group_ops; extern struct > ifpga_feature_ops fme_nios_spi_master_ops; > +extern struct ifpga_feature_ops fme_pmci_ops; >=20 > int port_get_prop(struct ifpga_port_hw *port, struct feature_prop *prop)= ; > int port_set_prop(struct ifpga_port_hw *port, struct feature_prop *prop); > diff --git a/drivers/raw/ifpga/base/ifpga_fme.c > b/drivers/raw/ifpga/base/ifpga_fme.c > index 43c7b9c..4d089d2 100644 > --- a/drivers/raw/ifpga/base/ifpga_fme.c > +++ b/drivers/raw/ifpga/base/ifpga_fme.c > @@ -983,11 +983,25 @@ static int fme_spi_init(struct ifpga_feature *featu= re) >=20 > altera_spi_init(spi_master); >=20 > - max10 =3D intel_max10_device_probe(spi_master, 0); > - if (!max10) { > + max10 =3D opae_zmalloc(sizeof(*max10)); > + if (!max10) > + goto release_dev; > + > + max10->spi_master =3D spi_master; > + max10->type =3D M10_N3000; > + > + max10->spi_tran_dev =3D spi_transaction_init(spi_master, 0); > + if (!max10->spi_tran_dev) { > + dev_err(fme, "%s spi tran init fail\n", __func__); > + goto free_max10; > + } > + > + /* init the max10 device */ > + ret =3D intel_max10_device_init(max10); > + if (ret) { > ret =3D -ENODEV; > dev_err(fme, "max10 init fail\n"); > - goto spi_fail; > + goto release_spi_tran_dev; > } >=20 > fme->max10_dev =3D max10; > @@ -1002,7 +1016,12 @@ static int fme_spi_init(struct ifpga_feature > *feature) >=20 > max10_fail: > intel_max10_device_remove(fme->max10_dev); > -spi_fail: > +release_spi_tran_dev: > + if (max10->spi_tran_dev) > + spi_transaction_remove(max10->spi_tran_dev); > +free_max10: > + opae_free(max10); > +release_dev: > altera_spi_release(spi_master); > return ret; > } > @@ -1011,8 +1030,10 @@ static void fme_spi_uinit(struct ifpga_feature > *feature) { > struct ifpga_fme_hw *fme =3D (struct ifpga_fme_hw *)feature- > >parent; >=20 > - if (fme->max10_dev) > + if (fme->max10_dev) { > intel_max10_device_remove(fme->max10_dev); > + opae_free(fme->max10_dev); > + } > } >=20 > struct ifpga_feature_ops fme_spi_master_ops =3D { @@ -1157,20 +1178,30 > @@ static int fme_nios_spi_init(struct ifpga_feature *feature) > /* 3. init the spi master*/ > altera_spi_init(spi_master); >=20 > + max10 =3D opae_zmalloc(sizeof(*max10)); > + if (!max10) > + goto release_dev; > + > + max10->spi_master =3D spi_master; > + max10->type =3D M10_N3000; > + > + max10->spi_tran_dev =3D spi_transaction_init(spi_master, 0); > + if (!max10->spi_tran_dev) { > + dev_err(fme, "%s spi tran init fail\n", __func__); > + goto free_max10; > + } > + > /* init the max10 device */ > - max10 =3D intel_max10_device_probe(spi_master, 0); > - if (!max10) { > + ret =3D intel_max10_device_init(max10); > + if (ret) { > ret =3D -ENODEV; > dev_err(fme, "max10 init fail\n"); > - goto release_dev; > + goto release_spi_tran_dev; > } >=20 > fme->max10_dev =3D max10; > - > max10->bus =3D hw->pci_data->bus; > - > fme_get_board_interface(fme); > - > mgr->sensor_list =3D &max10->opae_sensor_list; >=20 > /* SPI self test */ > @@ -1187,6 +1218,11 @@ static int fme_nios_spi_init(struct ifpga_feature > *feature) >=20 > spi_fail: > intel_max10_device_remove(fme->max10_dev); > +release_spi_tran_dev: > + if (max10->spi_tran_dev) > + spi_transaction_remove(max10->spi_tran_dev); > +free_max10: > + opae_free(max10); > release_dev: > altera_spi_release(spi_master); > return -ENODEV; > @@ -1197,8 +1233,10 @@ static void fme_nios_spi_uinit(struct > ifpga_feature *feature) > struct ifpga_fme_hw *fme =3D (struct ifpga_fme_hw *)feature- > >parent; >=20 > release_sec_mgr(fme); > - if (fme->max10_dev) > + if (fme->max10_dev) { > intel_max10_device_remove(fme->max10_dev); > + opae_free(fme->max10_dev); > + } > } >=20 > struct ifpga_feature_ops fme_nios_spi_master_ops =3D { @@ -1230,7 +1268,= 7 > @@ static int i2c_mac_rom_test(struct altera_i2c_dev *dev) > } >=20 > if (memcmp(buf, read_buf, strlen(string))) { > - dev_err(NULL, "%s test fail!\n", __func__); > + dev_info(NULL, "%s test fail!\n", __func__); > return -EFAULT; > } >=20 > @@ -1499,3 +1537,81 @@ int fme_mgr_get_sensor_value(struct > ifpga_fme_hw *fme, >=20 > return 0; > } > + > +static int fme_pmci_init(struct ifpga_feature *feature) { > + struct ifpga_fme_hw *fme =3D (struct ifpga_fme_hw *)feature- > >parent; > + struct intel_max10_device *max10; > + struct ifpga_hw *hw; > + struct opae_manager *mgr; > + opae_share_data *sd =3D NULL; > + int ret =3D 0; > + > + hw =3D fme->parent; > + if (!hw) > + return -ENODEV; > + > + mgr =3D hw->adapter->mgr; > + if (!mgr) > + return -ENODEV; > + > + dev_info(fme, "FME PMCI Init.\n"); > + dev_debug(fme, "FME PMCI base addr %p.\n", > + feature->addr); > + > + max10 =3D opae_zmalloc(sizeof(*max10)); > + if (!max10) > + return -ENOMEM; > + > + max10->type =3D M10_N6000; > + max10->mmio =3D feature->addr; > + if (hw->adapter && hw->adapter->shm.ptr) { > + sd =3D (opae_share_data *)hw->adapter->shm.ptr; > + max10->bmc_ops.mutex =3D &sd->spi_mutex; > + } else { > + max10->bmc_ops.mutex =3D NULL; > + } > + > + /* init the max10 device */ > + ret =3D intel_max10_device_init(max10); > + if (ret) { > + dev_err(fme, "max10 init fail\n"); > + goto free_max10; > + } > + > + fme->max10_dev =3D max10; > + max10->bus =3D hw->pci_data->bus; > + fme_get_board_interface(fme); > + mgr->sensor_list =3D &max10->opae_sensor_list; > + > + ret =3D init_sec_mgr(fme); > + if (ret) { > + dev_err(fme, "security manager init fail\n"); > + goto release_max10; > + } > + > + return ret; > + > +release_max10: > + intel_max10_device_remove(max10); > +free_max10: > + opae_free(max10); > + > + return ret; > +} > + > +static void fme_pmci_uinit(struct ifpga_feature *feature) { > + struct ifpga_fme_hw *fme =3D (struct ifpga_fme_hw *)feature- > >parent; > + > + release_sec_mgr(fme); > + if (fme->max10_dev) { > + intel_max10_device_remove(fme->max10_dev); > + opae_free(fme->max10_dev); > + } > +} > + > +struct ifpga_feature_ops fme_pmci_ops =3D { > + .init =3D fme_pmci_init, > + .uinit =3D fme_pmci_uinit, > +}; > diff --git a/drivers/raw/ifpga/base/opae_intel_max10.c > b/drivers/raw/ifpga/base/opae_intel_max10.c > index 9d82fb0..901a258 100644 > --- a/drivers/raw/ifpga/base/opae_intel_max10.c > +++ b/drivers/raw/ifpga/base/opae_intel_max10.c > @@ -4,51 +4,42 @@ >=20 > #include "opae_intel_max10.h" > #include > +#include "opae_osdep.h" >=20 > -int max10_reg_read(struct intel_max10_device *dev, > - unsigned int reg, unsigned int *val) > +int max10_sys_read(struct intel_max10_device *dev, > + unsigned int offset, unsigned int *val) > { > - if (!dev) > + if (!dev || !dev->ops->reg_read) > return -ENODEV; >=20 > - dev_debug(dev, "%s: bus:0x%x, reg:0x%x\n", __func__, dev->bus, > reg); > - > - return spi_transaction_read(dev->spi_tran_dev, > - reg, 4, (unsigned char *)val); > + return dev->ops->reg_read(dev, dev->csr->base + offset, val); > } >=20 > -int max10_reg_write(struct intel_max10_device *dev, > - unsigned int reg, unsigned int val) > +int max10_sys_write(struct intel_max10_device *dev, > + unsigned int offset, unsigned int val) > { > - unsigned int tmp =3D val; > - > - if (!dev) > + if (!dev || !dev->ops->reg_write) > return -ENODEV; >=20 > - dev_debug(dev, "%s: bus:0x%x, reg:0x%x, val:0x%x\n", __func__, > - dev->bus, reg, val); > - > - return spi_transaction_write(dev->spi_tran_dev, > - reg, 4, (unsigned char *)&tmp); > + return dev->ops->reg_write(dev, dev->csr->base + offset, val); > } >=20 > -int max10_sys_read(struct intel_max10_device *dev, > +int max10_reg_read(struct intel_max10_device *dev, > unsigned int offset, unsigned int *val) { > - if (!dev) > + if (!dev || !dev->ops->reg_read) > return -ENODEV; >=20 > - > - return max10_reg_read(dev, dev->base + offset, val); > + return dev->ops->reg_read(dev, offset, val); > } >=20 > -int max10_sys_write(struct intel_max10_device *dev, > +int max10_reg_write(struct intel_max10_device *dev, > unsigned int offset, unsigned int val) { > - if (!dev) > + if (!dev || !dev->ops->reg_write) > return -ENODEV; >=20 > - return max10_reg_write(dev, dev->base + offset, val); > + return dev->ops->reg_write(dev, offset, val); > } >=20 > int max10_sys_update_bits(struct intel_max10_device *dev, unsigned int > offset, @@ -67,6 +58,135 @@ int max10_sys_update_bits(struct > intel_max10_device *dev, unsigned int offset, > return max10_sys_write(dev, offset, temp); } >=20 > +static int max10_spi_read(struct intel_max10_device *dev, > + unsigned int addr, unsigned int *val) > +{ > + if (!dev) > + return -ENODEV; > + > + dev_debug(dev, "%s: bus:0x%x, addr:0x%x\n", __func__, dev->bus, > addr); > + > + return spi_transaction_read(dev->spi_tran_dev, > + addr, 4, (unsigned char *)val); > +} > + > +static int max10_spi_write(struct intel_max10_device *dev, > + unsigned int addr, unsigned int val) > +{ > + unsigned int tmp =3D val; > + > + if (!dev) > + return -ENODEV; > + > + dev_debug(dev, "%s: bus:0x%x, reg:0x%x, val:0x%x\n", __func__, > + dev->bus, addr, val); > + > + return spi_transaction_write(dev->spi_tran_dev, > + addr, 4, (unsigned char *)&tmp); > +} > + > +static int indirect_bus_clr_cmd(struct intel_max10_device *dev) { > + unsigned int cmd; > + int ret; > + > + opae_writel(0, dev->mmio + INDIRECT_CMD_OFF); > + > + ret =3D opae_readl_poll_timeout((dev->mmio + INDIRECT_CMD_OFF), > cmd, > + (!cmd), INDIRECT_INT_US, > INDIRECT_TIMEOUT_US); > + > + if (ret) > + dev_err(dev, "%s timed out on clearing cmd 0x%x\n", > + __func__, cmd); > + > + return ret; > +} > + > +static int max10_indirect_reg_read(struct intel_max10_device *dev, > + unsigned int addr, unsigned int *val) > +{ > + unsigned int cmd; > + int ret; > + > + if (!dev) > + return -ENODEV; > + > + pthread_mutex_lock(dev->bmc_ops.mutex); > + > + cmd =3D opae_readl(dev->mmio + INDIRECT_CMD_OFF); > + if (cmd) > + dev_warn(dev, "%s non-zero cmd 0x%x\n", __func__, cmd); > + > + opae_writel(addr, dev->mmio + INDIRECT_ADDR_OFF); > + > + opae_writel(INDIRECT_CMD_RD, dev->mmio + > INDIRECT_CMD_OFF); > + > + ret =3D opae_readl_poll_timeout((dev->mmio + INDIRECT_CMD_OFF), > cmd, > + (cmd & INDIRECT_CMD_ACK), > INDIRECT_INT_US, > + INDIRECT_TIMEOUT_US); > + > + *val =3D opae_readl(dev->mmio + INDIRECT_RD_OFF); > + > + if (ret) > + dev_err(dev, "%s timed out on reg 0x%x cmd 0x%x\n", > + __func__, addr, cmd); > + > + if (indirect_bus_clr_cmd(dev)) > + ret =3D -ETIME; > + > + pthread_mutex_unlock(dev->bmc_ops.mutex); > + > + return ret; > +} > + > +static int max10_indirect_reg_write(struct intel_max10_device *dev, > + unsigned int addr, unsigned int val) > +{ > + unsigned int cmd; > + int ret; > + > + if (!dev) > + return -ENODEV; > + > + pthread_mutex_lock(dev->bmc_ops.mutex); > + > + cmd =3D readl(dev->mmio + INDIRECT_CMD_OFF); > + > + if (cmd) > + dev_warn(dev, "%s non-zero cmd 0x%x\n", __func__, cmd); > + > + opae_writel(val, dev->mmio + INDIRECT_WR_OFF); > + > + opae_writel(addr, dev->mmio + INDIRECT_ADDR_OFF); > + > + writel(INDIRECT_CMD_WR, dev->mmio + INDIRECT_CMD_OFF); > + > + ret =3D opae_readl_poll_timeout((dev->mmio + INDIRECT_CMD_OFF), > cmd, > + (cmd & INDIRECT_CMD_ACK), > INDIRECT_INT_US, > + INDIRECT_TIMEOUT_US); > + > + if (ret) > + dev_err(dev, "%s timed out on reg 0x%x cmd 0x%x\n", > + __func__, addr, cmd); > + > + if (indirect_bus_clr_cmd(dev)) > + ret =3D -ETIME; > + > + pthread_mutex_unlock(dev->bmc_ops.mutex); > + > + return ret; > +} > + > +const struct m10bmc_regmap m10bmc_pmci_regmap =3D { > + .reg_write =3D max10_indirect_reg_write, > + .reg_read =3D max10_indirect_reg_read, > +}; > + > +const struct m10bmc_regmap m10bmc_n3000_regmap =3D { > + .reg_write =3D max10_spi_write, > + .reg_read =3D max10_spi_read, > +}; > + > static struct max10_compatible_id max10_id_table[] =3D { > {.compatible =3D MAX10_PAC,}, > {.compatible =3D MAX10_PAC_N3000,}, > @@ -561,11 +681,9 @@ static int check_max10_version(struct > intel_max10_device *dev) > &v)) { > if (v !=3D 0xffffffff) { > dev_info(dev, "secure MAX10 detected\n"); > - dev->base =3D MAX10_SEC_BASE_ADDR; > dev->flags |=3D MAX10_FLAGS_SECURE; > } else { > dev_info(dev, "non-secure MAX10 detected\n"); > - dev->base =3D MAX10_BASE_ADDR; > } > return 0; > } > @@ -648,73 +766,75 @@ static int max10_staging_area_init(struct > intel_max10_device *dev) > return 0; > } >=20 > -struct intel_max10_device * > -intel_max10_device_probe(struct altera_spi_device *spi, > - int chipselect) > -{ > - struct intel_max10_device *dev; > - int ret; > - unsigned int val; > +static const struct m10bmc_csr m10bmc_spi_csr =3D { > + .base =3D MAX10_SEC_BASE_ADDR, > + .build_version =3D MAX10_BUILD_VER, > + .fw_version =3D NIOS2_FW_VERSION, > + .fpga_page_info =3D FPGA_PAGE_INFO, > + .doorbell =3D MAX10_DOORBELL, > + .auth_result =3D MAX10_AUTH_RESULT, > +}; >=20 > - dev =3D opae_malloc(sizeof(*dev)); > - if (!dev) > - return NULL; > +static const struct m10bmc_csr m10bmc_pmci_csr =3D { > + .base =3D M10BMC_PMCI_SYS_BASE, > + .build_version =3D M10BMC_PMCI_BUILD_VER, > + .fw_version =3D NIOS2_PMCI_FW_VERSION, > + .fpga_page_info =3D M10BMC_PMCI_FPGA_CONF_STS, > + .doorbell =3D M10BMC_PMCI_DOORBELL, > + .auth_result =3D M10BMC_PMCI_AUTH_RESULT, }; >=20 > - TAILQ_INIT(&dev->opae_sensor_list); > +int > +intel_max10_device_init(struct intel_max10_device *dev) { > + int ret =3D 0; >=20 > - dev->spi_master =3D spi; > + TAILQ_INIT(&dev->opae_sensor_list); >=20 > - dev->spi_tran_dev =3D spi_transaction_init(spi, chipselect); > - if (!dev->spi_tran_dev) { > - dev_err(dev, "%s spi tran init fail\n", __func__); > - goto free_dev; > - } >=20 > - /* check the max10 version */ > - ret =3D check_max10_version(dev); > - if (ret) { > - dev_err(dev, "Failed to find max10 hardware!\n"); > - goto free_dev; > - } > + if (dev->type =3D=3D M10_N3000) { > + dev->ops =3D &m10bmc_n3000_regmap; > + dev->csr =3D &m10bmc_spi_csr; >=20 > - /* load the MAX10 device table */ > - ret =3D init_max10_device_table(dev); > - if (ret) { > - dev_err(dev, "Init max10 device table fail\n"); > - goto free_dev; > - } > + /* check the max10 version */ > + ret =3D check_max10_version(dev); > + if (ret) { > + dev_err(dev, "Failed to find max10 hardware!\n"); > + return ret; > + } >=20 > - /* init max10 devices, like sensor*/ > - if (dev->flags & MAX10_FLAGS_SECURE) > - ret =3D max10_secure_hw_init(dev); > - else > - ret =3D max10_non_secure_hw_init(dev); > - if (ret) { > - dev_err(dev, "Failed to init max10 hardware!\n"); > - goto free_dtb; > - } > + /* load the MAX10 device table */ > + ret =3D init_max10_device_table(dev); > + if (ret) { > + dev_err(dev, "Init max10 device table fail\n"); > + return ret; > + } >=20 > - /* read FPGA loading information */ > - ret =3D max10_sys_read(dev, FPGA_PAGE_INFO, &val); > - if (ret) { > - dev_err(dev, "fail to get FPGA loading info\n"); > - goto release_max10_hw; > - } > - dev_info(dev, "FPGA loaded from %s Image\n", val ? "User" : > "Factory"); > + /* init max10 devices, like sensor*/ > + if (dev->flags & MAX10_FLAGS_SECURE) > + ret =3D max10_secure_hw_init(dev); > + else > + ret =3D max10_non_secure_hw_init(dev); > + if (ret) { > + dev_err(dev, "Failed to init max10 hardware!\n"); > + opae_free(dev->fdt_root); > + return ret; > + } > + } else if (dev->type =3D=3D M10_N6000) { > + dev->ops =3D &m10bmc_pmci_regmap; > + dev->csr =3D &m10bmc_pmci_csr; > + dev->staging_area_size =3D MAX_STAGING_AREA_SIZE; > + dev->flags |=3D MAX10_FLAGS_SECURE; >=20 > - return dev; > + ret =3D pthread_mutex_init(&dev->bmc_ops.lock, NULL); > + if (ret) > + return ret; >=20 > -release_max10_hw: > - max10_sensor_uinit(dev); > -free_dtb: > - if (dev->fdt_root) > - opae_free(dev->fdt_root); > - if (dev->spi_tran_dev) > - spi_transaction_remove(dev->spi_tran_dev); > -free_dev: > - opae_free(dev); > + if (!dev->bmc_ops.mutex) > + dev->bmc_ops.mutex =3D &dev->bmc_ops.lock; > + } >=20 > - return NULL; > + return ret; > } >=20 > int intel_max10_device_remove(struct intel_max10_device *dev) @@ - > 722,15 +842,14 @@ int intel_max10_device_remove(struct > intel_max10_device *dev) > if (!dev) > return 0; >=20 > - max10_sensor_uinit(dev); > - > - if (dev->spi_tran_dev) > - spi_transaction_remove(dev->spi_tran_dev); > + pthread_mutex_destroy(&dev->bmc_ops.lock); >=20 > - if (dev->fdt_root) > - opae_free(dev->fdt_root); > + if (dev->type =3D=3D M10_N3000) { > + max10_sensor_uinit(dev); >=20 > - opae_free(dev); > + if (dev->fdt_root) > + opae_free(dev->fdt_root); > + } >=20 > return 0; > } > diff --git a/drivers/raw/ifpga/base/opae_intel_max10.h > b/drivers/raw/ifpga/base/opae_intel_max10.h > index e761d7e..0d31196 100644 > --- a/drivers/raw/ifpga/base/opae_intel_max10.h > +++ b/drivers/raw/ifpga/base/opae_intel_max10.h > @@ -7,6 +7,9 @@ >=20 > #include "opae_osdep.h" > #include "opae_spi.h" > +#include "ifpga_compat.h" > + > +struct intel_max10_device; >=20 > struct max10_compatible_id { > char compatible[128]; > @@ -29,6 +32,52 @@ struct max10_compatible_id { > /** List of opae sensors */ > TAILQ_HEAD(opae_sensor_list, opae_sensor_info); >=20 > +/* Supported MAX10 BMC types */ > +enum m10bmc_type { > + M10_N3000, > + M10_N6000 > +}; > + > +struct regmap_range { > + unsigned int min; > + unsigned int max; > +}; > + > +struct m10bmc_regmap { > + int (*reg_write)(struct intel_max10_device *dev, > + unsigned int reg, unsigned int val); > + int (*reg_read)(struct intel_max10_device *dev, > + unsigned int reg, unsigned int *val); > + const struct regmap_range *range; > + int num_ranges; > +}; > + > +struct m10bmc_csr { > + unsigned int base; > + unsigned int build_version; > + unsigned int fw_version; > + unsigned int fpga_page_info; > + unsigned int doorbell; > + unsigned int auth_result; > +}; > + > +/** > + * struct m10bmc_ops - device specific operations > + * @lock: prevent concurrent flash read/write > + * @mutex: prevent concurrent bmc read/write > + * @flash_read: read a block of data from flash > + * @flash_write: write a block of data to flash */ struct m10bmc_ops { > + pthread_mutex_t lock; > + pthread_mutex_t *mutex; > + int (*check_flash_range)(u32 start, u32 end); > + int (*flash_read)(struct intel_max10_device *dev, u32 addr, > + void *buf, u32 size); > + int (*flash_write)(struct intel_max10_device *dev, u32 addr, > + void *buf, u32 size); > +}; > + > struct intel_max10_device { > unsigned int flags; /*max10 hardware capability*/ > struct altera_spi_device *spi_master; > @@ -40,6 +89,11 @@ struct intel_max10_device { > struct opae_sensor_list opae_sensor_list; > u32 staging_area_base; > u32 staging_area_size; > + enum m10bmc_type type; > + const struct m10bmc_regmap *ops; > + const struct m10bmc_csr *csr; > + struct m10bmc_ops bmc_ops; > + u8 *mmio; /* mmio address for PMCI */ > }; >=20 > /* retimer speed */ > @@ -87,6 +141,7 @@ struct opae_retimer_status { > /* System Registers */ > #define MAX10_BASE_ADDR 0x300400 > #define MAX10_SEC_BASE_ADDR 0x300800 > + > /* Register offset of system registers */ > #define NIOS2_FW_VERSION 0x0 > #define MAX10_MACADDR1 0x10 > @@ -151,6 +206,32 @@ struct opae_retimer_status { > #define SEC_STATUS_NON_INC 0x6 > #define SEC_STATUS_ERASE_FAIL 0x7 > #define SEC_STATUS_WEAROUT 0x8 > +#define SEC_STATUS_PMCI_SS_FAIL 0x9 > +#define SEC_STATUS_FLASH_CMD 0xa > +#define SEC_STATUS_FACTORY_UNVERITY 0xb > +#define SEC_STATUS_FACTORY_ACTIVE 0xc > +#define SEC_STATUS_POWER_DOWN 0xd > +#define SEC_STATUS_CANCELLATION 0xe > +#define SEC_STATUS_HASH 0xf > +#define SEC_STATUS_FLASH_ACCESS 0x10 > +#define SEC_STATUS_SDM_PR_CERT 0x20 > +#define SEC_STATUS_SDM_PR_NIOS_BUSY 0x21 > +#define SEC_STATUS_SDM_PR_TIMEOUT 0x22 > +#define SEC_STATUS_SDM_PR_FAILED 0x23 > +#define SEC_STATUS_SDM_PR_MISMATCH 0x24 > +#define SEC_STATUS_SDM_PR_FLUSH 0x25 > +#define SEC_STATUS_SDM_SR_CERT 0x30 > +#define SEC_STATUS_SDM_SR_NIOS_BUSY 0x31 > +#define SEC_STATUS_SDM_SR_TIMEOUT 0x32 > +#define SEC_STATUS_SDM_SR_FAILED 0x33 > +#define SEC_STATUS_SDM_SR_MISMATCH 0x34 > +#define SEC_STATUS_SDM_SR_FLUSH 0x35 > +#define SEC_STATUS_SDM_KEY_CERT 0x40 > +#define SEC_STATUS_SDM_KEY_NIOS_BUSY 0x41 > +#define SEC_STATUS_SDM_KEY_TIMEOUT 0x42 > +#define SEC_STATUS_SDM_KEY_FAILED 0x43 > +#define SEC_STATUS_SDM_KEY_MISMATCH 0x44 > +#define SEC_STATUS_SDM_KEY_FLUSH 0x45 > #define SEC_STATUS_NIOS_OK 0x80 > #define SEC_STATUS_USER_OK 0x81 > #define SEC_STATUS_FACTORY_OK 0x82 > @@ -158,9 +239,65 @@ struct opae_retimer_status { > #define SEC_STATUS_FACTORY_FAIL 0x84 > #define SEC_STATUS_NIOS_FLASH_ERR 0x85 > #define SEC_STATUS_FPGA_FLASH_ERR 0x86 > +#define SEC_STATUS_MAX SEC_STATUS_FPGA_FLASH_ERR > + > +/* Authentication status */ > +#define SEC_AUTH_G(v) ((v) & 0xff) > +#define AUTH_STAT_PASS 0x0 > +#define AUTH_STAT_B0_MAGIC 0x1 > +#define AUTH_STAT_CONLEN 0x2 > +#define AUTH_STAT_CONTYPE 0x3 > +#define AUTH_STAT_B1_MAGIC 0x4 > +#define AUTH_STAT_ROOT_MAGIC 0x5 > +#define AUTH_STAT_CURVE_MAGIC 0x6 > +#define AUTH_STAT_PERMISSION 0x7 > +#define AUTH_STAT_KEY_ID 0x8 > +#define AUTH_STAT_CSK_MAGIC 0x9 > +#define AUTH_STAT_CSK_CURVE 0xa > +#define AUTH_STAT_CSK_PERMISSION 0xb > +#define AUTH_STAT_CSK_ID 0xc > +#define AUTH_STAT_CSK_SM 0xd > +#define AUTH_STAT_B0_E_MAGIC 0xe > +#define AUTH_STAT_B0_E_SIGN 0xf > +#define AUTH_STAT_RK_P 0x10 > +#define AUTH_STAT_RE_SHA 0x11 > +#define AUTH_STAT_CSK_SHA 0x12 > +#define AUTH_STAT_B0_SHA 0x13 > +#define AUTH_STAT_KEY_INV 0x14 > +#define AUTH_STAT_KEY_CAN 0x15 > +#define AUTH_STAT_UP_SHA 0x16 > +#define AUTH_STAT_CAN_SHA 0x17 > +#define AUTH_STAT_HASH 0x18 > +#define AUTH_STAT_INV_ID 0x19 > +#define AUTH_STAT_KEY_PROG 0x1a > +#define AUTH_STAT_INV_BC 0x1b > +#define AUTH_STAT_INV_SLOT 0x1c > +#define AUTH_STAT_IN_OP 0x1d > +#define AUTH_STAT_TIME_OUT 0X1e > +#define AUTH_STAT_SHA_TO 0x1f > +#define AUTH_STAT_CSK_TO 0x20 > +#define AUTH_STAT_B0_TO 0x21 > +#define AUTH_STAT_UP_TO 0x22 > +#define AUTH_STAT_CAN_TO 0x23 > +#define AUTH_STAT_HASH_TO 0x24 > +#define AUTH_STAT_AUTH_IDLE 0xfe > +#define AUTH_STAT_GA_FAIL 0xff > +#define AUTH_STAT_S_ERR 0x8000 > +#define AUTH_STAT_S_MN 0x8001 > +#define AUTH_STAT_SH_CRC 0x8002 > +#define AUTH_STAT_SD_CRC 0x8003 > +#define AUTH_STAT_SD_LEN 0x8004 > +#define AUTH_STAT_S_ID 0x8005 > +#define AUTH_STAT_S_THR 0x8006 > +#define AUTH_STAT_S_TO 0x8007 > +#define AUTH_STAT_S_EN 0x8008 > +#define AUTH_STAT_SF 0x8009 > +#define AUTH_STAT_MAX AUTH_STAT_SF > + > #define CONFIG_SEL BIT(28) > #define CONFIG_SEL_S(v) (((v) & 0x1) << 28) > #define REBOOT_REQ BIT(29) > +#define REBOOT_DISABLED BIT(30) > #define MAX10_AUTH_RESULT 0x404 >=20 > /* PKVL related registers, in system register region */ @@ -185,19 +322,= 21 > @@ struct opae_retimer_status { > #define MAX_STAGING_AREA_BASE 0xffffffff > #define MAX_STAGING_AREA_SIZE 0x3800000 >=20 > -int max10_reg_read(struct intel_max10_device *dev, > - unsigned int reg, unsigned int *val); > -int max10_reg_write(struct intel_max10_device *dev, > - unsigned int reg, unsigned int val); > +#define m10bmc_base(max10) ((max10)->csr->base) #define > +doorbell_reg(max10) ((max10)->csr->doorbell) #define > +auth_result_reg(max10) ((max10)->csr->auth_result) > + > int max10_sys_read(struct intel_max10_device *dev, > unsigned int offset, unsigned int *val); int max10_sys_write(struct > intel_max10_device *dev, > unsigned int offset, unsigned int val); > +int max10_reg_read(struct intel_max10_device *dev, > + unsigned int offset, unsigned int *val); int max10_reg_write(struct > +intel_max10_device *dev, > + unsigned int offset, unsigned int val); > int max10_sys_update_bits(struct intel_max10_device *dev, > unsigned int offset, unsigned int msk, unsigned int val); -struct > intel_max10_device * -intel_max10_device_probe(struct altera_spi_device > *spi, > - int chipselect); > +int intel_max10_device_init(struct intel_max10_device *dev); > int intel_max10_device_remove(struct intel_max10_device *dev); >=20 >=20 > @@ -254,4 +393,80 @@ struct opae_sensor_info { > unsigned int value_reg; > }; >=20 > +/* indirect access for PMCI */ > +#define PMCI_INDIRECT_BASE 0x400 > +#define INDIRECT_CMD_OFF (PMCI_INDIRECT_BASE + 0x0) > +#define INDIRECT_CMD_RD BIT(0) > +#define INDIRECT_CMD_WR BIT(1) > +#define INDIRECT_CMD_ACK BIT(2) > + > +#define INDIRECT_ADDR_OFF (PMCI_INDIRECT_BASE + 0x4) > +#define INDIRECT_RD_OFF (PMCI_INDIRECT_BASE + 0x8) > +#define INDIRECT_WR_OFF (PMCI_INDIRECT_BASE + 0xc) > + > +#define INDIRECT_INT_US 1 > +#define INDIRECT_TIMEOUT_US 10000 > + > +#define M10BMC_PMCI_SYS_BASE 0x0 > +#define M10BMC_PMCI_SYS_END 0xfff > + > +#define M10BMC_PMCI_BUILD_VER 0x0 > +#define NIOS2_PMCI_FW_VERSION 0x4 > + > +#define M10BMC_PMCI_PWR_STATE 0xb4 > +#define PMCI_PRIMARY_IMAGE_PAGE GENMASK(10, 8) > + > +#define M10BMC_PMCI_DOORBELL 0x1c0 > +#define PMCI_DRBL_REBOOT_DISABLED BIT(1) #define > +M10BMC_PMCI_AUTH_RESULT 0x1c4 > + > +#define M10BMC_PMCI_MAX10_RECONF 0xfc > +#define PMCI_MAX10_REBOOT_REQ BIT(0) > +#define PMCI_MAX10_REBOOT_PAGE BIT(1) > + > +#define M10BMC_PMCI_FPGA_RECONF 0xb8 > +#define PMCI_FPGA_RECONF_PAGE GENMASK(22, 20) > +#define PMCI_FPGA_RP_LOAD BIT(23) > + > +#define M10BMC_PMCI_FPGA_POC 0xb0 > +#define PMCI_FPGA_POC BIT(0) > +#define PMCI_NIOS_REQ_CLEAR BIT(1) > +#define PMCI_NIOS_STATUS GENMASK(5, 4) > +#define NIOS_STATUS_IDLE 0 > +#define NIOS_STATUS_SUCCESS 1 > +#define NIOS_STATUS_FAIL 2 > +#define PMCI_USER_IMAGE_PAGE GENMASK(10, 8) > +#define POC_USER_IMAGE_1 1 > +#define POC_USER_IMAGE_2 2 > +#define PMCI_FACTORY_IMAGE_SEL BIT(31) > + > +#define M10BMC_PMCI_FPGA_CONF_STS 0xa0 > +#define PMCI_FPGA_BOOT_PAGE GENMASK(2, 0) #define > PMCI_FPGA_CONFIGURED > +BIT(3) > + > +#define M10BMC_PMCI_SDM_CTRL_STS 0x230 > +#define PMCI_SDM_IMG_REQ BIT(0) > +#define PMCI_SDM_STAT GENMASK(23, 16) > + > +#define SDM_STAT_DONE 0x0 > +#define SDM_STAT_PROV 0x1 > +#define SDM_STAT_BUSY 0x2 > +#define SDM_STAT_INV 0x3 > +#define SDM_STAT_FAIL 0x4 > +#define SDM_STAT_BMC_BUSY 0x5 > +#define SDM_STAT_TO 0x6 > +#define SDM_STAT_DB 0x7 > +#define SDM_STAT_CON_R 0x8 > +#define SDM_STAT_CON_E 0x9 > +#define SDM_STAT_WAIT 0xa > +#define SDM_STAT_RTO 0xb > +#define SDM_STAT_SB 0xc > +#define SDM_STAT_RE 0xd > +#define SDM_STAT_PDD 0xe > +#define SDM_STAT_ISC 0xf > +#define SDM_STAT_SIC 0x10 > +#define SDM_STAT_NO_PROV 0x11 > +#define SDM_STAT_CS_MIS 0x12 > +#define SDM_STAT_PR_MIS 0x13 > +#define SDM_STAT_MAX SDM_STAT_PR_MIS > #endif > diff --git a/drivers/raw/ifpga/base/opae_osdep.h > b/drivers/raw/ifpga/base/opae_osdep.h > index 18e6a11..033b7e0 100644 > --- a/drivers/raw/ifpga/base/opae_osdep.h > +++ b/drivers/raw/ifpga/base/opae_osdep.h > @@ -79,15 +79,38 @@ struct uuid { > #define time_before(a, b) time_after(b, a) > #define opae_memset(a, b, c) memset((a), (b), (c)) >=20 > -#define opae_readq_poll_timeout(addr, val, cond, invl, timeout)\ > -({ \ > - int wait =3D 0; \ > - for (; wait <=3D timeout; wait +=3D invl) { \ > - (val) =3D opae_readq(addr); \ > - if (cond) \ > - break; \ > - udelay(invl); \ > - } \ > - (cond) ? 0 : -ETIMEDOUT; \ > +#define readx_poll_timeout(op, val, cond, invl, timeout, args...) \ > +({ \ > + unsigned long __wait =3D 0; \ > + unsigned long __invl =3D (invl); \ > + unsigned long __timeout =3D (timeout); \ > + for (; __wait <=3D __timeout; __wait +=3D __invl) { \ > + (val) =3D op(args); \ > + if (cond) \ > + break; \ > + udelay(__invl); \ > + } \ > + (cond) ? 0 : -ETIMEDOUT; \ > }) > + > +#define opae_readq_poll_timeout(addr, val, cond, invl, timeout) \ > + readx_poll_timeout(opae_readq, val, cond, invl, timeout, addr) > + > +#define opae_readl_poll_timeout(addr, val, cond, invl, timeout) \ > + readx_poll_timeout(opae_readl, val, cond, invl, timeout, addr) > + > +#define opae_readw_poll_timeout(addr, val, cond, invl, timeout) \ > + readx_poll_timeout(opae_readw, val, cond, invl, timeout, addr) > + > +#define opae_readb_poll_timeout(addr, val, cond, invl, timeout) \ > + readx_poll_timeout(opae_readb, val, cond, invl, timeout, addr) > + > +#define opae_max10_read_poll_timeout(dev, addr, value, cond, invl, > +timeout) \ ({ \ > + int __ret, __tmp; \ > + __tmp =3D readx_poll_timeout(max10_sys_read, __ret, __ret || > (cond), \ > + invl, timeout, (dev), (addr), &(value)); \ > + __ret?:__tmp; \ > +}) > + > #endif > -- > 1.8.3.1 Reviewed-by: Rosen Xu