From: Krzysztof Kozlowski <krzk@kernel.org>
To: Thippeswamy Havalige <thippesw@amd.com>,
manivannan.sadhasivam@linaro.org, robh@kernel.org,
linux-pci@vger.kernel.org, bhelgaas@google.com,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, krzk+dt@kernel.org,
conor+dt@kernel.org, devicetree@vger.kernel.org
Cc: bharat.kumar.gogada@amd.com, michal.simek@amd.com,
lpieralisi@kernel.org, kw@linux.com
Subject: Re: [PATCH 2/2] PCI: xilinx-cpm: Add support for Versal CPM5 Root Port controller-1
Date: Fri, 6 Sep 2024 11:56:23 +0200 [thread overview]
Message-ID: <e2f45f58-621f-4390-9595-723c3e829b05@kernel.org> (raw)
In-Reply-To: <20240906093148.830452-3-thippesw@amd.com>
On 06/09/2024 11:31, Thippeswamy Havalige wrote:
> In the CPM5, controller-1 has platform-specific error interrupt bits
> located at different offsets compared to controller-0.
>
> Signed-off-by: Thippeswamy Havalige <thippesw@amd.com>
> ---
> drivers/pci/controller/pcie-xilinx-cpm.c | 39 +++++++++++++++++++-----
> 1 file changed, 32 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/pci/controller/pcie-xilinx-cpm.c b/drivers/pci/controller/pcie-xilinx-cpm.c
> index a0f5e1d67b04..d672f620bc4c 100644
> --- a/drivers/pci/controller/pcie-xilinx-cpm.c
> +++ b/drivers/pci/controller/pcie-xilinx-cpm.c
> @@ -30,10 +30,13 @@
> #define XILINX_CPM_PCIE_REG_IDRN_MASK 0x00000E3C
> #define XILINX_CPM_PCIE_MISC_IR_STATUS 0x00000340
> #define XILINX_CPM_PCIE_MISC_IR_ENABLE 0x00000348
> -#define XILINX_CPM_PCIE_MISC_IR_LOCAL BIT(1)
> +#define XILINX_CPM_PCIE0_MISC_IR_LOCAL BIT(1)
> +#define XILINX_CPM_PCIE1_MISC_IR_LOCAL BIT(2)
>
> -#define XILINX_CPM_PCIE_IR_STATUS 0x000002A0
> -#define XILINX_CPM_PCIE_IR_ENABLE 0x000002A8
> +#define XILINX_CPM_PCIE0_IR_STATUS 0x000002A0
> +#define XILINX_CPM_PCIE1_IR_STATUS 0x000002B4
> +#define XILINX_CPM_PCIE0_IR_ENABLE 0x000002A8
> +#define XILINX_CPM_PCIE1_IR_ENABLE 0x000002BC
> #define XILINX_CPM_PCIE_IR_LOCAL BIT(0)
>
> #define IMR(x) BIT(XILINX_PCIE_INTR_ ##x)
> @@ -280,10 +283,17 @@ static void xilinx_cpm_pcie_event_flow(struct irq_desc *desc)
> pcie_write(port, val, XILINX_CPM_PCIE_REG_IDR);
>
> if (port->variant->version == CPM5) {
> - val = readl_relaxed(port->cpm_base + XILINX_CPM_PCIE_IR_STATUS);
> + val = readl_relaxed(port->cpm_base + XILINX_CPM_PCIE0_IR_STATUS);
> if (val)
> writel_relaxed(val, port->cpm_base +
> - XILINX_CPM_PCIE_IR_STATUS);
> + XILINX_CPM_PCIE0_IR_STATUS);
> + }
> +
There are no blank lines allowed between arms of conditional statements.
Please follow coding style. This case is explained there.
Best regards,
Krzysztof
next prev parent reply other threads:[~2024-09-06 9:56 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-09-06 9:31 [PATCH 0/2] Add support for CPM5 controller-1 Thippeswamy Havalige
2024-09-06 9:31 ` [PATCH 1/2] dt-bindings: PCI: xilinx-cpm: Add compatible string " Thippeswamy Havalige
2024-09-06 9:56 ` Krzysztof Kozlowski
2024-09-06 10:43 ` Havalige, Thippeswamy
2024-09-06 10:46 ` Krzysztof Kozlowski
2024-09-06 10:50 ` Havalige, Thippeswamy
2024-09-06 12:19 ` Krzysztof Kozlowski
2024-09-11 4:54 ` Havalige, Thippeswamy
2024-09-06 9:31 ` [PATCH 2/2] PCI: xilinx-cpm: Add support for Versal CPM5 Root Port controller-1 Thippeswamy Havalige
2024-09-06 9:56 ` Krzysztof Kozlowski [this message]
2024-09-06 19:19 ` Bjorn Helgaas
2024-09-12 9:38 ` Havalige, Thippeswamy
2024-09-07 6:15 ` kernel test robot
2024-09-07 9:00 ` kernel test robot
2024-09-07 10:01 ` kernel test robot
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=e2f45f58-621f-4390-9595-723c3e829b05@kernel.org \
--to=krzk@kernel.org \
--cc=bharat.kumar.gogada@amd.com \
--cc=bhelgaas@google.com \
--cc=conor+dt@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=krzk+dt@kernel.org \
--cc=kw@linux.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=lpieralisi@kernel.org \
--cc=manivannan.sadhasivam@linaro.org \
--cc=michal.simek@amd.com \
--cc=robh@kernel.org \
--cc=thippesw@amd.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox