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;
From:   Bharat Kumar Gogada <bharatku@xilinx.com>
To:     Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
CC:     "linux-pci@vger.kernel.org" <linux-pci@vger.kernel.org>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
        "bhelgaas@google.com" <bhelgaas@google.com>,
        Michal Simek <michals@xilinx.com>
Subject: RE: [PATCH v2 2/2] PCI: xilinx-cpm: Add support for Versal CPM5 Root
 Port
Thread-Topic: [PATCH v2 2/2] PCI: xilinx-cpm: Add support for Versal CPM5 Root
 Port
Thread-Index: AQHYImoMDICxsHV+4UiuebIA65FIP6ysUPIAgAEkiuA=
Date:   Thu, 3 Mar 2022 09:25:49 +0000
Message-ID: <BY5PR02MB6947106331FBE73A7B04434DA5049@BY5PR02MB6947.namprd02.prod.outlook.com>
References: <20220215124606.28627-1-bharat.kumar.gogada@xilinx.com>
 <20220215124606.28627-3-bharat.kumar.gogada@xilinx.com>
 <Yh+OUvLi56/H4l2z@lpieralisi>
In-Reply-To: <Yh+OUvLi56/H4l2z@lpieralisi>
Accept-Language: en-US
Content-Language: en-US
x-ms-exchange-antispam-messagedata-chunkcount: 1
x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?aTa+947eIHN8XHjJwnLm17MvpKzDJ0M6/I1mZDAnVrLxsxyTmOZPncbKHUx4?=
 =?us-ascii?Q?AXcqoWPO1jHLQn8EIvFaUzDeZQbHKQ+Wa2m6Csw7myJEfQFK2k64VJd1BRrT?=
 =?us-ascii?Q?bUamKHOTPEb7KJTMKblJ9zYu0UpsnlflpyxN5kAMm26uVkuaI4qVolz3S0+f?=
 =?us-ascii?Q?64h7KMOt6fDK1x/NdHJEbPgqo8IQrQETP0uQOv9nXpso1ul8VtUYTvQ/B0Ym?=
 =?us-ascii?Q?Zge5EbqG8C0Re6AFzR0oG0izTn99+JC3Pi77Ub79zR41GS3T8jjQJNfElhZf?=
 =?us-ascii?Q?RvazhPpmo64OIFzfyRwIofRZu6zFpLToc31hXQ1QZymDhzcdxjC4xnmkL4zT?=
 =?us-ascii?Q?04I7j5AKR5hl/9+Q1tvB30I1IVLk1jOt0vcZk98JbfwBa7zPVDIsbhrLD9AI?=
 =?us-ascii?Q?IYg3j4MdNsXPqBFZbPdV0UboHq6uQgujn3WZBpGFSio/447EBEikkloR6VH2?=
 =?us-ascii?Q?jBQ8sXZ8EDtdACArl9G14Kj5xZwhP94GpO2lmgJesJe4z78lJZKflfIU3Qrq?=
 =?us-ascii?Q?0jNAxDZxeTNufA1/6gQ3/wbV4aAebNsOQkW5Z85r7m695T+/gEt6MlovA049?=
 =?us-ascii?Q?nDsmGNY8CBDqIAZC2pyBsg+tNA5raMpYr4+s3Tf4jodxfVlEHHOcnbslwdmi?=
 =?us-ascii?Q?KifPMZ160uoyqKlDBbyzw7he1yq7ErIBsZ2ZBsoPM/SA2YEMhZaA/ntnwiHW?=
 =?us-ascii?Q?uB/KhlWE5gLK1dzG3nc3mg2cgh9O+aNQ0v3VzYsHCOh+Oek+ckXe9DA7+XZn?=
 =?us-ascii?Q?wLDLUktXY+7ZvJwxOmBddQgGhKOrfF0Bj1aw8P9Uu37DDYgYGJEG4Ctb2cgU?=
 =?us-ascii?Q?wr0uwculKSUVKZhmphC18Qn5b7i//2GHbuXmDmETeE+JNMg1BszFG3hlco0Q?=
 =?us-ascii?Q?SKVuKokhRDO5jc6gnGcD9mxMbHD/1kek/zE+/F6aJ1Un7O3/HqH9ARvSq1TE?=
 =?us-ascii?Q?DcGfrL3yPtcmuaS9VSZoJEU0yPW252VXSUIrCR546DAAyZ6snX7mzTuTCb0W?=
 =?us-ascii?Q?uvgHbhPpiGtwpiRw5igIeVa9/iSSBq3jq4ivWScyWDyKUG7UjMdMQ0avyxrm?=
 =?us-ascii?Q?K289jVgoppKZF25GmD6SvWWjIreGhN4tVn8RkGk58O5KgxYvEPlUCekUKQTC?=
 =?us-ascii?Q?kg8tLYpQwmTJwrami7czSw3euhQkspeyygBbdZaURjjPJqNt1N8JX0VarT8C?=
 =?us-ascii?Q?tZRR/efGArU4oSZVJrYtCPef1NyYqFftMK3KJrT/mjg/iqEYQe0nLodGRGD8?=
 =?us-ascii?Q?rP2pusKN1mNkqHFhL8Am8d1AkV+fUzkSafrAHjFFzUMPMYcI8iX+I54/wo4o?=
 =?us-ascii?Q?XYRyUoPmtUi9zEb93m7NMqYJaEFfc7NRw+InkLs/cXz9cYX1Mua6tPQawcgP?=
 =?us-ascii?Q?00Ryv4X6MC1klMJDeu8eOSV2I3bj0o94JlboNl9DnnRS+L/qNslIxknc8j8j?=
 =?us-ascii?Q?LKjGBQw49EfjtHLdZEhULr37vMpL+NRPuorFCnhvRIKSOEwbW8y0pcEqfTbM?=
 =?us-ascii?Q?jEvlM63QVoLdZHqCWUsw/CfC9JyxmLMkhMNE2njNN3E7PxAC3kk1v+IdaOVd?=
 =?us-ascii?Q?2FFTP/WBEkkLZWGTlNKN6UJqo//g3omAnaHHm5n1XDTz7aNxcbn6vxHCMDaQ?=
 =?us-ascii?Q?KTIsqURpmgrkAC18ndB+LxE=3D?=
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-OriginatorOrg: xilinx.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-AuthSource: BY5PR02MB6947.namprd02.prod.outlook.com
X-MS-Exchange-CrossTenant-Network-Message-Id: aacc9e0e-6b9d-4a7a-13d1-08d9fcf7ce0c
X-MS-Exchange-CrossTenant-originalarrivaltime: 03 Mar 2022 09:25:49.2562
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 657af505-d5df-48d0-8300-c31994686c5c
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-CrossTenant-userprincipalname: NOqDiiGLnZK5/XpO1bAmsAAUoW2tMTLpRYExjcYUcUv+BKHbBkg02xsoZ0ECl6nB6Bj1clsE6z6IuECK1hfX6A==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR02MB6948
X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,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: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

