Re: [PATCH 0/13] Atari EtherNAT/EtherNEC/NetUSBee support

Michael Schmitz
2013-04-30T22:18:26Z

Hi Geert,

[taking this back to the list ...]

> Before rebasing, you can also use "git cherry -v" to list the commits.
> Git will prepend
> them with "+" if it's new, "-" if it's already present. Note that git
> may guess wrong if the
> commits have changed/cause conflicts.

Thanks, that does help!

> E.g. the next command show me what's in my m68k-queue, and not yet in for-linus
> (the third parameter "v3.9" is there to limit displaying to commits
> not yet in v3.9.
> As "for-linus" is based on v3.9-rc7, it would also list all commits
> between v3.9-rc7 and
> v3.9 if I omit the "v3.9" parameter):
>
> $ git cherry -v for-linus m68k-queue v3.9

Nice trick - I tried git cherry but the output on two branches one merged
and one unmerged was too confusing.

> > That was the 3.9-rc2 version of m68k-queue, after git fetch and git rebase
> > origin/m68k-queue.
>
> OK, that one didn't have the new version yet.

Come to think of it - I am quite sure the branch _should_ have been based on
-rc7 because I updated to that not too long ago.

> > Is this because m68k-queue was rebased in your tree (from 3.9-rc2 to 3.9),
> > perhaps?
> > Anyway, I won't do that in a hurr again :-)
>
> Yes, I rebase m68k-queue on every -rc release.

OK, I'll just have to deal with that. Not sure what my next project will be
- the Amiga SCSI still simmers away on the back burner.

> >> If you want to retry, try to rebase on top of m68k-v3.9 (= version of m68k-queue
> >> on top of v3.9).
> >
> > I'd have to reset to the old HEAD of my m68k-queue working tree before
> > rebasing to m68k-v3.9, correct?
>
> Indeed. But if the differences are small, just cherry-pick your new commits.
> Or manually remove the old ones when using "rebase -i".

Cherry picking sure looks easier...

Another question: Is there a way to find out which physical address maps to
a given ioremapped one?

If I let the USB driver print the physical address, the ioremapped address,
and the result of __pa() on the ioremapped one, I get:

ISP116X probe: data 80000012 virt. 21098012 pa 21098012 , addr 80000016
virt. 21096016 pa 21096016

for the EtherNAT instance, and

ISP116X probe: data 00000340 virt. 2109e340 pa 2109e340 , addr 00000360
virt. 2109c360 pa 2109c360

for the NetUSBee instance. In both cases ioremapped and __pa() are equal.

I had hoped to get the physical address back from __pa() in the first
instance, and check for _pa(reg) > 0x8000000 to differentiate between the
two instances. Not so simple, apparently.

Any idea? Anyone?

Cheers,

Michael