Skip to contentSkip to conversation

ACPI: trim acpi_drivers.h

PATCH In review Bjorn Helgaas 2 participants 12 messages Feb 19, 2009 – Feb 26, 2009

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

cover ACPI: trim acpi_drivers.h

The include/acpi/acpi_drivers.h file contains declarations for several unrelated ACPI drivers, as well as things needed only within the ACPI core (a.k.a. the "OSPM").

These patches move some of those declarations out into new driver-specific and OSPM-specific header files where they aren't visible to the world.

Comments welcome.

Bjorn

---

Bjorn Helgaas (3):
ACPI: move internal core declarations to private header
ACPI: processor: make new processor.h header local to driver
ACPI: pci: make new pci.h header local to driver

 drivers/acpi/bus.c               |    2 ++
 drivers/acpi/ospm.h              |   23 +++++++++++++++++++
 drivers/acpi/pci.h               |   18 +++++++++++++++
 drivers/acpi/pci_bind.c          |    2 ++
 drivers/acpi/pci_irq.c           |    2 ++
 drivers/acpi/pci_root.c          |    2 ++
 drivers/acpi/processor.h         |    5 ++++
 drivers/acpi/processor_core.c    |    2 ++
 drivers/acpi/processor_thermal.c |    2 ++
 drivers/acpi/scan.c              |    2 ++
 drivers/acpi/sleep.c             |    1 +
 drivers/acpi/thermal.c           |    2 ++
 drivers/acpi/wakeup.c            |    1 +
 include/acpi/acpi_drivers.h      |   46 --------------------------------------
 14 files changed, 64 insertions(+), 46 deletions(-)
 create mode 100644 drivers/acpi/ospm.h
 create mode 100644 drivers/acpi/pci.h
 create mode 100644 drivers/acpi/processor.h
Signature · 1 line
Signature
#1 lore raw

PATCH 1/3 ACPI: pci: make new pci.h header local to driver

The PCI-related declarations in acpi_drivers.h are used only by the PCI root and related drivers. This patch moves those declarations to a new drivers/acpi/pci.h file.

---
 drivers/acpi/pci.h          |   18 ++++++++++++++++++
 drivers/acpi/pci_bind.c     |    2 ++
 drivers/acpi/pci_irq.c      |    2 ++
 drivers/acpi/pci_root.c     |    2 ++
 include/acpi/acpi_drivers.h |   13 -------------
 5 files changed, 24 insertions(+), 13 deletions(-)
 create mode 100644 drivers/acpi/pci.h
drivers/acpi/pci.h new file +18 -0
new file mode 100644
index 0000000..b3512cf
@@ -0,0 +1,18 @@
+/* ACPI PCI Interrupt Link (pci_link.c) */
+
+int acpi_pci_link_allocate_irq(acpi_handle handle, int index, int *triggering,
+			       int *polarity, char **name);
+int acpi_pci_link_free_irq(acpi_handle handle);
+
+/* ACPI PCI Interrupt Routing (pci_irq.c) */
+
+int acpi_pci_irq_add_prt(acpi_handle handle, int segment, int bus);
+void acpi_pci_irq_del_prt(int segment, int bus);
+
+/* ACPI PCI Device Binding (pci_bind.c) */
+
+struct pci_bus;
+
+int acpi_pci_bind(struct acpi_device *device);
+int acpi_pci_bind_root(struct acpi_device *device, struct acpi_pci_id *id,
+		       struct pci_bus *bus);
drivers/acpi/pci_bind.c +2 -0
index 95650f8..5504c9d 100644
@@ -35,6 +35,8 @@
 #include <acpi/acpi_bus.h>
 #include <acpi/acpi_drivers.h>
 
+#include "pci.h"
+
 #define _COMPONENT		ACPI_PCI_COMPONENT
 ACPI_MODULE_NAME("pci_bind");
 
drivers/acpi/pci_irq.c +2 -0
index be6b909..c20c848 100644
@@ -40,6 +40,8 @@
 #include <acpi/acpi_bus.h>
 #include <acpi/acpi_drivers.h>
 
+#include "pci.h"
+
 #define _COMPONENT		ACPI_PCI_COMPONENT
 ACPI_MODULE_NAME("pci_irq");
 
drivers/acpi/pci_root.c +2 -0
index 5b38a02..61e8979 100644
@@ -36,6 +36,8 @@
 #include <acpi/acpi_bus.h>
 #include <acpi/acpi_drivers.h>
 
+#include "pci.h"
+
 #define _COMPONENT		ACPI_PCI_COMPONENT
 ACPI_MODULE_NAME("pci_root");
 #define ACPI_PCI_ROOT_CLASS		"pci_bridge"
include/acpi/acpi_drivers.h +0 -13
index 5fc1bb0..9ea2684 100644
@@ -75,23 +75,10 @@
 /* ACPI PCI Interrupt Link (pci_link.c) */
 
 int acpi_irq_penalty_init(void);
-int acpi_pci_link_allocate_irq(acpi_handle handle, int index, int *triggering,
-			       int *polarity, char **name);
-int acpi_pci_link_free_irq(acpi_handle handle);
-
-/* ACPI PCI Interrupt Routing (pci_irq.c) */
-
-int acpi_pci_irq_add_prt(acpi_handle handle, int segment, int bus);
-void acpi_pci_irq_del_prt(int segment, int bus);
 
 /* ACPI PCI Device Binding (pci_bind.c) */
 
