* Re: [PATCH] Fix tas_suspend/resume build warning
From: Takashi Iwai @ 2007-07-23 10:11 UTC (permalink / raw)
To: Johannes Berg; +Cc: Stephen Rothwell, alsa-devel, Andrew Morton, linuxppc-dev
In-Reply-To: <1185038966.868.5.camel@johannes.berg>
At Sat, 21 Jul 2007 19:29:26 +0200,
Johannes Berg wrote:
>
> On Sun, 2007-07-22 at 00:29 +1000, Stephen Rothwell wrote:
> > sound/aoa/codecs/snd-aoa-codec-tas.c:750: warning: 'tas_suspend' defined but not used
> > sound/aoa/codecs/snd-aoa-codec-tas.c:760: warning: 'tas_resume' defined but not used
>
> Heh. I daresay I never compiled a kernel without PM. Not sure why you'd
> want to, but still good to have it fixed. Thanks.
>
>
> [full copy below for Takashi, I suppose it'll go through his tree]
Thanks, I applied it to ALSA tree now.
Takashi
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Subject: Fix tas_suspend/resume build warning
>
> sound/aoa/codecs/snd-aoa-codec-tas.c:750: warning: 'tas_suspend' defined but not used
> sound/aoa/codecs/snd-aoa-codec-tas.c:760: warning: 'tas_resume' defined but not used
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> Acked-by: Johannes Berg <johannes@sipsolutions.net>
> ---
> sound/aoa/codecs/snd-aoa-codec-tas.c | 9 +++++----
> 1 files changed, 5 insertions(+), 4 deletions(-)
>
> --
> Cheers,
> Stephen Rothwell sfr@canb.auug.org.au
>
> diff --git a/sound/aoa/codecs/snd-aoa-codec-tas.c b/sound/aoa/codecs/snd-aoa-codec-tas.c
> index 2f771f5..3cbfe46 100644
> --- a/sound/aoa/codecs/snd-aoa-codec-tas.c
> +++ b/sound/aoa/codecs/snd-aoa-codec-tas.c
> @@ -743,6 +743,7 @@ static int tas_switch_clock(struct codec_info_item *cii, enum clock_switch clock
> return 0;
> }
>
> +#ifdef CONFIG_PM
> /* we are controlled via i2c and assume that is always up
> * If that wasn't the case, we'd have to suspend once
> * our i2c device is suspended, and then take note of that! */
> @@ -768,7 +769,6 @@ static int tas_resume(struct tas *tas)
> return 0;
> }
>
> -#ifdef CONFIG_PM
> static int _tas_suspend(struct codec_info_item *cii, pm_message_t state)
> {
> return tas_suspend(cii->codec_data);
> @@ -778,7 +778,10 @@ static int _tas_resume(struct codec_info_item *cii)
> {
> return tas_resume(cii->codec_data);
> }
> -#endif
> +#else /* CONFIG_PM */
> +#define _tas_suspend NULL
> +#define _tas_resume NULL
> +#endif /* CONFIG_PM */
>
> static struct codec_info tas_codec_info = {
> .transfers = tas_transfers,
> @@ -791,10 +794,8 @@ static struct codec_info tas_codec_info = {
> .owner = THIS_MODULE,
> .usable = tas_usable,
> .switch_clock = tas_switch_clock,
> -#ifdef CONFIG_PM
> .suspend = _tas_suspend,
> .resume = _tas_resume,
> -#endif
> };
>
> static int tas_init_codec(struct aoa_codec *codec)
>
>
^ permalink raw reply
* Re: [PATCH 5/6 v2] 85xxCDS: Misc 8548 PCI Corrections.
From: Zang Roy-r61911 @ 2007-07-23 10:04 UTC (permalink / raw)
To: Randy Vinson; +Cc: linuxppc-dev list
In-Reply-To: <46A137C1.3080105@mvista.com>
On Sat, 2007-07-21 at 06:31, Randy Vinson wrote:
> @@ -272,10 +272,10 @@ static void __init mpc85xx_cds_setup_arch(void)
> for (np = NULL; (np = of_find_node_by_type(np, "pci")) !=
> NULL;) {
> struct resource rsrc;
> of_address_to_resource(np, 0, &rsrc);
> - if ((rsrc.start & 0xfffff) == 0x9000)
> - fsl_add_bridge(np, 0);
> - else
> + if ((rsrc.start & 0xfffff) == 0x8000)
> fsl_add_bridge(np, 1);
> + else
> + fsl_add_bridge(np, 0);
Why this is needed?
For pcie@a000, fsl_add_bridge(np, 0)?
Roy
^ permalink raw reply
* Re: [PATCH 2/2] fix showing xmon help
From: Milton Miller @ 2007-07-23 6:49 UTC (permalink / raw)
To: Ishizaki Kou; +Cc: linuxppc-dev, paulus
In-Reply-To: <20070720.171509.-1300522247.kouish@swc.toshiba.co.jp>
On Jul 20, 2007, at 3:15 AM, Ishizaki Kou wrote:
> Milton Miller <miltonm@bga.com> wrote:
>> On Jul 18, 2007, at 11:12 AM, Andreas Schwab wrote:
>>
>>> Milton Miller <miltonm@bga.com> writes:
>>>
>>>>> case '?':
>>>>> - printf(help_string);
>>>>> + xmon_puts(help_string);
>>>>> break;
>>>>>
>>>>
>>>> nonstdio.h #defines printf to xmon_printf. Please add a similar
>>>> line
>>>> for puts, and use the define here. (It will avoid an unnecessary
>>>> difference with the user space version).
>>>
>>> User space puts add a newline, which this xmon_puts doesn't.
>>>
>>> Andreas.
>>
>> Good point. This should be xmon_fputs #defined to fputs.
>>
>> milton
>
> Should we change like below?
>
> define fputs:
> #define fputs(str,stream) xmon_fputs(str) /* stream is ignored. */
>
> show the help string:
> fputs(help_string, stdout);
>
Sounds good to me. It's consistent with using printf.
milton
^ permalink raw reply
* Re: [PATCH] Update kuroboxH[GD].dts with i2c rtc entries, cleanup
From: David Gibson @ 2007-07-23 5:30 UTC (permalink / raw)
To: Guennadi Liakhovetski; +Cc: linuxppc-dev, Paul Mackerras
In-Reply-To: <Pine.LNX.4.60.0707230727210.3786@poirot.grange>
On Mon, Jul 23, 2007 at 07:28:12AM +0200, Guennadi Liakhovetski wrote:
> On Mon, 23 Jul 2007, David Gibson wrote:
>
> > On Sun, Jul 22, 2007 at 12:43:11AM +0200, Guennadi Liakhovetski wrote:
> > [snip]
> > > @@ -64,11 +62,19 @@ build with: "dtc -f -I dts -O dtb -o kuroboxHD.dtb -V 16 kuroboxHD.dts"
> > > fef00000 fef00000 00100000>; /* pci iack */
> > >
> > > i2c@80003000 {
> > > + #address-cells = <1>;
> > > + #size-cells = <0>;
> > > device_type = "i2c";
> > > compatible = "fsl-i2c";
> > > reg = <80003000 1000>;
> > > interrupts = <5 2>;
> > > interrupt-parent = <&mpic>;
> > > +
> > > + rtc@32 {
> > > + device_type = "rtc";
> > > + compatible = "ricoh,rs5c372b";
> > > + reg = <32>;
> >
> > Ok, just making sure that rtc at 0x32 (decimal 50) is correct, rather
> > than at decimal 32.
>
> Yes, it is. I even tested it:-)
Ok, just making sure, since it's an easy mistake to make.
--
David Gibson | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
^ permalink raw reply
* Re: [PATCH] Update kuroboxH[GD].dts with i2c rtc entries, cleanup
From: Guennadi Liakhovetski @ 2007-07-23 5:28 UTC (permalink / raw)
To: David Gibson; +Cc: linuxppc-dev, Paul Mackerras
In-Reply-To: <20070723012602.GA3272@localhost.localdomain>
On Mon, 23 Jul 2007, David Gibson wrote:
> On Sun, Jul 22, 2007 at 12:43:11AM +0200, Guennadi Liakhovetski wrote:
> [snip]
> > @@ -64,11 +62,19 @@ build with: "dtc -f -I dts -O dtb -o kuroboxHD.dtb -V 16 kuroboxHD.dts"
> > fef00000 fef00000 00100000>; /* pci iack */
> >
> > i2c@80003000 {
> > + #address-cells = <1>;
> > + #size-cells = <0>;
> > device_type = "i2c";
> > compatible = "fsl-i2c";
> > reg = <80003000 1000>;
> > interrupts = <5 2>;
> > interrupt-parent = <&mpic>;
> > +
> > + rtc@32 {
> > + device_type = "rtc";
> > + compatible = "ricoh,rs5c372b";
> > + reg = <32>;
>
> Ok, just making sure that rtc at 0x32 (decimal 50) is correct, rather
> than at decimal 32.
Yes, it is. I even tested it:-)
Thanks
Guennadi
---
Guennadi Liakhovetski
^ permalink raw reply
* Re: Kmalloc returns which address
From: Misbah khan @ 2007-07-23 3:47 UTC (permalink / raw)
To: linuxppc-embedded
In-Reply-To: <469B92DC.50609@freescale.com>
hi Scott
yes really it would really generate a machine check... but i guess if you
convert this virt address to physical address using __pa() then pass it to
the ioremap() i guess things will work .
Please correct me if i am wrong
regard
misbah
Scott Wood-2 wrote:
>
> suresh suresh wrote:
>> I want know the address return by kmalloc function? is it physical
>> address
>> or kernel virtual address.
>
> Kernel virtual.
>
>> For Tx and Rx, hardware uses buffers, so I have to allocate buffers and
>> pass
>> the pointer to hardware. Can I pass the pointer returned kmalloc? or I
>> should convert it into physical address?
>
> You need to convert it; read Documentation/DMA-mapping.txt.
>
> -Scott
> _______________________________________________
> Linuxppc-embedded mailing list
> Linuxppc-embedded@ozlabs.org
> https://ozlabs.org/mailman/listinfo/linuxppc-embedded
>
>
--
View this message in context: http://www.nabble.com/Kmalloc-returns-which-address-tf4086826.html#a11737504
Sent from the linuxppc-embedded mailing list archive at Nabble.com.
^ permalink raw reply
* Re: Problem faced while using workqueue in the character driver.
From: Misbah khan @ 2007-07-23 3:35 UTC (permalink / raw)
To: linuxppc-embedded
In-Reply-To: <46A0EE6B.3000904@ovro.caltech.edu>
hi David
Thanks for your reply I really appreciate it from the heart.
The problem is solved now ,Actually I was using a kernel timer in open call
(to run for the first time which ever application would open it and deleting
the timer for the last exit ) to simulate for an Interrupt in the same
driver. There i did mistake in the implimentation in the logic and as a
consiquence of which it was crashing the system and not because of the
workqueue.
thanks
misbah
David Hawkins-3 wrote:
>
> Hi Misbah,
>
>> I am working on a character driver for FPGA, in which i am using a
>> blocked
>> read call on workqueue. The read call will be unblocked by the Interrupt
>> from the Fpga to PPC Cpu.
>>
>> The problem is that if the process is in blocked mode and then an
>> Interrupt
>> occurs the system gives kernel Panic where as it get unblocked and start
>> reading the data but very soon it gets crashed.
>>
>> Please send me your suggessins regarding the mentioned problem.
>
> Er, without seeing the code, its a bit difficult to suggest
> anything.
>
> Perhaps you are using work-queues incorrectly?
>
> Take a look at:
>
> simple_work_queue.c
>
> In the tar-ball
>
> http://www.ovro.caltech.edu/~dwh/correlator/software/driver_design.tar.gz
>
> Which is described in:
>
> http://www.ovro.caltech.edu/~dwh/correlator/pdf/LNX-723-Hawkins.pdf
>
> There's also a more complex 'COBRA driver' here:
>
> http://www.ovro.caltech.edu/~dwh/correlator/cobra_docs.html
>
> Having an example of a working driver that uses work-queues
> might help you.
>
> Dave
> _______________________________________________
> Linuxppc-embedded mailing list
> Linuxppc-embedded@ozlabs.org
> https://ozlabs.org/mailman/listinfo/linuxppc-embedded
>
>
--
View this message in context: http://www.nabble.com/Problem-faced-while-using-workqueue-in-the-character-driver.-tf4116327.html#a11737447
Sent from the linuxppc-embedded mailing list archive at Nabble.com.
^ permalink raw reply
* [PATCH] ehea: silence some warnings
From: Stephen Rothwell @ 2007-07-23 2:01 UTC (permalink / raw)
To: Thomas Klein, Jan-Bernd Themann; +Cc: ppc-dev
drivers/net/ehea/ehea_main.c: In function 'write_swqe2_TSO':
drivers/net/ehea/ehea_main.c:1335: warning: passing argument 1 of 'ehea_map_vaddr' makes pointer from integer without a cast
drivers/net/ehea/ehea_main.c: In function 'write_swqe2_nonTSO':
drivers/net/ehea/ehea_main.c:1366: warning: passing argument 1 of 'ehea_map_vaddr' makes pointer from integer without a cast
drivers/net/ehea/ehea_main.c: In function 'write_swqe2_data':
drivers/net/ehea/ehea_main.c:1405: warning: passing argument 1 of 'ehea_map_vaddr' makes pointer from integer without a cast
drivers/net/ehea/ehea_main.c:1420: warning: passing argument 1 of 'ehea_map_vaddr' makes pointer from integer without a cast
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
drivers/net/ehea/ehea_main.c | 20 ++++++++------------
1 files changed, 8 insertions(+), 12 deletions(-)
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --git a/drivers/net/ehea/ehea_main.c b/drivers/net/ehea/ehea_main.c
index 4c70a93..8adcd6f 100644
--- a/drivers/net/ehea/ehea_main.c
+++ b/drivers/net/ehea/ehea_main.c
@@ -1309,7 +1309,6 @@ static void write_swqe2_TSO(struct sk_buff *skb,
u8 *imm_data = &swqe->u.immdata_desc.immediate_data[0];
int skb_data_size = skb->len - skb->data_len;
int headersize;
- u64 tmp_addr;
/* Packet is TCP with TSO enabled */
swqe->tx_control |= EHEA_SWQE_TSO;
@@ -1331,8 +1330,8 @@ static void write_swqe2_TSO(struct sk_buff *skb,
sg1entry->l_key = lkey;
sg1entry->len = skb_data_size - headersize;
- tmp_addr = (u64)(skb->data + headersize);
- sg1entry->vaddr = ehea_map_vaddr(tmp_addr);
+ sg1entry->vaddr =
+ ehea_map_vaddr(skb->data + headersize);
swqe->descriptors++;
}
} else
@@ -1345,7 +1344,6 @@ static void write_swqe2_nonTSO(struct sk_buff *skb,
int skb_data_size = skb->len - skb->data_len;
u8 *imm_data = &swqe->u.immdata_desc.immediate_data[0];
struct ehea_vsgentry *sg1entry = &swqe->u.immdata_desc.sg_entry;
- u64 tmp_addr;
/* Packet is any nonTSO type
*
@@ -1362,8 +1360,8 @@ static void write_swqe2_nonTSO(struct sk_buff *skb,
/* copy sg1entry data */
sg1entry->l_key = lkey;
sg1entry->len = skb_data_size - SWQE2_MAX_IMM;
- tmp_addr = (u64)(skb->data + SWQE2_MAX_IMM);
- sg1entry->vaddr = ehea_map_vaddr(tmp_addr);
+ sg1entry->vaddr =
+ ehea_map_vaddr(skb->data + SWQE2_MAX_IMM);
swqe->descriptors++;
}
} else {
@@ -1378,7 +1376,6 @@ static inline void write_swqe2_data(struct sk_buff *skb, struct net_device *dev,
struct ehea_vsgentry *sg_list, *sg1entry, *sgentry;
skb_frag_t *frag;
int nfrags, sg1entry_contains_frag_data, i;
- u64 tmp_addr;
nfrags = skb_shinfo(skb)->nr_frags;
sg1entry = &swqe->u.immdata_desc.sg_entry;
@@ -1400,9 +1397,9 @@ static inline void write_swqe2_data(struct sk_buff *skb, struct net_device *dev,
/* copy sg1entry data */
sg1entry->l_key = lkey;
sg1entry->len = frag->size;
- tmp_addr = (u64)(page_address(frag->page)
+ sg1entry->vaddr =
+ ehea_map_vaddr(page_address(frag->page)
+ frag->page_offset);
- sg1entry->vaddr = ehea_map_vaddr(tmp_addr);
swqe->descriptors++;
sg1entry_contains_frag_data = 1;
}
@@ -1415,9 +1412,8 @@ static inline void write_swqe2_data(struct sk_buff *skb, struct net_device *dev,
sgentry->l_key = lkey;
sgentry->len = frag->size;
- tmp_addr = (u64)(page_address(frag->page)
- + frag->page_offset);
- sgentry->vaddr = ehea_map_vaddr(tmp_addr);
+ sgentry->vaddr = ehea_map_vaddr(page_address(frag->page)
+ + frag->page_offset);
swqe->descriptors++;
}
}
--
1.5.2.3
^ permalink raw reply related
* [PATCH] [POWERPC] iSeries: we need vio_enable_interrupts
From: Stephen Rothwell @ 2007-07-23 1:55 UTC (permalink / raw)
To: paulus; +Cc: Brian King, ppc-dev
Commit 3d0e91f7ace12499c4b00088e9a6b1361e1bb0ca introduced a requirement
for vio_enable_interrupts which iSeires has never needed. So create a
dummy one.
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
include/asm-powerpc/vio.h | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
Paul, this is a fix for a 2.6.23 regression. I should do a better fix
for 2.6.24. Built for iseries_defconfig, ppc64_defconfig and
allmodconfig.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --git a/include/asm-powerpc/vio.h b/include/asm-powerpc/vio.h
index 0117b54..3a0975e 100644
--- a/include/asm-powerpc/vio.h
+++ b/include/asm-powerpc/vio.h
@@ -80,6 +80,11 @@ extern const void *vio_get_attribute(struct vio_dev *vdev, char *which,
extern struct vio_dev *vio_find_node(struct device_node *vnode);
extern int vio_enable_interrupts(struct vio_dev *dev);
extern int vio_disable_interrupts(struct vio_dev *dev);
+#else
+static inline int vio_enable_interrupts(struct vio_dev *dev)
+{
+ return 0;
+}
#endif
static inline struct vio_driver *to_vio_driver(struct device_driver *drv)
--
1.5.2.3
^ permalink raw reply related
* Re: Someone broke my allmodconfig build
From: David Gibson @ 2007-07-23 1:43 UTC (permalink / raw)
To: Josh Boyer; +Cc: Stephen Rothwell, Paul Mackerras, ppc-dev
In-Reply-To: <20070722020412.GQ3925@crusty.rchland.ibm.com>
On Sat, Jul 21, 2007 at 09:04:13PM -0500, Josh Boyer wrote:
> On Sun, Jul 22, 2007 at 10:37:06AM +1000, Paul Mackerras wrote:
> > Stephen Rothwell writes:
> >
> > > WRAP arch/powerpc/boot/zImage.ps3
> > > /home/sfr/kernels/linus/arch/powerpc/boot/wrapper: line 113: dtc: command not found
> > > make[2]: *** [arch/powerpc/boot/zImage.ps3] Error 1
> >
> > Hmmm, we should be shipping .dtb files with the tree, so people don't
> > have to have dtc installed.
>
> Really? I don't think we're quite ready for that. Particularly for the
> embedded boards. Those DTS files still get lots of churn, and having to
> update both the .dts and .dtb at the same time seems a bit fragile.
I sort of prefer this option in theory, but it's basically
impossible. People updating dts files by patch would also have to
update the dtb, which can't be done in a normal patch, since they're
binary.
I'm working with sfr now on importing dtc into the kernel tree.
--
David Gibson | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
^ permalink raw reply
* Re: [PATCH] Update kuroboxH[GD].dts with i2c rtc entries, cleanup
From: David Gibson @ 2007-07-23 1:26 UTC (permalink / raw)
To: Guennadi Liakhovetski; +Cc: linuxppc-dev, Paul Mackerras
In-Reply-To: <Pine.LNX.4.60.0707220028370.13322@poirot.grange>
On Sun, Jul 22, 2007 at 12:43:11AM +0200, Guennadi Liakhovetski wrote:
> Let's fix rtc on linkstation ppc machines again, plus .dts cleanup as
> suggested by Segher Boessenkool.
>
> Thanks
> Guennadi
> ---
> Guennadi Liakhovetski
>
> Device tree update: add rtc nodes on i2c, remove bogus 0-size cache-line
> declarations, rename interrupt-controller nodes, remove erroneous
> interrupt-parent line, accidentally introduced by a recent patch.
>
> Signed-off-by: G. Liakhovetski <g.liakhovetski@gmx.de>
>
[snip]
> @@ -64,11 +62,19 @@ build with: "dtc -f -I dts -O dtb -o kuroboxHD.dtb -V 16 kuroboxHD.dts"
> fef00000 fef00000 00100000>; /* pci iack */
>
> i2c@80003000 {
> + #address-cells = <1>;
> + #size-cells = <0>;
> device_type = "i2c";
> compatible = "fsl-i2c";
> reg = <80003000 1000>;
> interrupts = <5 2>;
> interrupt-parent = <&mpic>;
> +
> + rtc@32 {
> + device_type = "rtc";
> + compatible = "ricoh,rs5c372b";
> + reg = <32>;
Ok, just making sure that rtc at 0x32 (decimal 50) is correct, rather
than at decimal 32.
--
David Gibson | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
^ permalink raw reply
* Re: [patch 02/14] Rename 4xx paths to 40x
From: David Gibson @ 2007-07-18 3:26 UTC (permalink / raw)
To: Josh Boyer; +Cc: linuxppc-dev
In-Reply-To: <20070717182620.683036000@linux.vnet.ibm.com>
On Tue, Jul 17, 2007 at 01:15:49PM -0500, Josh Boyer wrote:
> 4xx is a bit of a misnomer for certain things, as they really apply to PowerPC
> 40x only. Rename some of the files to clean this up.
>
> Signed-off-by: Josh Boyer <jwboyer@linux.vnet.ibm.com>
Looks good
Acked-by: David Gibson <david@gibson.dropbear.id.au>
--
David Gibson | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
^ permalink raw reply
* Re: [RFC][PATCH 6/8] Walnut DTS
From: David Gibson @ 2007-07-18 1:02 UTC (permalink / raw)
To: Josh Boyer; +Cc: linuxppc-dev
In-Reply-To: <1184176531.32199.81.camel@weaponx.rchland.ibm.com>
On Wed, Jul 11, 2007 at 12:55:31PM -0500, Josh Boyer wrote:
> On Wed, 2007-07-11 at 19:49 +0200, Segher Boessenkool wrote:
> > > + UIC0: interrupt-controller0 {
> >
> > Why not just "interrupt-controller"?
>
> Copy/paste error from Ebony DTS, which has multiple UICs. Will fix.
>
> >
> > > + #address-cells = <0>;
> > > + #size-cells = <0>;
> >
> > No need for these.
>
> Ok.
>
> > >
> > > + plb {
> > > + ranges;
> >
> > Please make the valid address ranges explicit here.
>
> Meaning what exactly? I thought just specifying "ranges;" simply said
> "the addresses from this node don't have any translation from the parent
> node" (or something like that).
>
> >
> > > + SDRAM0: memory-controller {
> > > + compatible = "ibm,sdram-405gp", "ibm,sdram-440gp";
> >
> > It's a bit weird to mention 440 here, since 405 is older.
> > Not a real problem, but if you still can change all relevant
> > OS code and device trees, I'd swap it around (make 440 trees
> > include the 405 "compatible" value). Can you still do that
> > or is there a too big installed base already?
>
> The installed base for 440 exists of exactly 1 completely non-functional
> board ;). I can change it.
And I don't think we even actually look at this compatible property in
practice.
--
David Gibson | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
^ permalink raw reply
* Re: [patch 05/14] 40x MMU
From: David Gibson @ 2007-07-18 3:38 UTC (permalink / raw)
To: Josh Boyer; +Cc: linuxppc-dev
In-Reply-To: <20070717182621.437685000@linux.vnet.ibm.com>
On Tue, Jul 17, 2007 at 01:15:52PM -0500, Josh Boyer wrote:
> Add MMU definitions for 40x platforms. Also fixes two warnings in 40x_mmu.c.
>
> Signed-off-by: Josh Boyer <jwboyer@linux.vnet.ibm.com>
>
> ---
> arch/powerpc/mm/40x_mmu.c | 4 +-
> include/asm-powerpc/mmu-40x.h | 65 ++++++++++++++++++++++++++++++++++++++++++
> include/asm-powerpc/mmu.h | 3 +
> 3 files changed, 70 insertions(+), 2 deletions(-)
>
> --- /dev/null
> +++ linux-2.6/include/asm-powerpc/mmu-40x.h
> @@ -0,0 +1,65 @@
> +#ifndef _ASM_POWERPC_MMU_40X_H_
> +#define _ASM_POWERPC_MMU_40X_H_
> +
> +/*
> + * PPC40x support
> + */
> +
> +#define PPC4XX_TLB_SIZE 64
This should probably be 40X, like other things.
> +
> +/*
> + * TLB entries are defined by a "high" tag portion and a "low" data
> + * portion. On all architectures, the data portion is 32-bits.
> + *
> + * TLB entries are managed entirely under software control by reading,
> + * writing, and searchoing using the 4xx-specific tlbre, tlbwr, and tlbsx
> + * instructions.
> + */
> +
> +#define TLB_LO 1
> +#define TLB_HI 0
> +
> +#define TLB_DATA TLB_LO
> +#define TLB_TAG TLB_HI
> +
> +/* Tag portion */
> +
> +#define TLB_EPN_MASK 0xFFFFFC00 /* Effective Page Number */
> +#define TLB_PAGESZ_MASK 0x00000380
> +#define TLB_PAGESZ(x) (((x) & 0x7) << 7)
> +#define PAGESZ_1K 0
> +#define PAGESZ_4K 1
> +#define PAGESZ_16K 2
> +#define PAGESZ_64K 3
> +#define PAGESZ_256K 4
> +#define PAGESZ_1M 5
> +#define PAGESZ_4M 6
> +#define PAGESZ_16M 7
> +#define TLB_VALID 0x00000040 /* Entry is valid */
> +
> +/* Data portion */
> +
> +#define TLB_RPN_MASK 0xFFFFFC00 /* Real Page Number */
> +#define TLB_PERM_MASK 0x00000300
> +#define TLB_EX 0x00000200 /* Instruction execution allowed */
> +#define TLB_WR 0x00000100 /* Writes permitted */
> +#define TLB_ZSEL_MASK 0x000000F0
> +#define TLB_ZSEL(x) (((x) & 0xF) << 4)
> +#define TLB_ATTR_MASK 0x0000000F
> +#define TLB_W 0x00000008 /* Caching is write-through */
> +#define TLB_I 0x00000004 /* Caching is inhibited */
> +#define TLB_M 0x00000002 /* Memory is coherent */
> +#define TLB_G 0x00000001 /* Memory is guarded from prefetch */
> +
> +#ifndef __ASSEMBLY__
> +
> +typedef unsigned long phys_addr_t;
> +
> +typedef struct {
> + unsigned long id;
> + unsigned long vdso_base;
> +} mm_context_t;
> +
> +#endif /* !__ASSEMBLY__ */
> +
> +#endif /* _ASM_POWERPC_MMU_40X_H_ */
> --- linux-2.6.orig/include/asm-powerpc/mmu.h
> +++ linux-2.6/include/asm-powerpc/mmu.h
> @@ -8,6 +8,9 @@
> #elif defined(CONFIG_PPC_STD_MMU)
> /* 32-bit classic hash table MMU */
> # include <asm/mmu-hash32.h>
> +#elif defined(CONFIG_40x)
> +/* 40x-style software loaded TLB */
> +# include <asm/mmu-40x.h>
> #elif defined(CONFIG_44x)
> /* 44x-style software loaded TLB */
> # include <asm/mmu-44x.h>
> --- linux-2.6.orig/arch/powerpc/mm/40x_mmu.c
> +++ linux-2.6/arch/powerpc/mm/40x_mmu.c
> @@ -108,7 +108,7 @@ unsigned long __init mmu_mapin_ram(void)
> pmd_t *pmdp;
> unsigned long val = p | _PMD_SIZE_16M | _PAGE_HWEXEC | _PAGE_HWWRITE;
>
> - pmdp = pmd_offset(pgd_offset_k(v), v);
> + pmdp = pmd_offset(pud_offset(pgd_offset_k(v), v), v);
> pmd_val(*pmdp++) = val;
> pmd_val(*pmdp++) = val;
> pmd_val(*pmdp++) = val;
> @@ -123,7 +123,7 @@ unsigned long __init mmu_mapin_ram(void)
> pmd_t *pmdp;
> unsigned long val = p | _PMD_SIZE_4M | _PAGE_HWEXEC | _PAGE_HWWRITE;
>
> - pmdp = pmd_offset(pgd_offset_k(v), v);
> + pmdp = pmd_offset(pud_offset(pgd_offset_k(v), v), v);
> pmd_val(*pmdp) = val;
>
> v += LARGE_PAGE_SIZE_4M;
>
--
David Gibson | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
^ permalink raw reply
* Please pull powerpc.git merge branch
From: Paul Mackerras @ 2007-07-22 12:56 UTC (permalink / raw)
To: torvalds; +Cc: linuxppc-dev
Linus,
Please do
git pull \
git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git merge
to get a further powerpc update for 2.6.23.
Thanks,
Paul.
arch/powerpc/configs/prpmc2800_defconfig | 2 +-
arch/powerpc/kernel/pci-common.c | 2 +-
arch/powerpc/kernel/prom.c | 2 +-
arch/powerpc/kernel/smp.c | 7 +++++-
arch/powerpc/mm/fault.c | 8 ++++++-
arch/powerpc/mm/hash_utils_64.c | 4 ++--
arch/powerpc/platforms/Kconfig.cputype | 2 +-
arch/powerpc/platforms/embedded6xx/Kconfig | 2 +-
arch/powerpc/platforms/pseries/firmware.c | 19 +++--------------
arch/powerpc/platforms/pseries/pseries.h | 2 +-
arch/powerpc/platforms/pseries/setup.c | 17 ++++++++++-----
arch/powerpc/sysdev/mpic.c | 32 ++++++++++++++++++++++++++++
arch/powerpc/xmon/nonstdio.c | 5 ++++
arch/powerpc/xmon/nonstdio.h | 3 ++-
arch/powerpc/xmon/start.c | 2 +-
arch/powerpc/xmon/xmon.c | 2 +-
arch/ppc/syslib/mv64x60.c | 15 +++++++------
drivers/char/hvc_iseries.c | 8 ++++---
drivers/char/hvc_rtas.c | 2 +-
drivers/char/hvcs.c | 8 ++++---
drivers/macintosh/rack-meter.c | 1 -
drivers/pcmcia/m8xx_pcmcia.c | 2 +-
include/asm-powerpc/mpic.h | 3 +++
include/asm-powerpc/prom.h | 2 +-
include/asm-ppc/system.h | 1 +
include/linux/of_platform.h | 4 ++--
26 files changed, 101 insertions(+), 56 deletions(-)
Avi Kivity (1):
[POWERPC] Allow smp_call_function_single() to current cpu
Benjamin Herrenschmidt (1):
[POWERPC] MPIC protected sources
Christoph Hellwig (1):
[POWERPC] mv64x60: Use mutex instead of semaphore
Geert Uytterhoeven (1):
[POWERPC] cell: CONFIG_SPE_BASE is a typo
Ishizaki Kou (2):
[POWERPC] Make xmon_write accept a const buffer
[POWERPC] fix showing xmon help
Jesper Juhl (1):
[POWERPC] Clean up duplicate includes in drivers/macintosh/
Josh Boyer (1):
[POWERPC] Fix ARCH=ppc builds
Michael Neuling (1):
[POWERPC] Fix future firmware feature fixups function failure
Paul Mackerras (1):
[POWERPC] Allow exec faults on readable areas on classic 32-bit PowerPC
Robert P. J. Day (1):
[POWERPC] Fix misspelled "CONFIG_CHECK_CACHE_COHERENCY" Kconfig option.
Segher Boessenkool (1):
[POWERPC] of_detach_node()'s device node argument cannot be const
Stephen Rothwell (6):
[POWERPC] Constify of_platform_driver name
[POWERPC] hvcs: Make some things static and const
[POWERPC] Constify of_platform_driver match_table
[POWERPC] Quiet section mismatch in hvc_rtas.c
[POWERPC] init and exit markings for hvc_iseries
[POWERPC] Quiet section mismatch warning on pcibios_setup
^ permalink raw reply
* Re: [patch 1/3] m68k/mac: Make mac_hid_mouse_emulate_buttons() declaration visible
From: Geert Uytterhoeven @ 2007-07-22 12:51 UTC (permalink / raw)
To: Dmitry Torokhov
Cc: linux-m68k, linux-kernel, Adrian Bunk, linuxppc-dev, linux-input,
Andrew Morton
In-Reply-To: <200707220022.41797.dtor@insightbb.com>
On Sun, 22 Jul 2007, Dmitry Torokhov wrote:
> On Saturday 21 July 2007 04:27, Geert Uytterhoeven wrote:
> > On Fri, 20 Jul 2007, Dmitry Torokhov wrote:
> > > I am OK with adding a new header file. I was just saying that placing
> > > that declaration in linux/hid.h makes about the same sense as putting
> > > it into linux/scsi.h
> >
> > At first I just wanted to move it. Then I thought about the angry
> > comments I would get about not moving it to a header file ;-)
> >
> > <linux/hid.h> looked like the best candidate. <linux/kbd_kern.h> is
> > another option.
> >
>
> linux/kbd_kern.h sounds much better.
And so it will be.
---
m68k/mac: Make mac_hid_mouse_emulate_buttons() declaration visible
drivers/char/keyboard.c: In function 'kbd_keycode':
drivers/char/keyboard.c:1142: error: implicit declaration of function 'mac_hid_mouse_emulate_buttons'
The forward declaration of mac_hid_mouse_emulate_buttons() is not visible on
m68k because it's hidden in the middle of a big #ifdef block.
Move it to <linux/kbd_kern.h>, correct the type of the second parameter, and
include <linux/kbd_kern.h> where needed.
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
---
drivers/char/keyboard.c | 4 ----
drivers/macintosh/mac_hid.c | 1 +
include/linux/kbd_kern.h | 3 +++
3 files changed, 4 insertions(+), 4 deletions(-)
--- a/drivers/char/keyboard.c
+++ b/drivers/char/keyboard.c
@@ -1022,10 +1022,6 @@ static const unsigned short x86_keycodes
308,310,313,314,315,317,318,319,320,357,322,323,324,325,276,330,
332,340,365,342,343,344,345,346,356,270,341,368,369,370,371,372 };
-#ifdef CONFIG_MAC_EMUMOUSEBTN
-extern int mac_hid_mouse_emulate_buttons(int, int, int);
-#endif /* CONFIG_MAC_EMUMOUSEBTN */
-
#ifdef CONFIG_SPARC
static int sparc_l1_a_state = 0;
extern void sun_do_break(void);
--- a/drivers/macintosh/mac_hid.c
+++ b/drivers/macintosh/mac_hid.c
@@ -13,6 +13,7 @@
#include <linux/sysctl.h>
#include <linux/input.h>
#include <linux/module.h>
+#include <linux/kbd_kern.h>
static struct input_dev *emumousebtn;
--- a/include/linux/kbd_kern.h
+++ b/include/linux/kbd_kern.h
@@ -161,4 +161,7 @@ static inline void con_schedule_flip(str
schedule_delayed_work(&t->buf.work, 0);
}
+/* mac_hid.c */
+extern int mac_hid_mouse_emulate_buttons(int, unsigned int, int);
+
#endif
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
^ permalink raw reply
* ask some questions about u-boot's bootm command
From: poorbeyond @ 2007-07-22 7:39 UTC (permalink / raw)
To: Linux-ppc mail list
[-- Attachment #1: Type: text/plain, Size: 1467 bytes --]
my cpu is 860T, using bootm command boot a linux kernel image, the following message print by smc1:
bootm 300000
## Booting image at 00300000 ...
Image Name: Linux-2.6.20.14
Image Type: PowerPC Linux Kernel Image (gzip compressed)
Data Size: 1081591 Bytes = 1 MB
Load Address: 00100000
Entry Point: 00100000
Verifying Checksum ... OK
Uncompressing Kernel Image ... OK
## Current stack ends at 0x01D5DB10 => set upper limit to 0x00800000
No initrd
## Transferring control to Linux (at address 00100000) ...
then, the program has no response.
i debug it througth BDM, in u-boot function "do_bootm_linux", execute at "kernel = (void (*)(bd_t *, ulong, ulong, ulong, ulong))hdr->ih_ep", the program branch to address "0x00000000", the code is shown as following:
00000000 mr r31,r3
00000004 mr r30,r4
00000008 mr r29,r5
0000000C mr r28,r6
00000010 mr r27,r7
00000014 bl 0x000020C8
00000018 mfmsr r0
0000001C ori r0,r0,0x30
00000020 mtspr SRR1,r0
00000024 lis r0,0xC0002004@h
00000028 ori r0,r0,0xC0002004@l
0000002C mtspr SRR0,r0
00000030 rfi
my questions are:
1. Is the code "kernel = (void (*)(bd_t *, ulong, ulong, ulong, ulong))hdr->ih_ep" branch right?
2. What's the expected code after "kernel = (void (*)(bd_t *, ulong, ulong, ulong, ulong))hdr->ih_ep"?
3. When the kernel run to the "boot/simple/head.s"?
thanks a lot
poorbeyond
2007-07-22
[-- Attachment #2: Type: text/html, Size: 3790 bytes --]
^ permalink raw reply
* Re: [PATCH] ppc64 mismerge
From: Jeremy Kerr @ 2007-07-22 7:14 UTC (permalink / raw)
To: Al Viro; +Cc: linuxppc-dev, Linus Torvalds, linux-kernel
In-Reply-To: <20070722071035.GS21668@ftp.linux.org.uk>
> Mismerge in
> commit 8b6f50ef1d5cc86b278eb42bc91630fad455fb10
> Author: Jeremy Kerr <jk@ozlabs.org>
> Date: Sat Jul 21 04:37:51 2007 -0700
> spufs: make signal-notification files readonly for NOSCHED
> contexts
>
> structs got duplicated.
>
> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Yep, the original patch can be applied more than once without fuzz :/
Acked-by: Jeremy Kerr <jk@ozlabs.org>
Jeremy
^ permalink raw reply
* [PATCH] ppc64 mismerge
From: Al Viro @ 2007-07-22 7:10 UTC (permalink / raw)
To: Linus Torvalds; +Cc: linuxppc-dev, jk, linux-kernel
Mismerge in
commit 8b6f50ef1d5cc86b278eb42bc91630fad455fb10
Author: Jeremy Kerr <jk@ozlabs.org>
Date: Sat Jul 21 04:37:51 2007 -0700
spufs: make signal-notification files readonly for NOSCHED contexts
structs got duplicated.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
---
diff --git a/arch/powerpc/platforms/cell/spufs/file.c b/arch/powerpc/platforms/cell/spufs/file.c
index c2aaec5..4100ddc 100644
--- a/arch/powerpc/platforms/cell/spufs/file.c
+++ b/arch/powerpc/platforms/cell/spufs/file.c
@@ -941,13 +941,6 @@ static const struct file_operations spufs_signal1_nosched_fops = {
.mmap = spufs_signal1_mmap,
};
-static const struct file_operations spufs_signal1_nosched_fops = {
- .open = spufs_signal1_open,
- .release = spufs_signal1_release,
- .write = spufs_signal1_write,
- .mmap = spufs_signal1_mmap,
-};
-
static int spufs_signal2_open(struct inode *inode, struct file *file)
{
struct spufs_inode_info *i = SPUFS_I(inode);
@@ -1083,13 +1076,6 @@ static const struct file_operations spufs_signal2_nosched_fops = {
.mmap = spufs_signal2_mmap,
};
-static const struct file_operations spufs_signal2_nosched_fops = {
- .open = spufs_signal2_open,
- .release = spufs_signal2_release,
- .write = spufs_signal2_write,
- .mmap = spufs_signal2_mmap,
-};
-
static void spufs_signal1_type_set(void *data, u64 val)
{
struct spu_context *ctx = data;
^ permalink raw reply related
* Re: [patch 1/3] m68k/mac: Make mac_hid_mouse_emulate_buttons() declaration visible
From: Dmitry Torokhov @ 2007-07-22 4:22 UTC (permalink / raw)
To: Geert Uytterhoeven
Cc: linux-m68k, linux-kernel, Adrian Bunk, linuxppc-dev, linux-input,
Andrew Morton
In-Reply-To: <Pine.LNX.4.64.0707211026070.18493@anakin>
Hi Geert,
On Saturday 21 July 2007 04:27, Geert Uytterhoeven wrote:
> On Fri, 20 Jul 2007, Dmitry Torokhov wrote:
> >
> > I am OK with adding a new header file. I was just saying that placing
> > that declaration in linux/hid.h makes about the same sense as putting
> > it into linux/scsi.h
>
> At first I just wanted to move it. Then I thought about the angry
> comments I would get about not moving it to a header file ;-)
>
> <linux/hid.h> looked like the best candidate. <linux/kbd_kern.h> is
> another option.
>
linux/kbd_kern.h sounds much better.
--
Dmitry
^ permalink raw reply
* Re: [RFC 1/1] lro: Generic Large Receive Offload for TCP traffic
From: David Miller @ 2007-07-22 2:29 UTC (permalink / raw)
To: ossthema
Cc: tklein, themann, netdev, linux-kernel, linuxppc-dev, raisch,
meder, stefan.roscher
In-Reply-To: <200707201741.49290.ossthema@de.ibm.com>
From: Jan-Bernd Themann <ossthema@de.ibm.com>
Date: Fri, 20 Jul 2007 17:41:48 +0200
> Generic LRO patch
>
> Signed-off-by: Jan-Bernd Themann <themann@de.ibm.com>
I have no general objections to this patch.
However I'd like to see at least one or two uses of these APIs before
we put it in, and it sounds as if we have at least two pending and
in the works if not ready already, so that shouldn't be an issue.
Thanks.
^ permalink raw reply
* Re: [PATCH] constify of_platform_driver match_table
From: David Miller @ 2007-07-22 2:10 UTC (permalink / raw)
To: sfr; +Cc: linux-kernel, wli, linuxppc-dev, paulus, sparclinux, akpm
In-Reply-To: <20070722002701.77622474.sfr@canb.auug.org.au>
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Sun, 22 Jul 2007 00:27:01 +1000
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
> include/linux/of_platform.h | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> Built for PowerPC allmodconfig and ppc64_defconfig and Sparc and Sparc64
> defconfig.
Acked-by: David S. Miller <davem@davemloft.net>
^ permalink raw reply
* Re: [PATCH] constify of_platform_driver name
From: David Miller @ 2007-07-22 2:10 UTC (permalink / raw)
To: sfr; +Cc: linux-kernel, wli, linuxppc-dev, paulus, sparclinux, akpm
In-Reply-To: <20070722002303.df29f666.sfr@canb.auug.org.au>
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Sun, 22 Jul 2007 00:23:03 +1000
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
> drivers/pcmcia/m8xx_pcmcia.c | 2 +-
> include/linux/of_platform.h | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> Built for PowerPC allmodconfig and ppc64_defconfig, and for Sparc and
> Sparc64 defconfig.
Acked-by: David S. Miller <davem@davemloft.net>
^ permalink raw reply
* Re: [PATCH] Don't compile the PMU power driver on 64-bit PowerPC
From: Stephen Rothwell @ 2007-07-22 1:55 UTC (permalink / raw)
To: Paul Mackerras; +Cc: linuxppc-dev, linux-kernel
In-Reply-To: <18082.43262.487474.356610@cargo.ozlabs.ibm.com>
[-- Attachment #1: Type: text/plain, Size: 850 bytes --]
On Sun, 22 Jul 2007 10:46:54 +1000 Paul Mackerras <paulus@samba.org> wrote:
>
> As reported by Stephen Rothwell, an allmodconfig build on 64-bit
> PowerPC reports these errors:
>
> ERROR: "pmu_batteries" [drivers/power/pmu_battery.ko] undefined!
> ERROR: "pmu_battery_count" [drivers/power/pmu_battery.ko] undefined!
> ERROR: "pmu_power_flags" [drivers/power/pmu_battery.ko] undefined!
>
> This fixes the problem by not building pmu_battery.ko on ppc64. There
> are no battery-powered ppc64 machines with an Apple PMU, and we can be
> reasonably confident there never will be.
>
> Signed-off-by: Paul Mackerras <paulus@samba.org>
That fixes it.
Acked-by: Stephen Rothwell <sfr@canb.auug.org.au>
for what its worth :-)
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]
^ permalink raw reply
* Re: Someone broke my allmodconfig build
From: Stephen Rothwell @ 2007-07-22 1:53 UTC (permalink / raw)
To: Paul Mackerras; +Cc: ppc-dev
In-Reply-To: <18082.42674.651685.720737@cargo.ozlabs.ibm.com>
[-- Attachment #1: Type: text/plain, Size: 557 bytes --]
On Sun, 22 Jul 2007 10:37:06 +1000 Paul Mackerras <paulus@samba.org> wrote:
>
> Stephen Rothwell writes:
>
> > WRAP arch/powerpc/boot/zImage.ps3
> > /home/sfr/kernels/linus/arch/powerpc/boot/wrapper: line 113: dtc: command not found
> > make[2]: *** [arch/powerpc/boot/zImage.ps3] Error 1
>
> Hmmm, we should be shipping .dtb files with the tree, so people don't
> have to have dtc installed.
Unless, of course, we ship dtc ...
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox