25a26
>  * Copyright 2020 Oxide Computer Company
485c486,487
< 	const char *vendor, *brand;
---
> 	const char *vendor;
> 	char *brand, *socket;
552,553c554,555
< 		 * Attempt to lookup the processor brand string in kstats.
< 		 * and add it as a prop, if found.
---
> 		 * Attempt to lookup the processor brand and socket string in
> 		 * kstats and add it as a prop, if found.
555c557,558
< 		brand = get_chip_brand(mod, kc, chipid);
---
> 		brand = socket = NULL;
> 		get_chip_kstat_strs(mod, kc, chipid, &brand, &socket);
561c564
< 		topo_mod_strfree(mod, (char *)brand);
---
> 		topo_mod_strfree(mod, brand);
562a566,572
> 		if (socket != NULL && topo_prop_set_string(chip, PGNAME(CHIP),
> 		    CHIP_SOCKET, TOPO_PROP_IMMUTABLE, socket, &perr) != 0) {
> 			whinge(mod, &nerr, "failed to set prop %s/%s",
> 			    PGNAME(CHIP), CHIP_SOCKET);
> 		}
> 		topo_mod_strfree(mod, socket);
>