diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
index 8fe9e696ab4d4..5eb3c4d4d0ab2 100644
--- a/drivers/nvme/host/pci.c
+++ b/drivers/nvme/host/pci.c
@@ -2431,9 +2431,9 @@ static int nvme_alloc_host_mem_multi(struct nvme_dev *dev, u64 preferred,
 	i = dev->nr_host_mem_descs = mapped_nents;
 
 	while (--i >= 0) {
-		descs[i].addr = sg_dma_address(&slist[i]);
+		descs[i].addr = cpu_to_le64(sg_dma_address(&slist[i]));
 		WARN_ON_ONCE(sg_dma_len(&slist[i]) & (NVME_CTRL_PAGE_SIZE - 1));
-		descs[i].size = sg_dma_len(&slist[i]) / NVME_CTRL_PAGE_SIZE;
+		descs[i].size = cpu_to_le32(sg_dma_len(&slist[i]) / NVME_CTRL_PAGE_SIZE);
 	}
 
 	dev->host_mem_size = size;
diff --git a/drivers/pci/controller/pcie-brcmstb.c b/drivers/pci/controller/pcie-brcmstb.c
index b182ab75a8fc5..94d15c85ddba1 100644
--- a/drivers/pci/controller/pcie-brcmstb.c
+++ b/drivers/pci/controller/pcie-brcmstb.c
@@ -1575,7 +1575,7 @@ static void brcm_config_clkreq(struct brcm_pcie *pcie)
 {
 	static const char err_msg[] = "invalid 'brcm,clkreq-mode' DT string\n";
 	const char *mode = "default";
-	u32 clkreq_cntl = 0;
+	u32 clkreq_cntl;
 	int ret, tmp;
 
 	ret = of_property_read_string(pcie->np, "brcm,clkreq-mode", &mode);
@@ -1584,6 +1584,10 @@ static void brcm_config_clkreq(struct brcm_pcie *pcie)
 		mode = "safe";
 	}
 
+	/* Start out assuming safe mode (both mode bits cleared) */
+	clkreq_cntl = readl(pcie->base + HARD_DEBUG(pcie));
+	clkreq_cntl &= ~PCIE_CLKREQ_MASK;
+
 	if (strcmp(mode, "no-l1ss") == 0) {
 		/*
 		 * "no-l1ss" -- Provides Clock Power Management, L0s, and