* [PATCH 1/3] Fix call to replaced SuperIO functions
@ 2010-09-09 4:08 Matt Turner
2010-09-09 4:09 ` Matt Turner
2010-09-23 18:39 ` [stable] " Greg KH
0 siblings, 2 replies; 6+ messages in thread
From: Matt Turner @ 2010-09-09 4:08 UTC (permalink / raw)
To: stable; +Cc: linux-alpha, Morten H. Larsen, Matt Turner
From: Morten H. Larsen <m-larsen@post6.tele.dk>
This patch fixes the failure to compile Alpha Generic because of
previously overlooked calls to ns87312_enable_ide(). The function has
been replaced by newer SuperIO code.
Tested-by: Michael Cree <mcree@orcon.net.nz>
Signed-off-by: Morten H. Larsen <m-larsen@post6.tele.dk>
Signed-off-by: Matt Turner <mattst88@gmail.com>
---
This is a build fix for a regression introduced by 932e0c201d28a728e25d3b64.
It therefore only applies to 2.6.35-stable.
arch/alpha/kernel/proto.h | 3 ---
arch/alpha/kernel/sys_cabriolet.c | 19 ++++++++++++++++---
arch/alpha/kernel/sys_takara.c | 11 +++++++++--
3 files changed, 25 insertions(+), 8 deletions(-)
diff --git a/arch/alpha/kernel/proto.h b/arch/alpha/kernel/proto.h
index 3d2627e..d3e52d3 100644
--- a/arch/alpha/kernel/proto.h
+++ b/arch/alpha/kernel/proto.h
@@ -156,9 +156,6 @@ extern void SMC669_Init(int);
/* es1888.c */
extern void es1888_init(void);
-/* ns87312.c */
-extern void ns87312_enable_ide(long ide_base);
-
/* ../lib/fpreg.c */
extern void alpha_write_fp_reg (unsigned long reg, unsigned long val);
extern unsigned long alpha_read_fp_reg (unsigned long reg);
diff --git a/arch/alpha/kernel/sys_cabriolet.c b/arch/alpha/kernel/sys_cabriolet.c
index affd0f3..14c8898 100644
--- a/arch/alpha/kernel/sys_cabriolet.c
+++ b/arch/alpha/kernel/sys_cabriolet.c
@@ -33,7 +33,7 @@
#include "irq_impl.h"
#include "pci_impl.h"
#include "machvec_impl.h"
-
+#include "pc873xx.h"
/* Note mask bit is true for DISABLED irqs. */
static unsigned long cached_irq_mask = ~0UL;
@@ -236,17 +236,30 @@ cabriolet_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
}
static inline void __init
+cabriolet_enable_ide(void)
+{
+ if (pc873xx_probe() == -1) {
+ printk(KERN_ERR "Probing for PC873xx Super IO chip failed.\n");
+ } else {
+ printk(KERN_INFO "Found %s Super IO chip at 0x%x\n",
+ pc873xx_get_model(), pc873xx_get_base());
+
+ pc873xx_enable_ide();
+ }
+}
+
+static inline void __init
cabriolet_init_pci(void)
{
common_init_pci();
- ns87312_enable_ide(0x398);
+ cabriolet_enable_ide();
}
static inline void __init
cia_cab_init_pci(void)
{
cia_init_pci();
- ns87312_enable_ide(0x398);
+ cabriolet_enable_ide();
}
/*
diff --git a/arch/alpha/kernel/sys_takara.c b/arch/alpha/kernel/sys_takara.c
index 2304648..4da596b 100644
--- a/arch/alpha/kernel/sys_takara.c
+++ b/arch/alpha/kernel/sys_takara.c
@@ -29,7 +29,7 @@
#include "irq_impl.h"
#include "pci_impl.h"
#include "machvec_impl.h"
-
+#include "pc873xx.h"
/* Note mask bit is true for DISABLED irqs. */
static unsigned long cached_irq_mask[2] = { -1, -1 };
@@ -264,7 +264,14 @@ takara_init_pci(void)
alpha_mv.pci_map_irq = takara_map_irq_srm;
cia_init_pci();
- ns87312_enable_ide(0x26e);
+
+ if (pc873xx_probe() == -1) {
+ printk(KERN_ERR "Probing for PC873xx Super IO chip failed.\n");
+ } else {
+ printk(KERN_INFO "Found %s Super IO chip at 0x%x\n",
+ pc873xx_get_model(), pc873xx_get_base());
+ pc873xx_enable_ide();
+ }
}
--
1.7.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH 1/3] Fix call to replaced SuperIO functions
2010-09-09 4:08 [PATCH 1/3] Fix call to replaced SuperIO functions Matt Turner
@ 2010-09-09 4:09 ` Matt Turner
2010-09-23 18:39 ` [stable] " Greg KH
1 sibling, 0 replies; 6+ messages in thread
From: Matt Turner @ 2010-09-09 4:09 UTC (permalink / raw)
To: stable; +Cc: linux-alpha, Morten H. Larsen, Matt Turner
Whoops, please ignore the PATCH 1/3 title. This is the only patch
going to -stable.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [stable] [PATCH 1/3] Fix call to replaced SuperIO functions
2010-09-09 4:08 [PATCH 1/3] Fix call to replaced SuperIO functions Matt Turner
2010-09-09 4:09 ` Matt Turner
@ 2010-09-23 18:39 ` Greg KH
2010-09-23 19:24 ` Matt Turner
2010-09-23 20:56 ` Michael Cree
1 sibling, 2 replies; 6+ messages in thread
From: Greg KH @ 2010-09-23 18:39 UTC (permalink / raw)
To: Matt Turner; +Cc: stable, Morten H. Larsen, linux-alpha
On Thu, Sep 09, 2010 at 12:08:31AM -0400, Matt Turner wrote:
> From: Morten H. Larsen <m-larsen@post6.tele.dk>
>
> This patch fixes the failure to compile Alpha Generic because of
> previously overlooked calls to ns87312_enable_ide(). The function has
> been replaced by newer SuperIO code.
>
> Tested-by: Michael Cree <mcree@orcon.net.nz>
> Signed-off-by: Morten H. Larsen <m-larsen@post6.tele.dk>
> Signed-off-by: Matt Turner <mattst88@gmail.com>
> ---
> This is a build fix for a regression introduced by 932e0c201d28a728e25d3b64.
> It therefore only applies to 2.6.35-stable.
Why isn't it also relevant to Linus's tree for .36 and beyond?
Or is this the same as 59b25ed91400ace98d6cf0d59b1cb6928ad5cd37 in
Linus's tree? If so, please let me know that, it's important. I've
gone and applied that commit, if that is incorrect, please let me know.
thanks,
greg k-h
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [stable] [PATCH 1/3] Fix call to replaced SuperIO functions
2010-09-23 18:39 ` [stable] " Greg KH
@ 2010-09-23 19:24 ` Matt Turner
2010-09-23 20:56 ` Michael Cree
1 sibling, 0 replies; 6+ messages in thread
From: Matt Turner @ 2010-09-23 19:24 UTC (permalink / raw)
To: Greg KH; +Cc: stable, Morten H. Larsen, linux-alpha
On Thu, Sep 23, 2010 at 2:39 PM, Greg KH <greg@kroah.com> wrote:
> On Thu, Sep 09, 2010 at 12:08:31AM -0400, Matt Turner wrote:
>> From: Morten H. Larsen <m-larsen@post6.tele.dk>
>>
>> This patch fixes the failure to compile Alpha Generic because of
>> previously overlooked calls to ns87312_enable_ide(). The function has
>> been replaced by newer SuperIO code.
>>
>> Tested-by: Michael Cree <mcree@orcon.net.nz>
>> Signed-off-by: Morten H. Larsen <m-larsen@post6.tele.dk>
>> Signed-off-by: Matt Turner <mattst88@gmail.com>
>> ---
>> This is a build fix for a regression introduced by 932e0c201d28a728e25d3b64.
>> It therefore only applies to 2.6.35-stable.
>
> Why isn't it also relevant to Linus's tree for .36 and beyond?
>
> Or is this the same as 59b25ed91400ace98d6cf0d59b1cb6928ad5cd37 in
> Linus's tree? If so, please let me know that, it's important. I've
> gone and applied that commit, if that is incorrect, please let me know.
>
> thanks,
>
> greg k-h
>
Yes, it's the same as 59b25ed91400ace98d6cf0d59b1cb6 in Linus' tree.
Thanks Greg!
Matt
--
To unsubscribe from this list: send the line "unsubscribe linux-alpha" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [stable] [PATCH 1/3] Fix call to replaced SuperIO functions
2010-09-23 18:39 ` [stable] " Greg KH
2010-09-23 19:24 ` Matt Turner
@ 2010-09-23 20:56 ` Michael Cree
2010-09-23 23:12 ` Greg KH
1 sibling, 1 reply; 6+ messages in thread
From: Michael Cree @ 2010-09-23 20:56 UTC (permalink / raw)
To: Greg KH; +Cc: Matt Turner, stable, Morten H. Larsen, linux-alpha
Greg,
In addition to the patch below could we also get:
3e073367a57d41e506f20aebb98e308387ce3090 alpha: Fix printk format errors
added to the 2.6.35 stable queue. It fixes a compile error when
compiling a generic Alpha kernel without the legacy boot option.
Thanks
Michael.
On 24/09/2010, at 6:39 AM, Greg KH wrote:
> On Thu, Sep 09, 2010 at 12:08:31AM -0400, Matt Turner wrote:
>> From: Morten H. Larsen <m-larsen@post6.tele.dk>
>>
>> This patch fixes the failure to compile Alpha Generic because of
>> previously overlooked calls to ns87312_enable_ide(). The function has
>> been replaced by newer SuperIO code.
>>
>> Tested-by: Michael Cree <mcree@orcon.net.nz>
>> Signed-off-by: Morten H. Larsen <m-larsen@post6.tele.dk>
>> Signed-off-by: Matt Turner <mattst88@gmail.com>
>> ---
>> This is a build fix for a regression introduced by
>> 932e0c201d28a728e25d3b64.
>> It therefore only applies to 2.6.35-stable.
>
> Why isn't it also relevant to Linus's tree for .36 and beyond?
>
> Or is this the same as 59b25ed91400ace98d6cf0d59b1cb6928ad5cd37 in
> Linus's tree? If so, please let me know that, it's important. I've
> gone and applied that commit, if that is incorrect, please let me
> know.
>
> thanks,
>
> greg k-h
> --
> To unsubscribe from this list: send the line "unsubscribe linux-
> alpha" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [stable] [PATCH 1/3] Fix call to replaced SuperIO functions
2010-09-23 20:56 ` Michael Cree
@ 2010-09-23 23:12 ` Greg KH
0 siblings, 0 replies; 6+ messages in thread
From: Greg KH @ 2010-09-23 23:12 UTC (permalink / raw)
To: Michael Cree; +Cc: Matt Turner, stable, Morten H. Larsen, linux-alpha
On Fri, Sep 24, 2010 at 08:56:31AM +1200, Michael Cree wrote:
> Greg,
>
> In addition to the patch below could we also get:
>
> 3e073367a57d41e506f20aebb98e308387ce3090 alpha: Fix printk format errors
>
> added to the 2.6.35 stable queue. It fixes a compile error when
> compiling a generic Alpha kernel without the legacy boot option.
Now applied, thanks.
greg k-h
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2010-09-23 23:12 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-09-09 4:08 [PATCH 1/3] Fix call to replaced SuperIO functions Matt Turner
2010-09-09 4:09 ` Matt Turner
2010-09-23 18:39 ` [stable] " Greg KH
2010-09-23 19:24 ` Matt Turner
2010-09-23 20:56 ` Michael Cree
2010-09-23 23:12 ` Greg KH
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox