diff --git a/arch/arm64/boot/dts/broadcom/rp1.dtsi b/arch/arm64/boot/dts/broadcom/rp1.dtsi
index 4c2a06cb85e86..7141dfcff4e70 100644
--- a/arch/arm64/boot/dts/broadcom/rp1.dtsi
+++ b/arch/arm64/boot/dts/broadcom/rp1.dtsi
@@ -1126,7 +1126,6 @@
 			snps,dis_rxdet_inp3_quirk;
 			snps,enhanced-nak-fs-quirk;
 			snps,parkmode-disable-ss-quirk;
-			snps,parkmode-disable-hs-quirk;
 			snps,parkmode-disable-fsls-quirk;
 			snps,tx-max-burst = /bits/ 8 <8>;
 			snps,tx-thr-num-pkt = /bits/ 8 <2>;
@@ -1143,7 +1142,6 @@
 			snps,dis_rxdet_inp3_quirk;
 			snps,enhanced-nak-fs-quirk;
 			snps,parkmode-disable-ss-quirk;
-			snps,parkmode-disable-hs-quirk;
 			snps,parkmode-disable-fsls-quirk;
 			snps,tx-max-burst = /bits/ 8 <8>;
 			snps,tx-thr-num-pkt = /bits/ 8 <2>;
diff --git a/drivers/usb/storage/scsiglue.c b/drivers/usb/storage/scsiglue.c
index d2f476e48d0c7..f81c997656f59 100644
--- a/drivers/usb/storage/scsiglue.c
+++ b/drivers/usb/storage/scsiglue.c
@@ -111,7 +111,8 @@ static int sdev_configure(struct scsi_device *sdev, struct queue_limits *lim)
 		 * let the queue segment size sort out the real limit.
 		 */
 		lim->max_hw_sectors = 0x7FFFFF;
-	} else if (us->pusb_dev->speed >= USB_SPEED_SUPER) {
+	} else if (us->pusb_dev->speed >= USB_SPEED_SUPER ||
+		   (us->pusb_dev->bos && us->pusb_dev->bos->ss_cap)) {
 		/*
 		 * USB3 devices will be limited to 2048 sectors. This gives us
 		 * better throughput on most devices.
@@ -119,6 +120,15 @@ static int sdev_configure(struct scsi_device *sdev, struct queue_limits *lim)
 		lim->max_hw_sectors = 2048;
 	}
 
+	/*
+	 * The default of 240 sectors on 16K page platforms causes decomposition
+	 * of transfers into lengths of 224 sectors aligned to 32 sectors.
+	 * Middle-of-the-range devices show a modest sequential speed increase
+	 * with 192 sectors (64s alignment).
+	 */
+	if (lim->max_hw_sectors == 240 && PAGE_SIZE == SZ_16K)
+		lim->max_hw_sectors = 192;
+
 	/*
 	 * The max_hw_sectors should be up to maximum size of a mapping for
 	 * the device. Otherwise, a DMA API might fail on swiotlb environment.