Page MenuHomeFreeBSD
Differential D6196

Initial bhnd(4) SPROM/NVRAM support.
ClosedPublic
Actions

Authored by landon_landonf.org on May 3 2016, 7:19 PM.
Tags
None
Referenced Files
F83609682: D6196.diff
Sun, May 12, 3:52 PM
Unknown Object (File)
Thu, May 2, 9:17 PM
Unknown Object (File)
Thu, May 2, 9:17 PM
Unknown Object (File)
Thu, May 2, 9:17 PM
Unknown Object (File)
Thu, May 2, 9:17 PM
Unknown Object (File)
Thu, May 2, 8:02 PM
Unknown Object (File)
Thu, May 2, 7:59 PM
Unknown Object (File)
Thu, May 2, 6:39 PM
View All 73 Files
Subscribers
emaste
imp

Details

Reviewers
mizhka
adrian
Commits
rS299241: [bhnd] Initial bhnd(4) SPROM/NVRAM support.
Summary

This adds support for the NVRAM handling and the basic SPROM
hardware used on siba(4) and bcma(4) devices, including:

  • SPROM directly attached to the PCI core, accessible via PCI configuration space.
  • SPROM attached to later ChipCommon cores.
  • SPROM variables vended from the parent SoC bus (e.g. via a directly-attached flash device).

Additional improvements to the NVRAM/SPROM interface will
be required, but this changeset stands alone as working
checkpoint.

Depends on D6195

Test Plan

Load if_bwn_pci and look for a valid Broadcom MAC address:

bwn0: got macaddr 8c:2d:aa:36:5f:07

Diff Detail

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

Event Timeline

landon_landonf.org updated this revision to Diff 15870.May 3 2016, 7:19 PM
landon_landonf.org retitled this revision from to Initial bhnd(4) SPROM/NVRAM support..
landon_landonf.org updated this object.
landon_landonf.org edited the test plan for this revision. (Show Details)
landon_landonf.org added a reviewer: adrian.
landon_landonf.org added a parent revision: D6195: Add support for matching on chip identifiers..
Herald added a subscriber: imp. · View Herald TranscriptMay 3 2016, 7:19 PM
landon_landonf.org updated this revision to Diff 15871.May 3 2016, 7:20 PM

Minor spelling fix.

landon_landonf.org updated this revision to Diff 15959.May 6 2016, 12:26 AM

Optimize NVRAM table lookup, rebase against master.

  • Fix generation of struct variable records.
  • Implement a stable sorting guarantee for the generated NVRAM table.
  • Use the variable table order guarantee to implement binary search for variable definitions.
landon_landonf.org added a reviewer: mizhka.May 6 2016, 9:23 PM
landon_landonf.org added a comment.May 6 2016, 9:29 PM

mizkha: when you get a chance, can you eyeball this for any issues on the SoC side?

mizhka added inline comments.May 7 2016, 5:56 AM
sys/dev/bhnd/cores/chipc/chipc.c
196–199

I think if sprom is unsupported, it shouldn't cause fail of chipc attach call.

sys/dev/bhnd/nvram/nvram_subr.c
49–55

CRC8 polinom is duplicated few times in kernel. May be to add generic support?

mizhka requested changes to this revision.May 7 2016, 5:56 AM
mizhka edited edge metadata.
This revision now requires changes to proceed.May 7 2016, 5:56 AM
landon_landonf.org updated this revision to Diff 16024.May 7 2016, 7:36 PM
landon_landonf.org edited edge metadata.
  • Add support for generating a set of #defines for all bhnd(4) NVRAM variable keys.
  • Allow ChipCommon to attach when OTP or NFLASH SPROM sources are identified.
  • Rename the bhnd_nvram_* variable functions (modeled on the OF_prop* API).
  • When generating nvram map headers, truncate any existing output file.
  • Add an explicit fallback cases for unmatched enums.
  • Re-integrate module dependency that went missing in a merge.
landon_landonf.org added inline comments.May 7 2016, 7:40 PM
sys/dev/bhnd/cores/chipc/chipc.c
196–199

Makes sense; the unhandled sources will now just print a message, rather than breaking attach.

sys/dev/bhnd/nvram/nvram_subr.c
49–55

I think the only other code using these same crc8 parameters is in the siba code we're replacing.

mizhka accepted this revision.May 7 2016, 9:40 PM
mizhka edited edge metadata.
This revision is now accepted and ready to land.May 7 2016, 9:40 PM
Closed by commit rS299241: [bhnd] Initial bhnd(4) SPROM/NVRAM support. (authored by adrian). · Explain WhyMay 8 2016, 7:14 PM
This revision was automatically updated to reflect the committed changes.
emaste added a subscriber: emaste.May 9 2016, 4:34 PM
/scratch/tmp/emaste/freebsd/sys/modules/bhnd/bhndb_pci/../../../dev/bhnd/bhndb/bhndb_pci.c:170:52: error: format specifies type 'size_t' (aka 'unsigned int') but the argument has type 'bus_size_t' (aka 'unsigned long') [-Werror,-Wformat]
                        device_printf(dev, "found SPROM (%zu bytes)\n", nv_sz);
                                                         ~~~            ^~~~~
                                                         %lu
/scratch/tmp/emaste/freebsd/sys/modules/bhnd/bhndb_pci/../../../dev/bhnd/bhndb/bhndb_pci.c:237:1: error: conflicting types for 'bhndb_pci_sprom_size'
bhndb_pci_sprom_size(struct bhndb_pci_softc *sc)
^
/scratch/tmp/emaste/freebsd/sys/modules/bhnd/bhndb_pci/../../../dev/bhnd/bhndb/bhndb_pci.c:76:16: note: previous declaration is here
static size_t           bhndb_pci_sprom_size(struct bhndb_pci_softc *sc);
                        ^
2 errors generated.
adrian edited edge metadata.May 9 2016, 4:57 PM

Fixing it now

-a

Revision Contents
Changeset List

PathSize
sys/
conf/
8 lines
dev/
bhnd/
49 lines
51 lines
6 lines
3 lines
bhndb/
53 lines
183 lines
210 lines
18 lines
1 line
cores/
chipc/
310 lines
38 lines
76 lines
nvram/
41 lines
38 lines
572 lines
1445 lines
121 lines
128 lines
nvram/
bhndb/
bhnd_spromreg.h
bhndb_pcivar.h
47 lines
bhnd_spromvar.h
bhndb_pcivar.h
44 lines
tools/
980 lines
bwn/
6 lines
modules/
bhnd/
14 lines
bhndb/
4 lines
bhndb_pci/
4 lines
cores/
bhnd_chipc/
6 lines
nvram/

Diff 15870

View Options

sys/conf/files

Loading...
View Options

sys/dev/bhnd/bcmsrom_fmt.h

Loading...
View Options

sys/dev/bhnd/bcmsrom_tbl.h

Loading...
View Options

sys/dev/bhnd/bhnd.h

Loading...
View Options

sys/dev/bhnd/bhnd.c

Loading...
View Options

sys/dev/bhnd/bhnd_bus_if.m

Loading...
View Options

sys/dev/bhnd/bhnd_ids.h

Loading...
View Options

sys/dev/bhnd/bhndb/bhndb.c

Loading...
View Options

sys/dev/bhnd/bhndb/bhndb_pci.c

Loading...
View Options

sys/dev/bhnd/bhndb/bhndb_pci_sprom.c

Loading...
View Options

sys/dev/bhnd/bhndb/bhndb_pcireg.h

Loading...
View Options

sys/dev/bhnd/bhndb/bhndb_pcivar.h

Loading...
View Options

sys/dev/bhnd/cores/chipc/chipc.c

Loading...
View Options

sys/dev/bhnd/cores/chipc/chipcreg.h

Loading...
View Options

sys/dev/bhnd/cores/chipc/chipcvar.h

Loading...
View Options

sys/dev/bhnd/nvram/bhnd_nvram.h

Loading...
View Options

sys/dev/bhnd/nvram/bhnd_nvram_if.m

Loading...
View Options

sys/dev/bhnd/nvram/bhnd_sprom.c

Loading...
View Options

sys/dev/bhnd/nvram/bhnd_spromreg.h

Loading...
View Options

sys/dev/bhnd/nvram/bhnd_spromvar.h

Loading...
View Options

sys/dev/bhnd/nvram/nvram_map

Loading...
View Options

sys/dev/bhnd/nvram/nvram_subr.c

Loading...
View Options

sys/dev/bhnd/nvram/nvramvar.h

Loading...
View Options

sys/dev/bhnd/tools/bus_macro.sh

Loading...
View Options

sys/dev/bhnd/tools/nvram_map_gen.awk

Loading...
View Options

sys/dev/bwn/bwn_mac.c

Loading...
View Options

sys/modules/bhnd/Makefile

Loading...
View Options

sys/modules/bhnd/bhndb/Makefile

Loading...
View Options

sys/modules/bhnd/bhndb_pci/Makefile

Loading...
View Options

sys/modules/bhnd/cores/bhnd_chipc/Makefile

Loading...
View Options

sys/modules/bhnd/nvram/Makefile

Loading...