D12737.id34168.diff
No OneTemporary
Actions

Size

835 B

Referenced Files

None

Subscribers

None

D12737.id34168.diff
View Options

	Index: sys/mips/broadcom/bcm_machdep.c
	===================================================================
	--- sys/mips/broadcom/bcm_machdep.c
	+++ sys/mips/broadcom/bcm_machdep.c
	@@ -114,6 +114,9 @@
	extern int *edata;
	extern int *end;

	+/* from sys/mips/mips/machdep.c */
	+extern char cpu_model[];
	+
	static struct bcm_platform bcm_platform_data;
	static bool bcm_platform_data_avail = false;

	@@ -390,6 +393,12 @@
	return (error);
	}

	+ /* All hex formatted IDs are within the range of 0x4000-0x9C3F (40000-1) */
	+ if (bp->cid.chip_id >= 0x4000 && bp->cid.chip_id <= 0x9C3F)
	+ snprintf(cpu_model, 10, "BCM%hX", bp->cid.chip_id);
	+ else
	+ snprintf(cpu_model, 10, "BCM%hu", bp->cid.chip_id);
	+
	/* Fetch chipc capability flags */
	bp->cc_caps = BCM_SOC_READ_4(bp->cc_addr, CHIPC_CAPABILITIES);
	bp->cc_caps_ext = 0x0;