Skip to contentSkip to conversation

add dev_archdata to struct device

PATCH Applied Benjamin Herrenschmidt 4 participants 4 messages Nov 11, 2006 – Nov 13, 2006

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

PATCH 1/1 add dev_archdata to struct device

Add arch specific dev_archdata to struct device

Adds an arch specific struct dev_arch to struct device. This enables architecture to add specific fields to every device in the system, like DMA operation pointers, NUMA node ID, firmware specific data, etc...

---

Andrew, this patch replaces:
add-arch-specific-dev_sysdata-to-struct-device.patch
that you put in -mm the other day. You should also remove:
change-acpi-to-use-dev_sysdata-instead-of-firmware_data.patch
as a new version of it is following, adapted to the name change (sysdata -> archdata).

include/asm-alpha/device.h new file +7 -0
Index: linux-cell/include/asm-alpha/device.h
===================================================================
@@ -0,0 +1,7 @@
+/*
+ * Arch specific extensions to struct device
+ *
+ * This file is released under the GPLv2
+ */
+#include <asm-generic/device.h>
+
include/asm-arm/device.h new file +7 -0
Index: linux-cell/include/asm-arm/device.h
===================================================================
@@ -0,0 +1,7 @@
+/*
+ * Arch specific extensions to struct device
+ *
+ * This file is released under the GPLv2
+ */
+#include <asm-generic/device.h>
+
include/asm-arm26/device.h new file +7 -0
Index: linux-cell/include/asm-arm26/device.h
===================================================================
@@ -0,0 +1,7 @@
+/*
+ * Arch specific extensions to struct device
+ *
+ * This file is released under the GPLv2
+ */
+#include <asm-generic/device.h>
+
include/asm-avr32/device.h new file +7 -0
Index: linux-cell/include/asm-avr32/device.h
===================================================================
@@ -0,0 +1,7 @@
+/*
+ * Arch specific extensions to struct device
+ *
+ * This file is released under the GPLv2
+ */
+#include <asm-generic/device.h>
+
include/asm-cris/device.h new file +7 -0
Index: linux-cell/include/asm-cris/device.h
===================================================================
@@ -0,0 +1,7 @@
+/*
+ * Arch specific extensions to struct device
+ *
+ * This file is released under the GPLv2
+ */
+#include <asm-generic/device.h>
+
include/asm-frv/device.h new file +7 -0
Index: linux-cell/include/asm-frv/device.h
===================================================================
@@ -0,0 +1,7 @@
+/*
+ * Arch specific extensions to struct device
+ *
+ * This file is released under the GPLv2
+ */
+#include <asm-generic/device.h>
+
include/asm-generic/device.h new file +12 -0
Index: linux-cell/include/asm-generic/device.h
===================================================================
@@ -0,0 +1,12 @@
+/*
+ * Arch specific extensions to struct device
+ *
+ * This file is released under the GPLv2
+ */
+#ifndef _ASM_GENERIC_DEVICE_H
+#define _ASM_GENERIC_DEVICE_H
+
+struct dev_archdata {
+};
+
+#endif /* _ASM_GENERIC_DEVICE_H */
include/asm-h8300/device.h new file +7 -0
Index: linux-cell/include/asm-h8300/device.h
===================================================================
@@ -0,0 +1,7 @@
+/*
+ * Arch specific extensions to struct device
+ *
+ * This file is released under the GPLv2
+ */
+#include <asm-generic/device.h>
+
include/asm-i386/device.h new file +7 -0
Index: linux-cell/include/asm-i386/device.h
===================================================================
@@ -0,0 +1,7 @@
+/*
+ * Arch specific extensions to struct device
+ *
+ * This file is released under the GPLv2
+ */
+#include <asm-generic/device.h>
+
include/asm-ia64/device.h new file +7 -0
Index: linux-cell/include/asm-ia64/device.h
===================================================================
@@ -0,0 +1,7 @@
+/*
+ * Arch specific extensions to struct device
+ *
+ * This file is released under the GPLv2
+ */
+#include <asm-generic/device.h>
+
include/asm-m32r/device.h new file +7 -0
Index: linux-cell/include/asm-m32r/device.h
===================================================================
@@ -0,0 +1,7 @@
+/*
+ * Arch specific extensions to struct device
+ *
+ * This file is released under the GPLv2
+ */
+#include <asm-generic/device.h>
+
include/asm-m68k/device.h new file +7 -0
Index: linux-cell/include/asm-m68k/device.h
===================================================================
@@ -0,0 +1,7 @@
+/*
+ * Arch specific extensions to struct device
+ *
+ * This file is released under the GPLv2
+ */
+#include <asm-generic/device.h>
+
include/asm-m68knommu/device.h new file +7 -0
Index: linux-cell/include/asm-m68knommu/device.h
===================================================================
@@ -0,0 +1,7 @@
+/*
+ * Arch specific extensions to struct device
+ *
+ * This file is released under the GPLv2
+ */
+#include <asm-generic/device.h>
+
include/asm-mips/device.h new file +7 -0
Index: linux-cell/include/asm-mips/device.h
===================================================================
@@ -0,0 +1,7 @@
+/*
+ * Arch specific extensions to struct device
+ *
+ * This file is released under the GPLv2
+ */
+#include <asm-generic/device.h>
+
include/asm-parisc/device.h new file +7 -0
Index: linux-cell/include/asm-parisc/device.h
===================================================================
@@ -0,0 +1,7 @@
+/*
+ * Arch specific extensions to struct device
+ *
+ * This file is released under the GPLv2
+ */
+#include <asm-generic/device.h>
+
include/asm-powerpc/device.h new file +7 -0
Index: linux-cell/include/asm-powerpc/device.h
===================================================================
@@ -0,0 +1,7 @@
+/*
+ * Arch specific extensions to struct device
+ *
+ * This file is released under the GPLv2
+ */
+#include <asm-generic/device.h>
+
include/asm-ppc/device.h new file +7 -0
Index: linux-cell/include/asm-ppc/device.h
===================================================================
@@ -0,0 +1,7 @@
+/*
+ * Arch specific extensions to struct device
+ *
+ * This file is released under the GPLv2
+ */
+#include <asm-generic/device.h>
+
include/asm-s390/device.h new file +7 -0
Index: linux-cell/include/asm-s390/device.h
===================================================================
@@ -0,0 +1,7 @@
+/*
+ * Arch specific extensions to struct device
+ *
+ * This file is released under the GPLv2
+ */
+#include <asm-generic/device.h>
+
include/asm-sh/device.h new file +7 -0
Index: linux-cell/include/asm-sh/device.h
===================================================================
@@ -0,0 +1,7 @@
+/*
+ * Arch specific extensions to struct device
+ *
+ * This file is released under the GPLv2
+ */
+#include <asm-generic/device.h>
+
include/asm-sh64/device.h new file +7 -0
Index: linux-cell/include/asm-sh64/device.h
===================================================================
@@ -0,0 +1,7 @@
+/*
+ * Arch specific extensions to struct device
+ *
+ * This file is released under the GPLv2
+ */
+#include <asm-generic/device.h>
+
include/asm-sparc/device.h new file +7 -0
Index: linux-cell/include/asm-sparc/device.h
===================================================================
@@ -0,0 +1,7 @@
+/*
+ * Arch specific extensions to struct device
+ *
+ * This file is released under the GPLv2
+ */
+#include <asm-generic/device.h>
+
include/asm-sparc64/device.h new file +7 -0
Index: linux-cell/include/asm-sparc64/device.h
===================================================================
@@ -0,0 +1,7 @@
+/*
+ * Arch specific extensions to struct device
+ *
+ * This file is released under the GPLv2
+ */
+#include <asm-generic/device.h>
+
include/asm-um/device.h new file +7 -0
Index: linux-cell/include/asm-um/device.h
===================================================================
@@ -0,0 +1,7 @@
+/*
+ * Arch specific extensions to struct device
+ *
+ * This file is released under the GPLv2
+ */
+#include <asm-generic/device.h>
+
include/asm-v850/device.h new file +7 -0
Index: linux-cell/include/asm-v850/device.h
===================================================================
@@ -0,0 +1,7 @@
+/*
+ * Arch specific extensions to struct device
+ *
+ * This file is released under the GPLv2
+ */
+#include <asm-generic/device.h>
+
include/asm-x86_64/device.h new file +7 -0
Index: linux-cell/include/asm-x86_64/device.h
===================================================================
@@ -0,0 +1,7 @@
+/*
+ * Arch specific extensions to struct device
+ *
+ * This file is released under the GPLv2
+ */
+#include <asm-generic/device.h>
+
include/asm-xtensa/device.h new file +7 -0
Index: linux-cell/include/asm-xtensa/device.h
===================================================================
@@ -0,0 +1,7 @@
+/*
+ * Arch specific extensions to struct device
+ *
+ * This file is released under the GPLv2
+ */
+#include <asm-generic/device.h>
+
include/linux/device.h +3 -0
Index: linux-cell/include/linux/device.h
===================================================================
@@ -21,6 +21,7 @@
 #include <linux/pm.h>
 #include <asm/semaphore.h>
 #include <asm/atomic.h>
+#include <asm/device.h>
 
 #define DEVICE_NAME_SIZE	50
 #define DEVICE_NAME_HALF	__stringify(20)	/* Less than half to accommodate slop */
@@ -382,6 +383,8 @@
 
 	struct dma_coherent_mem	*dma_mem; /* internal for coherent mem
 					     override */
+	/* arch specific additions */
+	struct dev_archdata	archdata;
 
 	/* class_device migration path */
 	struct list_head	node;
#1 lore raw
Quoted 5 lines · Benjamin Herrenschmidt

Add arch specific dev_archdata to struct device

Adds an arch specific struct dev_arch to struct device. This enables architecture to add specific fields to every device in the system, like DMA operation pointers, NUMA node ID, firmware specific data, etc...

Fine by me from the x86 side.

-Andi

#3 lore raw

patch driver-core-add-dev_archdata-to-struct-device.patch added to gregkh-2.6 tree

In reply to Benjamin Herrenschmidt

This is a note to let you know that I've just added the patch titled

Subject: Driver core: add dev_archdata to struct device

to my gregkh-2.6 tree. Its filename is

driver-core-add-dev_archdata-to-struct-device.patch

This tree can be found at
http://www.kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/patches/

From [email protected] Fri Nov 10 22:18:51 2006
Subject: Driver core: add dev_archdata to struct device
From: Benjamin Herrenschmidt <[email protected]>
To: Linux Arch list <[email protected]>
Cc: Andrew Morton <[email protected]>, Greg KH <[email protected]>
Content-Type: text/plain
Date: Sat, 11 Nov 2006 17:18:39 +1100
Message-Id: <[email protected]>
Mime-Version: 1.0

