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;
Message-ID: <99d05188-3c5e-231f-a002-c9ed72dace83@intel.com>
Date:   Thu, 22 Jun 2023 17:02:33 -0700
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101
 Betterbird/102.11.1
Subject: Re: [PATCH v6 17/27] cxl/pci: Store the endpoint's Component Register
 mappings in struct cxl_dev_state
To:     Terry Bowman <terry.bowman@amd.com>, <alison.schofield@intel.com>,
        <vishal.l.verma@intel.com>, <ira.weiny@intel.com>,
        <bwidawsk@kernel.org>, <dan.j.williams@intel.com>,
        <Jonathan.Cameron@huawei.com>, <linux-cxl@vger.kernel.org>
CC:     <rrichter@amd.com>, <linux-kernel@vger.kernel.org>,
        <bhelgaas@google.com>
References: <20230622035126.4130151-1-terry.bowman@amd.com>
 <20230622035126.4130151-18-terry.bowman@amd.com>
Content-Language: en-US
From:   Dave Jiang <dave.jiang@intel.com>
In-Reply-To: <20230622035126.4130151-18-terry.bowman@amd.com>
Content-Type: text/plain; charset="UTF-8"; format=flowed
Content-Transfer-Encoding: 7bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?U0c0Mi9QSkZmSXM5SGVhSWxtY1FZK1NhL3NPTmtpajltVlM4b2lrMTBrSFFS?=
 =?utf-8?B?aTlDTnVFVHFzNkVwVjlRdkZMRUV6VGg1SHVqWis2ZlZKWkJ6YjlueGRRYnFl?=
 =?utf-8?B?MlZNaEVsVjlaSEIzWlRCSHFtUXpQUXlmM2dNbmdKK1lxQ29FNjlsV3BkV3p0?=
 =?utf-8?B?WjBYV2NBbVB6aXMySU5lQUUyL2tMc2taR1F6S0E5MXBVRk9XSWR5ME92M2Jr?=
 =?utf-8?B?ZVhQRFNNMmFZdTJ3dVZIeVF2VVIxRmszQmJkTVAyc1pJR3V5QTJUY1JkZnNE?=
 =?utf-8?B?c3JSSFd0bldBNEI2WlZUWTFNeVRmbnA3aFczTGhhcVpNbWo3QktRM3pEMjFP?=
 =?utf-8?B?SjRhbzhPQUZGN1cvUjFSMVdLRWErOTBXMkR1ZHM0QWRPNTdxWXgrM1l0Qm51?=
 =?utf-8?B?QU9wajJ4ZUxXcEd6OHhuUExHRU03dThQWm9HbDR6MHo1VnZjZXphUVhCQnBV?=
 =?utf-8?B?djBZcDIzK3FRNTJrT3l2aFJGNWhhc0JFcngxSkFCeUR5UU8rbmZ1Z2lDWEpQ?=
 =?utf-8?B?QnBTMlZLeXZoTy9saFc2NVdTakplM28rRmV0eXZqSDZtQVVhWU90TFhhRE1r?=
 =?utf-8?B?Vks3bnV6K2wwZG1OV1laaGg2UzhVY2FYK09rTlpiNWw1UGZkRkIzODRyWUNW?=
 =?utf-8?B?OG1MRTh5UHFBVG0rOE9QdnZzakJHVVJQaXVQVlg5Y1ZSRmxoaXY4cWRRM0hW?=
 =?utf-8?B?R0JncU1rN0RlYjUvajQ5V0NZRjFKL2liQmd2dENmT01jSm9NczFEc2NiWThX?=
 =?utf-8?B?VU5mUzBGS1VvUDhZdEhzY1ZqSEpiR2JPME5rcVg0QmhpM29Pd0IxNEZERHdQ?=
 =?utf-8?B?QWIrZWswTW5GMVE5TmI1ekFlRE40MXVqMXZaNCsrOFRWUVBsbzBNaFZxMTFH?=
 =?utf-8?B?amFtVzRZQVBEdGI1cC9JWW4vRndqcmJOWnI4QVV0cUo2UGNIYmxDdmdnWDdD?=
 =?utf-8?B?VUZXSVdmQ0tFMnNwWHdNMFREMHFlbEM5a2VzbElBYXZVeXB6OWhycXlZUWNJ?=
 =?utf-8?B?alltQ2tGdGVPTXVrSk5IVXJXRzVyS3l1NDN0My9BMWtIbVVmWENMTS81Vm9n?=
 =?utf-8?B?NEhlWklJK3ZPcmx4MkUwU0tFSmpTRmNzeTIwZllyVitHNEJkWitCS0tNLzBL?=
 =?utf-8?B?YUhGRHJ1bTBVNGsySTJxeUJaV1BJRUNmcERWMTFoS01ITENOS01vcThqQ0F5?=
 =?utf-8?B?elpobUVFTWQ1amVyZUFMbEZLZ3lPSUtPYytIZi9ycGdkUkZOV1F6d2dQbzlG?=
 =?utf-8?B?UmNtRkNDUGVOR2lic1g1WDhqaVVEUG1FaVF5VkZFK1hSNXZpcGxKb1VoNkZR?=
 =?utf-8?B?OC9JMnowS1ZMYnNXQmVjSk5IZ2haeWhBZThOcEZTMS8xUEhjd1Eza0NML0t3?=
 =?utf-8?B?cjBpbHo2akxrMURrRUFWbkJEVk1vNDVCb2JsbGFQcUNJVFFkcTRjclNWNkpi?=
 =?utf-8?B?Mk5GZjB5K1NoMVF2VG9EdmRPc1JlQkd5ejRkcEhoVTNlNCtFVktMbC9HcjZM?=
 =?utf-8?B?NFQwMUZzSFVFQjVMMDE0NUdSUkQxNC9sMy9WY0tzM0JQcWtCU0JmZU1DUE1z?=
 =?utf-8?B?cEFWUklTUWlhVHJTZ3RhZmhpMTVwdDdCUFhPZVl0QXMwS1cxQWpQOWY1VHIy?=
 =?utf-8?B?ZVFZVWs1TGY0NXlsQmRvUGtlMVVWYU9KWGNyTUduNjFNNm8zbk1KRm9KbFdL?=
 =?utf-8?B?ZDVIL1F4MXFQVnJuUEVUOGFQbUJyWHVNdWdINmVQN2ZVcm9jd25vTEdZeVNa?=
 =?utf-8?B?bTFLdTNpYWVQTXJ1ak85MmpadXphd1JtYWZZU3BDOFVUS09uNEJKeXNwZlBN?=
 =?utf-8?B?OTNVVTdrcXVNK0IzRHgrd2hiRGpzM2dxVFNaWUZ6YVhTZDV5UVd2K1dyYWph?=
 =?utf-8?B?OXh5TVJ6T0t3WTRldUlLbFNleFppaUQyYUczSGtRMlg2YmZLTloxV2Z3ZVFW?=
 =?utf-8?B?Vm5MdnJ2KzV2alM3NU8vMFFSYlVhbUEyZVpYOWlQRUdzK0pnYWorNFkzallz?=
 =?utf-8?B?Tnl6Vk5XaEJSSkpSNXEza28reUwyODQ2Y2dDQXdMejk4WXVnZFQzNFg3eHVz?=
 =?utf-8?B?c2lKMGtBZUZaRS9sZ3F3Wm5oZENpV0Z3a0RTN0toQWwxMFhMdXYyK2NKQmpX?=
 =?utf-8?Q?mtjHWUP8n3BD4o6WErtIu2NYC?=
