From: Shawn Lin Date: Wed, 4 Jan 2017 07:36:00 +0000 (+0800) Subject: NVMe: tage the disk with flag of is_rk_disk X-Git-Tag: firefly_0821_release~830 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=b90df318ef0078bf4d77778b8fa235cdd1197848;p=firefly-linux-kernel-4.4.55.git NVMe: tage the disk with flag of is_rk_disk For rockchip platform, we may need to support NVMe bootup, so we need to add this flag so that the rk partition layout could be able to find the correct partition from parameter. Change-Id: I3e0213df893bd137fa6d5fd0a0120cabeb6259e8 Signed-off-by: Shawn Lin --- diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c index 8bb2c666eb4c..37c5461050d0 100644 --- a/drivers/nvme/host/pci.c +++ b/drivers/nvme/host/pci.c @@ -2290,6 +2290,11 @@ static void nvme_alloc_ns(struct nvme_dev *dev, unsigned nsid) disk->queue = ns->queue; disk->driverfs_dev = dev->device; disk->flags = GENHD_FL_EXT_DEVT; +#ifdef CONFIG_ARCH_ROCKCHIP + disk->is_rk_disk = true; +#else + disk->is_rk_disk = false; +#endif sprintf(disk->disk_name, "nvme%dn%d", dev->instance, nsid); /*