From patchwork Thu May 16 03:05:14 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xiaowei Bao X-Patchwork-Id: 1100255 X-Patchwork-Delegate: prabhakar@freescale.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=nxp.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="Q9xC0Kgi"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 454GWm3Z8Mz9sMQ for ; Thu, 16 May 2019 13:05:40 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 0BB6BC21E07; Thu, 16 May 2019 03:05:33 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=SPF_HELO_PASS, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id B87A9C21E0F; Thu, 16 May 2019 03:05:23 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 9CDFCC21DB6; Thu, 16 May 2019 03:05:19 +0000 (UTC) Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-eopbgr00046.outbound.protection.outlook.com [40.107.0.46]) by lists.denx.de (Postfix) with ESMTPS id 8B918C21DC1 for ; Thu, 16 May 2019 03:05:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=KT/+QdzmdQsKGNV9J7Lkt8R7uOrIPZR+f0a5UEZ8yug=; b=Q9xC0KgiByUiIFqFAo2wZAobyp29gLNjpCR323oEU/QUQp8lqg1RhmzVkfiOuh5r8C9ZvlPTLUmxfHEVXdGY7s4oPxEJJhzx7qwi37uG5Pn1HYb8MMAa7ygWGx6xCiutgGqHKSTT5j/3VcOv0jfZeSxgidFbSoqq1SKHMaXBh2I= Received: from AM5PR04MB3299.eurprd04.prod.outlook.com (10.173.255.158) by AM5PR04MB2945.eurprd04.prod.outlook.com (10.173.254.13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1878.24; Thu, 16 May 2019 03:05:14 +0000 Received: from AM5PR04MB3299.eurprd04.prod.outlook.com ([fe80::15e3:bb28:7e33:1adb]) by AM5PR04MB3299.eurprd04.prod.outlook.com ([fe80::15e3:bb28:7e33:1adb%7]) with mapi id 15.20.1900.010; Thu, 16 May 2019 03:05:14 +0000 From: Xiaowei Bao To: "M.h. Lian" , "Z.q. Hou" , Mingkai Hu , Hongbo Wang , York Sun , "u-boot@lists.denx.de" Thread-Topic: [PATCH 2/2] pci: layerscape: Add the workaround for errata A-009460 Thread-Index: AQHVC5Que3nBZt0D/kGkAkxNMNe6rg== Date: Thu, 16 May 2019 03:05:14 +0000 Message-ID: <20190516030649.40602-2-xiaowei.bao@nxp.com> References: <20190516030649.40602-1-xiaowei.bao@nxp.com> In-Reply-To: <20190516030649.40602-1-xiaowei.bao@nxp.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: HK2PR03CA0058.apcprd03.prod.outlook.com (2603:1096:202:17::28) To AM5PR04MB3299.eurprd04.prod.outlook.com (2603:10a6:206:d::30) authentication-results: spf=none (sender IP is ) smtp.mailfrom=xiaowei.bao@nxp.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.17.1 x-originating-ip: [119.31.174.73] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 47230bd8-d2a3-43e5-1d06-08d6d9ab50c0 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600141)(711020)(4605104)(4618075)(2017052603328)(7193020); SRVR:AM5PR04MB2945; x-ms-traffictypediagnostic: AM5PR04MB2945: x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:2276; x-forefront-prvs: 0039C6E5C5 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(396003)(366004)(39860400002)(346002)(376002)(136003)(189003)(199004)(478600001)(25786009)(6436002)(71190400001)(71200400001)(66066001)(2501003)(54906003)(305945005)(110136005)(316002)(1076003)(6486002)(86362001)(52116002)(76176011)(99286004)(6506007)(6512007)(186003)(386003)(68736007)(73956011)(6116002)(81166006)(8936002)(8676002)(256004)(446003)(476003)(2616005)(11346002)(50226002)(53936002)(44832011)(2906002)(486006)(7736002)(81156014)(4326008)(3846002)(64756008)(66556008)(66946007)(66446008)(66476007)(14454004)(26005)(102836004)(5660300002)(36756003); DIR:OUT; SFP:1101; SCL:1; SRVR:AM5PR04MB2945; H:AM5PR04MB3299.eurprd04.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; received-spf: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: rXB2UUenVfpkvqPHid6vIOso/S6OZelFr641l4RTbBV1fFs5E6UO5l96tZnaa0OYAbHirokBV/g+gIhWySG2qvJFXCACzpc30fF3gEjjXO/vQw1deWqot56Cb8cSAQ6sFp3mzp8OW0CZsgBcZW8CixHpSklaErDS5155pZcL62eEVRXU6B0kRfIj8Kt7U/1WG7XaErF78opSdBk/q+7Vfb+u/EGbk93zyEsqfbMhaiIzbDypayxUg2NgHfrvLVywHQGIHZaY8Q8UdCT8tqaMflAV+U0SHbp7pClQvGTrOqbT+aaUwiGQzbg7NEGLHLXFvatc5mBMC2g/duun8T9ld6+BS5KQBRsUaNn1+aO/7FAJaFpmlBFV1MACvoJMGWEVGNJpg6V75sFNfzbWk3ZOAyj4d0HsvzIwyN7/VaEszjw= MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 47230bd8-d2a3-43e5-1d06-08d6d9ab50c0 X-MS-Exchange-CrossTenant-originalarrivaltime: 16 May 2019 03:05:14.7860 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR04MB2945 Cc: Jiafei Pan , Xiaowei Bao Subject: [U-Boot] [PATCH 2/2] pci: layerscape: Add the workaround for errata A-009460 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" From: Xiaowei Bao The VF_BARn_REG register's Prefetchable and Type bit fields are overwritten by a write to VF's BAR Mask register. workaround: Before writing to the VF_BARn_MASK_REG register, write 0b to the PCIE_MISC_CONTROL_1_OFF register. Signed-off-by: Xiaowei Bao --- drivers/pci/pcie_layerscape.c | 9 +++++++++ drivers/pci/pcie_layerscape.h | 1 + 2 files changed, 10 insertions(+), 0 deletions(-) diff --git a/drivers/pci/pcie_layerscape.c b/drivers/pci/pcie_layerscape.c index 1b082da..7ba3c1d 100644 --- a/drivers/pci/pcie_layerscape.c +++ b/drivers/pci/pcie_layerscape.c @@ -450,6 +450,15 @@ static void ls_pcie_setup_ep(struct ls_pcie *pcie) if (PCI_EXT_CAP_ID(sriov) == PCI_EXT_CAP_ID_SRIOV) { pcie->sriov_flag = 1; for (pf = 0; pf < PCIE_PF_NUM; pf++) { + /* + * The VF_BARn_REG register's Prefetchable and Type bit + * fields are overwritten by a write to VF's BAR Mask + * register. Before writing to the VF_BARn_MASK_REG + * register, write 0b to the PCIE_MISC_CONTROL_1_OFF + * register. + */ + writel(0, pcie->dbi + PCIE_MISC_CONTROL_1_OFF); + if (pcie->cfg2_flag) { for (vf = 0; vf <= PCIE_VF_NUM; vf++) { ctrl_writel(pcie, diff --git a/drivers/pci/pcie_layerscape.h b/drivers/pci/pcie_layerscape.h index 9038d32..067dd3c 100644 --- a/drivers/pci/pcie_layerscape.h +++ b/drivers/pci/pcie_layerscape.h @@ -94,6 +94,7 @@ #define PCIE_BAR4_SIZE SZ_1M /* 1M */ #define PCIE_SRIOV_VFBAR0 0x19C +#define PCIE_MISC_CONTROL_1_OFF 0x8BC #define PCIE_CTRL1_FUNC_NUM 0x00100000 #define PCIE_MASK_OFFSET(flag, pf) ((flag) ? 0 : (0x1000 + 0x20000 * (pf)))