* [PATCH v3 3/6] resource: Introduce resource_union() for overlapping resources
[not found] <20201030172556.21686-1-andriy.shevchenko@linux.intel.com>
@ 2020-10-30 17:25 ` Andy Shevchenko
2020-10-30 17:25 ` [PATCH v3 5/6] PCI/ACPI: Replace open coded variant of resource_union() Andy Shevchenko
1 sibling, 0 replies; 2+ messages in thread
From: Andy Shevchenko @ 2020-10-30 17:25 UTC (permalink / raw)
To: Rafael J. Wysocki, Len Brown, linux-acpi
Cc: Andy Shevchenko, Mika Westerberg, Kuppuswamy Sathyanarayanan,
Bjorn Helgaas, linux-pci
Some already present users may utilize resource_union() helper.
Provide it for them and for wider use in the future.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Cc: Mika Westerberg <mika.westerberg@linux.intel.com>
Cc: Kuppuswamy Sathyanarayanan <sathyanarayanan.kuppuswamy@linux.intel.com>
Cc: Bjorn Helgaas <bhelgaas@google.com>
Cc: linux-pci@vger.kernel.org
---
include/linux/ioport.h | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/include/linux/ioport.h b/include/linux/ioport.h
index df4581107536..40320eb5bc0e 100644
--- a/include/linux/ioport.h
+++ b/include/linux/ioport.h
@@ -10,9 +10,10 @@
#define _LINUX_IOPORT_H
#ifndef __ASSEMBLY__
+#include <linux/bits.h>
#include <linux/compiler.h>
+#include <linux/minmax.h>
#include <linux/types.h>
-#include <linux/bits.h>
/*
* Resources are tree-like, allowing
* nesting etc..
@@ -235,6 +236,16 @@ static inline bool resource_overlaps(struct resource *r1, struct resource *r2)
return r1->start <= r2->end && r1->end >= r2->start;
}
+static inline bool
+resource_union(struct resource *r1, struct resource *r2, struct resource *r)
+{
+ if (!resource_overlaps(r1, r2))
+ return false;
+ r->start = min(r1->start, r2->start);
+ r->end = max(r1->end, r2->end);
+ return true;
+}
+
/* Convenience shorthand with allocation */
#define request_region(start,n,name) __request_region(&ioport_resource, (start), (n), (name), 0)
#define request_muxed_region(start,n,name) __request_region(&ioport_resource, (start), (n), (name), IORESOURCE_MUXED)
--
2.28.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [PATCH v3 5/6] PCI/ACPI: Replace open coded variant of resource_union()
[not found] <20201030172556.21686-1-andriy.shevchenko@linux.intel.com>
2020-10-30 17:25 ` [PATCH v3 3/6] resource: Introduce resource_union() for overlapping resources Andy Shevchenko
@ 2020-10-30 17:25 ` Andy Shevchenko
1 sibling, 0 replies; 2+ messages in thread
From: Andy Shevchenko @ 2020-10-30 17:25 UTC (permalink / raw)
To: Rafael J. Wysocki, Len Brown, linux-acpi
Cc: Andy Shevchenko, Kuppuswamy Sathyanarayanan, Bjorn Helgaas,
linux-pci, Rafael J . Wysocki
Since we have resource_union() helper, let's utilize it here.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Cc: Kuppuswamy Sathyanarayanan <sathyanarayanan.kuppuswamy@linux.intel.com>
Cc: Bjorn Helgaas <bhelgaas@google.com>
Cc: linux-pci@vger.kernel.org
Reviewed-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
---
drivers/acpi/pci_root.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c
index c12b5fb3e8fb..0bf072cef6cf 100644
--- a/drivers/acpi/pci_root.c
+++ b/drivers/acpi/pci_root.c
@@ -722,9 +722,7 @@ static void acpi_pci_root_validate_resources(struct device *dev,
* our resources no longer match the ACPI _CRS, but
* the kernel resource tree doesn't allow overlaps.
*/
- if (resource_overlaps(res1, res2)) {
- res2->start = min(res1->start, res2->start);
- res2->end = max(res1->end, res2->end);
+ if (resource_union(res1, res2, res2)) {
dev_info(dev, "host bridge window expanded to %pR; %pR ignored\n",
res2, res1);
free = true;
--
2.28.0
^ permalink raw reply related [flat|nested] 2+ messages in thread