All of lore.kernel.org
 help / color / mirror / Atom feed
From: Damien Le Moal <dlemoal@kernel.org>
To: "Manivannan Sadhasivam" <manivannan.sadhasivam@linaro.org>,
	"Lorenzo Pieralisi" <lpieralisi@kernel.org>,
	"Kishon Vijay Abraham I" <kishon@kernel.org>,
	"Shawn Lin" <shawn.lin@rock-chips.com>,
	"Krzysztof Wilczyński" <kw@linux.com>,
	"Bjorn Helgaas" <bhelgaas@google.com>,
	"Heiko Stuebner" <heiko@sntech.de>,
	linux-pci@vger.kernel.org, "Rob Herring" <robh@kernel.org>,
	"Krzysztof Kozlowski" <krzysztof.kozlowski+dt@linaro.org>,
	"Conor Dooley" <conor+dt@kernel.org>,
	devicetree@vger.kernel.org
Cc: linux-rockchip@lists.infradead.org,
	linux-arm-kernel@lists.infradead.org,
	Rick Wertenbroek <rick.wertenbroek@gmail.com>,
	Wilfred Mallawa <wilfred.mallawa@wdc.com>,
	Niklas Cassel <cassel@kernel.org>
Subject: [PATCH v2 09/18] PCI: rockchip-ep: Improve rockchip_pcie_ep_unmap_addr()
Date: Sat, 30 Mar 2024 13:19:19 +0900	[thread overview]
Message-ID: <20240330041928.1555578-10-dlemoal@kernel.org> (raw)
In-Reply-To: <20240330041928.1555578-1-dlemoal@kernel.org>

From: Damien Le Moal <damien.lemoal@opensource.wdc.com>

There is no need to loop over all regions to find the memory window used
to map an address. We can use rockchip_ob_region() to determine the
region index, together with a check that the address passed as argument
is the address used to create the mapping. Furthermore, the
ob_region_map bitmap should also be checked to ensure that we are not
attempting to unmap an address that is not mapped.

Signed-off-by: Damien Le Moal <damien.lemoal@opensource.wdc.com>
---
 drivers/pci/controller/pcie-rockchip-ep.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/drivers/pci/controller/pcie-rockchip-ep.c b/drivers/pci/controller/pcie-rockchip-ep.c
