Differential D6712

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

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

Tags

None

Referenced Files

	Unknown Object (File)
	Jan 3 2025, 6:45 AM

	Unknown Object (File)
	Dec 25 2024, 5:57 PM

	Unknown Object (File)
	Dec 16 2024, 5:40 PM

	Unknown Object (File)
	Dec 7 2024, 1:03 PM

	Unknown Object (File)
	Dec 7 2024, 8:14 AM

	Unknown Object (File)
	Dec 5 2024, 10:10 AM

	Unknown Object (File)
	Nov 14 2024, 3:29 AM

	Unknown Object (File)
	Nov 4 2024, 4:58 AM

View All 92 Files

Subscribers

Details

Reviewers

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 Not Applicable

Unit

Tests Not Applicable

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

head/

sys/

conf/

83 lines

dev/

bhnd/

bcma/

5 lines

117 lines

120 lines

bhnd_nexusvar.h

46 lines

siba/

8 lines

395 lines

6 lines

soc/

51 lines

266 lines

siba/

154 lines

642 lines

430 lines

52 lines

mips/

broadcom/

28 lines

conf/

9 lines

7 lines

7 lines

6 lines

Diff 17315

head/sys/conf/files

Loading...

head/sys/dev/bhnd/bcma/bcma.c

Loading...

head/sys/dev/bhnd/bcma/bcma_nexus.c

Loading...

head/sys/dev/bhnd/bhnd_nexus.c

Loading...

head/sys/dev/bhnd/bhnd_nexusvar.h

Loading...

head/sys/dev/bhnd/siba/siba.c

Loading...

head/sys/dev/bhnd/siba/siba_nexus.c

Loading...

head/sys/dev/bhnd/siba/siba_subr.c

Loading...

head/sys/dev/bhnd/soc/bhnd_soc.h

Loading...

head/sys/dev/bhnd/soc/bhnd_soc.c

Loading...

head/sys/dev/siba/siba_cc.c

Loading...

head/sys/dev/siba/siba_mips.c

Loading...

head/sys/dev/siba/siba_pcib.c

Loading...

head/sys/dev/siba/siba_pcibvar.h

Loading...

head/sys/mips/broadcom/files.broadcom

Loading...

head/sys/mips/conf/BCM

Loading...

head/sys/mips/conf/BCM.hints

Loading...

head/sys/mips/conf/SENTRY5

Loading...

head/sys/mips/conf/SENTRY5.hints

Loading...