From patchwork Mon Aug 17 15:16:10 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: 247839 Delivered-To: patch@linaro.org Received: by 2002:a92:cc90:0:0:0:0:0 with SMTP id x16csp2854154ilo; Mon, 17 Aug 2020 11:14:18 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwhXnFgZ8C6xoaBrcekLAwpkH3dU2BDcdkxLs042LfgdY6mUVA2Y2yzmBTn08UhgzA9y1lw X-Received: by 2002:a17:906:3616:: with SMTP id q22mr17155273ejb.79.1597688058662; Mon, 17 Aug 2020 11:14:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1597688058; cv=none; d=google.com; s=arc-20160816; b=tHB6gsKjy5kciJz1aa47iPJKe1xJhuQcQiqNiukBFBmUCpt/mG4m+cjQWkfXEiG838 pm7xAXbNmUW9mfLZmRP8jlNiIYOqA6NYwsBGYQdIZuGWadLHIdJoNLfmnWiUEcS0ckl4 cTYnUcn0VThFg08Hxne5xio28yQiH9mQopQhtqPyvHBqSex8vFLSTInvUUs+CMTWkRC6 JqSDSU8bBE/eAnNqPi6BFZcNFEXu8H6n941zyMnZWD1gFpAd++5r0qBdGcmbRUd8NWxI tHW9T8ZIwVNKg3HHqOeZ9PKI0st5T3atG9cuOEB+ZX/WO6D+PavBQ7RQsjEumITh/J4J gtrQ== 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=aoEClGeKmWcxmnn5ogR7rg45NLTe0nexL9ui/pUVKO8=; b=z4LptXbKwgVSr1cLVa5MIHif/RHqQWmLHj2cwjIVJHgOU2TCBHYI89a0QjBHI1E1AS VvgPYz29DPS3N9tHJarDa9ZT62lhDEr0kuthiI3Wibl4QbraLR9c6JwIT+khBOBU5Ui7 4UiWATMMQ4aGke+Wdi5gAhhPuf2jq6jxJMR3jp5RH1b7R4T/CaF+DlUbuljBKa8QcSAM pCkkk9Hn+DY06VqCTMsURmqpFcQiyC1II8+LCo5BsPxTlRnXuSl0JET07kASKjCKXT+z BwklEZwPCdTKddPIwGBori3tNZ+zTZinrGkPkqBS7na/pP558XvyYFwyi3UiZRqnMm+O c5wQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=Dcvwnw0d; 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 rp10si11707654ejb.323.2020.08.17.11.14.18; Mon, 17 Aug 2020 11:14:18 -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=Dcvwnw0d; 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 S2390592AbgHQSOR (ORCPT + 15 others); Mon, 17 Aug 2020 14:14:17 -0400 Received: from mail.kernel.org ([198.145.29.99]:54650 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730496AbgHQQGc (ORCPT ); Mon, 17 Aug 2020 12:06:32 -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 76DF120829; Mon, 17 Aug 2020 16:06:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597680391; bh=e/kAoQ3oBtJDeY0Gc4RCa3dPp4rDPjCqyYysJo4fNQg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Dcvwnw0dBTS6lYMvsoc3vAZzRVZq5tUMSHWOR8I7ovLTuXQGKEfvIt+0So3S8BFGx msp6qAhxRmUIBrH9dvoarJ+qDwtrm5BveNIo7N6uqkAPsFDzXukska6ebrJFqud3Fy tgEsfpA9A82VTw46HpAp435/qrN/L1zPiAVSX81U= 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.4 169/270] PCI: cadence: Fix updating Vendor ID and Subsystem Vendor ID register Date: Mon, 17 Aug 2020 17:16:10 +0200 Message-Id: <20200817143804.252554194@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200817143755.807583758@linuxfoundation.org> References: <20200817143755.807583758@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/pcie-cadence-host.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) -- 2.25.1 diff --git a/drivers/pci/controller/pcie-cadence-host.c b/drivers/pci/controller/pcie-cadence-host.c index 97e251090b4f9..0dfc778f40a7a 100644 --- a/drivers/pci/controller/pcie-cadence-host.c +++ b/drivers/pci/controller/pcie-cadence-host.c @@ -102,6 +102,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: @@ -121,8 +122,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);