X-MS-Exchange-CrossTenant-Network-Message-Id: 52d26bca-802c-47d6-2911-08db737d275e
X-MS-Exchange-CrossTenant-AuthSource: PH7PR11MB5984.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Jun 2023 00:02:37.2895
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 46c98d88-e344-4ed4-8496-4ed7712e255d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: zfETDTGyUQ/8IHy/WUH9Hyo6g8DkD0o4m7iqaO12BoiwN6R8g9l1KEB1HlKvleFI2CcaBGBdS9DGi3vLnPfmEQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR11MB6654
X-OriginatorOrg: intel.com
X-Spam-Status: No, score=-4.5 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,
        DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,NICE_REPLY_A,
        RCVD_IN_DNSWL_MED,SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE,
        URIBL_BLOCKED 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: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org


On 6/21/23 20:51, Terry Bowman wrote:
> From: Robert Richter <rrichter@amd.com>
> 
> Same as for ports and dports, also store the endpoint's Component
> Register mappings, use struct cxl_dev_state for that.
> 
> The Component Register base address @component_reg_phys is no longer
> used after the rework of the Component Register setup which now uses
> struct member @comp_map instead. Remove the base address.
> 
> Signed-off-by: Robert Richter <rrichter@amd.com>
> Signed-off-by: Terry Bowman <terry.bowman@amd.com>
> Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>

