Page MenuHomeFreeBSD
Differential D5059

Convert the A20 and A10 to plaform.
ClosedPublic
Actions

Authored by manu_bidouilliste.com on Jan 24 2016, 9:37 PM.
Tags
Referenced Files
Unknown Object (File)
Mon, May 25, 8:39 AM
Unknown Object (File)
Sun, May 24, 4:35 PM
Unknown Object (File)
Sun, May 24, 2:43 PM
Unknown Object (File)
Wed, May 20, 9:36 PM
Unknown Object (File)
Wed, May 20, 10:38 AM
Unknown Object (File)
Mon, May 11, 4:38 PM
Unknown Object (File)
Mon, May 11, 7:10 AM
Unknown Object (File)
Mon, May 11, 1:00 AM
View All Files
Subscribers
andrew
imp
Contributor Reviews (src)

Details

Reviewers
andrew
Commits
rS294698: Update the Allwinner kernels:
Summary

Add allwinner_soc_type and allwinner_soc_family function that return the current SoC type and family based on what the attach machdep function set.

Add include files that contain all the Allwinner Soc type and family defines.

Use ARM_INTRNG and generic_timer for A20 SoC a10-timer is now only used on a10 SoC.

Test Plan

Apply patch and compile kernel for A20 or one of the A10 based platform (CUBIEBOARD for example).

Diff Detail

Repository
rS FreeBSD src repository - subversion
Lint
Lint Passed
Unit
No Test Coverage
Build Status
Buildable 2248
Build 2257: arc lint + arc unit

Event Timeline

manu_bidouilliste.com updated this revision to Diff 12656.Jan 24 2016, 9:37 PM
manu_bidouilliste.com retitled this revision from to Convert the A20 and A10 to plaform..
manu_bidouilliste.com updated this object.
manu_bidouilliste.com edited the test plan for this revision. (Show Details)
Herald added subscribers: Contributor Reviews (src), andrew, imp. · View Herald TranscriptJan 24 2016, 9:37 PM
manu_bidouilliste.com added a project: ARM.Jan 24 2016, 9:38 PM
andrew added inline comments.Jan 24 2016, 10:09 PM
sys/arm/allwinner/allwinner_machdep.c
141–142
u_int
allwinner_soc_type(void)
{
sys/arm/allwinner/allwinner_machdep.h
5

Is this correct?

30

Should be

#ifndef _ALLWINNER_MACHDEP_H_
#define<tab>_ALLWINNER_MACHDEP_H_
30–31

All .c files should have included this before including this file

sys/arm/allwinner/timer.c
152–153 ↗(On Diff #12656)

Have you hit this? We would expect the devicetree to be correct for the hardware.

manu_bidouilliste.com marked 2 inline comments as done.Jan 24 2016, 10:20 PM

Add answer to inline comments

sys/arm/allwinner/allwinner_machdep.h
5

Yes this is the original licence from a10_machdep.c

sys/arm/allwinner/timer.c
152–153 ↗(On Diff #12656)

Yes, upstream a20 DTS also have the sun4i-a10-timer node

manu_bidouilliste.com updated this revision to Diff 12657.Jan 24 2016, 10:21 PM
manu_bidouilliste.com marked 2 inline comments as done.

Fix style(9).
Sorry wrong cherry-pick ...

manu_bidouilliste.com marked 3 inline comments as done.Jan 24 2016, 10:52 PM
manu_bidouilliste.com marked 2 inline comments as done.
andrew added inline comments.Jan 24 2016, 10:58 PM
sys/arm/allwinner/allwinner_machdep.h
5

I don't see anything in this file that would require us to keep this notice, it looks like you've written everything other than the standard license.

sys/arm/allwinner/timer.c
152–153 ↗(On Diff #12657)

Ok, move this change to the update fdt review as it's also includes a compatibility string change.

manu_bidouilliste.com updated this revision to Diff 12659.Jan 24 2016, 11:23 PM

Remove fdt compatible prop change.

manu_bidouilliste.com marked an inline comment as done.Jan 24 2016, 11:24 PM
andrew added inline comments.Jan 24 2016, 11:34 PM
sys/arm/conf/A20
62

I think this also depends on the dts change. If so move it to that change & move timer.c back to files.allwinner

manu_bidouilliste.com added inline comments.Jan 24 2016, 11:36 PM
sys/arm/conf/A20
62

And what about gic and ARM_INTRNG ?
Should I also move them to the fdt change ? Or do another review that handle timer and gic ?

andrew added inline comments.Jan 24 2016, 11:50 PM
sys/arm/conf/A20
62

If generic_timer relies on a change in the dts move it to the fdt change.

What gic change do you mean? The only related changes I see are to enable ARM_INTRNG. I don't see how this would be an issue.

manu_bidouilliste.com added inline comments.Jan 24 2016, 11:54 PM
sys/arm/conf/A20
62

Yes you're right, I thought gic wasn't include in the original A20 file ... it's been a while.
For generic_timer is doesn't make sense right now are the our custom dts doesn't include the node.

manu_bidouilliste.com updated this revision to Diff 12664.Jan 24 2016, 11:55 PM

Remove generic_timer for now as our custom DTS doesn't include the node.

manu_bidouilliste.com updated this revision to Diff 12665.Jan 25 2016, 12:03 AM

Move timer.c to files.allwinner since A20 is still using it.

andrew accepted this revision.Jan 25 2016, 12:24 AM
andrew added a reviewer: andrew.
This revision is now accepted and ready to land.Jan 25 2016, 12:24 AM
Closed by commit rS294698: Update the Allwinner kernels: (authored by andrew). · Explain WhyJan 25 2016, 12:25 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathSize
sys/
arm/
allwinner/
4 lines
55 lines
allwinner_machdep.c
a10_machdep.c
69 lines
1 line
3 lines
conf/
6 lines
1 line

Diff 12659

View Options

sys/arm/allwinner/a10_common.c

Loading...
View Options

sys/arm/allwinner/a10_machdep.c

Loading...
View Options

sys/arm/allwinner/allwinner_machdep.h

Loading...
View Options

sys/arm/allwinner/allwinner_machdep.c

Loading...
View Options

sys/arm/allwinner/files.a10

Loading...
View Options

sys/arm/allwinner/files.allwinner

Loading...
View Options

sys/arm/conf/A20

Loading...
View Options

sys/arm/conf/CUBIEBOARD

Loading...