* [v0 PATCH 0/1] EDAC: Use dev_name() for AMD8111/AMD8131 drivers
@ 2009-05-07 1:47 Harry Ciao
2009-05-07 1:47 ` [v0 PATCH 1/1] Use dev_name() for AMD8111/AMD8131 EDAC driver Harry Ciao
0 siblings, 1 reply; 5+ messages in thread
From: Harry Ciao @ 2009-05-07 1:47 UTC (permalink / raw)
To: norsk5, bluesmoke-devel; +Cc: akpm, linux-kernel
Hi Doug,
I found both the Makefile entries for AMD8111/AMD8131 EDAC entries
are simply lost, and they are still referencing obsolete "bus_id"
member of the device structure.
Please help verify these issues again and help post this patch to
the mm tree, thanks!
Best regards,
Harry
^ permalink raw reply [flat|nested] 5+ messages in thread
* [v0 PATCH 1/1] Use dev_name() for AMD8111/AMD8131 EDAC driver
2009-05-07 1:47 [v0 PATCH 0/1] EDAC: Use dev_name() for AMD8111/AMD8131 drivers Harry Ciao
@ 2009-05-07 1:47 ` Harry Ciao
2009-05-07 21:57 ` Andrew Morton
0 siblings, 1 reply; 5+ messages in thread
From: Harry Ciao @ 2009-05-07 1:47 UTC (permalink / raw)
To: norsk5, bluesmoke-devel; +Cc: akpm, linux-kernel
The device structure no longer has bus_id member, dev_name() should
be used for AMD8111 & AMD8131 EDAC driver instead. Also, their Makefile
entries are lost, add them.
Signed-off-by: Harry Ciao <qingtao.cao@windriver.com>
---
drivers/edac/Makefile | 2 ++
drivers/edac/amd8111_edac.c | 4 ++--
drivers/edac/amd8131_edac.c | 2 +-
3 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/drivers/edac/Makefile b/drivers/edac/Makefile
index a5fdcf0..5907681 100644
--- a/drivers/edac/Makefile
+++ b/drivers/edac/Makefile
@@ -35,3 +35,5 @@ obj-$(CONFIG_EDAC_MPC85XX) += mpc85xx_edac.o
obj-$(CONFIG_EDAC_MV64X60) += mv64x60_edac.o
obj-$(CONFIG_EDAC_CELL) += cell_edac.o
obj-$(CONFIG_EDAC_PPC4XX) += ppc4xx_edac.o
+obj-$(CONFIG_EDAC_AMD8111) += amd8111_edac.o
+obj-$(CONFIG_EDAC_AMD8131) += amd8131_edac.o
diff --git a/drivers/edac/amd8111_edac.c b/drivers/edac/amd8111_edac.c
index 6146921..2cb58ef 100644
--- a/drivers/edac/amd8111_edac.c
+++ b/drivers/edac/amd8111_edac.c
@@ -389,7 +389,7 @@ static int amd8111_dev_probe(struct pci_dev *dev,
dev_info->edac_dev->dev = &dev_info->dev->dev;
dev_info->edac_dev->mod_name = AMD8111_EDAC_MOD_STR;
dev_info->edac_dev->ctl_name = dev_info->ctl_name;
- dev_info->edac_dev->dev_name = dev_info->dev->dev.bus_id;
+ dev_info->edac_dev->dev_name = dev_name(&dev_info->dev->dev);
if (edac_op_state == EDAC_OPSTATE_POLL)
dev_info->edac_dev->edac_check = dev_info->check;
@@ -473,7 +473,7 @@ static int amd8111_pci_probe(struct pci_dev *dev,
pci_info->edac_dev->dev = &pci_info->dev->dev;
pci_info->edac_dev->mod_name = AMD8111_EDAC_MOD_STR;
pci_info->edac_dev->ctl_name = pci_info->ctl_name;
- pci_info->edac_dev->dev_name = pci_info->dev->dev.bus_id;
+ pci_info->edac_dev->dev_name = dev_name(&pci_info->dev->dev);
if (edac_op_state == EDAC_OPSTATE_POLL)
pci_info->edac_dev->edac_check = pci_info->check;
diff --git a/drivers/edac/amd8131_edac.c b/drivers/edac/amd8131_edac.c
index c083b31..b432d60 100644
--- a/drivers/edac/amd8131_edac.c
+++ b/drivers/edac/amd8131_edac.c
@@ -287,7 +287,7 @@ static int amd8131_probe(struct pci_dev *dev, const struct pci_device_id *id)
dev_info->edac_dev->dev = &dev_info->dev->dev;
dev_info->edac_dev->mod_name = AMD8131_EDAC_MOD_STR;
dev_info->edac_dev->ctl_name = dev_info->ctl_name;
- dev_info->edac_dev->dev_name = dev_info->dev->dev.bus_id;
+ dev_info->edac_dev->dev_name = dev_name(&dev_info->dev->dev);
if (edac_op_state == EDAC_OPSTATE_POLL)
dev_info->edac_dev->edac_check = amd8131_chipset.check;
--
1.5.6.2
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [v0 PATCH 1/1] Use dev_name() for AMD8111/AMD8131 EDAC driver
2009-05-07 1:47 ` [v0 PATCH 1/1] Use dev_name() for AMD8111/AMD8131 EDAC driver Harry Ciao
@ 2009-05-07 21:57 ` Andrew Morton
2009-05-11 2:47 ` Harry Ciao
0 siblings, 1 reply; 5+ messages in thread
From: Andrew Morton @ 2009-05-07 21:57 UTC (permalink / raw)
To: Harry Ciao; +Cc: norsk5, bluesmoke-devel, linux-kernel
On Thu, 7 May 2009 09:47:38 +0800
Harry Ciao <qingtao.cao@windriver.com> wrote:
> The device structure no longer has bus_id member, dev_name() should
> be used for AMD8111 & AMD8131 EDAC driver instead. Also, their Makefile
> entries are lost, add them.
>
> Signed-off-by: Harry Ciao <qingtao.cao@windriver.com>
> ---
> drivers/edac/Makefile | 2 ++
> drivers/edac/amd8111_edac.c | 4 ++--
> drivers/edac/amd8131_edac.c | 2 +-
> 3 files changed, 5 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/edac/Makefile b/drivers/edac/Makefile
> index a5fdcf0..5907681 100644
> --- a/drivers/edac/Makefile
> +++ b/drivers/edac/Makefile
> @@ -35,3 +35,5 @@ obj-$(CONFIG_EDAC_MPC85XX) += mpc85xx_edac.o
> obj-$(CONFIG_EDAC_MV64X60) += mv64x60_edac.o
> obj-$(CONFIG_EDAC_CELL) += cell_edac.o
> obj-$(CONFIG_EDAC_PPC4XX) += ppc4xx_edac.o
> +obj-$(CONFIG_EDAC_AMD8111) += amd8111_edac.o
> +obj-$(CONFIG_EDAC_AMD8131) += amd8131_edac.o
hm, I wonder how that happened.
The drivers break x86-64 allmodconfig:
drivers/edac/amd8111_edac.c: In function 'amd8111_lpc_bridge_init':
drivers/edac/amd8111_edac.c:260: error: implicit declaration of function '__do_inb'
drivers/edac/amd8111_edac.c:274: error: implicit declaration of function '__do_outb'
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [v0 PATCH 1/1] Use dev_name() for AMD8111/AMD8131 EDAC driver
2009-05-07 21:57 ` Andrew Morton
@ 2009-05-11 2:47 ` Harry Ciao
2009-05-11 3:57 ` Stephen Rothwell
0 siblings, 1 reply; 5+ messages in thread
From: Harry Ciao @ 2009-05-11 2:47 UTC (permalink / raw)
To: Andrew Morton; +Cc: norsk5, bluesmoke-devel, linux-kernel
Andrew Morton wrote:
> On Thu, 7 May 2009 09:47:38 +0800
> Harry Ciao <qingtao.cao@windriver.com> wrote:
>
>
>> The device structure no longer has bus_id member, dev_name() should
>> be used for AMD8111 & AMD8131 EDAC driver instead. Also, their Makefile
>> entries are lost, add them.
>>
>> Signed-off-by: Harry Ciao <qingtao.cao@windriver.com>
>> ---
>> drivers/edac/Makefile | 2 ++
>> drivers/edac/amd8111_edac.c | 4 ++--
>> drivers/edac/amd8131_edac.c | 2 +-
>> 3 files changed, 5 insertions(+), 3 deletions(-)
>>
>> diff --git a/drivers/edac/Makefile b/drivers/edac/Makefile
>> index a5fdcf0..5907681 100644
>> --- a/drivers/edac/Makefile
>> +++ b/drivers/edac/Makefile
>> @@ -35,3 +35,5 @@ obj-$(CONFIG_EDAC_MPC85XX) += mpc85xx_edac.o
>> obj-$(CONFIG_EDAC_MV64X60) += mv64x60_edac.o
>> obj-$(CONFIG_EDAC_CELL) += cell_edac.o
>> obj-$(CONFIG_EDAC_PPC4XX) += ppc4xx_edac.o
>> +obj-$(CONFIG_EDAC_AMD8111) += amd8111_edac.o
>> +obj-$(CONFIG_EDAC_AMD8131) += amd8131_edac.o
>>
>
> hm, I wonder how that happened.
>
> The drivers break x86-64 allmodconfig:
>
> drivers/edac/amd8111_edac.c: In function 'amd8111_lpc_bridge_init':
> drivers/edac/amd8111_edac.c:260: error: implicit declaration of function '__do_inb'
> drivers/edac/amd8111_edac.c:274: error: implicit declaration of function '__do_outb'
>
>
>
Ah, this is because __do_inb so far only supported on PPC arch:
cao@cao-desktop:/work/community/linux-2.6/arch$ grep __do_inb * -r
powerpc/include/asm/io.h:#define __do_inb(port) _rec_inb(port)
powerpc/include/asm/io.h:#define __do_inb(port)
readb((PCI_IO_ADDR)_IO_BASE + port);
cao@cao-desktop:/work/community/linux-2.6/arch$
So far the only machine that hosts AMD8111 chip is Maple, however,
AMD8111 is of Hypertransport device and not necessarily depends on Maple
nor PPC, so its Kconfig option is only depended on EDAC && EDAC_MC_EDAC
&& PCI.
I think I could put some words into its Kconfig help section that
AMD8111 should be selected on Maple now.
What do you think? thanks!
Best regards,
Harry
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [v0 PATCH 1/1] Use dev_name() for AMD8111/AMD8131 EDAC driver
2009-05-11 2:47 ` Harry Ciao
@ 2009-05-11 3:57 ` Stephen Rothwell
0 siblings, 0 replies; 5+ messages in thread
From: Stephen Rothwell @ 2009-05-11 3:57 UTC (permalink / raw)
To: qingtao.cao; +Cc: Andrew Morton, norsk5, bluesmoke-devel, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 1519 bytes --]
Hi Harry,
On Mon, 11 May 2009 10:47:45 +0800 Harry Ciao <qingtao.cao@windriver.com> wrote:
>
> Andrew Morton wrote:
> >
> > The drivers break x86-64 allmodconfig:
> >
> > drivers/edac/amd8111_edac.c: In function 'amd8111_lpc_bridge_init':
> > drivers/edac/amd8111_edac.c:260: error: implicit declaration of function '__do_inb'
> > drivers/edac/amd8111_edac.c:274: error: implicit declaration of function '__do_outb'
>
> Ah, this is because __do_inb so far only supported on PPC arch:
>
> cao@cao-desktop:/work/community/linux-2.6/arch$ grep __do_inb * -r
> powerpc/include/asm/io.h:#define __do_inb(port) _rec_inb(port)
> powerpc/include/asm/io.h:#define __do_inb(port)
> readb((PCI_IO_ADDR)_IO_BASE + port);
> cao@cao-desktop:/work/community/linux-2.6/arch$
>
> So far the only machine that hosts AMD8111 chip is Maple, however,
> AMD8111 is of Hypertransport device and not necessarily depends on Maple
> nor PPC, so its Kconfig option is only depended on EDAC && EDAC_MC_EDAC
> && PCI.
>
> I think I could put some words into its Kconfig help section that
> AMD8111 should be selected on Maple now.
>
> What do you think? thanks!
You need to make them depend on CONFIG_PPC (or use a different i/o
interface) since the automated builds will enable them for
all{mod,yes}config builds. Some explanation of the dependency is, of
course, appropriate.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2009-05-11 3:57 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-05-07 1:47 [v0 PATCH 0/1] EDAC: Use dev_name() for AMD8111/AMD8131 drivers Harry Ciao
2009-05-07 1:47 ` [v0 PATCH 1/1] Use dev_name() for AMD8111/AMD8131 EDAC driver Harry Ciao
2009-05-07 21:57 ` Andrew Morton
2009-05-11 2:47 ` Harry Ciao
2009-05-11 3:57 ` Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox