diff --git a/arch/arm64/kernel/topology.c b/arch/arm64/kernel/topology.c
index 4c22fe0cd3c686a1f62d08863d056bfccdc4be99..02d3e688d657dc12eb4635711784423b3f801dbf 100644
--- a/arch/arm64/kernel/topology.c
+++ b/arch/arm64/kernel/topology.c
@@ -290,10 +290,10 @@ void store_cpu_topology(unsigned int cpuid)
 	cpuid_topo->core_id    = cpuid;
 	cpuid_topo->package_id = cpu_to_node(cpuid);
 
-	if (!(mpidr & MPIDR_MT_BITMASK) &&
-	    read_cpuid_implementor() == ARM_CPU_IMP_PHYTIUM) {
+	/* Some PHYTIUM FT2000PLUS platform firmware has no PPTT table */
+	if ((read_cpuid_id() & MIDR_CPU_MODEL_MASK) == MIDR_PHYTIUM_FT2000PLUS
+		&& cpu_to_node(cpuid) == NUMA_NO_NODE) {
 		cpuid_topo->thread_id  = 0;
-		cpuid_topo->core_id  = cpuid;
 		cpuid_topo->package_id = 0;
 	}
 
diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c
index 164f4d6350fed6391489fa326f2446c2940c2d4f..886cd6fc4b640dd1319217c982fe671f590f63e0 100644
--- a/drivers/usb/host/xhci-pci.c
+++ b/drivers/usb/host/xhci-pci.c
@@ -310,8 +310,10 @@ static int xhci_pci_setup(struct usb_hcd *hcd)
 #include <asm/cputype.h>
 static void phytium_xhci_pci_workaround(struct pci_dev *dev)
 {
+	u32 midr = read_cpuid_id();
+
 	/* Firmware bug, DMA mask is not reported by the firmware */
-	if (read_cpuid_implementor() == ARM_CPU_IMP_PHYTIUM)
+	if ((midr & MIDR_CPU_MODEL_MASK) == MIDR_PHYTIUM_FT2000PLUS)
 		dma_set_mask(&dev->dev, DMA_BIT_MASK(64));
 }
 #else