* [PATCH 2.6.37] lpc: irq and pci_ids patch for Intel DH89xxCC DeviceIDs
@ 2011-01-10 21:08 Seth Heasley
2011-01-10 22:34 ` Jean Delvare
2011-02-08 21:10 ` Jesse Barnes
0 siblings, 2 replies; 4+ messages in thread
From: Seth Heasley @ 2011-01-10 21:08 UTC (permalink / raw)
To: jbarnes; +Cc: linux-pci, linux-kernel, khali, seth.heasley
This patch adds the LPC Controller DeviceIDs for the Intel DH89xxCC PCH.
The code for capturing ranges of LPC Controller DeviceIDs has also been updated.
Signed-off-by: Seth Heasley <seth.heasley@intel.com>
--- linux-2.6.37/include/linux/pci_ids.h.orig 2011-01-04 16:50:19.000000000 -0800
+++ linux-2.6.37/include/linux/pci_ids.h 2011-01-10 11:23:19.000000000 -0800
@@ -2469,6 +2469,9 @@
#define PCI_DEVICE_ID_INTEL_COUGARPOINT_LPC_MAX 0x1c5f
#define PCI_DEVICE_ID_INTEL_PATSBURG_SMBUS 0x1d22
#define PCI_DEVICE_ID_INTEL_PATSBURG_LPC 0x1d40
+#define PCI_DEVICE_ID_INTEL_DH89XXCC_LPC_MIN 0x2310
+#define PCI_DEVICE_ID_INTEL_DH89XXCC_LPC_MAX 0x231f
+#define PCI_DEVICE_ID_INTEL_DH89XXCC_SMBUS 0x2330
#define PCI_DEVICE_ID_INTEL_82801AA_0 0x2410
#define PCI_DEVICE_ID_INTEL_82801AA_1 0x2411
#define PCI_DEVICE_ID_INTEL_82801AA_3 0x2413
--- linux-2.6.37/arch/x86/pci/irq.c.orig 2011-01-04 16:50:19.000000000 -0800
+++ linux-2.6.37/arch/x86/pci/irq.c 2011-01-10 11:31:02.000000000 -0800
@@ -596,21 +596,18 @@
return 1;
}
- if ((device >= PCI_DEVICE_ID_INTEL_5_3400_SERIES_LPC_MIN) &&
- (device <= PCI_DEVICE_ID_INTEL_5_3400_SERIES_LPC_MAX)) {
+ if ((device >= PCI_DEVICE_ID_INTEL_5_3400_SERIES_LPC_MIN &&
+ device <= PCI_DEVICE_ID_INTEL_5_3400_SERIES_LPC_MAX)
+ || (device >= PCI_DEVICE_ID_INTEL_COUGARPOINT_LPC_MIN &&
+ device <= PCI_DEVICE_ID_INTEL_COUGARPOINT_LPC_MAX)
+ || (device >= PCI_DEVICE_ID_INTEL_DH89XXCC_LPC_MIN &&
+ device <= PCI_DEVICE_ID_INTEL_DH89XXCC_LPC_MAX)) {
r->name = "PIIX/ICH";
r->get = pirq_piix_get;
r->set = pirq_piix_set;
return 1;
}
- if ((device >= PCI_DEVICE_ID_INTEL_COUGARPOINT_LPC_MIN) &&
- (device <= PCI_DEVICE_ID_INTEL_COUGARPOINT_LPC_MAX)) {
- r->name = "PIIX/ICH";
- r->get = pirq_piix_get;
- r->set = pirq_piix_set;
- return 1;
- }
return 0;
}
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH 2.6.37] lpc: irq and pci_ids patch for Intel DH89xxCC DeviceIDs
2011-01-10 21:08 [PATCH 2.6.37] lpc: irq and pci_ids patch for Intel DH89xxCC DeviceIDs Seth Heasley
@ 2011-01-10 22:34 ` Jean Delvare
2011-02-08 21:10 ` Jesse Barnes
1 sibling, 0 replies; 4+ messages in thread
From: Jean Delvare @ 2011-01-10 22:34 UTC (permalink / raw)
To: Seth Heasley; +Cc: jbarnes, linux-pci, linux-kernel
On Mon, 10 Jan 2011 13:08:37 -0800, Seth Heasley wrote:
> This patch adds the LPC Controller DeviceIDs for the Intel DH89xxCC PCH.
>
> The code for capturing ranges of LPC Controller DeviceIDs has also been updated.
>
> Signed-off-by: Seth Heasley <seth.heasley@intel.com>
>
> --- linux-2.6.37/include/linux/pci_ids.h.orig 2011-01-04 16:50:19.000000000 -0800
> +++ linux-2.6.37/include/linux/pci_ids.h 2011-01-10 11:23:19.000000000 -0800
> @@ -2469,6 +2469,9 @@
> #define PCI_DEVICE_ID_INTEL_COUGARPOINT_LPC_MAX 0x1c5f
> #define PCI_DEVICE_ID_INTEL_PATSBURG_SMBUS 0x1d22
> #define PCI_DEVICE_ID_INTEL_PATSBURG_LPC 0x1d40
> +#define PCI_DEVICE_ID_INTEL_DH89XXCC_LPC_MIN 0x2310
> +#define PCI_DEVICE_ID_INTEL_DH89XXCC_LPC_MAX 0x231f
> +#define PCI_DEVICE_ID_INTEL_DH89XXCC_SMBUS 0x2330
> #define PCI_DEVICE_ID_INTEL_82801AA_0 0x2410
> #define PCI_DEVICE_ID_INTEL_82801AA_1 0x2411
> #define PCI_DEVICE_ID_INTEL_82801AA_3 0x2413
> --- linux-2.6.37/arch/x86/pci/irq.c.orig 2011-01-04 16:50:19.000000000 -0800
> +++ linux-2.6.37/arch/x86/pci/irq.c 2011-01-10 11:31:02.000000000 -0800
> @@ -596,21 +596,18 @@
> return 1;
> }
>
> - if ((device >= PCI_DEVICE_ID_INTEL_5_3400_SERIES_LPC_MIN) &&
> - (device <= PCI_DEVICE_ID_INTEL_5_3400_SERIES_LPC_MAX)) {
> + if ((device >= PCI_DEVICE_ID_INTEL_5_3400_SERIES_LPC_MIN &&
> + device <= PCI_DEVICE_ID_INTEL_5_3400_SERIES_LPC_MAX)
> + || (device >= PCI_DEVICE_ID_INTEL_COUGARPOINT_LPC_MIN &&
> + device <= PCI_DEVICE_ID_INTEL_COUGARPOINT_LPC_MAX)
> + || (device >= PCI_DEVICE_ID_INTEL_DH89XXCC_LPC_MIN &&
> + device <= PCI_DEVICE_ID_INTEL_DH89XXCC_LPC_MAX)) {
> r->name = "PIIX/ICH";
> r->get = pirq_piix_get;
> r->set = pirq_piix_set;
> return 1;
> }
>
> - if ((device >= PCI_DEVICE_ID_INTEL_COUGARPOINT_LPC_MIN) &&
> - (device <= PCI_DEVICE_ID_INTEL_COUGARPOINT_LPC_MAX)) {
> - r->name = "PIIX/ICH";
> - r->get = pirq_piix_get;
> - r->set = pirq_piix_set;
> - return 1;
> - }
> return 0;
> }
>
Looks good.
Acked-by: Jean Delvare <khali@linux-fr.org>
--
Jean Delvare
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH 2.6.37] lpc: irq and pci_ids patch for Intel DH89xxCC DeviceIDs
2011-01-10 21:08 [PATCH 2.6.37] lpc: irq and pci_ids patch for Intel DH89xxCC DeviceIDs Seth Heasley
2011-01-10 22:34 ` Jean Delvare
@ 2011-02-08 21:10 ` Jesse Barnes
2011-03-18 9:26 ` Jean Delvare
1 sibling, 1 reply; 4+ messages in thread
From: Jesse Barnes @ 2011-02-08 21:10 UTC (permalink / raw)
To: Seth Heasley; +Cc: linux-pci, linux-kernel, khali
On Mon, 10 Jan 2011 13:08:37 -0800
Seth Heasley <seth.heasley@intel.com> wrote:
> This patch adds the LPC Controller DeviceIDs for the Intel DH89xxCC PCH.
>
> The code for capturing ranges of LPC Controller DeviceIDs has also been updated.
>
> Signed-off-by: Seth Heasley <seth.heasley@intel.com>
>
> --- linux-2.6.37/include/linux/pci_ids.h.orig 2011-01-04 16:50:19.000000000 -0800
> +++ linux-2.6.37/include/linux/pci_ids.h 2011-01-10 11:23:19.000000000 -0800
> @@ -2469,6 +2469,9 @@
> #define PCI_DEVICE_ID_INTEL_COUGARPOINT_LPC_MAX 0x1c5f
> #define PCI_DEVICE_ID_INTEL_PATSBURG_SMBUS 0x1d22
> #define PCI_DEVICE_ID_INTEL_PATSBURG_LPC 0x1d40
> +#define PCI_DEVICE_ID_INTEL_DH89XXCC_LPC_MIN 0x2310
> +#define PCI_DEVICE_ID_INTEL_DH89XXCC_LPC_MAX 0x231f
> +#define PCI_DEVICE_ID_INTEL_DH89XXCC_SMBUS 0x2330
> #define PCI_DEVICE_ID_INTEL_82801AA_0 0x2410
> #define PCI_DEVICE_ID_INTEL_82801AA_1 0x2411
> #define PCI_DEVICE_ID_INTEL_82801AA_3 0x2413
> --- linux-2.6.37/arch/x86/pci/irq.c.orig 2011-01-04 16:50:19.000000000 -0800
> +++ linux-2.6.37/arch/x86/pci/irq.c 2011-01-10 11:31:02.000000000 -0800
> @@ -596,21 +596,18 @@
> return 1;
> }
>
> - if ((device >= PCI_DEVICE_ID_INTEL_5_3400_SERIES_LPC_MIN) &&
> - (device <= PCI_DEVICE_ID_INTEL_5_3400_SERIES_LPC_MAX)) {
> + if ((device >= PCI_DEVICE_ID_INTEL_5_3400_SERIES_LPC_MIN &&
> + device <= PCI_DEVICE_ID_INTEL_5_3400_SERIES_LPC_MAX)
> + || (device >= PCI_DEVICE_ID_INTEL_COUGARPOINT_LPC_MIN &&
> + device <= PCI_DEVICE_ID_INTEL_COUGARPOINT_LPC_MAX)
> + || (device >= PCI_DEVICE_ID_INTEL_DH89XXCC_LPC_MIN &&
> + device <= PCI_DEVICE_ID_INTEL_DH89XXCC_LPC_MAX)) {
> r->name = "PIIX/ICH";
> r->get = pirq_piix_get;
> r->set = pirq_piix_set;
> return 1;
> }
>
> - if ((device >= PCI_DEVICE_ID_INTEL_COUGARPOINT_LPC_MIN) &&
> - (device <= PCI_DEVICE_ID_INTEL_COUGARPOINT_LPC_MAX)) {
> - r->name = "PIIX/ICH";
> - r->get = pirq_piix_get;
> - r->set = pirq_piix_set;
> - return 1;
> - }
> return 0;
> }
Applied to linux-next, thanks.
It would be cool if you could figure out a way to avoid having to
continually send these sorts of patches for new chipsets as they come
out. Maybe for stuff newer than a certain date we can just assume PIIX
style interfaces? Or maybe there's a way to refactor this even more
cleanly?
Thanks,
--
Jesse Barnes, Intel Open Source Technology Center
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH 2.6.37] lpc: irq and pci_ids patch for Intel DH89xxCC DeviceIDs
2011-02-08 21:10 ` Jesse Barnes
@ 2011-03-18 9:26 ` Jean Delvare
0 siblings, 0 replies; 4+ messages in thread
From: Jean Delvare @ 2011-03-18 9:26 UTC (permalink / raw)
To: Jesse Barnes; +Cc: Seth Heasley, linux-pci, linux-kernel
Hi Jesse,
On Tue, 8 Feb 2011 13:10:15 -0800, Jesse Barnes wrote:
> On Mon, 10 Jan 2011 13:08:37 -0800
> Seth Heasley <seth.heasley@intel.com> wrote:
>
> > This patch adds the LPC Controller DeviceIDs for the Intel DH89xxCC PCH.
> >
> > The code for capturing ranges of LPC Controller DeviceIDs has also been updated.
> >
> > Signed-off-by: Seth Heasley <seth.heasley@intel.com>
> >
> > --- linux-2.6.37/include/linux/pci_ids.h.orig 2011-01-04 16:50:19.000000000 -0800
> > +++ linux-2.6.37/include/linux/pci_ids.h 2011-01-10 11:23:19.000000000 -0800
> > @@ -2469,6 +2469,9 @@
> > #define PCI_DEVICE_ID_INTEL_COUGARPOINT_LPC_MAX 0x1c5f
> > #define PCI_DEVICE_ID_INTEL_PATSBURG_SMBUS 0x1d22
> > #define PCI_DEVICE_ID_INTEL_PATSBURG_LPC 0x1d40
> > +#define PCI_DEVICE_ID_INTEL_DH89XXCC_LPC_MIN 0x2310
> > +#define PCI_DEVICE_ID_INTEL_DH89XXCC_LPC_MAX 0x231f
> > +#define PCI_DEVICE_ID_INTEL_DH89XXCC_SMBUS 0x2330
> > #define PCI_DEVICE_ID_INTEL_82801AA_0 0x2410
> > #define PCI_DEVICE_ID_INTEL_82801AA_1 0x2411
> > #define PCI_DEVICE_ID_INTEL_82801AA_3 0x2413
> > --- linux-2.6.37/arch/x86/pci/irq.c.orig 2011-01-04 16:50:19.000000000 -0800
> > +++ linux-2.6.37/arch/x86/pci/irq.c 2011-01-10 11:31:02.000000000 -0800
> > @@ -596,21 +596,18 @@
> > return 1;
> > }
> >
> > - if ((device >= PCI_DEVICE_ID_INTEL_5_3400_SERIES_LPC_MIN) &&
> > - (device <= PCI_DEVICE_ID_INTEL_5_3400_SERIES_LPC_MAX)) {
> > + if ((device >= PCI_DEVICE_ID_INTEL_5_3400_SERIES_LPC_MIN &&
> > + device <= PCI_DEVICE_ID_INTEL_5_3400_SERIES_LPC_MAX)
> > + || (device >= PCI_DEVICE_ID_INTEL_COUGARPOINT_LPC_MIN &&
> > + device <= PCI_DEVICE_ID_INTEL_COUGARPOINT_LPC_MAX)
> > + || (device >= PCI_DEVICE_ID_INTEL_DH89XXCC_LPC_MIN &&
> > + device <= PCI_DEVICE_ID_INTEL_DH89XXCC_LPC_MAX)) {
> > r->name = "PIIX/ICH";
> > r->get = pirq_piix_get;
> > r->set = pirq_piix_set;
> > return 1;
> > }
> >
> > - if ((device >= PCI_DEVICE_ID_INTEL_COUGARPOINT_LPC_MIN) &&
> > - (device <= PCI_DEVICE_ID_INTEL_COUGARPOINT_LPC_MAX)) {
> > - r->name = "PIIX/ICH";
> > - r->get = pirq_piix_get;
> > - r->set = pirq_piix_set;
> > - return 1;
> > - }
> > return 0;
> > }
>
> Applied to linux-next, thanks.
Please make sure this patch goes to Linus quickly, I have a patch in my
i2c tree which depends on it.
Thanks,
--
Jean Delvare
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2011-03-18 9:26 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-01-10 21:08 [PATCH 2.6.37] lpc: irq and pci_ids patch for Intel DH89xxCC DeviceIDs Seth Heasley
2011-01-10 22:34 ` Jean Delvare
2011-02-08 21:10 ` Jesse Barnes
2011-03-18 9:26 ` Jean Delvare
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox