diff mbox

[RFC,1/2] pci: Add a framework for quirks

Message ID 20161220065333.30625-1-ruscur@russell.cc
State Superseded
Headers show

Commit Message

Russell Currey Dec. 20, 2016, 6:53 a.m. UTC 
In future we may want to be able to do fixups for specific PCI devices in
skiboot, so add a small framework for doing this.

Signed-off-by: Russell Currey <ruscur@russell.cc>
---
This doesn't compile because the compiler wants pci_handle_quirk() to be
const, when in the next patch I would have to make it not const.  That's
dumb.  Should I just suck it up and make it const for now?  I don't know.
---
 core/Makefile.inc   |  2 +-
 core/pci-quirk.c    | 42 ++++++++++++++++++++++++++++++++++++++++++
 core/pci.c          |  3 +++
 include/pci-quirk.h | 36 ++++++++++++++++++++++++++++++++++++
 4 files changed, 82 insertions(+), 1 deletion(-)
 create mode 100644 core/pci-quirk.c
 create mode 100644 include/pci-quirk.h

Comments

Andrew Donnellan Dec. 21, 2016, 3:14 a.m. UTC | #1 
On 20/12/16 17:53, Russell Currey wrote:
> In future we may want to be able to do fixups for specific PCI devices in
> skiboot, so add a small framework for doing this.
>
> Signed-off-by: Russell Currey <ruscur@russell.cc>

Reviewed-by: Andrew Donnellan <andrew.donnellan@au1.ibm.com>

> ---
> This doesn't compile because the compiler wants pci_handle_quirk() to be
> const, when in the next patch I would have to make it not const.  That's
> dumb.  Should I just suck it up and make it const for now?  I don't know.

Probably.
diff mbox

Patch

diff --git a/core/Makefile.inc b/core/Makefile.inc
index 9223af1b..ff522473 100644
--- a/core/Makefile.inc
+++ b/core/Makefile.inc
@@ -8,7 +8,7 @@  CORE_OBJS += pci-opal.o fast-reboot.o device.o exceptions.o trace.o affinity.o
 CORE_OBJS += vpd.o hostservices.o platform.o nvram.o nvram-format.o hmi.o
 CORE_OBJS += console-log.o ipmi.o time-utils.o pel.o pool.o errorlog.o
 CORE_OBJS += timer.o i2c.o rtc.o flash.o sensor.o ipmi-opal.o
-CORE_OBJS += flash-subpartition.o
+CORE_OBJS += flash-subpartition.o pci-quirk.o
 
 ifeq ($(SKIBOOT_GCOV),1)
 CORE_OBJS += gcov-profiling.o
diff --git a/core/pci-quirk.c b/core/pci-quirk.c
new file mode 100644
index 00000000..708f07fc
--- /dev/null
+++ b/core/pci-quirk.c
@@ -0,0 +1,42 @@ 
+/* Copyright 2016 IBM Corp.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * 	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ * implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <skiboot.h>
+#include <pci.h>
+#include <pci-quirk.h>
+#include <ast.h>
+
+/* Quirks are: {fixup function, vendor ID, (device ID or PCI_ANY_ID)} */
+static const struct pci_quirk quirk_table[] = {
+	{0}
+};
+
+void pci_handle_quirk(struct phb *phb,
+		      struct pci_device *pd,
+		      struct dt_node *np,
+		      uint16_t vendor_id,
+		      uint16_t device_id)
+{
+	const struct pci_quirk *quirks = quirk_table;
+
+	while (quirks->vendor_id) {
+		if (vendor_id == quirks->vendor_id &&
+		    (quirks->device_id == PCI_ANY_ID ||
+		     device_id == quirks->device_id))
+			quirks->fixup(phb, pd, np);
+		quirks++;
+	}
+}
diff --git a/core/pci.c b/core/pci.c
index 41602991..6b87ad66 100644
--- a/core/pci.c
+++ b/core/pci.c
@@ -19,6 +19,7 @@ 
 #include <pci.h>
 #include <pci-cfg.h>
 #include <pci-slot.h>
+#include <pci-quirk.h>
 #include <timebase.h>
 #include <device.h>
 #include <fsp.h>
@@ -1402,6 +1403,8 @@  static void pci_add_one_device_node(struct phb *phb,
 	if (intpin)
 		dt_add_property_cells(np, "interrupts", intpin);
 
+	pci_handle_quirk(phb, pd, np, vdid & 0xffff, vdid >> 16);
+
 	/* XXX FIXME: Add a few missing ones such as
 	 *
 	 *  - devsel-speed (!express)
diff --git a/include/pci-quirk.h b/include/pci-quirk.h
new file mode 100644
index 00000000..c2ceb55f
--- /dev/null
+++ b/include/pci-quirk.h
@@ -0,0 +1,36 @@ 
+/* Copyright 2016 IBM Corp.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * 	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ * implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __PCI_QUIRK_H
+#define __PCI_QUIRK_H
+
+#include <pci.h>
+
+#define PCI_ANY_ID 0xFFFF
+
+struct pci_quirk {
+	void (*fixup)(struct phb *, struct pci_device *, struct dt_node *);
+	uint16_t vendor_id;
+	uint16_t device_id;
+};
+
+void pci_handle_quirk(struct phb *phb,
+		      struct pci_device *pd,
+		      struct dt_node *np,
+		      uint16_t vendor_id,
+		      uint16_t device_id);
+
+#endif /* __PCI_QUIRK_H */