index f8c26606df58..93c2466d6fef 100644
--- a/drivers/pci/controller/pcie-rockchip-ep.c
+++ b/drivers/pci/controller/pcie-rockchip-ep.c
@@ -258,13 +258,9 @@ static void rockchip_pcie_ep_unmap_addr(struct pci_epc *epc, u8 fn, u8 vfn,
 {
 	struct rockchip_pcie_ep *ep = epc_get_drvdata(epc);
 	struct rockchip_pcie *rockchip = &ep->rockchip;
-	u32 r;
-
-	for (r = 0; r < ep->max_regions; r++)
-		if (ep->ob_addr[r] == addr)
-			break;
+	u32 r = rockchip_ob_region(addr);
 
-	if (r == ep->max_regions)
+	if (addr != ep->ob_addr[r] || !test_bit(r, &ep->ob_region_map))
 		return;
 
 	rockchip_pcie_clear_ep_ob_atu(rockchip, r);
-- 
2.44.0


WARNING: multiple messages have this Message-ID (diff)
From: Damien Le Moal <dlemoal@kernel.org>
To: "Manivannan Sadhasivam" <manivannan.sadhasivam@linaro.org>,
	"Lorenzo Pieralisi" <lpieralisi@kernel.org>,
	"Kishon Vijay Abraham I" <kishon@kernel.org>,
	"Shawn Lin" <shawn.lin@rock-chips.com>,
	"Krzysztof Wilczyński" <kw@linux.com>,
	"Bjorn Helgaas" <bhelgaas@google.com>,
	"Heiko Stuebner" <heiko@sntech.de>,
	linux-pci@vger.kernel.org, "Rob Herring" <robh@kernel.org>,
	"Krzysztof Kozlowski" <krzysztof.kozlowski+dt@linaro.org>,
	"Conor Dooley" <conor+dt@kernel.org>,
	devicetree@vger.kernel.org
Cc: linux-rockchip@lists.infradead.org,
	linux-arm-kernel@lists.infradead.org,
	Rick Wertenbroek <rick.wertenbroek@gmail.com>,
	Wilfred Mallawa <wilfred.mallawa@wdc.com>,
	Niklas Cassel <cassel@kernel.org>
Subject: [PATCH v2 09/18] PCI: rockchip-ep: Improve rockchip_pcie_ep_unmap_addr()
Date: Sat, 30 Mar 2024 13:19:19 +0900	[thread overview]
Message-ID: <20240330041928.1555578-10-dlemoal@kernel.org> (raw)
In-Reply-To: <20240330041928.1555578-1-dlemoal@kernel.org>

From: Damien Le Moal <damien.lemoal@opensource.wdc.com>

There is no need to loop over all regions to find the memory window used
to map an address. We can use rockchip_ob_region() to determine the
region index, together with a check that the address passed as argument
is the address used to create the mapping. Furthermore, the
ob_region_map bitmap should also be checked to ensure that we are not
attempting to unmap an address that is not mapped.

Signed-off-by: Damien Le Moal <damien.lemoal@opensource.wdc.com>
---
 drivers/pci/controller/pcie-rockchip-ep.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/drivers/pci/controller/pcie-rockchip-ep.c b/drivers/pci/controller/pcie-rockchip-ep.c
index f8c26606df58..93c2466d6fef 100644
--- a/drivers/pci/controller/pcie-rockchip-ep.c
+++ b/drivers/pci/controller/pcie-rockchip-ep.c
@@ -258,13 +258,9 @@ static void rockchip_pcie_ep_unmap_addr(struct pci_epc *epc, u8 fn, u8 vfn,
 {
 	struct rockchip_pcie_ep *ep = epc_get_drvdata(epc);
 	struct rockchip_pcie *rockchip = &ep->rockchip;
-	u32 r;
-
-	for (r = 0; r < ep->max_regions; r++)
-		if (ep->ob_addr[r] == addr)
-			break;
+	u32 r = rockchip_ob_region(addr);
 
-	if (r == ep->max_regions)
+	if (addr != ep->ob_addr[r] || !test_bit(r, &ep->ob_region_map))
 		return;
 
 	rockchip_pcie_clear_ep_ob_atu(rockchip, r);
-- 
2.44.0


_______________________________________________
Linux-rockchip mailing list
Linux-rockchip@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-rockchip

WARNING: multiple messages have this Message-ID (diff)
From: Damien Le Moal <dlemoal@kernel.org>
To: "Manivannan Sadhasivam" <manivannan.sadhasivam@linaro.org>,
	"Lorenzo Pieralisi" <lpieralisi@kernel.org>,
	"Kishon Vijay Abraham I" <kishon@kernel.org>,
	"Shawn Lin" <shawn.lin@rock-chips.com>,
	"Krzysztof Wilczyński" <kw@linux.com>,
	"Bjorn Helgaas" <bhelgaas@google.com>,
	"Heiko Stuebner" <heiko@sntech.de>,
	linux-pci@vger.kernel.org, "Rob Herring" <robh@kernel.org>,
	"Krzysztof Kozlowski" <krzysztof.kozlowski+dt@linaro.org>,
	"Conor Dooley" <conor+dt@kernel.org>,
	devicetree@vger.kernel.org
Cc: linux-rockchip@lists.infradead.org,
	linux-arm-kernel@lists.infradead.org,
	Rick Wertenbroek <rick.wertenbroek@gmail.com>,
	Wilfred Mallawa <wilfred.mallawa@wdc.com>,
	Niklas Cassel <cassel@kernel.org>
Subject: [PATCH v2 09/18] PCI: rockchip-ep: Improve rockchip_pcie_ep_unmap_addr()
Date: Sat, 30 Mar 2024 13:19:19 +0900	[thread overview]
Message-ID: <20240330041928.1555578-10-dlemoal@kernel.org> (raw)
In-Reply-To: <20240330041928.1555578-1-dlemoal@kernel.org>

From: Damien Le Moal <damien.lemoal@opensource.wdc.com>

There is no need to loop over all regions to find the memory window used
to map an address. We can use rockchip_ob_region() to determine the
region index, together with a check that the address passed as argument
is the address used to create the mapping. Furthermore, the
ob_region_map bitmap should also be checked to ensure that we are not
attempting to unmap an address that is not mapped.

Signed-off-by: Damien Le Moal <damien.lemoal@opensource.wdc.com>
---
 drivers/pci/controller/pcie-rockchip-ep.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/drivers/pci/controller/pcie-rockchip-ep.c b/drivers/pci/controller/pcie-rockchip-ep.c
index f8c26606df58..93c2466d6fef 100644
--- a/drivers/pci/controller/pcie-rockchip-ep.c
+++ b/drivers/pci/controller/pcie-rockchip-ep.c
@@ -258,13 +258,9 @@ static void rockchip_pcie_ep_unmap_addr(struct pci_epc *epc, u8 fn, u8 vfn,
 {
 	struct rockchip_pcie_ep *ep = epc_get_drvdata(epc);
 	struct rockchip_pcie *rockchip = &ep->rockchip;
-	u32 r;
-
-	for (r = 0; r < ep->max_regions; r++)
-		if (ep->ob_addr[r] == addr)
-			break;
+	u32 r = rockchip_ob_region(addr);
 
-	if (r == ep->max_regions)
+	if (addr != ep->ob_addr[r] || !test_bit(r, &ep->ob_region_map))
 		return;
 
 	rockchip_pcie_clear_ep_ob_atu(rockchip, r);
-- 
2.44.0


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

  parent reply	other threads:[~2024-03-30  4:20 UTC|newest]

Thread overview: 162+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-03-30  4:19 [PATCH v2 00/18] Improve PCI memory mapping API Damien Le Moal
2024-03-30  4:19 ` Damien Le Moal
2024-03-30  4:19 ` Damien Le Moal
2024-03-30  4:19 ` [PATCH v2 01/18] PCI: endpoint: Introduce pci_epc_function_is_valid() Damien Le Moal
2024-03-30  4:19   ` Damien Le Moal
2024-03-30  4:19   ` Damien Le Moal
2024-04-03  6:46   ` Manivannan Sadhasivam
2024-04-03  6:46     ` Manivannan Sadhasivam
2024-04-03  6:46     ` Manivannan Sadhasivam
2024-04-05 13:33   ` Niklas Cassel
2024-04-05 13:33     ` Niklas Cassel
2024-04-05 13:33     ` Niklas Cassel
2024-03-30  4:19 ` [PATCH v2 02/18] PCI: endpoint: Introduce pci_epc_map_align() Damien Le Moal
2024-03-30  4:19   ` Damien Le Moal
2024-03-30  4:19   ` Damien Le Moal
2024-04-03  7:45   ` Manivannan Sadhasivam
2024-04-03  7:45     ` Manivannan Sadhasivam
2024-04-03  7:45     ` Manivannan Sadhasivam
2024-04-03  7:54     ` Damien Le Moal
2024-04-03  7:54       ` Damien Le Moal
2024-04-03  7:54       ` Damien Le Moal
2024-04-03  9:21       ` Manivannan Sadhasivam
2024-04-03  9:21         ` Manivannan Sadhasivam
2024-04-03  9:21         ` Manivannan Sadhasivam
2024-04-03 12:33   ` Kishon Vijay Abraham I
2024-04-03 12:33     ` Kishon Vijay Abraham I
2024-04-03 12:33     ` Kishon Vijay Abraham I
2024-04-04  2:43     ` Damien Le Moal
2024-04-04  2:43       ` Damien Le Moal
2024-04-04  2:43       ` Damien Le Moal
2024-04-05 12:20       ` Niklas Cassel
2024-04-05 12:20         ` Niklas Cassel
2024-04-05 12:20         ` Niklas Cassel
2024-04-05 12:43         ` Damien Le Moal
2024-04-05 12:43           ` Damien Le Moal
2024-04-05 12:43           ` Damien Le Moal
2024-04-05 15:18           ` Niklas Cassel
2024-04-05 15:18             ` Niklas Cassel
2024-04-05 15:18             ` Niklas Cassel
2024-04-10 11:57         ` Kishon Vijay Abraham I
2024-04-10 11:57           ` Kishon Vijay Abraham I
2024-04-10 11:57           ` Kishon Vijay Abraham I
2024-04-05  8:38   ` Dan Carpenter
2024-04-05  8:38     ` Dan Carpenter
2024-04-05  8:38     ` Dan Carpenter
2024-03-30  4:19 ` [PATCH v2 03/18] PCI: endpoint: Introduce pci_epc_mem_map()/unmap() Damien Le Moal
2024-03-30  4:19   ` Damien Le Moal
2024-03-30  4:19   ` Damien Le Moal
2024-04-03  9:48   ` Manivannan Sadhasivam
2024-04-03  9:48     ` Manivannan Sadhasivam
2024-04-03  9:48     ` Manivannan Sadhasivam
2024-04-05 14:10   ` Niklas Cassel
2024-04-05 14:10     ` Niklas Cassel
2024-04-05 14:10     ` Niklas Cassel
2024-03-30  4:19 ` [PATCH v2 04/18] PCI: endpoint: test: Use pci_epc_mem_map/unmap() Damien Le Moal
2024-03-30  4:19   ` Damien Le Moal
2024-03-30  4:19   ` Damien Le Moal
2024-04-05 13:37   ` Niklas Cassel
2024-04-05 13:37     ` Niklas Cassel
2024-04-05 13:37     ` Niklas Cassel
2024-03-30  4:19 ` [PATCH v2 05/18] PCI: endpoint: test: Synchronously cancel command handler work Damien Le Moal
2024-03-30  4:19   ` Damien Le Moal
2024-03-30  4:19   ` Damien Le Moal
2024-04-03  7:47   ` Manivannan Sadhasivam
2024-04-03  7:47     ` Manivannan Sadhasivam
2024-04-03  7:47     ` Manivannan Sadhasivam
2024-04-05 13:41     ` Niklas Cassel
2024-04-05 13:41       ` Niklas Cassel
2024-04-05 13:41       ` Niklas Cassel
2024-03-30  4:19 ` [PATCH v2 06/18] PCI: endpoint: test: Implement link_down event operation Damien Le Moal
2024-03-30  4:19   ` Damien Le Moal
2024-03-30  4:19   ` Damien Le Moal
2024-04-03  7:48   ` Manivannan Sadhasivam
2024-04-03  7:48     ` Manivannan Sadhasivam
2024-04-03  7:48     ` Manivannan Sadhasivam
2024-04-05 13:39     ` Niklas Cassel
2024-04-05 13:39       ` Niklas Cassel
2024-04-05 13:39       ` Niklas Cassel
2024-04-06  2:24       ` Manivannan Sadhasivam
2024-04-06  2:24         ` Manivannan Sadhasivam
2024-04-06  2:24         ` Manivannan Sadhasivam
2024-03-30  4:19 ` [PATCH v2 07/18] PCI: rockchip-ep: Fix address translation unit programming Damien Le Moal
2024-03-30  4:19   ` Damien Le Moal
2024-03-30  4:19   ` Damien Le Moal
2024-03-30  4:19 ` [PATCH v2 08/18] PCI: rockchip-ep: Use a macro to define EP controller .align feature Damien Le Moal
2024-03-30  4:19   ` Damien Le Moal
2024-03-30  4:19   ` Damien Le Moal
2024-03-30  4:19 ` Damien Le Moal [this message]
2024-03-30  4:19   ` [PATCH v2 09/18] PCI: rockchip-ep: Improve rockchip_pcie_ep_unmap_addr() Damien Le Moal
2024-03-30  4:19   ` Damien Le Moal
2024-03-30  4:19 ` [PATCH v2 10/18] PCI: rockchip-ep: Improve rockchip_pcie_ep_map_addr() Damien Le Moal
2024-03-30  4:19   ` Damien Le Moal
2024-03-30  4:19   ` Damien Le Moal
2024-03-30  4:19 ` [PATCH v2 11/18] PCI: rockchip-ep: Implement the map_align endpoint controller operation Damien Le Moal
2024-03-30  4:19   ` Damien Le Moal
2024-03-30  4:19   ` Damien Le Moal
2024-03-30  4:19 ` [PATCH v2 12/18] PCI: rockchip-ep: Refactor rockchip_pcie_ep_probe() memory allocations Damien Le Moal
2024-03-30  4:19   ` Damien Le Moal
2024-03-30  4:19   ` Damien Le Moal
2024-03-30  4:19 ` [PATCH v2 13/18] PCI: rockchip-ep: Refactor rockchip_pcie_ep_probe() MSI-X hiding Damien Le Moal
2024-03-30  4:19   ` Damien Le Moal
2024-03-30  4:19   ` Damien Le Moal
2024-03-30  4:19 ` [PATCH v2 14/18] PCI: rockchip-ep: Refactor endpoint link training enable Damien Le Moal
2024-03-30  4:19   ` Damien Le Moal
2024-03-30  4:19   ` Damien Le Moal
2024-03-30  4:19 ` [PATCH v2 15/18] PCI: rockship-ep: Introduce rockchip_pcie_ep_stop() Damien Le Moal
2024-03-30  4:19   ` Damien Le Moal
2024-03-30  4:19   ` Damien Le Moal
2024-03-30  4:19 ` [PATCH v2 16/18] PCI: rockchip-ep: Improve link training Damien Le Moal
2024-03-30  4:19   ` Damien Le Moal
2024-03-30  4:19   ` Damien Le Moal
2024-04-03 11:54   ` Rick Wertenbroek
2024-04-03 11:54     ` Rick Wertenbroek
2024-04-03 11:54     ` Rick Wertenbroek
2024-03-30  4:19 ` [PATCH v2 17/18] dt-bindings: pci: rockchip,rk3399-pcie-ep: Add ep-gpios property Damien Le Moal
2024-03-30  4:19   ` Damien Le Moal
2024-03-30  4:19   ` Damien Le Moal
2024-03-30  9:16   ` Krzysztof Kozlowski
2024-03-30  9:16     ` Krzysztof Kozlowski
2024-03-30  9:16     ` Krzysztof Kozlowski
2024-03-31 23:06     ` Damien Le Moal
2024-03-31 23:06       ` Damien Le Moal
2024-03-31 23:06       ` Damien Le Moal
2024-04-01  9:57       ` Krzysztof Kozlowski
2024-04-01  9:57         ` Krzysztof Kozlowski
2024-04-01  9:57         ` Krzysztof Kozlowski
2024-04-01 23:36         ` Damien Le Moal
2024-04-01 23:36           ` Damien Le Moal
2024-04-01 23:36           ` Damien Le Moal
2024-04-02  7:33           ` Krzysztof Kozlowski
2024-04-02  7:33             ` Krzysztof Kozlowski
2024-04-02  7:33             ` Krzysztof Kozlowski
2024-04-02  7:38             ` Damien Le Moal
2024-04-02  7:38               ` Damien Le Moal
2024-04-02  7:38               ` Damien Le Moal
2024-04-02  7:55               ` Damien Le Moal
2024-04-02  7:55                 ` Damien Le Moal
2024-04-02  7:55                 ` Damien Le Moal
2024-04-02 18:10                 ` Krzysztof Kozlowski
2024-04-02 18:10                   ` Krzysztof Kozlowski
2024-04-02 18:10                   ` Krzysztof Kozlowski
2024-04-02 23:23                   ` Damien Le Moal
2024-04-02 23:23                     ` Damien Le Moal
2024-04-02 23:23                     ` Damien Le Moal
2024-04-02  7:38             ` Damien Le Moal
2024-04-02  7:38               ` Damien Le Moal
2024-04-02  7:38               ` Damien Le Moal
2024-03-30  4:19 ` [PATCH v2 18/18] PCI: rockchip-ep: Handle PERST# signal in endpoint mode Damien Le Moal
2024-03-30  4:19   ` Damien Le Moal
2024-03-30  4:19   ` Damien Le Moal
2024-04-02 12:36 ` [PATCH v2 00/18] Improve PCI memory mapping API Rick Wertenbroek
2024-04-02 12:36   ` Rick Wertenbroek
2024-04-02 12:36   ` Rick Wertenbroek
2024-04-03  7:50 ` Manivannan Sadhasivam
2024-04-03  7:50   ` Manivannan Sadhasivam
2024-04-03  7:50   ` Manivannan Sadhasivam
2024-04-03  7:58   ` Damien Le Moal
2024-04-03  7:58     ` Damien Le Moal
2024-04-03  7:58     ` Damien Le Moal
2024-04-03  9:25     ` Manivannan Sadhasivam
2024-04-03  9:25       ` Manivannan Sadhasivam
2024-04-03  9:25       ` Manivannan Sadhasivam

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=20240330041928.1555578-10-dlemoal@kernel.org \
    --to=dlemoal@kernel.org \
    --cc=bhelgaas@google.com \
    --cc=cassel@kernel.org \
    --cc=conor+dt@kernel.org \
    --cc=devicetree@vger.kernel.org \
    --cc=heiko@sntech.de \
    --cc=kishon@kernel.org \
    --cc=krzysztof.kozlowski+dt@linaro.org \
    --cc=kw@linux.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-pci@vger.kernel.org \
    --cc=linux-rockchip@lists.infradead.org \
    --cc=lpieralisi@kernel.org \
    --cc=manivannan.sadhasivam@linaro.org \
    --cc=rick.wertenbroek@gmail.com \
    --cc=robh@kernel.org \
    --cc=shawn.lin@rock-chips.com \
    --cc=wilfred.mallawa@wdc.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.