Received: by 10.213.65.68 with SMTP id h4csp346886imn; Wed, 28 Mar 2018 04:54:25 -0700 (PDT) X-Google-Smtp-Source: AIpwx4/Lt9/MNKUFKRkT/Ms3KupzS7u2xtQDL+15wV0qrR3KLm9ovTKix6tUonhb62Kns9C9E0sD X-Received: by 2002:a17:902:144:: with SMTP id 62-v6mr3569528plb.202.1522238065612; Wed, 28 Mar 2018 04:54:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1522238065; cv=none; d=google.com; s=arc-20160816; b=WupdTevlzK1vNHt2pHSMuxg9tV5+kuLvILtbzkCPES8+CKGCOGExVqpLK4nMln7jOF x+w74h+jRMmHZ/OTWUXLR/THHtYoOjkG/66cnYwa4NeyFOKiqL6aeCM1IexnJqS6OPPl GN8mk72cx0oRMhVRL8MfhGKqiV1xsSvb7J6JRdXx1jPXWHJYtmrzhOdHM1QMo0+J1xH8 TNy3YNQqQNRd3PhfMVMOBSDIkmk3Bs3kwAIc+ajT/7NXfVmcXkwgRcZ1Qh0Mt40kGhpb I/EU6PjxLZJj51t8+Z5NSsw6/yz5Z6eSmiX1i1yun52x03S1A875bXm/EIsU5C1nv+i+ SfJg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=N7E1NER+nqavDQRiYxCFx8N1ma8DrRzKg4Ale7FzWuU=; b=mj/fjtjXtlbsL37ECzPbAPHF+2/kDS/uhR3kr77wGvQgUkWMezujHRPUee80lVNzuc Sw8Ne0+yTQPJoExj5wdNF1jVWwT6ORnc9c4eygmHr7aHzkhaUKwYax3wzR+6CCpTbdiQ h8QWjJaQyYGbXvRoxgJiYblotR7YSy77JSJvCtlpo6Mg7Legvzp+5V6+govk6IGJi4ip FFpta+dMc/S8o//APCxhmO44P9eMt9XTIohx+WVqukPCiAMTzeVGvsXd3kyCRDN8po8q /EONco3Yso5sxE2HfORti3W26EBhBKKjWGRrNI/sZdouEGerINodJcrb7xfId2GBUcPg XMAQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id f7si771933pgo.799.2018.03.28.04.54.11; Wed, 28 Mar 2018 04:54:25 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752892AbeC1Luy (ORCPT + 99 others); Wed, 28 Mar 2018 07:50:54 -0400 Received: from bastet.se.axis.com ([195.60.68.11]:53917 "EHLO bastet.se.axis.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752780AbeC1Lus (ORCPT ); Wed, 28 Mar 2018 07:50:48 -0400 Received: from localhost (localhost [127.0.0.1]) by bastet.se.axis.com (Postfix) with ESMTP id D8B601832D; Wed, 28 Mar 2018 13:50:46 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at bastet.se.axis.com Received: from bastet.se.axis.com ([IPv6:::ffff:127.0.0.1]) by localhost (bastet.se.axis.com [::ffff:127.0.0.1]) (amavisd-new, port 10024) with LMTP id UxXosSVtN9j3; Wed, 28 Mar 2018 13:50:46 +0200 (CEST) Received: from boulder02.se.axis.com (boulder02.se.axis.com [10.0.8.16]) by bastet.se.axis.com (Postfix) with ESMTPS id 4075A18491; Wed, 28 Mar 2018 13:50:46 +0200 (CEST) Received: from boulder02.se.axis.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 243631A077; Wed, 28 Mar 2018 13:50:46 +0200 (CEST) Received: from boulder02.se.axis.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 195051A06D; Wed, 28 Mar 2018 13:50:46 +0200 (CEST) Received: from thoth.se.axis.com (unknown [10.0.2.173]) by boulder02.se.axis.com (Postfix) with ESMTP; Wed, 28 Mar 2018 13:50:46 +0200 (CEST) Received: from lnxartpec1.se.axis.com (lnxartpec1.se.axis.com [10.88.4.10]) by thoth.se.axis.com (Postfix) with ESMTP id 0C8053085; Wed, 28 Mar 2018 13:50:46 +0200 (CEST) Received: by lnxartpec1.se.axis.com (Postfix, from userid 20283) id 0808140197; Wed, 28 Mar 2018 13:50:46 +0200 (CEST) From: Niklas Cassel To: kishon@ti.com, cyrille.pitchen@free-electrons.com, Lorenzo Pieralisi , Bjorn Helgaas Cc: Niklas Cassel , linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v5 05/12] PCI: endpoint: Setting a BAR size > 4 GB is invalid if 64-bit flag is not set Date: Wed, 28 Mar 2018 13:50:10 +0200 Message-Id: <20180328115018.31921-6-niklas.cassel@axis.com> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20180328115018.31921-1-niklas.cassel@axis.com> References: <20180328115018.31921-1-niklas.cassel@axis.com> X-TM-AS-GCONF: 00 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Setting a BAR size > 4 GB is invalid if PCI_BASE_ADDRESS_MEM_TYPE_64 flag is not set. This sanity check is done in pci_epc_set_bar(), so that we don't need to do this sanity check in all epc->ops->set_bar() implementations. Signed-off-by: Niklas Cassel --- drivers/pci/endpoint/pci-epc-core.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/pci/endpoint/pci-epc-core.c b/drivers/pci/endpoint/pci-epc-core.c index 40eea20d21f9..8637822605ff 100644 --- a/drivers/pci/endpoint/pci-epc-core.c +++ b/drivers/pci/endpoint/pci-epc-core.c @@ -315,7 +315,9 @@ int pci_epc_set_bar(struct pci_epc *epc, u8 func_no, (epf_bar->barno == BAR_5 && flags & PCI_BASE_ADDRESS_MEM_TYPE_64) || (flags & PCI_BASE_ADDRESS_SPACE_IO && - flags & PCI_BASE_ADDRESS_IO_MASK)) + flags & PCI_BASE_ADDRESS_IO_MASK) || + (upper_32_bits(epf_bar->size) && + !(flags & PCI_BASE_ADDRESS_MEM_TYPE_64))) return -EINVAL; if (!epc->ops->set_bar) -- 2.14.2