From patchwork Mon Aug 17 15:14:13 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 247866 Delivered-To: patch@linaro.org Received: by 2002:a54:3b12:0:0:0:0:0 with SMTP id j18csp2587570ect; Mon, 17 Aug 2020 12:29:27 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzuwBfdPpG/gH7ll37fDsFXpbiB0szj6Pmk8dWfJS5vNXJhkS87O3FT0RPPnSuXOf6W1rcs X-Received: by 2002:a17:906:12cd:: with SMTP id l13mr16336002ejb.385.1597692567653; Mon, 17 Aug 2020 12:29:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1597692567; cv=none; d=google.com; s=arc-20160816; b=wPmFICAxkc6mJrf3i3JcnOOAlG7wngUrgLeZlGvM6NEgwnWSRgr3XQfTsnHv0KkFj6 +4UpJ4F6o8uDrR8FrjhzwIkRn9FJyuvyxYWpYrFVvmH6emlBKpDoriqfXQb+6xm2TQK5 99iGrHVAlfaSQRSrWS/hQ2V8BYK/GYPB4MR2P+EFQ++Hb7ZuyQTZEo+gCoNzNNfTDLOt St6kntYPcbXG8c57KF+qRDUTkOoLR+xb4CfXtV8UrO0qR/VIEGF3/+ZDF7c9k1lL213C dHdd1+SYKatA40/jrIi4Q6o2qguZBMUGCbwC3gzuNBlPiZyV4/UC8deCziCGwh+xjwr1 bANA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=KVa6QluDgfEFh8EtuZrwRZa30sTz9yiVC1lWVtuRotU=; b=e1FCQxfYJADb1l7kYEYHhuLHF+JoSny99aOZpzOAuXhzXPS37etDbiFZu7vwGTVYji cgfElvOKScvoLkgJwKsSTqrzVvNzWhS6yUYLJZRlVMovao08hkoGaqht4T+6P69Sbd3e kSQqFABc8YZ3vwh95Twfpdwzl6VPRtwFkThU1bbRJoNKkKcK3vPZx0f2hvduOf73CBEQ RXtr8U1zXSiFVhH8tXVNYhIzkO6RT1dEeXnDh3RCn/tGhGMR+LvrrY7z1jomke0ljC7U RvaVwl0sRpB8I8SqPXxsAbyZEVyk8N21J7FqASvbt6Otr23WTqNq88+Yu8zfpaD9WDTY 6v5Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=iN6woKPQ; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id h23si11984489ejq.149.2020.08.17.12.29.27; Mon, 17 Aug 2020 12:29:27 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=iN6woKPQ; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732245AbgHQT30 (ORCPT + 15 others); Mon, 17 Aug 2020 15:29:26 -0400 Received: from mail.kernel.org ([198.145.29.99]:59382 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730316AbgHQPcT (ORCPT ); Mon, 17 Aug 2020 11:32:19 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id C519E208B3; Mon, 17 Aug 2020 15:32:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597678339; bh=ze9HKk+XLBrhOyKTBfBCrUO1lyL8xuq02+/if6CeQDw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iN6woKPQhXzV8bj1ohxzrL2TlEdHMMPa9I6eVsMViUM/W8dxzF709FBDbM+6nJIVD UVDLcX0I0C9iZM1KxpnmJ46AhrOO5Ct0uUPtLZ5KMbz1O3kTEOwC3Lr8YlCwjsLQsE zziGlDsMlcOry8uXOa+JE7m20OmRlc+f5hG6SFF0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Kishon Vijay Abraham I , Lorenzo Pieralisi , Rob Herring , Sasha Levin Subject: [PATCH 5.8 300/464] PCI: cadence: Fix updating Vendor ID and Subsystem Vendor ID register Date: Mon, 17 Aug 2020 17:14:13 +0200 Message-Id: <20200817143848.177563427@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200817143833.737102804@linuxfoundation.org> References: <20200817143833.737102804@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Kishon Vijay Abraham I [ Upstream commit e3bca37d15dca118f2ef1f0a068bb6e07846ea20 ] Commit 1b79c5284439 ("PCI: cadence: Add host driver for Cadence PCIe controller") in order to update Vendor ID, directly wrote to PCI_VENDOR_ID register. However PCI_VENDOR_ID in root port configuration space is read-only register and writing to it will have no effect. Use local management register to configure Vendor ID and Subsystem Vendor ID. Link: https://lore.kernel.org/r/20200722110317.4744-10-kishon@ti.com Fixes: 1b79c5284439 ("PCI: cadence: Add host driver for Cadence PCIe controller") Signed-off-by: Kishon Vijay Abraham I Signed-off-by: Lorenzo Pieralisi Reviewed-by: Rob Herring Signed-off-by: Sasha Levin --- drivers/pci/controller/cadence/pcie-cadence-host.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) -- 2.25.1 diff --git a/drivers/pci/controller/cadence/pcie-cadence-host.c b/drivers/pci/controller/cadence/pcie-cadence-host.c index a1c6bd6f87c51..b2411e8e6f188 100644 --- a/drivers/pci/controller/cadence/pcie-cadence-host.c +++ b/drivers/pci/controller/cadence/pcie-cadence-host.c @@ -69,6 +69,7 @@ static int cdns_pcie_host_init_root_port(struct cdns_pcie_rc *rc) { struct cdns_pcie *pcie = &rc->pcie; u32 value, ctrl; + u32 id; /* * Set the root complex BAR configuration register: @@ -88,8 +89,12 @@ static int cdns_pcie_host_init_root_port(struct cdns_pcie_rc *rc) cdns_pcie_writel(pcie, CDNS_PCIE_LM_RC_BAR_CFG, value); /* Set root port configuration space */ - if (rc->vendor_id != 0xffff) - cdns_pcie_rp_writew(pcie, PCI_VENDOR_ID, rc->vendor_id); + if (rc->vendor_id != 0xffff) { + id = CDNS_PCIE_LM_ID_VENDOR(rc->vendor_id) | + CDNS_PCIE_LM_ID_SUBSYS(rc->vendor_id); + cdns_pcie_writel(pcie, CDNS_PCIE_LM_ID, id); + } + if (rc->device_id != 0xffff) cdns_pcie_rp_writew(pcie, PCI_DEVICE_ID, rc->device_id);