On 8/9/19 7:13 AM, Stephen Douthit wrote:

On 8/8/19 11:46 PM, Jens Axboe wrote:

quoted

On 8/8/19 1:24 PM, Stephen Douthit wrote:

quoted

Intel moved the PCS register from 0x92 to 0x94 on Denverton for some
reason, so now we get to check the device ID before poking it on reset.

Signed-off-by: Stephen Douthit <redacted>
---
    drivers/ata/ahci.c | 42 +++++++++++++++++++++++++++++++++++++++---
    1 file changed, 39 insertions(+), 3 deletions(-)

diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
index f7652baa6337..7090c7754fc2 100644
--- a/drivers/ata/ahci.c
+++ b/drivers/ata/ahci.c

@@ -623,6 +623,41 @@ static void ahci_pci_save_initial_config(struct pci_dev *pdev,
    	ahci_save_initial_config(&pdev->dev, hpriv);
    }
    
+/*
+ * Intel moved the PCS register on the Denverton AHCI controller, see which
+ * offset this controller is using
+ */
+static int ahci_pcs_offset(struct ata_host *host)
+{
+	struct pci_dev *pdev = to_pci_dev(host->dev);
+
+	switch (pdev->device) {
+	case 0x19b0:
+	case 0x19b1:
+	case 0x19b2:
+	case 0x19b3:
+	case 0x19b4:
+	case 0x19b5:
+	case 0x19b6:
+	case 0x19b7:
+	case 0x19bE:
+	case 0x19bF:
+	case 0x19c0:
+	case 0x19c1:
+	case 0x19c2:
+	case 0x19c3:
+	case 0x19c4:
+	case 0x19c5:
+	case 0x19c6:
+	case 0x19c7:
+	case 0x19cE:
+	case 0x19cF:

Any particular reason why you made some of hex alphas upper case?

No good reason.  These were copied from the ahci_pci_tbl above and I
didn't notice the mixed case.

Ah I see.

I'll resend.

Would you like a separate cleanup patch for ahci_pci_tbl as well?

Yes please, I have a hard time reading the weird mixed case.

-- 
Jens Axboe