Differential D6712

Migrate SENTRY5 to bhnd(4) and unify with BCM
ClosedPublic
Actions

Authored by landonf on Jun 3 2016, 11:00 PM.

Details

Reviewers

adrian

Commits

rS301410: Switch mips/sentry5 to bhnd(4), and unify with mips/broadcom

Summary

Migrates SENTRY5 fully over to bhnd's siba(4), unifying SENTRY5's and BCM's nexus handling.

The previous SENTRY5/siba code required a few changes to get it booting again, but I was able to confirmed that the new bhnd(4) code provides feature parity with the previous implementation.

Issues resolved:

Fixed enumeration of siba(4) per-core address maps, required for discovery of the memory mapped chipc flash region on siba(4) devices (e.g. SENTRY5).
Simplified bhnd kernel configuration (dropped 'bhndbus' option).
Replaced files.broadcom's direct file references with their corresponding kernel options.
Lifted out common bcma/siba nexus support, inheriting from the new generic bhnd_nexus driver.
Dropped now-unused sentry5 siba code.
Re-integrated BCM into the universe build now that it actually compiles.

Depends on D6250

Test Plan

Tested against:

Asus RT-N16 (BCM)
Netgear WGT634U (SENTRY5)
BCM4331 (if_bwn_pci)
BCM4312 (if_bwn_pci)

Non-build breakage confirmed via tinderbox (MAKE_JUST_KERNELS).

Diff Detail

Repository

rS FreeBSD src repository - subversion

Lint

Lint Passed

Unit

No Test Coverage

Build Status

Buildable 4101
Build 4144: arc lint + arc unit

Event Timeline

landonf updated this revision to Diff 17284.Jun 3 2016, 11:00 PM

landonf retitled this revision from to Migrate SENTRY5 to bhnd(4) and unify with BCM.

landonf updated this object.

landonf edited the test plan for this revision. (Show Details)

landonf added a reviewer: adrian.

landonf added a parent revision: D6250: [BHND] ChipCommon: Resource managers, Serial & Parallel Flash support, .

landonf added a subscriber: imp.

Yup, do it!

This revision is now accepted and ready to land.Jun 4 2016, 1:25 AM

Add necessary BCM bcma_nexus delta that went missing in review diff (and thus, prevented bhnd attachment). Caught when testing D6712 diff locally.

This revision now requires review to proceed.Jun 4 2016, 6:27 PM

landonf added a child revision: D6729: [BHND] Support IPX OTP NVRAM/SPROM data source.Jun 4 2016, 6:54 PM

Yup, do it!

This revision is now accepted and ready to land.Jun 4 2016, 7:10 PM

Closed by commit rS301410: Switch mips/sentry5 to bhnd(4), and unify with mips/broadcom (authored by landonf). · Explain WhyJun 4 2016, 7:54 PM

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Path

Size

sys/

conf/

files

82 lines

dev/

bhnd/

bcma/

bcma_nexus.c

116 lines

bhnd_nexus.c

120 lines

	bhnd_nexusvar.h/
	soc/


	bhnd_soc.h

33 lines

siba/

siba.c

8 lines

siba_nexus.c

393 lines

siba_subr.c

6 lines

soc/

siba/

mips/

broadcom/

files.broadcom

28 lines

conf/

8 lines

5 lines

7 lines

6 lines

Commit	Tree	Parents	Author	Summary	Date
a8bf40f6866e	a36d0cf0357b	f150d6c7a11a c8a1ff7b67e5	Landon Fuller	Merge branch 'arcpatch-D6250' into user/landonf/bcmsoc/0001_chipc_bus_integ	Jun 3 2016, 10:31 PM
f150d6c7a11a	a36d0cf0357b	01a48dae85be	Landon Fuller	Update copyright statements (and restore a mizhka's copyright that went missing… (Show More…)	Jun 3 2016, 10:26 PM
01a48dae85be	fe28f1268da7	e22cfdeb8e2a	Landon Fuller	Clean up includes.	Jun 3 2016, 10:23 PM
e22cfdeb8e2a	40d61a3b033b	c1809148ae45	Landon Fuller	Now that SENTRY5 has been migrated to bhnd(4), we can drop the legacy sentry5… (Show More…)	Jun 3 2016, 10:16 PM
c1809148ae45	76dea85d7070	afc815b40234	Landon Fuller	Re-integrate BCM into the universe build now that it actually compiles.	Jun 3 2016, 10:08 PM
afc815b40234	79c7d6b58116	c6d9248a227e	Landon Fuller	Lift out common bcma/siba nexus support, inheriting from a generic bhnd_nexus… (Show More…)	Jun 3 2016, 10:07 PM
c6d9248a227e	010d002ce559	f7fca9d49eb1	Landon Fuller	Replace the bhnd_soc/bhnd_nexus parent/child relationship with a single… (Show More…)	Jun 3 2016, 9:37 PM
f7fca9d49eb1	c410b6a851e7	c357785c23b1 669868d6d67f	Landon Fuller	Merge branch 'user/landonf/sentry5/0002_bhnd_support' into… (Show More…)	Jun 3 2016, 9:18 PM
669868d6d67f	66a25b6b39dd	6f213ff8ad55 18e657ce0985	Landon Fuller	Merge branch 'master' into user/landonf/sentry5/0002_bhnd_support	Jun 3 2016, 9:16 PM
c357785c23b1	b3a31ac43b3c	0931e0677030	Landon Fuller	Switch BCM over to the standard bhnd kernel configuration options.	Jun 3 2016, 7:52 PM
0931e0677030	65d10881c476	5b11b0de52b6	Landon Fuller	Simplify bhnd device configuration, removing the 'bhndbus' configuration option.	Jun 3 2016, 7:50 PM
5b11b0de52b6	100134886fc7	02b5aa04005b 18e657ce0985	Landon Fuller	Merge branch 'master' into user/landonf/bcmsoc/0001_chipc_bus_integ	Jun 3 2016, 12:33 AM
02b5aa04005b	21e34d7c7cb3	7599a00dc309 82d54d6039d4	Landon Fuller	Merge branch 'arcpatch-D6250_1' into user/landonf/bcmsoc/0001_chipc_bus_integ	May 31 2016, 2:26 AM
82d54d6039d4	21e34d7c7cb3	55bd8421a181	Landon Fuller	[BHND] ChipCommon: Resource managers, Serial & Parallel Flash support, (Show More…)	May 31 2016, 2:25 AM
55bd8421a181	0ff61f15d504	ff648c6aa522	Landon Fuller	[BHND] (fix) set of corrections (Show More…)	May 31 2016, 2:25 AM
6f213ff8ad55	dc30f1c62aa1	8fe14f81d327	Landon Fuller	Fix handling of siba(4) admatch address mappings. (Show More…)	May 30 2016, 10:55 PM
7599a00dc309	77de882faf22	454059087340	Landon Fuller	[BHND] (fix) set of corrections (Show More…)	May 30 2016, 8:53 PM
8fe14f81d327	e70abe52d0ee	84bc11e56648	Landon Fuller	Switch SENTRY5 to bhnd(4)	May 30 2016, 2:13 AM