> On Tue, Feb 15, 2022 at 06:16:06PM +0530, Bharat Kumar Gogada wrote:
> > Xilinx Versal Premium series has CPM5 block which supports Root Port
> > functioning at Gen5 speed.
> >
> > Xilinx Versal CPM5 has few changes with existing CPM block.
> > - CPM5 has dedicated register space for control and status registers.
> > - CPM5 legacy interrupt handling needs additional register bit
> >   to enable and handle legacy interrupts.
> >
> > Signed-off-by: Bharat Kumar Gogada <bharat.kumar.gogada@xilinx.com>
> > ---
> >  drivers/pci/controller/pcie-xilinx-cpm.c | 33
> > +++++++++++++++++++++++-
> >  1 file changed, 32 insertions(+), 1 deletion(-)
>=20
> Only a couple of very minor suggestions below.
>=20
> > diff --git a/drivers/pci/controller/pcie-xilinx-cpm.c
> > b/drivers/pci/controller/pcie-xilinx-cpm.c
> > index c7cd44ed4dfc..eb69f494571a 100644
> > --- a/drivers/pci/controller/pcie-xilinx-cpm.c
> > +++ b/drivers/pci/controller/pcie-xilinx-cpm.c
> > @@ -35,6 +35,10 @@
> >  #define XILINX_CPM_PCIE_MISC_IR_ENABLE	0x00000348
> >  #define XILINX_CPM_PCIE_MISC_IR_LOCAL	BIT(1)
> >
> > +#define XILINX_CPM_PCIE_IR_STATUS       0x000002A0
> > +#define XILINX_CPM_PCIE_IR_ENABLE       0x000002A8
> > +#define XILINX_CPM_PCIE_IR_LOCAL        BIT(0)
> > +
> >  /* Interrupt registers definitions */
> >  #define XILINX_CPM_PCIE_INTR_LINK_DOWN		0
> >  #define XILINX_CPM_PCIE_INTR_HOT_RESET		3
> > @@ -109,6 +113,7 @@
> >   * @intx_irq: legacy interrupt number
> >   * @irq: Error interrupt number
> >   * @lock: lock protecting shared register access
> > + * @is_cpm5: value to check cpm version
> >   */
> >  struct xilinx_cpm_pcie {
> >  	struct device			*dev;
> > @@ -120,6 +125,7 @@ struct xilinx_cpm_pcie {
> >  	int				intx_irq;
> >  	int				irq;
> >  	raw_spinlock_t			lock;
> > +	bool                            is_cpm5;
> >  };
> >
> >  static u32 pcie_read(struct xilinx_cpm_pcie *port, u32 reg) @@ -285,6
> > +291,14 @@ static void xilinx_cpm_pcie_event_flow(struct irq_desc *desc=
)
> >  		generic_handle_domain_irq(port->cpm_domain, i);
> >  	pcie_write(port, val, XILINX_CPM_PCIE_REG_IDR);
> >
> > +	if (port->is_cpm5) {
> > +		val =3D readl_relaxed(port->cpm_base +
> XILINX_CPM_PCIE_IR_STATUS);
> > +		if (val)
> > +			writel_relaxed(val,
> > +				       port->cpm_base +
> > +				       XILINX_CPM_PCIE_IR_STATUS);
> > +	}
> > +
> >  	/*
> >  	 * XILINX_CPM_PCIE_MISC_IR_STATUS register is mapped to
> >  	 * CPM SLCR block.
> > @@ -484,6 +498,12 @@ static void xilinx_cpm_pcie_init_port(struct
> xilinx_cpm_pcie *port)
> >  	 */
> >  	writel(XILINX_CPM_PCIE_MISC_IR_LOCAL,
> >  	       port->cpm_base + XILINX_CPM_PCIE_MISC_IR_ENABLE);
> > +
> > +	if (port->is_cpm5) {
> > +		writel(XILINX_CPM_PCIE_IR_LOCAL,
> > +		       port->cpm_base + XILINX_CPM_PCIE_IR_ENABLE);
> > +	}
> > +
> >  	/* Enable the Bridge enable bit */
> >  	pcie_write(port, pcie_read(port, XILINX_CPM_PCIE_REG_RPSC) |
> >  		   XILINX_CPM_PCIE_REG_RPSC_BEN,
> > @@ -504,6 +524,9 @@ static int xilinx_cpm_pcie_parse_dt(struct
> xilinx_cpm_pcie *port,
> >  	struct platform_device *pdev =3D to_platform_device(dev);
> >  	struct resource *res;
> >
> > +	if (of_device_is_compatible(dev->of_node, "xlnx,versal-cpm5-host-
> 1.00"))
> > +		port->is_cpm5 =3D true;
>=20
> port->is_cpm5 =3D of_device_is_compatible(dev->of_node,
> 					"xlnx,versal-cpm5-host-1.00");
>=20
> ?
>=20
> > +		port->is_cpm5 =3D true;
> > +
> >  	port->cpm_base =3D devm_platform_ioremap_resource_byname(pdev,
> >  							       "cpm_slcr");
> >  	if (IS_ERR(port->cpm_base))
> > @@ -518,7 +541,14 @@ static int xilinx_cpm_pcie_parse_dt(struct
> xilinx_cpm_pcie *port,
> >  	if (IS_ERR(port->cfg))
> >  		return PTR_ERR(port->cfg);
> >
> > -	port->reg_base =3D port->cfg->win;
> > +	if (!port->is_cpm5) {
>=20
> Nit: I'd keep the check as above for consistency but it is not really
> important:
Thanks Lorenzo, will fix these in next patch.