Commit f4ca5c6a authored by Yinghai Lu's avatar Yinghai Lu Committed by Jesse Barnes
Browse files

PCI: Add class support in quirk handling 



Recently added support to allow quirks to report duration also make the
boot log very crowded when initcall_debug is specified.

One thing we can to do mitigate this is to not call quirks unnecessarily
by adding a new quirk declaration macro that takes a class argument.

The new macro takes a class value and a class shift value (since it can
vary) so that quirks will be limited to certain device classes, greatly
reducing the number we call on every PCI device addition.

-v2: fix v1 that left over of sparated patch.
-v3: according to Jesse, change cls to class, cls_shift, to class_shift.

Signed-off-by: default avatarYinghai Lu <yinghai@kernel.org>
Signed-off-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
parent ecd58d66

drivers/pci/quirks.c

+7 −5
Original line number Diff line number Diff line
@@ -2961,17 +2961,19 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x010a, disable_igfx_irq); 
static void pci_do_fixups(struct pci_dev *dev, struct pci_fixup *f,

			  struct pci_fixup *end)

{

	while (f < end) {

		if ((f->vendor == dev->vendor || f->vendor == (u16) PCI_ANY_ID) &&

		    (f->device == dev->device || f->device == (u16) PCI_ANY_ID)) {

	for (; f < end; f++)

		if ((f->class == (u32) (dev->class >> f->class_shift) ||

		     f->class == (u32) PCI_ANY_ID) &&

		    (f->vendor == dev->vendor ||

		     f->vendor == (u16) PCI_ANY_ID) &&

		    (f->device == dev->device ||

		     f->device == (u16) PCI_ANY_ID)) {

			dev_dbg(&dev->dev, "calling %pF\n", f->hook);

			if (initcall_debug)

				do_one_fixup_debug(f->hook, dev);

			else

				f->hook(dev);

		}

		f++;

	}

}



extern struct pci_fixup __start_pci_fixups_early[];

include/linux/pci.h

+52 −11
Original line number Diff line number Diff line
@@ -1382,7 +1382,10 @@ static inline void pci_resource_to_user(const struct pci_dev *dev, int bar, 
 */



struct pci_fixup {

	u16 vendor, device;	/* You can use PCI_ANY_ID here of course */

	u16 vendor;		/* You can use PCI_ANY_ID here of course */

	u16 device;		/* You can use PCI_ANY_ID here of course */

	u32 class;		/* You can use PCI_ANY_ID here too */

	unsigned int class_shift;	/* should be 0, 8, 16 */

	void (*hook)(struct pci_dev *dev);

};
@@ -1397,30 +1400,68 @@ enum pci_fixup_pass { 
};



/* Anonymous variables would be nice... */

#define DECLARE_PCI_FIXUP_SECTION(section, name, vendor, device, hook)	\

	static const struct pci_fixup __pci_fixup_##name __used		\

	__attribute__((__section__(#section))) = { vendor, device, hook };

#define DECLARE_PCI_FIXUP_SECTION(section, name, vendor, device, class,	\

				  class_shift, hook)			\

	static const struct pci_fixup const __pci_fixup_##name __used	\

	__attribute__((__section__(#section), aligned((sizeof(void *)))))    \

		= { vendor, device, class, class_shift, hook };



#define DECLARE_PCI_FIXUP_CLASS_EARLY(vendor, device, class,		\

					 class_shift, hook)		\

	DECLARE_PCI_FIXUP_SECTION(.pci_fixup_early,			\

		vendor##device##hook, vendor, device, class, class_shift, hook)

#define DECLARE_PCI_FIXUP_CLASS_HEADER(vendor, device, class,		\

					 class_shift, hook)		\

	DECLARE_PCI_FIXUP_SECTION(.pci_fixup_header,			\

		vendor##device##hook, vendor, device, class, class_shift, hook)

#define DECLARE_PCI_FIXUP_CLASS_FINAL(vendor, device, class,		\

					 class_shift, hook)		\

	DECLARE_PCI_FIXUP_SECTION(.pci_fixup_final,			\

		vendor##device##hook, vendor, device, class, class_shift, hook)

#define DECLARE_PCI_FIXUP_CLASS_ENABLE(vendor, device, class,		\

					 class_shift, hook)		\

	DECLARE_PCI_FIXUP_SECTION(.pci_fixup_enable,			\

		vendor##device##hook, vendor, device, class, class_shift, hook)

#define DECLARE_PCI_FIXUP_CLASS_RESUME(vendor, device, class,		\

					 class_shift, hook)		\

	DECLARE_PCI_FIXUP_SECTION(.pci_fixup_resume,			\

		resume##vendor##device##hook, vendor, device, class,	\

		class_shift, hook)

#define DECLARE_PCI_FIXUP_CLASS_RESUME_EARLY(vendor, device, class,	\

					 class_shift, hook)		\

	DECLARE_PCI_FIXUP_SECTION(.pci_fixup_resume_early,		\

		resume_early##vendor##device##hook, vendor, device,	\

		class, class_shift, hook)

#define DECLARE_PCI_FIXUP_CLASS_SUSPEND(vendor, device, class,		\

					 class_shift, hook)		\

	DECLARE_PCI_FIXUP_SECTION(.pci_fixup_suspend,			\

		suspend##vendor##device##hook, vendor, device, class,	\

		class_shift, hook)



#define DECLARE_PCI_FIXUP_EARLY(vendor, device, hook)			\

	DECLARE_PCI_FIXUP_SECTION(.pci_fixup_early,			\

			vendor##device##hook, vendor, device, hook)

		vendor##device##hook, vendor, device, PCI_ANY_ID, 0, hook)

#define DECLARE_PCI_FIXUP_HEADER(vendor, device, hook)			\

	DECLARE_PCI_FIXUP_SECTION(.pci_fixup_header,			\

			vendor##device##hook, vendor, device, hook)

		vendor##device##hook, vendor, device, PCI_ANY_ID, 0, hook)

#define DECLARE_PCI_FIXUP_FINAL(vendor, device, hook)			\

	DECLARE_PCI_FIXUP_SECTION(.pci_fixup_final,			\

			vendor##device##hook, vendor, device, hook)

		vendor##device##hook, vendor, device, PCI_ANY_ID, 0, hook)

#define DECLARE_PCI_FIXUP_ENABLE(vendor, device, hook)			\

	DECLARE_PCI_FIXUP_SECTION(.pci_fixup_enable,			\

			vendor##device##hook, vendor, device, hook)

		vendor##device##hook, vendor, device, PCI_ANY_ID, 0, hook)

#define DECLARE_PCI_FIXUP_RESUME(vendor, device, hook)			\

	DECLARE_PCI_FIXUP_SECTION(.pci_fixup_resume,			\

			resume##vendor##device##hook, vendor, device, hook)

		resume##vendor##device##hook, vendor, device,		\

		PCI_ANY_ID, 0, hook)

#define DECLARE_PCI_FIXUP_RESUME_EARLY(vendor, device, hook)		\

	DECLARE_PCI_FIXUP_SECTION(.pci_fixup_resume_early,		\

			resume_early##vendor##device##hook, vendor, device, hook)

		resume_early##vendor##device##hook, vendor, device,	\

		PCI_ANY_ID, 0, hook)

#define DECLARE_PCI_FIXUP_SUSPEND(vendor, device, hook)			\

	DECLARE_PCI_FIXUP_SECTION(.pci_fixup_suspend,			\

			suspend##vendor##device##hook, vendor, device, hook)

		suspend##vendor##device##hook, vendor, device,		\

		PCI_ANY_ID, 0, hook)



#ifdef CONFIG_PCI_QUIRKS

void pci_fixup_device(enum pci_fixup_pass pass, struct pci_dev *dev);

CRA Git | Maintained and supported by SUSTech CRA and CCSE