Message ID | 20160728010940.GD3158@phlsvsds.ph.intel.com (mailing list archive) |
---|---|
State | Accepted |
Headers | show |
On Wed, 2016-07-27 at 21:09 -0400, ira.weiny wrote: > Expand the serial number space by using more bits > from the GUID. > > Reviewed-by: Jubin John <jubin.john@intel.com> > Signed-off-by: Dean Luick <dean.luick@intel.com> > Signed-off-by: Ira Weiny <ira.weiny@intel.com> > Thanks, applied.
diff --git a/drivers/infiniband/hw/hfi1/chip.c b/drivers/infiniband/hw/hfi1/chip.c index becc7b11e31e..c93683496614 100644 --- a/drivers/infiniband/hw/hfi1/chip.c +++ b/drivers/infiniband/hw/hfi1/chip.c @@ -14601,8 +14601,14 @@ struct hfi1_devdata *hfi1_init_dd(struct pci_dev *pdev, /* set up LCB access - must be after set_up_interrupts() */ init_lcb_access(dd); + /* + * Serial number is created from the base guid: + * [27:24] = base guid [38:35] + * [23: 0] = base guid [23: 0] + */ snprintf(dd->serial, SERIAL_MAX, "0x%08llx\n", - dd->base_guid & 0xFFFFFF); + (dd->base_guid & 0xFFFFFF) | + ((dd->base_guid >> 11) & 0xF000000)); dd->oui1 = dd->base_guid >> 56 & 0xFF; dd->oui2 = dd->base_guid >> 48 & 0xFF;