Re: [PATCH v4 2/2] x86: intel-mid: add watchdog platform code for Merrifield

[David Cohen <david.a.cohen@linux.intel.com>]

On Tue, Apr 15, 2014 at 02:13:49PM -0700, Guenter Roeck wrote:
> On Tue, Apr 15, 2014 at 01:09:00PM -0700, David Cohen wrote:
> > On Tue, Apr 15, 2014 at 01:06:06PM -0700, David Cohen wrote:
> > > This patch adds platform code for Intel Merrifield.
> > > Since the watchdog is not part of SFI table, we have no other option but
> > > to manually register watchdog's platform device (argh!).
> > > 
> > > Signed-off-by: David Cohen <david.a.cohen@linux.intel.com>
> > > ---
> > >  arch/x86/platform/intel-mid/device_libs/Makefile   |  1 +
> > >  .../platform/intel-mid/device_libs/platform_wdt.c  | 66 ++++++++++++++++++++++
> > >  2 files changed, 67 insertions(+)
> > >  create mode 100644 arch/x86/platform/intel-mid/device_libs/platform_wdt.c
> > > 
> > > diff --git a/arch/x86/platform/intel-mid/device_libs/Makefile b/arch/x86/platform/intel-mid/device_libs/Makefile
> > > index 097e7a7940d8..af9307f2cc28 100644
> > > --- a/arch/x86/platform/intel-mid/device_libs/Makefile
> > > +++ b/arch/x86/platform/intel-mid/device_libs/Makefile
> > > @@ -20,3 +20,4 @@ obj-$(subst m,y,$(CONFIG_DRM_MEDFIELD)) += platform_tc35876x.o
> > >  obj-$(subst m,y,$(CONFIG_SERIAL_MRST_MAX3110)) += platform_max3111.o
> > >  # MISC Devices
> > >  obj-$(subst m,y,$(CONFIG_KEYBOARD_GPIO)) += platform_gpio_keys.o
> > > +obj-$(subst m,y,$(CONFIG_INTEL_MID_WATCHDOG)) += platform_wdt.o
> > > diff --git a/arch/x86/platform/intel-mid/device_libs/platform_wdt.c b/arch/x86/platform/intel-mid/device_libs/platform_wdt.c
> > > new file mode 100644
> > > index 000000000000..4b0434b54aff
> > > --- /dev/null
> > > +++ b/arch/x86/platform/intel-mid/device_libs/platform_wdt.c
> > > @@ -0,0 +1,66 @@
> > > +/*
> > > + * platform_wdt.c: Watchdog platform library file
> > > + *
> > > + * (C) Copyright 2014 Intel Corporation
> > > + * Author: David Cohen <david.a.cohen@linux.intel.com>
> > > + *
> > > + * This program is free software; you can redistribute it and/or
> > > + * modify it under the terms of the GNU General Public License
> > > + * as published by the Free Software Foundation; version 2
> > > + * of the License.
> > > + */
> > > +
> > > +#include <linux/init.h>
> > > +#include <linux/interrupt.h>
> > > +#include <linux/platform_device.h>
> > > +#include <linux/platform_data/intel-mid_wdt.h>
> > > +#include <asm/intel-mid.h>
> > > +
> > > +#define TANGIER_EXT_TIMER0_MSI 15
> > > +
> > > +static struct platform_device wdt_dev = {
> > > +	.name = "intel_mid_wdt",
> > > +	.id = -1,
> > > +};
> > > +
> > > +static int tangier_probe(struct platform_device *pdev)
> > > +{
> > > +	int ioapic;
> > > +	struct io_apic_irq_attr irq_attr = { 0 };
> > > +
> > > +	ioapic = mp_find_ioapic(TANGIER_EXT_TIMER0_MSI);
> > 
> > Forgot remove this hardcoded irq number. I'll send v4.1 of this patch.
> > 
> > BR, David
> > 
> > > +	if (ioapic >= 0) {
> > > +		int ret;
> > > +		irq_attr.ioapic = ioapic;
> > > +		irq_attr.ioapic_pin = TANGIER_EXT_TIMER0_MSI;
> > > +		irq_attr.trigger = 1;
> > > +		irq_attr.polarity = 0; /* Active high */
> > > +		ret = io_apic_set_pci_routing(NULL, TANGIER_EXT_TIMER0_MSI,
> > > +					      &irq_attr);
> 
> Here is another one, just in case you missed it.

This one I didn't miss. I checked and it returns dummy error code (-1).
Better to keep the hardcoded value.

Br, David

> 
> Guenter