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;