-struct pci_bus;
-
 acpi_status acpi_get_pci_id(acpi_handle handle, struct acpi_pci_id *id);
-int acpi_pci_bind(struct acpi_device *device);
-int acpi_pci_bind_root(struct acpi_device *device, struct acpi_pci_id *id,
-		       struct pci_bus *bus);
 
 /* Arch-defined function to add a bus to the system */
 
reviewer
#2 lore raw

Re: [PATCH 1/3] ACPI: pci: make new pci.h header local to driver

I like this patch, but not wild about the name "pci.h"

there are already about 20 pci.h files in the tree. sure, they are context specific, but still i don't like it.

(and I don't like having 11 acpi.h files in the tree either...)

how about acpi_pci.h?

yeah, i know it would be redundant, as it lives in drivers/acpi/ but as basically everything it the file starts with "acpi_pci..." maybe a little redundancy can be seen as consistent?

thanks,
--
Len Brown, Intel Open Source Technology Center

Quoted 111 lines · Bjorn Helgaas

The PCI-related declarations in acpi_drivers.h are used only by the PCI root and related drivers. This patch moves those declarations to a new drivers/acpi/pci.h file.

---
 drivers/acpi/pci.h          |   18 ++++++++++++++++++
 drivers/acpi/pci_bind.c     |    2 ++
 drivers/acpi/pci_irq.c      |    2 ++
 drivers/acpi/pci_root.c     |    2 ++
 include/acpi/acpi_drivers.h |   13 -------------
 5 files changed, 24 insertions(+), 13 deletions(-)
 create mode 100644 drivers/acpi/pci.h
drivers/acpi/pci.h new file +18 -0
new file mode 100644
index 0000000..b3512cf
@@ -0,0 +1,18 @@
+/* ACPI PCI Interrupt Link (pci_link.c) */
+
+int acpi_pci_link_allocate_irq(acpi_handle handle, int index, int *triggering,
+			       int *polarity, char **name);
+int acpi_pci_link_free_irq(acpi_handle handle);
+
+/* ACPI PCI Interrupt Routing (pci_irq.c) */
+
+int acpi_pci_irq_add_prt(acpi_handle handle, int segment, int bus);
+void acpi_pci_irq_del_prt(int segment, int bus);
+
+/* ACPI PCI Device Binding (pci_bind.c) */
+
+struct pci_bus;
+
+int acpi_pci_bind(struct acpi_device *device);
+int acpi_pci_bind_root(struct acpi_device *device, struct acpi_pci_id *id,
+		       struct pci_bus *bus);
drivers/acpi/pci_bind.c +2 -0
index 95650f8..5504c9d 100644
@@ -35,6 +35,8 @@
 #include <acpi/acpi_bus.h>
 #include <acpi/acpi_drivers.h>
 
+#include "pci.h"
+
 #define _COMPONENT		ACPI_PCI_COMPONENT
 ACPI_MODULE_NAME("pci_bind");
 
drivers/acpi/pci_irq.c +2 -0
index be6b909..c20c848 100644
@@ -40,6 +40,8 @@
 #include <acpi/acpi_bus.h>
 #include <acpi/acpi_drivers.h>
 
+#include "pci.h"
+
 #define _COMPONENT		ACPI_PCI_COMPONENT
 ACPI_MODULE_NAME("pci_irq");
 
drivers/acpi/pci_root.c +2 -0
index 5b38a02..61e8979 100644
@@ -36,6 +36,8 @@
 #include <acpi/acpi_bus.h>
 #include <acpi/acpi_drivers.h>
 
+#include "pci.h"
+
 #define _COMPONENT		ACPI_PCI_COMPONENT
 ACPI_MODULE_NAME("pci_root");
 #define ACPI_PCI_ROOT_CLASS		"pci_bridge"
include/acpi/acpi_drivers.h +0 -14
index 5fc1bb0..9ea2684 100644
@@ -75,23 +75,10 @@
 /* ACPI PCI Interrupt Link (pci_link.c) */
 
 int acpi_irq_penalty_init(void);
-int acpi_pci_link_allocate_irq(acpi_handle handle, int index, int *triggering,
-			       int *polarity, char **name);
-int acpi_pci_link_free_irq(acpi_handle handle);
-
-/* ACPI PCI Interrupt Routing (pci_irq.c) */
-
-int acpi_pci_irq_add_prt(acpi_handle handle, int segment, int bus);
-void acpi_pci_irq_del_prt(int segment, int bus);
 
 /* ACPI PCI Device Binding (pci_bind.c) */
 
-struct pci_bus;
-
 acpi_status acpi_get_pci_id(acpi_handle handle, struct acpi_pci_id *id);
-int acpi_pci_bind(struct acpi_device *device);
-int acpi_pci_bind_root(struct acpi_device *device, struct acpi_pci_id *id,
-		       struct pci_bus *bus);
 
 /* Arch-defined function to add a bus to the system */
 
 
--

To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

#3 lore raw

Re: [PATCH 1/3] ACPI: pci: make new pci.h header local to driver

Quoted 5 lines · Len Brown

I like this patch, but not wild about the name "pci.h"

there are already about 20 pci.h files in the tree. sure, they are context specific, but still i don't like it.

Quoted 7 lines

(and I don't like having 11 acpi.h files in the tree either...)

how about acpi_pci.h?

yeah, i know it would be redundant, as it lives in drivers/acpi/ but as basically everything it the file starts with "acpi_pci..." maybe a little redundancy can be seen as consistent?

Personally, I *like* the fact that we have a hierarchy where the context provides useful information.

"ls drivers/acpi" already looks goofy because most of the names are nice and simple, but we have the "acpi_memhotplug.c" weird thing. I think it would be better to see "pci.h" next to the PCI-related drivers and "processor.h" next to the processor-related drivers rather than having "acpi_pci.h" and "acpi_processor.h" off by themselves.

But I want the stuff out of include/acpi/acpi_drivers.h more than I care about the new names, so if these names:

drivers/acpi/acpi_pci.h
drivers/acpi/acpi_processor.h
drivers/acpi/internal.h

work for you, I'll update the patches.

Bjorn

Quoted 114 lines · Bjorn Helgaas
Quoted 112 lines

The PCI-related declarations in acpi_drivers.h are used only by the PCI root and related drivers. This patch moves those declarations to a new drivers/acpi/pci.h file.

---
 drivers/acpi/pci.h          |   18 ++++++++++++++++++
 drivers/acpi/pci_bind.c     |    2 ++
 drivers/acpi/pci_irq.c      |    2 ++
 drivers/acpi/pci_root.c     |    2 ++
 include/acpi/acpi_drivers.h |   13 -------------
 5 files changed, 24 insertions(+), 13 deletions(-)
 create mode 100644 drivers/acpi/pci.h
drivers/acpi/pci.h new file +18 -0
new file mode 100644
index 0000000..b3512cf
@@ -0,0 +1,18 @@
+/* ACPI PCI Interrupt Link (pci_link.c) */
+
+int acpi_pci_link_allocate_irq(acpi_handle handle, int index, int *triggering,
+			       int *polarity, char **name);
+int acpi_pci_link_free_irq(acpi_handle handle);
+
+/* ACPI PCI Interrupt Routing (pci_irq.c) */
+
+int acpi_pci_irq_add_prt(acpi_handle handle, int segment, int bus);
+void acpi_pci_irq_del_prt(int segment, int bus);
+
+/* ACPI PCI Device Binding (pci_bind.c) */
+
+struct pci_bus;
+
+int acpi_pci_bind(struct acpi_device *device);
+int acpi_pci_bind_root(struct acpi_device *device, struct acpi_pci_id *id,
+		       struct pci_bus *bus);
drivers/acpi/pci_bind.c +2 -0
index 95650f8..5504c9d 100644
@@ -35,6 +35,8 @@
 #include <acpi/acpi_bus.h>
 #include <acpi/acpi_drivers.h>
 
+#include "pci.h"
+
 #define _COMPONENT		ACPI_PCI_COMPONENT
 ACPI_MODULE_NAME("pci_bind");
 
drivers/acpi/pci_irq.c +2 -0
index be6b909..c20c848 100644
@@ -40,6 +40,8 @@
 #include <acpi/acpi_bus.h>
 #include <acpi/acpi_drivers.h>
 
+#include "pci.h"
+
 #define _COMPONENT		ACPI_PCI_COMPONENT
 ACPI_MODULE_NAME("pci_irq");
 
drivers/acpi/pci_root.c +2 -0
index 5b38a02..61e8979 100644
@@ -36,6 +36,8 @@
 #include <acpi/acpi_bus.h>
 #include <acpi/acpi_drivers.h>
 
+#include "pci.h"
+
 #define _COMPONENT		ACPI_PCI_COMPONENT
 ACPI_MODULE_NAME("pci_root");
 #define ACPI_PCI_ROOT_CLASS		"pci_bridge"
include/acpi/acpi_drivers.h +0 -14
index 5fc1bb0..9ea2684 100644
@@ -75,23 +75,10 @@
 /* ACPI PCI Interrupt Link (pci_link.c) */
 
 int acpi_irq_penalty_init(void);
-int acpi_pci_link_allocate_irq(acpi_handle handle, int index, int *triggering,
-			       int *polarity, char **name);
-int acpi_pci_link_free_irq(acpi_handle handle);
-
-/* ACPI PCI Interrupt Routing (pci_irq.c) */
-
-int acpi_pci_irq_add_prt(acpi_handle handle, int segment, int bus);
-void acpi_pci_irq_del_prt(int segment, int bus);
 
 /* ACPI PCI Device Binding (pci_bind.c) */
 
-struct pci_bus;
-
 acpi_status acpi_get_pci_id(acpi_handle handle, struct acpi_pci_id *id);
-int acpi_pci_bind(struct acpi_device *device);
-int acpi_pci_bind_root(struct acpi_device *device, struct acpi_pci_id *id,
-		       struct pci_bus *bus);
 
 /* Arch-defined function to add a bus to the system */
 
 
--

To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

#4 lore raw

Re: [PATCH 1/3] ACPI: pci: make new pci.h header local to driver

Quoted 8 lines · Bjorn Helgaas
Quoted 7 lines · Len Brown

I like this patch, but not wild about the name "pci.h"

there are already about 20 pci.h files in the tree. sure, they are context specific, but still i don't like it.

(and I don't like having 11 acpi.h files in the tree either...)

Quoted 8 lines
Quoted 5 lines

how about acpi_pci.h?

yeah, i know it would be redundant, as it lives in drivers/acpi/ but as basically everything it the file starts with "acpi_pci..." maybe a little redundancy can be seen as consistent?

Personally, I *like* the fact that we have a hierarchy where the context provides useful information.

P.S. My opinion here might be influenced by the fact that I always use "cscope -p4". Cscope users who use the default (show only one path component) would benefit a lot more from having redundant information in the filename.

Bjorn

#5 lore raw

PATCH 2/3 ACPI: processor: make new processor.h header local to driver

In reply to Bjorn Helgaas

The processor-related declarations in acpi_drivers.h are used only by the processor driver, which happens to be split across several files. This patch moves those declarations to a new drivers/acpi/processor.h file.

---
 drivers/acpi/processor.h         |    5 +++++
 drivers/acpi/processor_core.c    |    2 ++
 drivers/acpi/processor_thermal.c |    2 ++
 drivers/acpi/thermal.c           |    2 ++
 include/acpi/acpi_drivers.h      |   10 ----------
 5 files changed, 11 insertions(+), 10 deletions(-)
 create mode 100644 drivers/acpi/processor.h
drivers/acpi/processor.h new file +5 -0
new file mode 100644
index 0000000..51df8cb
@@ -0,0 +1,5 @@
+#define ACPI_PROCESSOR_LIMIT_NONE	0x00
+#define ACPI_PROCESSOR_LIMIT_INCREMENT	0x01
+#define ACPI_PROCESSOR_LIMIT_DECREMENT	0x02
+
+int acpi_processor_set_thermal_limit(acpi_handle handle, int type);
drivers/acpi/processor_core.c +2 -0
index 0cc2fd3..a744ad4 100644
@@ -59,6 +59,8 @@
 #include <acpi/acpi_drivers.h>
 #include <acpi/processor.h>
 
+#include "processor.h"
+
 #define ACPI_PROCESSOR_CLASS		"processor"
 #define ACPI_PROCESSOR_DEVICE_NAME	"Processor"
 #define ACPI_PROCESSOR_FILE_INFO	"info"
drivers/acpi/processor_thermal.c +2 -0
index b1eb376..a778ac2 100644
@@ -40,6 +40,8 @@
 #include <acpi/processor.h>
 #include <acpi/acpi_drivers.h>
 
+#include "processor.h"
+
 #define ACPI_PROCESSOR_CLASS            "processor"
 #define _COMPONENT              ACPI_PROCESSOR_COMPONENT
 ACPI_MODULE_NAME("processor_thermal");
drivers/acpi/thermal.c +2 -0
index 99e6f1f..23c5bc9 100644
@@ -47,6 +47,8 @@
 #include <acpi/acpi_bus.h>
 #include <acpi/acpi_drivers.h>
 
+#include "processor.h"
+
 #define ACPI_THERMAL_CLASS		"thermal_zone"
 #define ACPI_THERMAL_DEVICE_NAME	"Thermal Zone"
 #define ACPI_THERMAL_FILE_STATE		"state"
include/acpi/acpi_drivers.h +0 -10
index 9ea2684..4358917 100644
@@ -103,16 +103,6 @@ extern int acpi_power_nocheck;
 int acpi_ec_ecdt_probe(void);
 int acpi_boot_ec_enable(void);
 
-/* --------------------------------------------------------------------------
-                                    Processor
-   -------------------------------------------------------------------------- */
-
-#define ACPI_PROCESSOR_LIMIT_NONE	0x00
-#define ACPI_PROCESSOR_LIMIT_INCREMENT	0x01
-#define ACPI_PROCESSOR_LIMIT_DECREMENT	0x02
-
-int acpi_processor_set_thermal_limit(acpi_handle handle, int type);
-
 /*--------------------------------------------------------------------------
                                   Dock Station
   -------------------------------------------------------------------------- */
reviewer
#6 lore raw

Re: [PATCH 2/3] ACPI: processor: make new processor.h header local to driver

we already have include/acpi/processor.h, i'd rather not also have a drivers/acpi/processor.h

--
Len Brown, Intel Open Source Technology Center

Quoted 92 lines · Bjorn Helgaas

The processor-related declarations in acpi_drivers.h are used only by the processor driver, which happens to be split across several files. This patch moves those declarations to a new drivers/acpi/processor.h file.

---
 drivers/acpi/processor.h         |    5 +++++
 drivers/acpi/processor_core.c    |    2 ++
 drivers/acpi/processor_thermal.c |    2 ++
 drivers/acpi/thermal.c           |    2 ++
 include/acpi/acpi_drivers.h      |   10 ----------
 5 files changed, 11 insertions(+), 10 deletions(-)
 create mode 100644 drivers/acpi/processor.h
drivers/acpi/processor.h new file +5 -0
new file mode 100644
index 0000000..51df8cb
@@ -0,0 +1,5 @@
+#define ACPI_PROCESSOR_LIMIT_NONE	0x00
+#define ACPI_PROCESSOR_LIMIT_INCREMENT	0x01
+#define ACPI_PROCESSOR_LIMIT_DECREMENT	0x02
+
+int acpi_processor_set_thermal_limit(acpi_handle handle, int type);
drivers/acpi/processor_core.c +2 -0
index 0cc2fd3..a744ad4 100644
@@ -59,6 +59,8 @@
 #include <acpi/acpi_drivers.h>
 #include <acpi/processor.h>
 
+#include "processor.h"
+
 #define ACPI_PROCESSOR_CLASS		"processor"
 #define ACPI_PROCESSOR_DEVICE_NAME	"Processor"
 #define ACPI_PROCESSOR_FILE_INFO	"info"
drivers/acpi/processor_thermal.c +2 -0
index b1eb376..a778ac2 100644
@@ -40,6 +40,8 @@
 #include <acpi/processor.h>
 #include <acpi/acpi_drivers.h>
 
+#include "processor.h"
+
 #define ACPI_PROCESSOR_CLASS            "processor"
 #define _COMPONENT              ACPI_PROCESSOR_COMPONENT
 ACPI_MODULE_NAME("processor_thermal");
drivers/acpi/thermal.c +2 -0
index 99e6f1f..23c5bc9 100644
@@ -47,6 +47,8 @@
 #include <acpi/acpi_bus.h>
 #include <acpi/acpi_drivers.h>
 
+#include "processor.h"
+
 #define ACPI_THERMAL_CLASS		"thermal_zone"
 #define ACPI_THERMAL_DEVICE_NAME	"Thermal Zone"
 #define ACPI_THERMAL_FILE_STATE		"state"
include/acpi/acpi_drivers.h +0 -11
index 9ea2684..4358917 100644
@@ -103,16 +103,6 @@ extern int acpi_power_nocheck;
 int acpi_ec_ecdt_probe(void);
 int acpi_boot_ec_enable(void);
 
-/* --------------------------------------------------------------------------
-                                    Processor
-   -------------------------------------------------------------------------- */
-
-#define ACPI_PROCESSOR_LIMIT_NONE	0x00
-#define ACPI_PROCESSOR_LIMIT_INCREMENT	0x01
-#define ACPI_PROCESSOR_LIMIT_DECREMENT	0x02
-
-int acpi_processor_set_thermal_limit(acpi_handle handle, int type);
-
 /*--------------------------------------------------------------------------
                                   Dock Station
   -------------------------------------------------------------------------- */
 
--

To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

#7 lore raw

PATCH 3/3 ACPI: move internal core declarations to private header

In reply to Bjorn Helgaas

A number of things that shouldn't be exposed outside the ACPI core were declared in include/acpi/acpi_drivers.h, where anybody can see them. This patch moves those declarations to a new "ospm.h" inside drivers/acpi.

---
 drivers/acpi/bus.c          |    2 ++
 drivers/acpi/ospm.h         |   23 +++++++++++++++++++++++
 drivers/acpi/scan.c         |    2 ++
 drivers/acpi/sleep.c        |    1 +
 drivers/acpi/wakeup.c       |    1 +
 include/acpi/acpi_drivers.h |   23 -----------------------
 6 files changed, 29 insertions(+), 23 deletions(-)
 create mode 100644 drivers/acpi/ospm.h
drivers/acpi/bus.c +2 -0
index 765fd1c..0286607 100644
@@ -39,6 +39,8 @@
 #include <acpi/acpi_bus.h>
 #include <acpi/acpi_drivers.h>
 
+#include "ospm.h"
+
 #define _COMPONENT		ACPI_BUS_COMPONENT
 ACPI_MODULE_NAME("bus");
 
drivers/acpi/ospm.h new file +23 -0
new file mode 100644
index 0000000..8e54c90
@@ -0,0 +1,23 @@
+
+/* --------------------------------------------------------------------------
+                                  Power Resource
+   -------------------------------------------------------------------------- */
+
+int acpi_device_sleep_wake(struct acpi_device *dev,
+                           int enable, int sleep_state, int dev_state);
+int acpi_enable_wakeup_device_power(struct acpi_device *dev, int sleep_state);
+int acpi_disable_wakeup_device_power(struct acpi_device *dev);
+int acpi_power_get_inferred_state(struct acpi_device *device);
+int acpi_power_transition(struct acpi_device *device, int state);
+extern int acpi_power_nocheck;
+
+/* --------------------------------------------------------------------------
+                                  Embedded Controller
+   -------------------------------------------------------------------------- */
+int acpi_ec_ecdt_probe(void);
+int acpi_boot_ec_enable(void);
+
+/*--------------------------------------------------------------------------
+                                  Suspend/Resume
+  -------------------------------------------------------------------------- */
+extern int acpi_sleep_init(void);
drivers/acpi/scan.c +2 -0
index c54d7b6..2e00298 100644
@@ -11,6 +11,8 @@
 
 #include <acpi/acpi_drivers.h>
 
+#include "ospm.h"
+
 #define _COMPONENT		ACPI_BUS_COMPONENT
 ACPI_MODULE_NAME("scan");
 #define STRUCT_TO_INT(s)	(*((int*)&s))
drivers/acpi/sleep.c +1 -0
index 5192666..e841938 100644
@@ -21,6 +21,7 @@
 
 #include <acpi/acpi_bus.h>
 #include <acpi/acpi_drivers.h>
+#include "ospm.h"
 #include "sleep.h"
 
 u8 sleep_states[ACPI_S_STATE_COUNT];
drivers/acpi/wakeup.c +1 -0
index 2d34806..58c1f91 100644
@@ -8,6 +8,7 @@
 #include <acpi/acpi_drivers.h>
 #include <linux/kernel.h>
 #include <linux/types.h>
+#include "ospm.h"
 #include "sleep.h"
 
 #define _COMPONENT		ACPI_SYSTEM_COMPONENT
include/acpi/acpi_drivers.h +0 -23
index 4358917..f237ec2 100644
@@ -85,24 +85,6 @@ acpi_status acpi_get_pci_id(acpi_handle handle, struct acpi_pci_id *id);
 struct pci_bus *pci_acpi_scan_root(struct acpi_device *device, int domain,
 				   int bus);
 
-/* --------------------------------------------------------------------------
-                                  Power Resource
-   -------------------------------------------------------------------------- */
-
-int acpi_device_sleep_wake(struct acpi_device *dev,
-                           int enable, int sleep_state, int dev_state);
-int acpi_enable_wakeup_device_power(struct acpi_device *dev, int sleep_state);
-int acpi_disable_wakeup_device_power(struct acpi_device *dev);
-int acpi_power_get_inferred_state(struct acpi_device *device);
-int acpi_power_transition(struct acpi_device *device, int state);
-extern int acpi_power_nocheck;
-
-/* --------------------------------------------------------------------------
-                                  Embedded Controller
-   -------------------------------------------------------------------------- */
-int acpi_ec_ecdt_probe(void);
-int acpi_boot_ec_enable(void);
-
 /*--------------------------------------------------------------------------
                                   Dock Station
   -------------------------------------------------------------------------- */
@@ -142,9 +124,4 @@ static inline void unregister_hotplug_dock_device(acpi_handle handle)
 }
 #endif
 
-/*--------------------------------------------------------------------------
-                                  Suspend/Resume
-  -------------------------------------------------------------------------- */
-extern int acpi_sleep_init(void);
-
 #endif /*__ACPI_DRIVERS_H__*/
reviewer
#8 lore raw

Re: [PATCH 3/3] ACPI: move internal core declarations to private header

Quoted 4 lines · Bjorn Helgaas

A number of things that shouldn't be exposed outside the ACPI core were declared in include/acpi/acpi_drivers.h, where anybody can see them. This patch moves those declarations to a new "ospm.h" inside drivers/acpi.

I'm not sure that we're using the same terminology.

In ACPI I usually use the word "core" to refer to everything that is now under drivers/acpi/acpica/
eg. the ACPI interpreter and the OS agnostic code in ACPICA.

That is why dmesg prints this:

ACPI: Core revision 20090123

I use the word "Linux/ACPI" to refer to everything in drivers/acpi/* and the ACPI stuff under arch/ etc.

OSPM is supposed to be a generic concept of the OS controlling power management, and ACPI is supposed to be a component that allows OSPM to work
on (ACPI-compliant) systems.

I think that the ACPI guys probably invented the term OSPM. I have heard it used outside an ACPI context only once, and that was mostly to describe what a non-ACPI system does to deal with its lack of ACPI...

Sometimes in the context of ACPICA, the OS code is called the "host OS" (and I generally cringe when this term is used rather than just saying "Linux") and sometimes it is called OSPM -- ie where the OS policy etc are.

We havn't used the term OSPM in the Linux context much. We do use the term PM, as in CONFIG_PM though...
I'm not immediately wild about the name ospm.h for some reason.

Anyway, to the content of the patch...

We are sort of in transition WRT hiding private information.

We just finished re-factoring all the ACPICA-specific header files, resulting in 21 private headers under drivers/acpi/acpica/ and out of include/acpi/

I'm not fond of include/acpi/

Currently it is a bucket for include/acpi/acpi.h to pick up files, and that is in-turn included
by linux/acpi.h -- which is the file that most of the kernel should include to talk to ACPI.

I do want things that are private to drivers/acpi/ files to be in drivers/acpi/, and not in include/acpi/

so i guess I like what you're doing here,
but for some reason i'm not excited about the name "ospm.h", maybe I"ll sleep on it and it will sound excellent tomorrow...

Len Brown, Intel Open Source Technology Center

Quoted 135 lines
---
 drivers/acpi/bus.c          |    2 ++
 drivers/acpi/ospm.h         |   23 +++++++++++++++++++++++
 drivers/acpi/scan.c         |    2 ++
 drivers/acpi/sleep.c        |    1 +
 drivers/acpi/wakeup.c       |    1 +
 include/acpi/acpi_drivers.h |   23 -----------------------
 6 files changed, 29 insertions(+), 23 deletions(-)
 create mode 100644 drivers/acpi/ospm.h
drivers/acpi/bus.c +2 -0
index 765fd1c..0286607 100644
@@ -39,6 +39,8 @@
 #include <acpi/acpi_bus.h>
 #include <acpi/acpi_drivers.h>
 
+#include "ospm.h"
+
 #define _COMPONENT		ACPI_BUS_COMPONENT
 ACPI_MODULE_NAME("bus");
 
drivers/acpi/ospm.h new file +23 -0
new file mode 100644
index 0000000..8e54c90
@@ -0,0 +1,23 @@
+
+/* --------------------------------------------------------------------------
+                                  Power Resource
+   -------------------------------------------------------------------------- */
+
+int acpi_device_sleep_wake(struct acpi_device *dev,
+                           int enable, int sleep_state, int dev_state);
+int acpi_enable_wakeup_device_power(struct acpi_device *dev, int sleep_state);
+int acpi_disable_wakeup_device_power(struct acpi_device *dev);
+int acpi_power_get_inferred_state(struct acpi_device *device);
+int acpi_power_transition(struct acpi_device *device, int state);
+extern int acpi_power_nocheck;
+
+/* --------------------------------------------------------------------------
+                                  Embedded Controller
+   -------------------------------------------------------------------------- */
+int acpi_ec_ecdt_probe(void);
+int acpi_boot_ec_enable(void);
+
+/*--------------------------------------------------------------------------
+                                  Suspend/Resume
+  -------------------------------------------------------------------------- */
+extern int acpi_sleep_init(void);
drivers/acpi/scan.c +2 -0
index c54d7b6..2e00298 100644
@@ -11,6 +11,8 @@
 
 #include <acpi/acpi_drivers.h>
 
+#include "ospm.h"
+
 #define _COMPONENT		ACPI_BUS_COMPONENT
 ACPI_MODULE_NAME("scan");
 #define STRUCT_TO_INT(s)	(*((int*)&s))
drivers/acpi/sleep.c +1 -0
index 5192666..e841938 100644
@@ -21,6 +21,7 @@
 
 #include <acpi/acpi_bus.h>
 #include <acpi/acpi_drivers.h>
+#include "ospm.h"
 #include "sleep.h"
 
 u8 sleep_states[ACPI_S_STATE_COUNT];
drivers/acpi/wakeup.c +1 -0
index 2d34806..58c1f91 100644
@@ -8,6 +8,7 @@
 #include <acpi/acpi_drivers.h>
 #include <linux/kernel.h>
 #include <linux/types.h>
+#include "ospm.h"
 #include "sleep.h"
 
 #define _COMPONENT		ACPI_SYSTEM_COMPONENT
include/acpi/acpi_drivers.h +0 -24
index 4358917..f237ec2 100644
@@ -85,24 +85,6 @@ acpi_status acpi_get_pci_id(acpi_handle handle, struct acpi_pci_id *id);
 struct pci_bus *pci_acpi_scan_root(struct acpi_device *device, int domain,
 				   int bus);
 
-/* --------------------------------------------------------------------------
-                                  Power Resource
-   -------------------------------------------------------------------------- */
-
-int acpi_device_sleep_wake(struct acpi_device *dev,
-                           int enable, int sleep_state, int dev_state);
-int acpi_enable_wakeup_device_power(struct acpi_device *dev, int sleep_state);
-int acpi_disable_wakeup_device_power(struct acpi_device *dev);
-int acpi_power_get_inferred_state(struct acpi_device *device);
-int acpi_power_transition(struct acpi_device *device, int state);
-extern int acpi_power_nocheck;
-
-/* --------------------------------------------------------------------------
-                                  Embedded Controller
-   -------------------------------------------------------------------------- */
-int acpi_ec_ecdt_probe(void);
-int acpi_boot_ec_enable(void);
-
 /*--------------------------------------------------------------------------
                                   Dock Station
   -------------------------------------------------------------------------- */
@@ -142,9 +124,4 @@ static inline void unregister_hotplug_dock_device(acpi_handle handle)
 }
 #endif
 
-/*--------------------------------------------------------------------------
-                                  Suspend/Resume
-  -------------------------------------------------------------------------- */
-extern int acpi_sleep_init(void);
-
 #endif /*__ACPI_DRIVERS_H__*/
 
--

To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

#9 lore raw

Re: [PATCH 3/3] ACPI: move internal core declarations to private header

Quoted 8 lines · Len Brown
Quoted 4 lines · Bjorn Helgaas

A number of things that shouldn't be exposed outside the ACPI core were declared in include/acpi/acpi_drivers.h, where anybody can see them. This patch moves those declarations to a new "ospm.h" inside drivers/acpi.

I'm not sure that we're using the same terminology.

I'm sure we're not :-)