Reviewed-by: Dave Jiang <dave.jiang@intel.com>
> ---
>   drivers/cxl/cxlmem.h         |  5 ++---
>   drivers/cxl/mem.c            |  4 ++--
>   drivers/cxl/pci.c            | 10 ++++------
>   tools/testing/cxl/test/mem.c |  1 -
>   4 files changed, 8 insertions(+), 12 deletions(-)
> 
> diff --git a/drivers/cxl/cxlmem.h b/drivers/cxl/cxlmem.h
> index 76743016b64c..8aee1a42d9af 100644
> --- a/drivers/cxl/cxlmem.h
> +++ b/drivers/cxl/cxlmem.h
> @@ -263,6 +263,7 @@ struct cxl_poison_state {
>    *
>    * @dev: The device associated with this CXL state
>    * @cxlmd: The device representing the CXL.mem capabilities of @dev
> + * @comp_map: component register capability mappings
>    * @regs: Parsed register blocks
>    * @cxl_dvsec: Offset to the PCIe device DVSEC
>    * @rcd: operating in RCD mode (CXL 3.0 9.11.8 CXL Devices Attached to an RCH)
> @@ -286,7 +287,6 @@ struct cxl_poison_state {
>    * @active_persistent_bytes: sum of hard + soft persistent
>    * @next_volatile_bytes: volatile capacity change pending device reset
>    * @next_persistent_bytes: persistent capacity change pending device reset
> - * @component_reg_phys: register base of component registers
>    * @info: Cached DVSEC information about the device.
>    * @serial: PCIe Device Serial Number
>    * @event: event log driver state
> @@ -299,7 +299,7 @@ struct cxl_poison_state {
>   struct cxl_dev_state {
>   	struct device *dev;
>   	struct cxl_memdev *cxlmd;
> -
> +	struct cxl_register_map comp_map;
>   	struct cxl_regs regs;
>   	int cxl_dvsec;
>   
> @@ -325,7 +325,6 @@ struct cxl_dev_state {
>   	u64 next_volatile_bytes;
>   	u64 next_persistent_bytes;
>   
> -	resource_size_t component_reg_phys;
>   	u64 serial;
>   
>   	struct cxl_event_state event;
> diff --git a/drivers/cxl/mem.c b/drivers/cxl/mem.c
> index 205e2e280aed..92c6151b7206 100644
> --- a/drivers/cxl/mem.c
> +++ b/drivers/cxl/mem.c
> @@ -49,7 +49,6 @@ static int devm_cxl_add_endpoint(struct device *host, struct cxl_memdev *cxlmd,
>   				 struct cxl_dport *parent_dport)
>   {
>   	struct cxl_port *parent_port = parent_dport->port;
> -	struct cxl_dev_state *cxlds = cxlmd->cxlds;
>   	struct cxl_port *endpoint, *iter, *down;
>   	int rc;
>   
> @@ -65,8 +64,9 @@ static int devm_cxl_add_endpoint(struct device *host, struct cxl_memdev *cxlmd,
>   		ep->next = down;
>   	}
>   
> +	/* The Endpoint's component regs are located in cxlds. */
>   	endpoint = devm_cxl_add_port(host, &cxlmd->dev,
> -				     cxlds->component_reg_phys,
> +				     CXL_RESOURCE_NONE,
>   				     parent_dport);
>   	if (IS_ERR(endpoint))
>   		return PTR_ERR(endpoint);
> diff --git a/drivers/cxl/pci.c b/drivers/cxl/pci.c
> index 99a75c54ee39..ad4cfcd95e17 100644
> --- a/drivers/cxl/pci.c
> +++ b/drivers/cxl/pci.c
> @@ -665,16 +665,14 @@ static int cxl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)
>   	 * If the component registers can't be found, the cxl_pci driver may
>   	 * still be useful for management functions so don't return an error.
>   	 */
> -	cxlds->component_reg_phys = CXL_RESOURCE_NONE;
> -	rc = cxl_pci_setup_regs(pdev, CXL_REGLOC_RBI_COMPONENT, &map);
> +	rc = cxl_pci_setup_regs(pdev, CXL_REGLOC_RBI_COMPONENT,
> +				&cxlds->comp_map);
>   	if (rc)
>   		dev_warn(&pdev->dev, "No component registers (%d)\n", rc);
> -	else if (!map.component_map.ras.valid)
> +	else if (!cxlds->comp_map.component_map.ras.valid)
>   		dev_dbg(&pdev->dev, "RAS registers not found\n");
>   
> -	cxlds->component_reg_phys = map.resource;
> -
> -	rc = cxl_map_component_regs(&map, &cxlds->regs.component,
> +	rc = cxl_map_component_regs(&cxlds->comp_map, &cxlds->regs.component,
>   				    BIT(CXL_CM_CAP_CAP_ID_RAS));
>   	if (rc)
>   		dev_dbg(&pdev->dev, "Failed to map RAS capability.\n");
> diff --git a/tools/testing/cxl/test/mem.c b/tools/testing/cxl/test/mem.c
> index 34b48027b3de..fd562a5fa06f 100644
> --- a/tools/testing/cxl/test/mem.c
> +++ b/tools/testing/cxl/test/mem.c
> @@ -1241,7 +1241,6 @@ static int cxl_mock_mem_probe(struct platform_device *pdev)
>   	cxlds->event.buf = (struct cxl_get_event_payload *) mdata->event_buf;
>   	if (is_rcd(pdev)) {
>   		cxlds->rcd = true;
> -		cxlds->component_reg_phys = CXL_RESOURCE_NONE;
>   	}
>   
>   	rc = cxl_enumerate_cmds(cxlds);