Received-SPF: pass (google.com: domain of linux-kernel+bounces-5349-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3;
From: Frank Li <Frank.Li@nxp.com>
To: frank.li@nxp.com
Cc: allenbh@gmail.com,
	bhelgaas@google.com,
	dave.jiang@intel.com,
	imx@lists.linux.dev,
	jdmason@kudzu.us,
	kishon@kernel.org,
	kw@linux.com,
	linux-kernel@vger.kernel.org,
	linux-pci@vger.kernel.org,
	lpieralisi@kernel.org,
	mani@kernel.org,
	ntb@lists.linux.dev
Subject: [PATCH v2 1/1] PCI: endpoint: pci-epf-vntb: Fix transfer fail when BAR1 is fixed size
Date: Tue, 19 Dec 2023 09:24:03 -0500
Message-Id: <20231219142403.1223873-1-Frank.Li@nxp.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0:
	=?us-ascii?Q?ZXAZpNLdkfIHtkGTly9o0FRb25rPzDNU9tbQ8V7uX9ux+DYO/PZU5T2vNhWE?=
 =?us-ascii?Q?BqlwQ86oRpkupfpT85U6ubXV1NOM4knGBn/9VLnHDQsMXlNoJatnCu1x8aPT?=
 =?us-ascii?Q?GDAOqIkZxoOvCoxiuB9OyGSB4BuLA2olEeZVz6jv6VXYV7E+dvWCLHTfDXKE?=
 =?us-ascii?Q?X4rQjeeSTWvC1JIwcv8GUjpCJja2quZFEQQELLKz7F2ypTjojzsInwGWuCIn?=
 =?us-ascii?Q?AGZDBawdsL1lZ16Uef/UgVbAcP/X9i8VWC0Do4I0srNpyOXT5d22hiaQ87TR?=
 =?us-ascii?Q?tLdD7oQZ/bNEW4EqbmLl58mnl4/H2ZCGxp9J9/J+HkToUYhNGsdy5ZOfhZRm?=
 =?us-ascii?Q?DbU29c9n78xHuh8CHft1RotjHSVDUH0xYuhA/gdZo/IB+4ud/bzZQEySiy2y?=
 =?us-ascii?Q?NpIvn5OkETkH5FqJZGVroSjds95ZpNkvP7n3BJM/Qvjk7S8mOQ7697l9Jsdu?=
 =?us-ascii?Q?dgHPTYsWKXaROxVLg+g5/acEqXIe8d7ahK4usTLs1Cf52g39Y2ymRCl9WWD5?=
 =?us-ascii?Q?Mlno6f+c6cxU1nN2AdavwPwSi3Kh1OYQFf0nsTiXca89GwyFS7HtQpaxJxAZ?=
 =?us-ascii?Q?+eNyYqoTTadquIOYMEtj8eukUQ06svuoENxM6WRd6Cn1VFQrv7ZKVcUhYjnP?=
 =?us-ascii?Q?7R+UGdvsh2WlSiATzREQeMW1IXLYCevS7fXomqBdaDTqxOfEVRunYQmUwvlC?=
 =?us-ascii?Q?+2Un4MLWGhR4HbtKa4FN04WICR6M7s8JQ7vmszyYzHhatpmSbCcOtekhqvvZ?=
 =?us-ascii?Q?M3/19DXPJqWB3Azb18RAsrZKC9oYbJZFvObTk1SYc2VcPUAh5VFPDpXHPN1Q?=
 =?us-ascii?Q?WwcIxSqvxAfVZ+Abtb/uckjzpaHjr9V9ZTLrIKfSUGMw7yJS/hVNMTlaIQml?=
 =?us-ascii?Q?2vxescMRkePaF48ucOkrzCOOqLOniCzd/RjyuMufVwH+TWfL4ZQRXqoBHsbr?=
 =?us-ascii?Q?ilX6NFwTdm/a6kkI1Tzz3D40tPj2JXmA5Q4cTP3kwxGAe/RmpBKkqgkfP1iU?=
 =?us-ascii?Q?aDObsm3n8e+i8M8qBykU7lBjgE5LsJMrjHg3TUji2aoubS9zQgcpL32ttGRA?=
 =?us-ascii?Q?mWJBVTiDBlmC4EYiFRLwzpxCmMGK7qLinv071dbS7KIQZVYn1tkFMizIfovr?=
 =?us-ascii?Q?ZNnExunWl3f+KMHzA1tldXuhKR1JqGBQYUb+bRkCzkOV5tnEye8VN5IE7l8n?=
 =?us-ascii?Q?Y1RiWZulrTSFNZ+N3sj3beZEUATgYx29eZp46xKVZ2k9CuY3/vgdED9pKw/o?=
 =?us-ascii?Q?HCgthqm4cf3j8F5ybUafDnXNfnCHZjvUo6BCQeGABNuCm5CFpE9xxnem9Q5D?=
 =?us-ascii?Q?gwWjSuQBItRwHPZwHvOYRJd2Y2q7XiBIsvKUfcUFozh3gJ4BMwgzof/BStL4?=
 =?us-ascii?Q?Zn06blPlbxWid8zDQddzexbAhbHmgdhU1niyNlY2zma1Q82wLdqje5PdnCIX?=
 =?us-ascii?Q?slKN528KiYZhZrp5J54LdQK0vjWqJZ256EvAyASU3Lyq+7tnh0kQCbUwKpdU?=
 =?us-ascii?Q?NCTQi5ORajwSmC5LHnEMYlX6UXSg4nE9I6e5pSokzILM0a5YvSvEZGxDszQU?=
 =?us-ascii?Q?/jFCgA0Npv5pFsUzOAm6JWY2FZOm85aYSO8uPy8k?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 20fbfbf9-4c47-42ba-8c09-08dc009e2e55
X-MS-Exchange-CrossTenant-AuthSource: AM6PR04MB4838.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Dec 2023 14:24:16.3642
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: YtZDKy73R7UGd/mIJlgz78R18Veb0bVaSKkOwxtT5HfSfPER4AzY6d5URWFX0Nwj6ku2C/gs95OoGkR+QgZxZQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR04MB8576

ntb_netdev transfer is failing when epc controller's BAR1 is fix size, such
as 64K. Certain controller(like dwc) require memory address must be align
with the fixed bar size.

For example:
	If BAR1's fix size is 64K, and other size programmable BAR's
alignment is 4K.
	vntb call pci_epf_alloc_space() get 4K aligned address, like
0x104E31000. But root complex actually write to address 0x104E30000 when
write BAR1.

Adds bar_fixed_size check and sets correct alignment for fixed-size BAR.

Signed-off-by: Frank Li <Frank.Li@nxp.com>
---

Notes:
    Change from v1 to v2
    - Remove unnessary set align when fix_bar_size.

 drivers/pci/endpoint/functions/pci-epf-vntb.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/drivers/pci/endpoint/functions/pci-epf-vntb.c b/drivers/pci/endpoint/functions/pci-epf-vntb.c
index 3f60128560ed0..ec3922f404efe 100644
--- a/drivers/pci/endpoint/functions/pci-epf-vntb.c
+++ b/drivers/pci/endpoint/functions/pci-epf-vntb.c
@@ -550,6 +550,14 @@ static int epf_ntb_db_bar_init(struct epf_ntb *ntb)
 
 	barno = ntb->epf_ntb_bar[BAR_DB];
 
+	if (epc_features->bar_fixed_size[barno]) {
+		if (size > epc_features->bar_fixed_size[barno]) {
+			dev_err(dev, "Fixed BAR%d is too small for doorbell\n", barno);
+			return -EINVAL;
+		}
+		size = epc_features->bar_fixed_size[barno];
+	}
+
 	mw_addr = pci_epf_alloc_space(ntb->epf, size, barno, align, 0);
 	if (!mw_addr) {
 		dev_err(dev, "Failed to allocate OB address\n");
-- 
2.34.1