From nobody Mon Feb 9 18:20:01 2026 Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) (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 AE7DF26B978 for ; Mon, 5 May 2025 17:42:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.49 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746466930; cv=none; b=J7GdQJYKg3/xOVX9pnXp7FAhqyunJKMex1266rbZulpjgbbaKSQLxs7I3omBPMFo2z2pqKE30Krv9Np2YIlPlCYScgXsb1+FVQnpepDQF2i/j3/UYkwYMgviyLvNpse6MULrZcqxbtcLYZpe3vVCIvSJpmYj3opAwYbijGNKtfw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746466930; c=relaxed/simple; bh=qyM1aZTG9d6MOwjR/qspKtycZJprSidmxi28fR4mEFg=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=nR56rzJOym2U9kGZfycxdI37Igwz2ncLm5FKXomJRqFL6oJwuCFGoH96VjoVVVEYy5rEF4x2EmVvhSueslaeRdCZXzj1BP25MJPSbic/gyh34kwAMcmvu0FoByg5glBEAOOsI9gORUaSVmEPuA+PVRjAm7vG8SZK+lxtkDOjzOg= 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=nfOO6VlY; arc=none smtp.client-ip=209.85.221.49 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="nfOO6VlY" Received: by mail-wr1-f49.google.com with SMTP id ffacd0b85a97d-39141ffa9fcso5057747f8f.0 for ; Mon, 05 May 2025 10:42:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20230601.gappssmtp.com; s=20230601; t=1746466927; x=1747071727; 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=J3LBY8kEk9gi4o8XX/rUOgzd9iIiBOazH7vpEqQ3lP0=; b=nfOO6VlYQF/EeJJabgK3JW36VANqT2Wlz+f1Qs1tmGJNeOOUCgRBc2ACNmvjDDwodY OWZzMyyuhPvjUulzIRlTnMi0ARd2vMiVAT0lOJnPnfF6FOLdDWpziRyLZ7g5UtBhWoGD kwFFGxq7fh3xgK0Y7xSSjOk/ZicTJyuaTUVd7rTmDDdjn9tSRmm1snwUU0PTI6cTAY9y R02CGQXo0yVvoD7zmp4ZwmxTSb+moA6DXNx+5l1kzTFc9HE0XYeLvePERn0DBPJ5RzFe BvEo8KzJACywPk1+DQNYCq/Pp2MQXTaaXNLsc/AlDhaEXzrnvGxoAWrVg9Z0WZj2TfoD eTKg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746466927; x=1747071727; 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=J3LBY8kEk9gi4o8XX/rUOgzd9iIiBOazH7vpEqQ3lP0=; b=F4LaLglIb7usUgSMHp5eavmGnlySaAY5Gg5k6n7Gtx1+NBmKMG+EgZpmdHfDd9G9eQ RWXLejBQtmw8mswAhMuxFTR1mlnVnirg0ypeMEuvl8lTJo8PKpzXpIUM65N+Ac1wQ4BK pwUncgaXpMryOA+jA+x50xshNrJzFYScqJBF6yHsXlF5nckd+2SzIPtGXl4Me05+mylA +l0yCVeFOccgPbq3GetFmJxZjhy04Jl95e0ElDmvmaDWgMdKXoqUbxRtLILPv11uwNtk WJqP8gBFdqJjTlpOjbzhMIV0HP8PA/kPeMGZOhUuH3a7n9PLL43gcGiENWBeuduQt0dY tDeA== X-Forwarded-Encrypted: i=1; AJvYcCXE1SFWjRPaWuwF8eYf68N5CCVPZpx/3X/3cUp63IeRRHLWHwRQPx5HCynfY3N08w0OwVNU9XN22kUueBI=@vger.kernel.org X-Gm-Message-State: AOJu0YwHJnFJLsbHc0iWGccoKhL5WYft4kEnF5lVAanLtexi+EKDZDos 04cH0fAPsrJMbCXLGm/eJa1URqCfy4u7lEjSNHaPAuFScMxO7U+A9p71eJpzzyu85l6LgyPIBrJ o X-Gm-Gg: ASbGncv39BS+5xpHGrwzHqTwThg7RoEQw2m7HZrI0XeSp8OQk/Nec6N5fYzxxjj+Awc 8WU/P0sAP5iWuTtnRlE4N4EErwqLJNqbUN16R+cQscp/T6dQ0CereJqm/jerXl41Ap2gZJWvQh5 uFAm0NLPoCgYETOvvnCUxBLEA3kLB/WHmVgMkUXTJw2D6K6nBwOJhF9d7alcTQFIB3pTGAvV8rJ EAIELj7Vu/2N2jQc3dwi4OzpRrBj7QF6QShK08cUm7FiH/fBBeEB36wbTZVZWusps0gXRAvPpDq 3HZxw76fhYcJRpQXJN5LaJBoxl1pSsHoG2XWWjm5m7ZoDv+v/lmlkQ== X-Google-Smtp-Source: AGHT+IF3UDYv5RkphgGj8Lc6CvGE7Xu3M0hl7sTbGqxmHG0EE/jkSjD3603rUOunex+bJISfmCMesA== X-Received: by 2002:a5d:64cd:0:b0:3a0:8331:3380 with SMTP id ffacd0b85a97d-3a09cea693dmr6651442f8f.8.1746466926987; Mon, 05 May 2025 10:42:06 -0700 (PDT) Received: from toaster.baylibre.com ([2a01:e0a:3c5:5fb1:dc81:e7a:3a49:7a3b]) by smtp.googlemail.com with ESMTPSA id ffacd0b85a97d-3a099b0efbfsm11345829f8f.69.2025.05.05.10.42.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 05 May 2025 10:42:06 -0700 (PDT) From: Jerome Brunet Date: Mon, 05 May 2025 19:41:48 +0200 Subject: [PATCH 2/4] PCI: endpoint: pci-epf-vntb: align mw naming with config names Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250505-pci-vntb-bar-mapping-v1-2-0e0d12b2fa71@baylibre.com> References: <20250505-pci-vntb-bar-mapping-v1-0-0e0d12b2fa71@baylibre.com> In-Reply-To: <20250505-pci-vntb-bar-mapping-v1-0-0e0d12b2fa71@baylibre.com> To: Jon Mason , Dave Jiang , Allen Hubbe , Manivannan Sadhasivam , =?utf-8?q?Krzysztof_Wilczy=C5=84ski?= , Kishon Vijay Abraham I , Bjorn Helgaas , Frank Li Cc: ntb@lists.linux.dev, linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, Jerome Brunet X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=2573; i=jbrunet@baylibre.com; h=from:subject:message-id; bh=qyM1aZTG9d6MOwjR/qspKtycZJprSidmxi28fR4mEFg=; b=owEBbQKS/ZANAwAKAeb8Dxw38tqFAcsmYgBoGPhp/L+P2VULngOx5WQ0FytTBC13S2IpX/kyf rhqp5Vhb1mJAjMEAAEKAB0WIQT04VmuGPP1bV8btxvm/A8cN/LahQUCaBj4aQAKCRDm/A8cN/La hZDaEACyUbFbc9jDGPkGRgRbI2ANesSAAiw/c8EgwKetMd3ukPITJo3PCzD2oL0aGM3bHF29jZ0 f8JyjmtHRCg9YB/Qmf7EcDSsLQTIH18xFTnFbRfJoeamxOFwya1ZXWw0fEO+lxj4aaF3g1Y66ao BeVLV4NzCBb2zsq/jgxV6DBIsqnwLLtbBZQXtCZO3b6cYv69TsvtreFZfccbbS/zuQmwKK+FVGf jchYdxCz00h8j8UBDC5xDmMWOW2cVaaQbvn4TlHXd2bbqv638knmpa34SK8NskDcRRn4SynD5md 4FQga18Wbq62NXuhQ8GeEjHecprS/M9DvX1Oyzfde47I+kYXTKYJiVACKvVuIem1hOCMabRYC7+ iJDSfG6DLS75ecJdKyJyrJ/EqVtRiudQPXFCQCWXaZVmISU2BjNcb3httVvOGeW7JfvWE2PUzDW Op51YiDHwtNMjIBsBeJwd7+qqy3fdEAkMjh7XrOD3+IYYdmDQqO+FdFIVg3nZsNgBEtlyqguYiG 1YYWYf8lqp+kIi4HwFQTJOkjZLw+vppXpuNFHx2LX+WGEkY1wnPMFNOzkJNPNmbNi8az8BbbO1k Zp8Xqjw424aoIl//71+AxbA1EYWBMlNjL2oOCSLrXHfOwCTd9fkwQw/DHewRqxhM4aaXIGs3FzZ nCBEtVJzoQXIV2A== X-Developer-Key: i=jbrunet@baylibre.com; a=openpgp; fpr=F29F26CF27BAE1A9719AE6BDC3C92AAF3E60AED9 The config file related to the memory windows start the numbering of the MW from 1. The other NTB function does the same, yet the enumeration defining the BARs of the vNTB function starts numbering the MW from 0. Both numbering are fine I suppose but mixing the two is a bit confusing. The configfs file being the interface with userspace, lets keep that stable and consistently start the numbering of the MW from 1. Signed-off-by: Jerome Brunet --- drivers/pci/endpoint/functions/pci-epf-vntb.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/drivers/pci/endpoint/functions/pci-epf-vntb.c b/drivers/pci/en= dpoint/functions/pci-epf-vntb.c index 35fa0a21fc91100a5539bff775e7ebc25e1fb9c1..f9f4a8bb65f364962dbf1e9011a= b0e4479c61034 100644 --- a/drivers/pci/endpoint/functions/pci-epf-vntb.c +++ b/drivers/pci/endpoint/functions/pci-epf-vntb.c @@ -70,9 +70,10 @@ static struct workqueue_struct *kpcintb_workqueue; enum epf_ntb_bar { BAR_CONFIG, BAR_DB, - BAR_MW0, BAR_MW1, BAR_MW2, + BAR_MW3, + BAR_MW4, }; =20 /* @@ -576,7 +577,7 @@ static int epf_ntb_mw_bar_init(struct epf_ntb *ntb) =20 for (i =3D 0; i < ntb->num_mws; i++) { size =3D ntb->mws_size[i]; - barno =3D ntb->epf_ntb_bar[BAR_MW0 + i]; + barno =3D ntb->epf_ntb_bar[BAR_MW1 + i]; =20 ntb->epf->bar[barno].barno =3D barno; ntb->epf->bar[barno].size =3D size; @@ -629,7 +630,7 @@ static void epf_ntb_mw_bar_clear(struct epf_ntb *ntb, i= nt num_mws) int i; =20 for (i =3D 0; i < num_mws; i++) { - barno =3D ntb->epf_ntb_bar[BAR_MW0 + i]; + barno =3D ntb->epf_ntb_bar[BAR_MW1 + i]; pci_epc_clear_bar(ntb->epf->epc, ntb->epf->func_no, ntb->epf->vfunc_no, @@ -676,7 +677,7 @@ static int epf_ntb_init_epc_bar(struct epf_ntb *ntb) epc_features =3D pci_epc_get_features(ntb->epf->epc, ntb->epf->func_no, n= tb->epf->vfunc_no); =20 /* These are required BARs which are mandatory for NTB functionality */ - for (bar =3D BAR_CONFIG; bar <=3D BAR_MW0; bar++, barno++) { + for (bar =3D BAR_CONFIG; bar <=3D BAR_MW1; bar++, barno++) { barno =3D pci_epc_get_next_free_bar(epc_features, barno); if (barno < 0) { dev_err(dev, "Fail to get NTB function BAR\n"); @@ -1048,7 +1049,7 @@ static int vntb_epf_mw_set_trans(struct ntb_dev *ndev= , int pidx, int idx, struct device *dev; =20 dev =3D &ntb->ntb.dev; - barno =3D ntb->epf_ntb_bar[BAR_MW0 + idx]; + barno =3D ntb->epf_ntb_bar[BAR_MW1 + idx]; epf_bar =3D &ntb->epf->bar[barno]; epf_bar->phys_addr =3D addr; epf_bar->barno =3D barno; --=20 2.47.2