Received: by 2002:a05:6a10:2726:0:0:0:0 with SMTP id ib38csp685717pxb; Tue, 5 Apr 2022 18:44:58 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxg0aqTJzUm2dS5rJAtCKsAWk4XNJxAoxBA/wLt3mgBR/rORbcaX/zfceEAkiFXob3Q/A7L X-Received: by 2002:a17:907:3d8c:b0:6df:4bdc:a282 with SMTP id he12-20020a1709073d8c00b006df4bdca282mr6029871ejc.464.1649209384150; Tue, 05 Apr 2022 18:43:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1649209384; cv=none; d=google.com; s=arc-20160816; b=ohGB6UDZ+QZ0QaOzKjyqIEeyucAiU8ebyXfLDSIWBuVlVg2C125jYEfEiR28QU7f04 +T6i22v3Yi+t4jpZ3PUQZfRVDgYN6WcTENqQIWCuaiHjw2Gh8SvjQu2qMvw+LOPUMGMu Fh2cRmRXvg0pJGgv3cywdw/7HQKkWU0L9m2l+iGCvLr+7n5u9cTi+HcGBg48ZVzcgKqG zomMSJOHAmjBIg78PJxZvXkExDJcji0pserjZvfWV4iVEMgWlzswCtByYti5wBkmFk+V sVG/NJA6Tyv7+/hKdX5WFrY156lKD5QPGd/ujNGsKeFT135eMbEn7R45bD4ANsAdjbs2 as6Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=aPaiE7rx7QKcEkL+fjI9kf3z/zZukEETgJwD81UaPhE=; b=ogQlgO6ucHMvVP5UqvrspDI7BsyaCCfWIT7AxPd7ufYvhfn+COfrBPkTMb4HyM5dHP CAg2W5vXNaoEIL55mPUuN2PIh2oKNUYC9jsw4y7yRdKDudesL60KANMAXmtkbHGBJfPk wfO41mbpM05yNkp2jG2biFdjsp3fLNpIL31LjQMIaS7BskHJlDfz4c620oE7PRTR3++B nF3maoi96SyuieZEfED+MxeGBg3y2gZQ0RlbpJ3Sdt707ZFj0HefHtt0TdCdLVSxWuJs k/QETbRioOgYhDGbnZCfqj74YuIit8uGo9Dj6QUP+aYZP+gqmI7ANL342xuAk9j+847w CPJQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=gM7cgR+R; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id k10-20020a50e18a000000b00418c2b5bdafsi10431384edl.145.2022.04.05.18.42.34; Tue, 05 Apr 2022 18:43:04 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=gM7cgR+R; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1385367AbiDEMcq (ORCPT + 99 others); Tue, 5 Apr 2022 08:32:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52782 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236258AbiDEJAO (ORCPT ); Tue, 5 Apr 2022 05:00:14 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E9C9C26AEC; Tue, 5 Apr 2022 01:53:32 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 9A320B81C69; Tue, 5 Apr 2022 08:53:31 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E177BC385A0; Tue, 5 Apr 2022 08:53:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1649148810; bh=ko2SpRfNjpELYGxgdaGx9p3UeCcclOfeq8wiIuIytGQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gM7cgR+Ro6iNSWChwYbgplT1GF+AKFD9BinkULpu1fJ3pvhXPxyUdEGoyyhCckaVa Oyf0iP09j7p3Q/mMtXRIoAxn/plHh9ypLQRsJ44BuxGLYO+rQmkm9P9fhGbWfWQ7Kr /pqY4TDRvmISqQBuI+KdqlEvYSDRgGs0zH5mnMPc= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Dan Williams , Sasha Levin Subject: [PATCH 5.16 0489/1017] tools/testing/cxl: Fix root port to host bridge assignment Date: Tue, 5 Apr 2022 09:23:22 +0200 Message-Id: <20220405070408.814606454@linuxfoundation.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220405070354.155796697@linuxfoundation.org> References: <20220405070354.155796697@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Dan Williams [ Upstream commit a4a0ce242fcd7022349212c4e2f795762e6ff050 ] Mocked root-ports are meant to be round-robin assigned to host-bridges. Fixes: 67dcdd4d3b83 ("tools/testing/cxl: Introduce a mocked-up CXL port hierarchy") Link: https://lore.kernel.org/r/164298431629.3018233.14004377108116384485.stgit@dwillia2-desk3.amr.corp.intel.com Signed-off-by: Dan Williams Signed-off-by: Sasha Levin --- tools/testing/cxl/test/cxl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/testing/cxl/test/cxl.c b/tools/testing/cxl/test/cxl.c index cb32f9e27d5d..5a39b3fdcac4 100644 --- a/tools/testing/cxl/test/cxl.c +++ b/tools/testing/cxl/test/cxl.c @@ -488,7 +488,7 @@ static __init int cxl_test_init(void) for (i = 0; i < ARRAY_SIZE(cxl_root_port); i++) { struct platform_device *bridge = - cxl_host_bridge[i / NR_CXL_ROOT_PORTS]; + cxl_host_bridge[i % ARRAY_SIZE(cxl_host_bridge)]; struct platform_device *pdev; pdev = platform_device_alloc("cxl_root_port", i); -- 2.34.1