Quoted 10 lines

In ACPI I usually use the word "core" to refer to everything that is now under drivers/acpi/acpica/
eg. the ACPI interpreter and the OS agnostic code in ACPICA.

That is why dmesg prints this:

ACPI: Core revision 20090123

I use the word "Linux/ACPI" to refer to everything in drivers/acpi/* and the ACPI stuff under arch/ etc.

I think the common Linux usage of "core" is more along the lines of "bus infrastructure and implementation of stuff in the driver/ kernel interface," e.g.,

    PCI core -> drivers/pci/*
    PNP core -> drivers/pnp/*

So by analogy, I think the "ACPI core" should refer to the stuff in drivers/acpi. The stuff in drivers/acpi/acpica is something else that doesn't really appear in other subsystems, so using "core" to refer to the ACPICA makes ACPI unnecessarily different.

But this is tangential, and I'll gladly remove "core" from the changelog!

Quoted 7 lines

...
I do want things that are private to drivers/acpi/ files to be in drivers/acpi/, and not in include/acpi/

so i guess I like what you're doing here,
but for some reason i'm not excited about the name "ospm.h", maybe I"ll sleep on it and it will sound excellent tomorrow...

I'm not married to "ospm.h", and you're right that it's not very descriptive and doesn't have much history in Linux. I tried "acpi.h" and "acpi_core.h" earlier, but those were duds as well. Here are some similar files in other parts of Linux:

block/blk.h
crypto/internal.h
drivers/base/base.h
drivers/pci/pci.h
drivers/pnp/base.h
drivers/scsi/scsi_priv.h
fs/internal.h
mm/internal.h

What would you think of "drivers/acpi/internal.h"?

Bjorn

reviewer
#10 lore raw

Re: [PATCH 3/3] ACPI: move internal core declarations to private header

Quoted 28 lines · Bjorn Helgaas
Quoted 8 lines · Len Brown
Quoted 4 lines · Bjorn Helgaas

A number of things that shouldn't be exposed outside the ACPI core were declared in include/acpi/acpi_drivers.h, where anybody can see them. This patch moves those declarations to a new "ospm.h" inside drivers/acpi.

I'm not sure that we're using the same terminology.

I'm sure we're not :-)

Quoted 10 lines

In ACPI I usually use the word "core" to refer to everything that is now under drivers/acpi/acpica/
eg. the ACPI interpreter and the OS agnostic code in ACPICA.

That is why dmesg prints this:

ACPI: Core revision 20090123

I use the word "Linux/ACPI" to refer to everything in drivers/acpi/* and the ACPI stuff under arch/ etc.

I think the common Linux usage of "core" is more along the lines of "bus infrastructure and implementation of stuff in the driver/ kernel interface," e.g.,

    PCI core -> drivers/pci/*
    PNP core -> drivers/pnp/*
Quoted 7 lines

So by analogy, I think the "ACPI core" should refer to the stuff in drivers/acpi. The stuff in drivers/acpi/acpica is something else that doesn't really appear in other subsystems, so using "core" to refer to the ACPICA makes ACPI unnecessarily different.

But this is tangential, and I'll gladly remove "core" from the changelog!

Okay, lets stay away from the word core,
since it has two common conflicting uses.

Quoted 21 lines
Quoted 6 lines

I do want things that are private to drivers/acpi/ files to be in drivers/acpi/, and not in include/acpi/

so i guess I like what you're doing here,
but for some reason i'm not excited about the name "ospm.h", maybe I"ll sleep on it and it will sound excellent tomorrow...

I'm not married to "ospm.h", and you're right that it's not very descriptive and doesn't have much history in Linux. I tried "acpi.h" and "acpi_core.h" earlier, but those were duds as well. Here are some similar files in other parts of Linux:

block/blk.h
crypto/internal.h
drivers/base/base.h
drivers/pci/pci.h
drivers/pnp/base.h
drivers/scsi/scsi_priv.h
fs/internal.h
mm/internal.h

Quoted 1 line

What would you think of "drivers/acpi/internal.h"?

better.

I do like internal.h better than ospm.h because internal.h sounds like something that drivers should not include, while ospm.h sounds like something they should include.

The murkyness right now I think is because we still have two different types of code in drivers/acpi/

acpi/ seems to be where we have some infrastructre code, plus some "acpi drivers", such as battery.c that use the infrastructure to implement OS policy. Maybe we should have the infrastructure and the drivers in two different directories?

acpi/acpica/ is a single place for the ACPICA C-code
and has its own private headers down there, finally.

include/linux/acpi.h
this is what other parts of the kernel use to talk to the acpi sub-system

include/acpi/
this is here so that the above can include <acpi/acpi.h> which bundles various public ACPICA headers there is probably a more elegant way to do this.

drivers/platform/x86/
platform specific drivers that use acpi rather than implement acpi, finally moved out of the drivers/acpi/ directory

thanks,
-Len

#11 lore raw

Re: [PATCH 3/3] ACPI: move internal core declarations to private header

Quoted 8 lines · Len Brown
Quoted 1 line · Bjorn Helgaas

What would you think of "drivers/acpi/internal.h"?

better.

I do like internal.h better than ospm.h because internal.h sounds like something that drivers should not include, while ospm.h sounds like something they should include.

Yep, I can agree with that.

Quoted 8 lines

The murkyness right now I think is because we still have two different types of code in drivers/acpi/

acpi/ seems to be where we have some infrastructre code, plus some "acpi drivers", such as battery.c that use the infrastructure to implement OS policy. Maybe we should have the infrastructure and the drivers in two different directories?

Yes, maybe so. We certainly don't have drivers under drivers/pci just because they happen to call pci_register_driver().

drivers/platform/x86 obviously isn't the right place for generic things like battery.c, fan.c, etc, but I'd be happy if they were moved out of drivers/acpi someday.

Bjorn

Quoted 16 lines

acpi/acpica/ is a single place for the ACPICA C-code
and has its own private headers down there, finally.

include/linux/acpi.h
this is what other parts of the kernel use to talk to the acpi sub-system

include/acpi/
this is here so that the above can include <acpi/acpi.h> which bundles various public ACPICA headers there is probably a more elegant way to do this.

drivers/platform/x86/
platform specific drivers that use acpi rather than implement acpi, finally moved out of the drivers/acpi/ directory