From patchwork Fri Mar 28 14:53:42 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Brunet X-Patchwork-Id: 14032143 X-Patchwork-Delegate: kw@linux.com Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 747541C5F29 for ; Fri, 28 Mar 2025 14:53:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743173632; cv=none; b=Cw+jD2v8VnfWXRoCUb2XH28qrvbugJsJnANtBB3x6nlw5gzJN+zkM8XVOULPAVZtTxZss0uXaI3bSorFDzAHkvGhSQXS6oE3Gw0/bn8PxjLnN1Bt/8jN9ra0tl2ySjN3Rt7jFkWfsUT3DbGtxFAAQuqa7s/ntT+t+B4cAazOhWY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743173632; c=relaxed/simple; bh=gUEdTnXFrxQFCubyzkt8h7MkbAD/T1O1BvGuN2YMSZk=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=mGbtP6ywropqm9/cV7emZ/uWNeKO+EeDZfwRXt+OnA4pImAAtGDK2XV0OM05s7O9SlnzAFaiG8PFAfqznIeSuxxdZMDi+xWAlSPvYDBpSCxE4wfsiq4woTXLxpapiv9uWMVrrjc1+2MDkKTCZuvfwBWc6BBah2sNbd9U5KwhAeM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=baylibre.com; spf=pass smtp.mailfrom=baylibre.com; dkim=pass (2048-bit key) header.d=baylibre-com.20230601.gappssmtp.com header.i=@baylibre-com.20230601.gappssmtp.com header.b=otgY/Ol5; arc=none smtp.client-ip=209.85.128.51 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=baylibre.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=baylibre.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=baylibre-com.20230601.gappssmtp.com header.i=@baylibre-com.20230601.gappssmtp.com header.b="otgY/Ol5" Received: by mail-wm1-f51.google.com with SMTP id 5b1f17b1804b1-43cf680d351so19312375e9.0 for ; Fri, 28 Mar 2025 07:53:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20230601.gappssmtp.com; s=20230601; t=1743173629; x=1743778429; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=hmbC5RFYydPYh642kyN0rQaa467lBDxTsawumsVo1Aw=; b=otgY/Ol5ZtwGWKVKjZZ5B9DQI77BDRPGqjsojkUYq3bYG685AdupaJ+fig5vsOnBqn orP/wwX9n5UznpEfzz2PyExPpPt3/XUpOr0wPOvLfR7zejEP/RSpP4FI/hO4aURLpy1F O4hccnf4gej/pU+XphRKVFxGKMKfMRUqfEHj3kie3gvcLMxjg7YMaXr9s0pz+txuR/pj CZmuzTsa4cRKYN9kZmZpi/+YVYW/LCqBxrCJ9kSX6IvNrV4toEqDFUhojLNS+jXO2W5v z+OOjc6CN33/nLpca05nWk7UMwV8mxOO6vmFvAog9Ya6MXqz8wCDWhmuVjFP7AM780KF BUKw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743173629; x=1743778429; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=hmbC5RFYydPYh642kyN0rQaa467lBDxTsawumsVo1Aw=; b=qeOhblWfnaQulWxr30Bv+QtIKLXd/rgkT8jkx0NfINWW74ie1WxXolPLkAEtIIbFqa Xsb2nvSMAYCqSLljZ1LUWqc4GmHg+bUhP5GaaVb7mza7q14FmtSqpgk1ID5or1NK7YEJ DZNYg6pt2lVowZwrAx6mu16LTjCJEiYS0NOYHcizKP9/T4xgMvUJZ0onTFNGp8jESovM ZC/ikZPBiimQoq3IRmS0YuI/fKR2lgvCYJqHcI/k0flTnkncEVlWL8wDJLTw1IYQtYzP 6bv3eKpjWHOWV87F4m6w7Fe7Eu19QWSIoO4a8Ja+5yDoxvr5p4nsYrBfJWcasgITpbY7 XNow== X-Forwarded-Encrypted: i=1; AJvYcCX0dJ4BP3N6MiKwaIzS26LynI+yGyGsY5DhLy+oe4AMU3tukB5aXpgQO9EOqNsUxkR9HRpcEhxwrV8=@vger.kernel.org X-Gm-Message-State: AOJu0YzXnyRx8Rt7N7Atss4iIiosG2soZDIM1jy/7OyyX4N3BX4LGAtX FPPPWJH7YVqQhlbM0s/pWY6AWYm41E9zMvMfJmG4MHiFpld0zlXy3u4mDkHm480= X-Gm-Gg: ASbGncv1CKkbT71mPc1kR6+Sc5xvMPkflM7Ud0QGkBgRrJcqqLCGpWTSM6ipR3G5VBn 5CKp1O8yzvieo2WFaibUp15NVk3w0MiggXmVJi3Uger6p0hlpsvPPib+Pv05I3Tc9uRpnfCS/DH TuQDgSrhXqsbxygRGvQtltvYwr9vYkYqLsj/eNnRigr8G2ZfSAd/Jup8CaToD48Rbsp84EzTwvs Wx5RKCyxyAuXktQtAXq/ye60IvenFrmx5CsgHOh74KEdKEBKsZFrfQkx/fpnAdsuKeJ/ACrct78 JahG0668vCVgtrevJLqZ280jn9wdj7gtmielGhVtZcCJpHpC+b1Ch1pu+Jo= X-Google-Smtp-Source: AGHT+IHEwb8loYtorvEBGaqWpt3wJlMaO1x80S4rv3p5SrimoSh4/TC2550uL3aEEWUnSViQo2QLzg== X-Received: by 2002:a05:600c:1f14:b0:439:9737:675b with SMTP id 5b1f17b1804b1-43d9145bb08mr29097225e9.7.1743173628723; Fri, 28 Mar 2025 07:53:48 -0700 (PDT) Received: from toaster.baylibre.com ([2a01:e0a:3c5:5fb1:70c0:edf6:6897:a3f8]) by smtp.googlemail.com with ESMTPSA id 5b1f17b1804b1-43d8314e110sm75219615e9.39.2025.03.28.07.53.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Mar 2025 07:53:48 -0700 (PDT) From: Jerome Brunet Date: Fri, 28 Mar 2025 15:53:42 +0100 Subject: [PATCH 1/2] PCI: endpoint: strictly apply bar fixed size to allocate space Precedence: bulk X-Mailing-List: linux-pci@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250328-pci-ep-size-alignment-v1-1-ee5b78b15a9a@baylibre.com> References: <20250328-pci-ep-size-alignment-v1-0-ee5b78b15a9a@baylibre.com> In-Reply-To: <20250328-pci-ep-size-alignment-v1-0-ee5b78b15a9a@baylibre.com> To: Manivannan Sadhasivam , =?utf-8?q?Krzy?= =?utf-8?q?sztof_Wilczy=C5=84ski?= , Kishon Vijay Abraham I , Bjorn Helgaas , Lorenzo Pieralisi , Jon Mason , Dave Jiang , Allen Hubbe Cc: Marek Vasut , Yoshihiro Shimoda , Yuya Hamamachi , linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, ntb@lists.linux.dev, Jerome Brunet X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=1358; i=jbrunet@baylibre.com; h=from:subject:message-id; bh=gUEdTnXFrxQFCubyzkt8h7MkbAD/T1O1BvGuN2YMSZk=; b=owEBbQKS/ZANAwAKAeb8Dxw38tqFAcsmYgBn5rf42oi1rZDSM6XrbYRStOeGfWZi4bFla10nb K7qwiyD9t2JAjMEAAEKAB0WIQT04VmuGPP1bV8btxvm/A8cN/LahQUCZ+a3+AAKCRDm/A8cN/La hQFGD/9VO5rQNfzw3OhspgPwCblFhKTlz8Qu/BP7+Qx/Qecie+/xT66l3wDwIyad6t73UH6EZh+ NukWAUMUFVnsHzpetu6cHHxG7P4cJSiZraHpTxk71rJlqqtKNln1JZEetSZr3tzurykZtQn8IB1 QIDGc2ZwKf+F4LCkZYdc+U8FpWGWnK19thptpoX90MTBDHL3p3IjNrIpl9dcMXta41/n7hKU0iM X3mKwqfDLJoAkCVksfneEjJG7SrhHsOSZqGgJ65uWAaRiWvKlffc7HPcI/efUA4mJcDOPmg5s7v XSmaI5ZBFx+gYypJ9WM7/NdvAc9lCboqY8NgqUOnMuQN2NmXXCDoGkKYtkcdKz2KMv/zpd5azU5 3SLmLc91smK/m1+aMgcSSeklGogyj/hJwXSZD4lrExrqboOvYygPI2fzXuQTFojuggTLB6KuwSR U4T97kNYN3Xmmwq9uraABImbwJh923AmxWLWRGwy7Sl1zNZDNirHVLPEHoxR7pfgi9k9nwmc3+E p2oFQ1DElCClLIRexJtriHYKtLAnTXj74AXyHwfAL+tIrfRLUzflyGtgXYOPBgC3Zt2yXrhLMdZ 4rJ0Py7yCIhPY6LJtTKWSTw5DNgzsnByz/UewoSMZbuG+3rfjWlIk4+XSlG2jCcyozAXCXODfHn W+2qbCqgSrz1bhg== X-Developer-Key: i=jbrunet@baylibre.com; a=openpgp; fpr=F29F26CF27BAE1A9719AE6BDC3C92AAF3E60AED9 When trying to allocate space for an endpoint function on a BAR with a fixed size, that size should be used regardless of the alignment. Some controller may have specified an alignment, but do have a BAR with a fixed size smaller that alignment. In such case, pci_epf_alloc_space() tries to allocate a space that matches the alignment and it won't work. When the BAR size is fixed, pci_epf_alloc_space() should not deviate from this fixed size. Fixes: 2a9a801620ef ("PCI: endpoint: Add support to specify alignment for buffers allocated to BARs") Signed-off-by: Jerome Brunet --- drivers/pci/endpoint/pci-epf-core.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/pci/endpoint/pci-epf-core.c b/drivers/pci/endpoint/pci-epf-core.c index 394395c7f8decfa2010469655a4bd58a002993fd..cb985b172ed041c6f319c083f412e51e25b0a157 100644 --- a/drivers/pci/endpoint/pci-epf-core.c +++ b/drivers/pci/endpoint/pci-epf-core.c @@ -285,12 +285,11 @@ void *pci_epf_alloc_space(struct pci_epf *epf, size_t size, enum pci_barno bar, return NULL; } size = bar_fixed_size; - } - - if (align) + } else if (align) { size = ALIGN(size, align); - else + } else { size = roundup_pow_of_two(size); + } if (type == PRIMARY_INTERFACE) { epc = epf->epc; From patchwork Fri Mar 28 14:53:43 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Brunet X-Patchwork-Id: 14032144 X-Patchwork-Delegate: kw@linux.com Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 511AC1C7013 for ; Fri, 28 Mar 2025 14:53:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.48 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743173633; cv=none; b=rFoUB73kK8vvXZ0XH2sLbkqW6YOuiXRVjiE52o9R71Ax/k9MM3CDrHnShNt+66JJoLdCO4mWMa43L5hmV9+BAoDv61Q/mvKHM5H/PQ9z32Gr1wejXK05jhrpLtHkRcugatZuN+012P0DljCgWQR3CYFIfpHSm5ZPLzIKxcVwBzU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743173633; c=relaxed/simple; bh=5oAHlbTAcauldOWi9cMUgYioWN6gScafeHZfYPLkyRw=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=JacecIgAL7dq7sN8hd7aFySbSpsUgz2yNphE4F2bI+nsS2NclG6ZIpI/PJSMhNht7bhxTf94hV1RVGMzerLGGijiA4ooFqhxsaQ6157PkaqSfOXZP/97Ho4iqRqrrECAO62mMvO9YzvGyb6mGiISD5ceuf5hSnI0c+X8T1o/5rE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=baylibre.com; spf=pass smtp.mailfrom=baylibre.com; dkim=pass (2048-bit key) header.d=baylibre-com.20230601.gappssmtp.com header.i=@baylibre-com.20230601.gappssmtp.com header.b=okOKEWfn; arc=none smtp.client-ip=209.85.128.48 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=baylibre.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=baylibre.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=baylibre-com.20230601.gappssmtp.com header.i=@baylibre-com.20230601.gappssmtp.com header.b="okOKEWfn" Received: by mail-wm1-f48.google.com with SMTP id 5b1f17b1804b1-43cef035a3bso16665105e9.1 for ; Fri, 28 Mar 2025 07:53:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20230601.gappssmtp.com; s=20230601; t=1743173629; x=1743778429; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=om5WJnI/3Srzz6KnBz+MWEytyGjHkNFH1uylSroKmIg=; b=okOKEWfnhIchaZtaYWp60UK0xpayqqgpB5D4b0i+I8ukqG/Sk8+XjXnMU5ZSXHHiWz d+g2HYuLBHn4gdO1t99+6/VlFsAG8+rpBzFqtPiXz5SGk2/0i6RQ1rOOCbJs6bsuyxoH 7gtOPvckR+YJzU57+nMxEPPLKbxmeXtFd8F9IRCpGI9uhEZKSdJYU4vSQ1ALG/1LTIUc WhR9jfS0yWdziivczKntuGWlNSgvLfHnMrkbxpcZBZmjrR7HCUOqGoQesHaKT6AysUTz MTF2me2ZBw9HO20Hs6nTz1Rjm51UQmvK5r0MSnTi7suVo1vwTrdOlNyekhXtbPISj2Pp 7N9A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743173629; x=1743778429; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=om5WJnI/3Srzz6KnBz+MWEytyGjHkNFH1uylSroKmIg=; b=K1hx7VfM+kNpwvYknEUXhIwt0KZzz/AEaQI3kSm6OVM5CkAvkpEh1T6Vr6zhfqquWK ykIMLp7wXdmOkXvNBW1YJK0CZVEfqjvScoha7tpnOB6rvDV1o5nW34xzBN9YuLLtcvhw G5vqibjT6Q98W9k8oB+wl0pyC0ibInYk9mSXlKwd1rjbWIlVUYwXKApj6+9XcF7+0pE/ tPSssjBdXYFJ1D0BxQ9Do4Eokxy8Hqg96qoAewhaljL0cbrQTox2HqDhObbdB+6HVoQY E5HaQ5jFqs4pQZ7Wo4L9ERX2rsv3mfiaWlecZIcJgSTyhHet42uZYcKnkPAk9c9DO2w/ 048w== X-Forwarded-Encrypted: i=1; AJvYcCWPUosh7Z6OcDosa4HxXOiFPGmFdwA5No5NrPtAcrIUbn/ZiLQUrkaLwaHIU0KeItqRHeYlc85NkYY=@vger.kernel.org X-Gm-Message-State: AOJu0YzNSTHS+zSfJm10fpT1orh0lQdf8s1jHaWrmcdDh1ggjpD2BPhC BdGAPOe3t8C6VPX5XXu2G9zkSmbluc1qQtxS2/x3YpJgF0VgKiIy9QqLHd8Hm04= X-Gm-Gg: ASbGnctqjaTtr/iHh3GzXrB0xls6VH6oZD+HguyPjeD2CRilNYMWND8RRzK9im6yXiY cSjXBVlCjvznkJMyzSIhBWEOvM1MKkRuw0swi6PbVS7gYtstr2ymcvI0c5Bem4X//eZVetjuosA 0DzBXajXz4ylVZYSOhfBEkC2Vs65MqdCnFtoWEYhBBN49Cb445Vk6y5xu0T7HQi1x0XEjq/gufh mqde4pMKLVGZV5jwZb9Fam2Ipaj65DUoLy3JqFkdRNKtJsEGZDWLLKJHt2jZsSjjUjdkiQufxOO SH7HRO5yglMK381BP6bz7m/2Hwfv0LeoYpk981mFi9wOzsjKpRIy5Piccag= X-Google-Smtp-Source: AGHT+IHxpmdIjzZ3NBy6ZKDeIo2oJ9uzZLQK6IFavRFuRv86Y+8cRv+dnKeq1VLQiY8bi9c3dCFsFQ== X-Received: by 2002:a05:6000:22c7:b0:391:4889:503e with SMTP id ffacd0b85a97d-39ad17503e8mr8632876f8f.33.1743173629528; Fri, 28 Mar 2025 07:53:49 -0700 (PDT) Received: from toaster.baylibre.com ([2a01:e0a:3c5:5fb1:70c0:edf6:6897:a3f8]) by smtp.googlemail.com with ESMTPSA id 5b1f17b1804b1-43d8314e110sm75219615e9.39.2025.03.28.07.53.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Mar 2025 07:53:49 -0700 (PDT) From: Jerome Brunet Date: Fri, 28 Mar 2025 15:53:43 +0100 Subject: [PATCH 2/2] PCI: endpoint: pci-epf-vntb: simplify ctrl/spad space allocation Precedence: bulk X-Mailing-List: linux-pci@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250328-pci-ep-size-alignment-v1-2-ee5b78b15a9a@baylibre.com> References: <20250328-pci-ep-size-alignment-v1-0-ee5b78b15a9a@baylibre.com> In-Reply-To: <20250328-pci-ep-size-alignment-v1-0-ee5b78b15a9a@baylibre.com> To: Manivannan Sadhasivam , =?utf-8?q?Krzy?= =?utf-8?q?sztof_Wilczy=C5=84ski?= , Kishon Vijay Abraham I , Bjorn Helgaas , Lorenzo Pieralisi , Jon Mason , Dave Jiang , Allen Hubbe Cc: Marek Vasut , Yoshihiro Shimoda , Yuya Hamamachi , linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, ntb@lists.linux.dev, Jerome Brunet X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=2533; i=jbrunet@baylibre.com; h=from:subject:message-id; bh=5oAHlbTAcauldOWi9cMUgYioWN6gScafeHZfYPLkyRw=; b=owEBbQKS/ZANAwAKAeb8Dxw38tqFAcsmYgBn5rf5tteiMGeKSx358xJ2+154PVr7k7RAJ8OqE x2hmwLHlNeJAjMEAAEKAB0WIQT04VmuGPP1bV8btxvm/A8cN/LahQUCZ+a3+QAKCRDm/A8cN/La hX1yD/sHaWYMETTJwDgxrGxRlNsQF+Rc9Q5oMX73ZbvDomTMBb5/EiuCjNA+WGqvLAaxZPnInYb gbgbOiq3WmzHn+nEp/DGRjxo8UlUCwJEE0w+E+D89smicnQpIelt4t7+C/M+ImfP/AUC7bxZfiJ aJqVUT1ya+PnF0xTs2X1txWYxCtLvr1ez3Zpq7tWgPbvlZzrQgQX1Gs5NkYGemnRj4CdKAwWwc/ WdPQ6RD2QjKbsur4fqR5Mm5Ykd+yveBedPVUDb2otNDQSi+P+8ACxZ9wn2ZpFbQeSdWa/wrxgFS uaKxglM4i8uT7qLrWJWP5we/cAKLPVTI3n11V36Zs8g2ppjfZgAwIhZckxcPGaBFNStjI3em2DX y1oAkpi56w/B7itaLGgQ2OnANTCeZ74U/9RJe80a4dq7rHsZcbs8yeIxhhnIWjN/fRvO4nqpH09 B/XqYI18bYdgYLJ4zPvixPbtVhvoAxCpY7xJPyOhrJR27m0njeWb/dugQjI+03LABwI5PstLYYl qtDWRm0pg2/TA/v5JTTzpqK2BbEG2ST+9Htlt/UeGLN54VADr9qtKB/C4PCkqs0HoHNRJpX6ufm 2UoJI+sD12dRMYYnCviwxrBt7KSVPuWTN5lnUmnHqTOFDl6WfqoPgNvu3mAsPJfqPMpvduOzCNN hJsCtJfdABnSOEg== X-Developer-Key: i=jbrunet@baylibre.com; a=openpgp; fpr=F29F26CF27BAE1A9719AE6BDC3C92AAF3E60AED9 When allocating the shared ctrl/spad space, epf_ntb_config_spad_bar_alloc() should not try to handle the size quirks for the underlying BAR, whether it is fixed size or alignment. This is already handled by pci_epf_alloc_space(). Also, when handling the alignment, this allocate more space than necessary. For example, with a spad size of 1024B and a ctrl size of 308B, the space necessary is 1332B. If the alignment is 1MB, epf_ntb_config_spad_bar_alloc() tries to allocate 2MB where 1MB would have been more than enough. Just drop all the handling of the BAR size quirks and let pci_epf_alloc_space() handle that. Signed-off-by: Jerome Brunet --- drivers/pci/endpoint/functions/pci-epf-vntb.c | 24 ++---------------------- 1 file changed, 2 insertions(+), 22 deletions(-) diff --git a/drivers/pci/endpoint/functions/pci-epf-vntb.c b/drivers/pci/endpoint/functions/pci-epf-vntb.c index 874cb097b093ae645bbc4bf3c9d28ca812d7689d..c20a60fcb99e6e16716dd78ab59ebf7cf074b2a6 100644 --- a/drivers/pci/endpoint/functions/pci-epf-vntb.c +++ b/drivers/pci/endpoint/functions/pci-epf-vntb.c @@ -408,11 +408,9 @@ static void epf_ntb_config_spad_bar_free(struct epf_ntb *ntb) */ static int epf_ntb_config_spad_bar_alloc(struct epf_ntb *ntb) { - size_t align; enum pci_barno barno; struct epf_ntb_ctrl *ctrl; u32 spad_size, ctrl_size; - u64 size; struct pci_epf *epf = ntb->epf; struct device *dev = &epf->dev; u32 spad_count; @@ -422,31 +420,13 @@ static int epf_ntb_config_spad_bar_alloc(struct epf_ntb *ntb) epf->func_no, epf->vfunc_no); barno = ntb->epf_ntb_bar[BAR_CONFIG]; - size = epc_features->bar[barno].fixed_size; - align = epc_features->align; - - if ((!IS_ALIGNED(size, align))) - return -EINVAL; - spad_count = ntb->spad_count; ctrl_size = sizeof(struct epf_ntb_ctrl); spad_size = 2 * spad_count * sizeof(u32); - if (!align) { - ctrl_size = roundup_pow_of_two(ctrl_size); - spad_size = roundup_pow_of_two(spad_size); - } else { - ctrl_size = ALIGN(ctrl_size, align); - spad_size = ALIGN(spad_size, align); - } - - if (!size) - size = ctrl_size + spad_size; - else if (size < ctrl_size + spad_size) - return -EINVAL; - - base = pci_epf_alloc_space(epf, size, barno, epc_features, 0); + base = pci_epf_alloc_space(epf, ctrl_size + spad_size, + barno, epc_features, 0); if (!base) { dev_err(dev, "Config/Status/SPAD alloc region fail\n"); return -ENOMEM;