Add arch specific dev_archdata to struct device

Adds an arch specific struct dev_arch to struct device. This enables architecture to add specific fields to every device in the system, like DMA operation pointers, NUMA node ID, firmware specific data, etc...

---
 include/asm-alpha/device.h     |    7 +++++++
 include/asm-arm/device.h       |    7 +++++++
 include/asm-arm26/device.h     |    7 +++++++
 include/asm-avr32/device.h     |    7 +++++++
 include/asm-cris/device.h      |    7 +++++++
 include/asm-frv/device.h       |    7 +++++++
 include/asm-generic/device.h   |   12 ++++++++++++
 include/asm-h8300/device.h     |    7 +++++++
 include/asm-i386/device.h      |    7 +++++++
 include/asm-ia64/device.h      |    7 +++++++
 include/asm-m32r/device.h      |    7 +++++++
 include/asm-m68k/device.h      |    7 +++++++
 include/asm-m68knommu/device.h |    7 +++++++
 include/asm-mips/device.h      |    7 +++++++
 include/asm-parisc/device.h    |    7 +++++++
 include/asm-powerpc/device.h   |    7 +++++++
 include/asm-ppc/device.h       |    7 +++++++
 include/asm-s390/device.h      |    7 +++++++
 include/asm-sh/device.h        |    7 +++++++
 include/asm-sh64/device.h      |    7 +++++++
 include/asm-sparc/device.h     |    7 +++++++
 include/asm-sparc64/device.h   |    7 +++++++
 include/asm-um/device.h        |    7 +++++++
 include/asm-v850/device.h      |    7 +++++++
 include/asm-x86_64/device.h    |    7 +++++++
 include/asm-xtensa/device.h    |    7 +++++++
 include/linux/device.h         |    3 +++
 27 files changed, 190 insertions(+)
include/asm-alpha/device.h new file +7 -0
@@ -0,0 +1,7 @@
+/*
+ * Arch specific extensions to struct device
+ *
+ * This file is released under the GPLv2
+ */
+#include <asm-generic/device.h>
+
include/asm-arm/device.h new file +7 -0
@@ -0,0 +1,7 @@
+/*
+ * Arch specific extensions to struct device
+ *
+ * This file is released under the GPLv2
+ */
+#include <asm-generic/device.h>
+
include/asm-arm26/device.h new file +7 -0
@@ -0,0 +1,7 @@
+/*
+ * Arch specific extensions to struct device
+ *
+ * This file is released under the GPLv2
+ */
+#include <asm-generic/device.h>
+
include/asm-avr32/device.h new file +7 -0
@@ -0,0 +1,7 @@
+/*
+ * Arch specific extensions to struct device
+ *
+ * This file is released under the GPLv2
+ */
+#include <asm-generic/device.h>
+
include/asm-cris/device.h new file +7 -0
@@ -0,0 +1,7 @@
+/*
+ * Arch specific extensions to struct device
+ *
+ * This file is released under the GPLv2
+ */
+#include <asm-generic/device.h>
+
include/asm-frv/device.h new file +7 -0
@@ -0,0 +1,7 @@
+/*
+ * Arch specific extensions to struct device
+ *
+ * This file is released under the GPLv2
+ */
+#include <asm-generic/device.h>
+
include/asm-generic/device.h new file +12 -0
@@ -0,0 +1,12 @@
+/*
+ * Arch specific extensions to struct device
+ *
+ * This file is released under the GPLv2
+ */
+#ifndef _ASM_GENERIC_DEVICE_H
+#define _ASM_GENERIC_DEVICE_H
+
+struct dev_archdata {
+};
+
+#endif /* _ASM_GENERIC_DEVICE_H */
include/asm-h8300/device.h new file +7 -0
@@ -0,0 +1,7 @@
+/*
+ * Arch specific extensions to struct device
+ *
+ * This file is released under the GPLv2
+ */
+#include <asm-generic/device.h>
+
include/asm-i386/device.h new file +7 -0
@@ -0,0 +1,7 @@
+/*
+ * Arch specific extensions to struct device
+ *
+ * This file is released under the GPLv2
+ */
+#include <asm-generic/device.h>
+
include/asm-ia64/device.h new file +7 -0
@@ -0,0 +1,7 @@
+/*
+ * Arch specific extensions to struct device
+ *
+ * This file is released under the GPLv2
+ */
+#include <asm-generic/device.h>
+
include/asm-m32r/device.h new file +7 -0
@@ -0,0 +1,7 @@
+/*
+ * Arch specific extensions to struct device
+ *
+ * This file is released under the GPLv2
+ */
+#include <asm-generic/device.h>
+
include/asm-m68k/device.h new file +7 -0
@@ -0,0 +1,7 @@
+/*
+ * Arch specific extensions to struct device
+ *
+ * This file is released under the GPLv2
+ */
+#include <asm-generic/device.h>
+
include/asm-m68knommu/device.h new file +7 -0
@@ -0,0 +1,7 @@
+/*
+ * Arch specific extensions to struct device
+ *
+ * This file is released under the GPLv2
+ */
+#include <asm-generic/device.h>
+
include/asm-mips/device.h new file +7 -0
@@ -0,0 +1,7 @@
+/*
+ * Arch specific extensions to struct device
+ *
+ * This file is released under the GPLv2
+ */
+#include <asm-generic/device.h>
+
include/asm-parisc/device.h new file +7 -0
@@ -0,0 +1,7 @@
+/*
+ * Arch specific extensions to struct device
+ *
+ * This file is released under the GPLv2
+ */
+#include <asm-generic/device.h>
+
include/asm-powerpc/device.h new file +7 -0
@@ -0,0 +1,7 @@
+/*
+ * Arch specific extensions to struct device
+ *
+ * This file is released under the GPLv2
+ */
+#include <asm-generic/device.h>
+
include/asm-ppc/device.h new file +7 -0
@@ -0,0 +1,7 @@
+/*
+ * Arch specific extensions to struct device
+ *
+ * This file is released under the GPLv2
+ */
+#include <asm-generic/device.h>
+
include/asm-s390/device.h new file +7 -0
@@ -0,0 +1,7 @@
+/*
+ * Arch specific extensions to struct device
+ *
+ * This file is released under the GPLv2
+ */
+#include <asm-generic/device.h>
+
include/asm-sh/device.h new file +7 -0
@@ -0,0 +1,7 @@
+/*
+ * Arch specific extensions to struct device
+ *
+ * This file is released under the GPLv2
+ */
+#include <asm-generic/device.h>
+
include/asm-sh64/device.h new file +7 -0
@@ -0,0 +1,7 @@
+/*
+ * Arch specific extensions to struct device
+ *
+ * This file is released under the GPLv2
+ */
+#include <asm-generic/device.h>
+
include/asm-sparc/device.h new file +7 -0
@@ -0,0 +1,7 @@
+/*
+ * Arch specific extensions to struct device
+ *
+ * This file is released under the GPLv2
+ */
+#include <asm-generic/device.h>
+
include/asm-sparc64/device.h new file +7 -0
@@ -0,0 +1,7 @@
+/*
+ * Arch specific extensions to struct device
+ *
+ * This file is released under the GPLv2
+ */
+#include <asm-generic/device.h>
+
include/asm-um/device.h new file +7 -0
@@ -0,0 +1,7 @@
+/*
+ * Arch specific extensions to struct device
+ *
+ * This file is released under the GPLv2
+ */
+#include <asm-generic/device.h>
+
include/asm-v850/device.h new file +7 -0
@@ -0,0 +1,7 @@
+/*
+ * Arch specific extensions to struct device
+ *
+ * This file is released under the GPLv2
+ */
+#include <asm-generic/device.h>
+
include/asm-x86_64/device.h new file +7 -0
@@ -0,0 +1,7 @@
+/*
+ * Arch specific extensions to struct device
+ *
+ * This file is released under the GPLv2
+ */
+#include <asm-generic/device.h>
+
include/asm-xtensa/device.h new file +7 -0
@@ -0,0 +1,7 @@
+/*
+ * Arch specific extensions to struct device
+ *
+ * This file is released under the GPLv2
+ */
+#include <asm-generic/device.h>
+
include/linux/device.h +3 -0
@@ -21,6 +21,7 @@
 #include <linux/pm.h>
 #include <asm/semaphore.h>
 #include <asm/atomic.h>
+#include <asm/device.h>
 
 #define DEVICE_NAME_SIZE	50
 #define DEVICE_NAME_HALF	__stringify(20)	/* Less than half to accommodate slop */
@@ -383,6 +384,8 @@ struct device {
 
 	struct dma_coherent_mem	*dma_mem; /* internal for coherent mem
 					     override */
+	/* arch specific additions */
+	struct dev_archdata	archdata;
 
 	/* class_device migration path */
 	struct list_head	node;

Patches currently in gregkh-2.6 which might be from [email protected] are

driver/driver-core-add-notification-of-bus-events.patch driver/acpi-change-acpi-to-use-dev_archdata-instead-of-firmware_data.patch driver/driver-core-add-dev_archdata-to-struct-device.patch gregkh/battery-class-driver.patch pci/pci-make-some-msi-x-defines-generic.patch pci/pci-delete-unused-extern-in-powermac-pci.c.patch usb/usb-correct-keymapping-on-powerbook-built-in-usb-iso-keyboards.patch